From 7a0ea17e340319f14fb7f0d5832feca93902c5b3 Mon Sep 17 00:00:00 2001
From: WenShiJun <piratecaptain37@aliyun.com>
Date: Fri, 19 Jul 2024 16:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E6=95=85=E6=97=A5=E5=BF=97=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E9=80=9A=E7=9F=A5=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=8B=E6=95=85=E6=8E=A5=E6=8A=A5=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../incident_report/components/list.vue       | 13 +++--
 .../notification_log/components/detail.vue    |  2 +-
 .../notification_log/components/list.vue      | 47 +------------------
 .../process_management/components/detail.vue  | 26 +++++++---
 .../process_management/components/list.vue    | 39 +++------------
 .../components/equipment.vue                  | 26 +---------
 .../components/equipmentInfo.vue              |  6 ---
 .../components/facilitiesInfo.vue             |  6 ---
 .../equipment_library/components/supplies.vue | 26 +---------
 .../components/suppliesInfo.vue               |  8 ----
 10 files changed, 42 insertions(+), 157 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue b/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
index b103861..6c96e1e 100644
--- a/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
@@ -34,6 +34,11 @@
       <el-table-column prop="EVENT_TYPE" label="事件类型" show-overflow-tooltip="true" />
       <el-table-column prop="REPORT_TIME" label="接报时间" show-overflow-tooltip="true" />
       <el-table-column prop="OCCURRENCE_TIME" label="发生时间" show-overflow-tooltip="true" />
+      <el-table-column prop="RESCUE_SITUATION" label="救援情况" show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          {{ scope.row.RESCUE_SITUATION === '1' ? '已发起' : (scope.row.RESCUE_SITUATION === '2' || scope.row.RESCUE_SITUATION === null ? '未发起' : '') }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="500">
         <template slot-scope="{row}">
           <el-button type="primary" size="mini" @click="handleRescue(row.ID)">是否救援</el-button>
@@ -725,12 +730,14 @@ export default {
           this.dialogRescueVisible = false
           // 发送救援信息
           this.sendSMS(this.rescueForm.FIRERESERVEPLAN_ID, this.rescueForm.HIERARCHICALRESPONSE_ID, this.rescueForm.REGISTRATION_ID)
+            .finally(() => {
+              this.getList()
+            })
         }
       })
     },
     sendSMS(planId, responseId, registrationId) {
-      requestFN('/major/registration/sendSMS', { planId, responseId, registrationId }).then((response) => {
-      })
+      return requestFN('/major/registration/sendSMS', { planId, responseId, registrationId })
     },
     handleRegionChange(value) {
       const selectedRegion = this.regionData.find(region => region.DICTIONARIES_ID === value)
@@ -935,7 +942,7 @@ export default {
       this.form.LONGITUDE = this.LONGITUDE
     },
     //* *******************列表查询******************************
-    getList(queryParams) {
+    getList(queryParams = {}) {
       this.listLoading = true
       requestFN(
         '/major/registration/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
diff --git a/src/views/emergen_cyrescue/emergency_report/notification_log/components/detail.vue b/src/views/emergen_cyrescue/emergency_report/notification_log/components/detail.vue
index bb9b5aa..659d6c2 100644
--- a/src/views/emergen_cyrescue/emergency_report/notification_log/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_report/notification_log/components/detail.vue
@@ -214,7 +214,7 @@ export default {
     },
     getDetail(Id) {
       const params = { Id }
-      requestFN('/major/registration/detail', params).then((response) => {
+      requestFN('/major/registration/detailLog', params).then((response) => {
         const data = response.msg
         this.form = {
           REPORT_UNIT: data.REPORT_UNIT,
diff --git a/src/views/emergen_cyrescue/emergency_report/notification_log/components/list.vue b/src/views/emergen_cyrescue/emergency_report/notification_log/components/list.vue
index 5dfe1a6..cad6823 100644
--- a/src/views/emergen_cyrescue/emergency_report/notification_log/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_report/notification_log/components/list.vue
@@ -22,7 +22,6 @@
       <el-table-column prop="CREATETIME" label="通知时间" show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{ row }">
-          <el-button type="primary" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
           <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.NAME)">删除</el-button>
         </template>
       </el-table-column>
@@ -41,7 +40,6 @@
 <script>
 import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
-import { MessageBox, Message } from 'element-ui'
 export default {
   components: { Pagination },
   data() {
@@ -79,46 +77,6 @@ export default {
       this.NAME = ''
       this.getQuery()
     },
-    confirmExport(id) {
-      MessageBox.confirm('确定要导出数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.getExportExcel(id)
-      })
-    },
-    getExportExcel(id) {
-      const params = { Id: id }
-      requestFN('/major/dutylog/ExportExcel', params).then((response) => {
-        Message({
-          type: 'success',
-          message: '导出成功'
-        })
-      }).catch((e) => {
-        Message({
-          type: 'error',
-          message: '导出失败'
-        })
-        console.error('导出数据失败', e)
-      })
-    },
-    getDetail(id) {
-      const params = { Id: id }
-      requestFN('/major/dutylog/detail', params).then((response) => {
-        const data = response.msg
-        this.form = {
-          Id: data.ID,
-          NAME: data.NAME,
-          ORDER_CONTENT: data.ORDER_CONTENT,
-          PHONE: data.PHONE,
-          PLAN_ID: data.PLAN_ID,
-          RESPONSE_ID: data.RESPONSE_ID
-        }
-      }).catch((e) => {
-        console.error('获取详情数据失败', e)
-      })
-    },
     handleDelete(id, NAME) {
       this.$confirm('确定要删除[' + NAME + ']吗?', {
         confirmButtonText: '确定',
@@ -126,7 +84,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        requestFN('/major/dutylog/delete', { id }).then((data) => {
+        requestFN('/major/notification/delete', { id }).then((data) => {
           if (data.result === 'success') {
             this.listLoading = false
             this.getList()
@@ -153,7 +111,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.listLoading = true
-        requestFN('/major/dutylog/deleteAll', { ids }).then(() => {
+        requestFN('/major/notification/deleteAll', { ids }).then(() => {
           this.listLoading = false
           this.getList()
         }).catch((e) => {
@@ -161,7 +119,6 @@ export default {
         })
       }).catch(() => { })
     },
-
     getList() {
       this.listLoading = true
       requestFN('/major/notification/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
diff --git a/src/views/emergen_cyrescue/incident_management/process_management/components/detail.vue b/src/views/emergen_cyrescue/incident_management/process_management/components/detail.vue
index fe7682c..73fa691 100644
--- a/src/views/emergen_cyrescue/incident_management/process_management/components/detail.vue
+++ b/src/views/emergen_cyrescue/incident_management/process_management/components/detail.vue
@@ -109,16 +109,28 @@
             <td colspan="3">{{ form.DISPOSAL_SITUATION }}</td>
           </tr>
           <tr>
+            <td class="tbg">事件标题</td>
+            <td>{{ form.EVENT_NAME }}</td>
+            <td class="tbg">呼入电话</td>
+            <td>{{ form.INCOMING_PHONE }}</td>
+          </tr>
+          <tr v-for="order in orderInfoList" :key="order.id">
+            <td class="tbg">指令名称</td>
+            <td>{{ order.name }}</td>
             <td class="tbg">指令内容</td>
-            <td colspan="3">{{ form.ORDER_CONTENT }}</td>
+            <td>{{ order.order_CONTENT }}</td>
           </tr>
-          <tr>
+          <tr v-for="order in orderInfoList" :key="order.id">
+            <td class="tbg">响应级别</td>
+            <td>{{ order.response_NAME }}</td>
             <td class="tbg">预案名称</td>
-            <td colspan="3">{{ form.PLAN_NAME }}</td>
+            <td>{{ order.plan_NAME }}</td>
           </tr>
-          <tr>
-            <td class="tbg">响应级别名称</td>
-            <td colspan="3">{{ form.RESPONSE_NAME }}</td>
+          <tr v-for="order in orderInfoList" :key="order.id">
+            <td class="tbg">联系电话</td>
+            <td>{{ order.phone }}</td>
+            <td class="tbg">备注</td>
+            <td>{{ order.remark }}</td>
           </tr>
         </table>
       </div>
@@ -180,6 +192,7 @@ export default {
   created() {
     if (this.$parent.CASE_ID) {
       this.Id = this.$parent.CASE_ID
+      this.RegistrationId = this.$parent.REGISTRATION_ID
       this.getDetail(this.Id)
     }
   },
@@ -230,6 +243,7 @@ export default {
           ORDER_CONTENT: data.ORDER_CONTENT,
           Id: data.ID
         }
+        this.orderInfoList = data.orderInfoList
       }).catch((e) => {
         console.error('获取详情数据失败', e)
       })
diff --git a/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue b/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue
index c7216a4..4862bf1 100644
--- a/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue
+++ b/src/views/emergen_cyrescue/incident_management/process_management/components/list.vue
@@ -14,14 +14,14 @@
     <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="NAME" label="姓名" width="180" />
-      <el-table-column prop="PHONE" label="电话" show-overflow-tooltip="true" />
-      <el-table-column prop="PLAN_NAME" label="预案名称" show-overflow-tooltip="true" />
-      <el-table-column prop="RESPONSE_NAME" label="响应级别名称" show-overflow-tooltip="true" />
-      <el-table-column prop="CREATETIME" label="通知时间" show-overflow-tooltip="true" />
+      <el-table-column prop="EVENT_NAME" label="事件标题" width="180" />
+      <el-table-column prop="INCOMING_PHONE" label="接入电话" show-overflow-tooltip="true" />
+      <el-table-column prop="OWNER_NAME" label="机主姓名" show-overflow-tooltip="true" />
+      <el-table-column prop="ACCESS_MODE" label="接入方式" show-overflow-tooltip="true" />
+      <el-table-column prop="EVENT_TYPE" label="事件类型" show-overflow-tooltip="true" />
+      <el-table-column prop="CALLER_ADDRESS" label="主叫地址" show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{ row }">
-          <el-button type="primary" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看</el-button>
           <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.NAME)">删除</el-button>
         </template>
@@ -41,7 +41,6 @@
 <script>
 import Pagination from '@/components/Pagination'
 import { requestFN } from '@/utils/request'
-import { MessageBox, Message } from 'element-ui'
 export default {
   components: { Pagination },
   data() {
@@ -83,30 +82,6 @@ export default {
       this.$parent.CASE_ID = CASE_ID
       this.$parent.ticketType = ticketType
     },
-    confirmExport(id) {
-      MessageBox.confirm('确定要导出数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.getExportExcel(id)
-      })
-    },
-    getExportExcel(id) {
-      const params = { Id: id }
-      requestFN('/major/dutylog/ExportExcel', params).then((response) => {
-        Message({
-          type: 'success',
-          message: '导出成功'
-        })
-      }).catch((e) => {
-        Message({
-          type: 'error',
-          message: '导出失败'
-        })
-        console.error('导出数据失败', e)
-      })
-    },
     getDetail(id) {
       const params = { Id: id }
       requestFN('/major/dutylog/detail', params).then((response) => {
@@ -166,7 +141,7 @@ export default {
     },
     getList() {
       this.listLoading = true
-      requestFN('/major/notification/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+      requestFN('/major/registration/listLog?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           name: this.NAME
         }
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 b923308..bbaf2d3 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
@@ -102,19 +102,6 @@
         </el-form-item>
 
         <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="所属区域" prop="ADMINISTRATIVE_REGION">
-              <Treeselect
-                :options="treeData"
-                :normalizer="normalizer"
-                v-model="form.REGION"
-                :disable-branch-nodes="true"
-                placeholder="请选择所属区域"
-                no-options-text="暂无数据"
-                no-children-text="暂无数据"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="所属单位" prop="SUPERVISING_AGENCY">
               <Treeselect
@@ -248,7 +235,6 @@ export default {
       },
 
       yjrescueEquipData: [],
-      treeData: [],
       DepartmentData: [],
       normalizer(node) {
         return {
@@ -304,19 +290,9 @@ export default {
         console.error('获取主管单位数据失败', e)
       })
     },
-    getTreeList() {
-      const params = {
-        PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
-      }
-      requestFN('/dictionaries/listTree', params).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
-      }).catch((e) => {
-        console.error('获取树形数据失败', e)
-      })
-    },
     getyjrescueEquipDataList() {
       const params = {
-        PARENT_ID: '73e875a1123443b69956cf6761f943de'
+        PARENT_ID: 'd80b53993f8e46cca18bc98e1ad9304e'
       }
       requestFN('/dictionaries/listTree', params).then((data) => {
         this.yjrescueEquipData = JSON.parse(data.zTreeNodes)
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue
index 4e71d62..40174f6 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/equipmentInfo.vue
@@ -35,14 +35,8 @@
           <tr>
             <td class="tbg">企业名称</td>
             <td>{{ form.COMPANY }}</td>
-            <td class="tbg">所属区域</td>
-            <td>{{ form.REGION_NAME }}</td>
-          </tr>
-          <tr>
             <td class="tbg">采集单位</td>
             <td>{{ form.AFFILIATEDUNIT_NAME }}</td>
-            <td class="tbg"/>
-            <td/>
           </tr>
         </table>
       </div>
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 cbfa475..14cce74 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
@@ -12,18 +12,12 @@
             <td class="tbg">设备类型</td>
             <td>{{ form.TYPE_NAME }}</td>
           </tr>
-
-          <tr>
-            <td class="tbg">所在位置</td>
-            <td colspan="3">{{ form.LOCATION }}</td>
-          </tr>
           <tr>
             <td class="tbg">经度</td>
             <td>{{ form.LONGITUDE }}</td>
             <td class="tbg">纬度</td>
             <td>{{ form.LATITUDE }}</td>
           </tr>
-
           <tr>
             <td class="tbg">联系人</td>
             <td>{{ form.CONTACT_PERSON }}</td>
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 5d50c90..3d51093 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
@@ -102,19 +102,6 @@
         </el-form-item>
 
         <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="所属区域" prop="ADMINISTRATIVE_REGION">
-              <Treeselect
-                :options="treeData"
-                :normalizer="normalizer"
-                v-model="form.REGION"
-                :disable-branch-nodes="true"
-                placeholder="请选择所属区域"
-                no-options-text="暂无数据"
-                no-children-text="暂无数据"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="采集单位" prop="SUPERVISING_AGENCY">
               <Treeselect
@@ -248,7 +235,6 @@ export default {
       },
 
       yjrescueSuppliesData: [],
-      treeData: [],
       DepartmentData: [],
       normalizer(node) {
         return {
@@ -304,19 +290,9 @@ export default {
         console.error('获取主管单位数据失败', e)
       })
     },
-    getTreeList() {
-      const params = {
-        PARENT_ID: '5a5d2809ed644aa6ba97a5240ff35484'
-      }
-      requestFN('/dictionaries/listTree', params).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
-      }).catch((e) => {
-        console.error('获取树形数据失败', e)
-      })
-    },
     getyjrescueSuppliesDataList() {
       const params = {
-        PARENT_ID: '73e875a1123443b69956cf6761f943de'
+        PARENT_ID: 'd80b53993f8e46cca18bc98e1ad9304e'
       }
       requestFN('/dictionaries/listTree', params).then((data) => {
         this.yjrescueSuppliesData = JSON.parse(data.zTreeNodes)
diff --git a/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue b/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue
index b6e3b09..9068dc2 100644
--- a/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue
+++ b/src/views/emergen_cyrescue/resource_management/equipment_library/components/suppliesInfo.vue
@@ -12,14 +12,12 @@
             <td class="tbg">物资类别</td>
             <td>{{ form.TYPE_NAME }}</td>
           </tr>
-
           <tr>
             <td class="tbg">经度</td>
             <td>{{ form.LONGITUDE }}</td>
             <td class="tbg">纬度</td>
             <td>{{ form.LATITUDE }}</td>
           </tr>
-
           <tr>
             <td class="tbg">联系人</td>
             <td>{{ form.CONTACT_PERSON }}</td>
@@ -35,14 +33,8 @@
           <tr>
             <td class="tbg">企业物资名称</td>
             <td>{{ form.COMPANY }}</td>
-            <td class="tbg">所属区域</td>
-            <td>{{ form.REGION_NAME }}</td>
-          </tr>
-          <tr>
             <td class="tbg">所属单位</td>
             <td>{{ form.AFFILIATEDUNIT_NAME }}</td>
-            <td class="tbg"/>
-            <td/>
           </tr>
         </table>
       </div>