Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/dutyOfficer/index.vue

@@ -37,7 +37,7 @@
       <InputSearch style="width: 402px;" :formList="searchFormList" :formConfigOptions="{ labelWidth: '72px' }"
         @handleSearch="handleSearch" />
     </div>
-    <ElEmpty v-if="!data.length" description="暂无数据" style="width: 100%;height: 100%;" />
+    <ElEmpty v-if="!data.length && !isFirst" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
 
     <SpecialTable v-else :columns="columns" :data="data" class="body">
       <template #title-DateDuty>
@@ -171,7 +171,8 @@ export default {
       ],
       operateRecordVisible: false,
       modifyDutyInformationTableVisible: false,
-      dialogData: null
+      dialogData: null,
+      isFirst: true,
     }
   },
   created() {
@@ -253,6 +254,7 @@ export default {
           this.total = result.total;
         })
         .finally(() => {
+          this.isFirst = false;
           closeLoading();
         })
     },

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/emergencyAgencies/index.vue

@@ -27,7 +27,7 @@
     </div>
 
     <div class='body'>
-      <ElEmpty v-if="!data.length" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
+      <ElEmpty v-if="!data.length && !isFirst" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
 
       <template v-else>
         <Card v-for="(item, index) in data" :keyMap="keyMap" :cardData="item" :key="index">
@@ -108,7 +108,8 @@ export default {
           key: "dcOrganizations.latitude",
           label: "救援外协单位"
         }
-      ]
+      ],
+      isFirst: true,
     }
   },
   created() {
@@ -171,6 +172,7 @@ export default {
         this.setTotal(result.total)
       }).finally(() => {
         closeLoading();
+        this.isFirst = false;
       })
     }
   }

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue

@@ -27,7 +27,7 @@
     </div>
 
     <div class='body'>
-      <ElEmpty v-if="!data.length" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
+      <ElEmpty v-if="!data.length && !isFirst" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
       <template v-else>
         <PeopleCard v-for="(item, index) in data" :cardData="item" :key="index"
           @edit="data => handleOpenDialogAddEdit(data)" @delete="handleDelete" />
@@ -66,7 +66,8 @@ export default {
       searchFormList,
       data: [],
       addNEditDialogVisible: false,
-      dialogData: null
+      dialogData: null,
+      isFirst: true,
     }
   },
   created() {
@@ -153,6 +154,7 @@ export default {
 
         this.setTotal(result.total)
       }).finally(() => {
+        this.isFirst = false;
         closeLoading();
       })
     }

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/jurisdictionalManagement/index.vue

@@ -28,8 +28,7 @@
 
 
     <div class="body">
-
+      <ElEmpty v-if="!data.length && !isFirst" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
-      <ElEmpty v-if="!data.length" description="暂无数据" style="width: 100%;height: 100%;position: absolute;" />
 
       <template v-else>
         <Card v-for="(item, index) in data" :buttonIcon="null" :keyMap="keyMap" :cardData="item" :key="index"
@@ -118,7 +117,8 @@ export default {
       // })),
       data: [],
       dialogData: null,
-      editEventInformationDialogVisible: false
+      editEventInformationDialogVisible: false,
+      isFirst: true
     }
   },
   created() {
@@ -185,6 +185,7 @@ export default {
         this.data = result.rows;
         this.setTotal(result.total)
       }).finally(() => {
+        this.isFirst = false;
         closeLoading();
       })
     }

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/coordinateSchedulingRecords/index.vue

@@ -2,6 +2,13 @@
   <div class='CoordinateSchedulingRecords'>
     <!-- 搜索栏 -->
     <div class="filter">
+      <ButtonGradient>
+        <template #prefix>
+          <img src="@screen/images/refresh.svg" />
+        </template>
+        刷新
+      </ButtonGradient>
+
       <InputSearch style="width: 402px;" />
     </div>
 
@@ -21,6 +28,7 @@
 import Pagination from '@screen/components/Pagination.vue';
 import InputSearch from '@screen/components/InputSearch/index.vue';
 import Card from './components/Card/index.vue';
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
 
 export default {
   name: 'CoordinateSchedulingRecords',
@@ -28,6 +36,7 @@ export default {
     Pagination,
     Card,
     InputSearch,
+    ButtonGradient
   },
   data() {
     return {
@@ -58,7 +67,7 @@ export default {
   .filter {
     height: 60px;
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
   }
 
   .body {

ruoyi-ui/src/views/JiHeExpressway/pages/service/PublishingChannelManagement/index.vue

@@ -2,6 +2,13 @@
   <div class='PublishingChannelManagement'>
     <!-- 搜索栏 -->
     <div class="filter">
+      <ButtonGradient>
+        <template #prefix>
+          <img src="@screen/images/refresh.svg" />
+        </template>
+        刷新
+      </ButtonGradient>
+
       <InputSearch style="width: 402px;" />
     </div>
 
@@ -21,13 +28,15 @@
 import Pagination from '@screen/components/Pagination.vue';
 import InputSearch from '@screen/components/InputSearch/index.vue';
 import Card from './components/Card';
+import ButtonGradient from '@screen/components/Buttons/ButtonGradient.vue';
 
 export default {
   name: 'PublishingChannelManagement',
   components: {
     Pagination,
     InputSearch,
-    Card
+    Card,
+    ButtonGradient
   },
 }
 </script>
@@ -46,7 +55,7 @@ export default {
   .filter {
     height: 60px;
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
   }
 
   .body {