From f2bc4bdea895c87647200b18920e90e5aab3ec33 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 23 Aug 2024 12:10:53 +0800
Subject: [PATCH] =?UTF-8?q?543=20=E6=90=9C=E7=B4=A2=E6=A1=86=20=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=20541=20=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=8D?=
 =?UTF-8?q?=E5=A5=BD=E4=BD=BF=20538=20=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=E8=93=9D=E8=89=B2=20542=20=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=9F=A5=E7=9C=8B=E7=89=A9=E8=B5=84=20=E6=8E=89?=
 =?UTF-8?q?=E7=BA=BF=20541=20=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B8=8D=E5=A5=BD?=
 =?UTF-8?q?=E4=BD=BF=20534=20=E5=85=88=E7=82=B9=E5=87=BB=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20=E5=86=8D=E7=82=B9=E5=87=BB=E7=BC=96=E8=BE=91=20=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E4=BF=A1=E6=81=AF=E5=90=8E=E4=BF=9D=E5=AD=98=20?=
 =?UTF-8?q?=E6=98=AF=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emergency_personnel/components/list.vue   |  4 ++--
 .../emergency_shelter/components/list.vue     | 19 +++++++++++----
 .../components/equipment.vue                  | 13 ++++++----
 .../components/facilities.vue                 | 24 +++++++++----------
 .../components/facilitiesInfo.vue             |  6 ++---
 .../equipment_library/components/supplies.vue | 16 ++++++-------
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
index c9c7f4c..ed74799 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
@@ -7,7 +7,7 @@
         </el-form-item>
         <el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
-          <el-button class="filter-item" type="default" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          <el-button class="filter-item" type="info" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -280,7 +280,7 @@ export default {
       })
     },
     getDetail(id) {
-      const params = { Id: id }
+      const params = { ID: id }
       requestFN('/major/personnel/detail', params).then((response) => {
         const data = response.msg
         this.form = {
diff --git a/src/views/emergen_cyrescue/resource_management/emergency_shelter/components/list.vue b/src/views/emergen_cyrescue/resource_management/emergency_shelter/components/list.vue
index 0e67be7..2efd3b9 100644
--- a/src/views/emergen_cyrescue/resource_management/emergency_shelter/components/list.vue
+++ b/src/views/emergen_cyrescue/resource_management/emergency_shelter/components/list.vue
@@ -1,10 +1,21 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      <el-form>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="名称：">
+              <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+              搜索
+            </el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue
index 7bdcbe8..f74defa 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      装备名称：<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="resetting">搜索</el-button>
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
@@ -452,7 +451,7 @@ export default {
       requestFN(
         '/rescueEquip/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          name: this.KEYWORDS,
+          EQUIP_NAME: this.KEYWORDS,
           LIBRARY_ID: this.resourceLibraryId
         }
       ).then((data) => {
@@ -618,6 +617,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.getList()
+      this.KEYWORDS = ''
     }
 
   }
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue
index fa467b5..63dbab6 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue
@@ -1,19 +1,18 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      名字：<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+      <el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">重置</el-button>
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="FAC_NAME" label="名称" width="180" />
-      <el-table-column prop="TYPE_NAME" label="设备类型" show-overflow-tooltip="true" />
-      <el-table-column prop="CONTACT_PERSON" label="联系人" show-overflow-tooltip="true" />
-      <el-table-column prop="CONTACT_MOBILE_PHONE" label="联系人固定电话" show-overflow-tooltip="true" />
-      <el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" />
+      <el-table-column :show-overflow-tooltip="true" prop="TYPE_NAME" label="设备类型" />
+      <el-table-column :show-overflow-tooltip="true" prop="CONTACT_PERSON" label="联系人" />
+      <el-table-column :show-overflow-tooltip="true" prop="CONTACT_MOBILE_PHONE" label="联系人固定电话" />
+      <el-table-column :show-overflow-tooltip="true" prop="UPDATE_TIME_STRING" label="修改时间" />
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{row}">
           <el-button type="text" icon="el-icon-document" size="mini" @click="goList('facilitiesInfo', row.FAC_ID)">查看</el-button>
@@ -137,11 +136,8 @@
             <div style="flex:1;">
               <el-autocomplete v-model="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
             </div>
-            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
-            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
           </div>
         </bm-control>
-        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
       </baidu-map>
       <div slot="footer" class="dialog-footer">
         <span>经度：</span>
@@ -434,7 +430,7 @@ export default {
       requestFN(
         '/equipmentfacilities/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          name: this.KEYWORDS,
+          FAC_NAME: this.KEYWORDS,
           LIBRARY_ID: this.resourceLibraryId
         }
       ).then((data) => {
@@ -600,6 +596,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue
index 14cce74..6da9b38 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/facilitiesInfo.vue
@@ -31,12 +31,12 @@
             <td>{{ form.CONTACT_MOBILE_TOW_PHONE }}</td>
           </tr>
           <tr>
-            <td class="tbg">概述</td>
-            <td>{{ form.OVERVIEW }}</td>
+            <td class="tbg" >概述</td>
+            <td colspan="3">{{ form.OVERVIEW }}</td>
           </tr>
           <tr v-if="form.FILE_URL">
             <td class="tbg">附件</td>
-            <td><a @click="download(form)">下载</a></td>
+            <td colspan="3"><el-button type="primary" @click="download(form)">下载</el-button></td>
           </tr>
         </table>
       </div>
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue
index 598f3e2..c5a4045 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      物资名称：<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+      <el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">重置</el-button>
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
@@ -139,11 +138,8 @@
             <div style="flex:1;">
               <el-autocomplete v-model="TYPEKeyword" :fetch-suggestions="querySearch" :trigger-on-focus="false" placeholder="请输入详细设备类型" style="width:100%" @select="handleSelect" />
             </div>
-            <!--            <el-input v-model="TYPEKeyword" style="width: 200px" placeholder="请输入内容" />-->
-            <!--            <el-button slot="append" icon="el-icon-search" @click="mapNameChange"/>-->
           </div>
         </bm-control>
-        <!--        <bm-local-search :keyword="TYPEKeyword" :auto-viewport="true"/>-->
       </baidu-map>
       <div slot="footer" class="dialog-footer">
         <span>经度：</span>
@@ -453,7 +449,7 @@ export default {
       requestFN(
         '/rescueSupplies/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          name: this.KEYWORDS,
+          SUPPLIES_NAME: this.KEYWORDS,
           LIBRARY_ID: this.resourceLibraryId
         }
       ).then((data) => {
@@ -618,6 +614,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.getList()
+      this.KEYWORDS = ''
     }
 
   }