From ac02974a8775cf201bd4dc565630d305763bc7ca Mon Sep 17 00:00:00 2001 From: glj Date: Sun, 23 Apr 2023 16:00:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E9=A1=B5=E8=BD=AC=E5=8F=B3=E4=BE=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataService/multimediaData/index.vue | 4 +- src/views/dataService/otherData/index.vue | 4 +- src/views/dataService/pictureInfo/index.vue | 4 +- .../components/retrievalCondition.vue | 4 +- src/views/dataService/visualData/index.vue | 6 +- .../responseManagement/contact/index.vue | 160 ++++++++--------- .../responseManagement/dataUpload/index.vue | 6 +- src/views/responseManagement/tool/index.vue | 37 ++-- .../userResponse/component/selectUser.vue | 25 +-- .../responseManagement/userResponse/index.vue | 6 +- src/views/system/role/index.vue | 105 ++++------- src/views/system/user/index.vue | 4 +- .../systemManagement/administrator/index.vue | 169 ++++++++---------- .../component/disasterInfo.vue | 4 +- .../component/manageDisaster.vue | 147 +++++++-------- .../chiefAdministrator/index.vue | 4 +- 16 files changed, 308 insertions(+), 381 deletions(-) diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue index 632ec59..1767187 100644 --- a/src/views/dataService/multimediaData/index.vue +++ b/src/views/dataService/multimediaData/index.vue @@ -380,7 +380,7 @@ onMounted(() => { } } .mt15 { - float: right; - margin-bottom: 15px; + display: flex; + justify-content: end; } diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue index d8113db..20f9a64 100644 --- a/src/views/dataService/otherData/index.vue +++ b/src/views/dataService/otherData/index.vue @@ -278,7 +278,7 @@ onMounted(() => { } } .mt15 { - float: right; - margin-bottom: 15px; + display: flex; + justify-content: end; } diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue index b3827c9..1f17c2f 100644 --- a/src/views/dataService/pictureInfo/index.vue +++ b/src/views/dataService/pictureInfo/index.vue @@ -291,8 +291,8 @@ onMounted(() => { \ No newline at end of file diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue index d21517d..a493290 100644 --- a/src/views/dataService/visualData/index.vue +++ b/src/views/dataService/visualData/index.vue @@ -49,7 +49,7 @@ @selection-change="handleSelectionChange" style="width: 100%"> - + @@ -367,7 +367,7 @@ onMounted(() => { font-weight: 600; } .mt15 { - float: right; - margin-bottom: 15px; + display: flex; + justify-content: end; } diff --git a/src/views/responseManagement/contact/index.vue b/src/views/responseManagement/contact/index.vue index ac9e866..414f114 100644 --- a/src/views/responseManagement/contact/index.vue +++ b/src/views/responseManagement/contact/index.vue @@ -1,22 +1,23 @@ diff --git a/src/views/responseManagement/dataUpload/index.vue b/src/views/responseManagement/dataUpload/index.vue index 842c47e..e55119f 100644 --- a/src/views/responseManagement/dataUpload/index.vue +++ b/src/views/responseManagement/dataUpload/index.vue @@ -224,7 +224,7 @@ onMounted(() => { getTableData(); }); - diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue index 873e22e..102dd15 100644 --- a/src/views/responseManagement/tool/index.vue +++ b/src/views/responseManagement/tool/index.vue @@ -1,7 +1,6 @@ \ No newline at end of file diff --git a/src/views/responseManagement/userResponse/component/selectUser.vue b/src/views/responseManagement/userResponse/component/selectUser.vue index 832f27f..f69b716 100644 --- a/src/views/responseManagement/userResponse/component/selectUser.vue +++ b/src/views/responseManagement/userResponse/component/selectUser.vue @@ -5,27 +5,28 @@ - + + background v-model:page-size="state.tableData.param.pageSize" layout="total, sizes, prev, pager, next" + :total="state.tableData.total"> @@ -168,15 +129,17 @@ onMounted(() => { diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 4a06b19..f851cc6 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -149,7 +149,7 @@ onMounted(() => { } } .mt15 { - float: right; - margin-bottom: 15px; + display: flex; + justify-content: end; } diff --git a/src/views/systemManagement/administrator/index.vue b/src/views/systemManagement/administrator/index.vue index 363ffb8..4746bf4 100644 --- a/src/views/systemManagement/administrator/index.vue +++ b/src/views/systemManagement/administrator/index.vue @@ -2,83 +2,63 @@
- - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
- - + +
- diff --git a/src/views/systemManagement/chiefAdministrator/component/disasterInfo.vue b/src/views/systemManagement/chiefAdministrator/component/disasterInfo.vue index 7a28152..9837df0 100644 --- a/src/views/systemManagement/chiefAdministrator/component/disasterInfo.vue +++ b/src/views/systemManagement/chiefAdministrator/component/disasterInfo.vue @@ -126,7 +126,7 @@ defineExpose({ \ No newline at end of file diff --git a/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue b/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue index 0fa702b..31f38f5 100644 --- a/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue +++ b/src/views/systemManagement/chiefAdministrator/component/manageDisaster.vue @@ -1,75 +1,62 @@