From 1b46f3b1922b5cd6faaabc5a77e712a7dfa9150a Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 7 Sep 2024 15:51:02 +0800
Subject: [PATCH] =?UTF-8?q?912=20=E5=B8=A6=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=20=E4=BC=9A=E5=8D=A1=E9=A1=BF=20=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E8=BF=9E=E7=82=B9=20911=20=E5=B8=A6=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=20=E4=BC=9A=E5=8D=A1=E9=A1=BF=20=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E8=BF=9E=E7=82=B9=20910=20=E5=B8=A6=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=20=E4=BC=9A=E5=8D=A1=E9=A1=BF=20=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E8=BF=9E=E7=82=B9=20908=20=E5=B8=A6=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=20=E4=BC=9A=E5=8D=A1=E9=A1=BF=20=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E8=BF=9E=E7=82=B9=20909=20=E5=B8=A6=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=20=E4=BC=9A=E5=8D=A1=E9=A1=BF=20=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E8=BF=9E=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../case_library/components/casebasic.vue     | 29 +++++++++++++++----
 .../dangerous_goods/index.vue                 | 28 ++++++++++++++----
 .../hazardous_chemicals/index.vue             | 27 +++++++++++++----
 .../production_process/index.vue              | 28 ++++++++++++++----
 .../regulatory_library/index.vue              | 12 ++++++--
 .../emergency_map/components/sysChat.vue      |  2 +-
 6 files changed, 101 insertions(+), 25 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
index 66b3739..6cba0bd 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/case_library/components/casebasic.vue
@@ -1,10 +1,16 @@
 <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 inline>
+        <el-form-item label="标题:">
+          <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
+        </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="info" icon="el-icon-search" @click="resetting">重置</el-button>
+        </el-form-item>
+      </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" />
@@ -212,8 +218,13 @@ export default {
       this.FFILE = fileList
     },
     upload(fun) {
+      const loading = this.$loading({
+        lock: true,
+        text: '正在上传',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       const formData = new FormData()
-
       for (let i = 0; i < this.FFILE.length; i++) {
         if (this.FFILE[i].raw) {
           formData.append('FFILE', this.FFILE[i].raw)
@@ -224,7 +235,10 @@ export default {
         formData
       ).then((data) => {
         fun(data.fileurl)
+        loading.close()
       }).catch((e) => {
+        this.$message.error(e)
+        loading.close()
       })
     },
     //* *******************列表查询******************************
@@ -378,8 +392,11 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
-
   }
 }
 </script>
diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/dangerous_goods/index.vue b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/dangerous_goods/index.vue
index 77a253f..0b550b1 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/dangerous_goods/index.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/dangerous_goods/index.vue
@@ -1,10 +1,16 @@
 <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 inline>
+        <el-form-item label="名称:" prop="TYPE">
+          <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
+        </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="info" icon="el-icon-search" @click="resetting">重置</el-button>
+        </el-form-item>
+      </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" />
@@ -152,8 +158,13 @@ export default {
       this.FFILE = fileList
     },
     upload(fun) {
+      const loading = this.$loading({
+        lock: true,
+        text: '正在上传',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       const formData = new FormData()
-
       for (let i = 0; i < this.FFILE.length; i++) {
         if (this.FFILE[i].raw) {
           formData.append('FFILE', this.FFILE[i].raw)
@@ -164,7 +175,10 @@ export default {
         formData
       ).then((data) => {
         fun(data.fileurl)
+        loading.close()
       }).catch((e) => {
+        this.$message.error(e)
+        loading.close()
       })
     },
     //* *******************列表查询******************************
@@ -309,6 +323,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/hazardous_chemicals/index.vue b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/hazardous_chemicals/index.vue
index 4b92aa2..66bcf99 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/hazardous_chemicals/index.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/hazardous_chemicals/index.vue
@@ -1,10 +1,15 @@
 <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 inline>
+        <el-form-item label="中文名称:">
+          <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
+        </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="info" icon="el-icon-search" @click="resetting">重置</el-button>
+        </el-form-item>
+      </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" />
@@ -156,8 +161,13 @@ export default {
       this.FFILE = fileList
     },
     upload(fun) {
+      const loading = this.$loading({
+        lock: true,
+        text: '正在上传',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       const formData = new FormData()
-
       for (let i = 0; i < this.FFILE.length; i++) {
         if (this.FFILE[i].raw) {
           formData.append('FFILE', this.FFILE[i].raw)
@@ -168,7 +178,10 @@ export default {
         formData
       ).then((data) => {
         fun(data.fileurl)
+        loading.close()
       }).catch((e) => {
+        this.$message.error(e)
+        loading.close()
       })
     },
     //* *******************列表查询******************************
@@ -312,6 +325,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/production_process/index.vue b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/production_process/index.vue
index 2166078..2c19584 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/production_process/index.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/production_process/index.vue
@@ -1,10 +1,16 @@
 <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 inline>
+        <el-form-item label="中文名称:">
+          <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;" />
+        </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="info" icon="el-icon-search" @click="resetting">重置</el-button>
+        </el-form-item>
+      </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" />
@@ -136,8 +142,13 @@ export default {
       this.FFILE = fileList
     },
     upload(fun) {
+      const loading = this.$loading({
+        lock: true,
+        text: '正在上传',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       const formData = new FormData()
-
       for (let i = 0; i < this.FFILE.length; i++) {
         if (this.FFILE[i].raw) {
           formData.append('FFILE', this.FFILE[i].raw)
@@ -148,7 +159,10 @@ export default {
         formData
       ).then((data) => {
         fun(data.fileurl)
+        loading.close()
       }).catch((e) => {
+        this.$message.error(e)
+        loading.close()
       })
     },
     //* *******************列表查询******************************
@@ -283,6 +297,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/regulatory_library/index.vue b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/regulatory_library/index.vue
index 35fbf4e..60ee319 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/regulatory_library/index.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_knowledge/regulatory_library/index.vue
@@ -16,7 +16,10 @@
       </el-aside>
       <el-main>
         <div class="filter-btn-group">
-          <div><el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button></div>
+          <div>
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+            <el-button type="info" icon="el-icon-search" @click="resetting">重置</el-button>
+          </div>
         </div>
         <el-table v-loading="listLoading" ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
           <el-table-column type="index" label="序号" width="50" align="center" />
@@ -379,7 +382,6 @@ export default {
         TYPE_DIC_ID: null
       }
     },
-
     handleDelete(id, name) {
       this.$confirm('确定要删除[' + name + ']吗?', {
         confirmButtonText: '确定',
@@ -402,8 +404,12 @@ export default {
         })
       }).catch(() => {
       })
+    },
+    resetting() {
+      this.DICTIONARIES_ID = ''
+      this.filterText = ''
+      this.getList()
     }
-
   }
 }
 </script>
diff --git a/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue b/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue
index 7aef624..dbf5fd7 100644
--- a/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue
+++ b/src/views/emergen_cyrescue/emergency_map/components/sysChat.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="sys_chat_container">
-    <div v-for="(item, ind) in chatData" :key="ind" class="chat_body">
+    <div v-for="(item, ind) in chatData" :key="ind" class="chat_body" style="margin-bottom: 25px">
       <p class="chat_title">{{ '指令：' + item.info.MESS }}</p>
       <p v-for="(answer, indx) in item.list" :key="indx" :class="{ 'ready': answer.READ_STATUS === '1'}" class="chat_item">
         <span v-if="answer.IDENT_SIGN === '1'" class="chat_item_head">{{ answer.SEND_MEN_NAME + ' 回复:' }} </span>