From 9991688a47b7ad6f72c72862c4a6bce1d135a97e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 23 Aug 2024 13:31:14 +0800
Subject: [PATCH] =?UTF-8?q?526=20=E5=88=A0=E9=99=A4=E5=92=8C=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=20=E4=B8=8D=E5=A5=BD=E4=BD=BF=20525?=
 =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=20524=20=E7=BC=96=E8=BE=91=E6=8A=A5=E9=94=99=20516=20?=
 =?UTF-8?q?=E5=BA=94=E6=80=A5=E7=AE=A1=E7=90=86=E6=89=80=E6=9C=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=93=AA=E9=83=BD=E6=9C=89=20=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=20=E9=80=89=E6=8B=A9=E4=B9=8B=E5=90=8E=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=81=B0=E8=89=B2=E6=96=87=E5=AD=97=20515=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E4=BC=A0=E7=9C=9F=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=9A=84=E6=97=B6=E5=80=99=E6=9C=89=20514=20?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=20=E5=A4=87=E6=B3=A8=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=20513=20=E7=BC=96=E8=BE=91=20=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=20512=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E5=A5=BD=E4=BD=BF=20511=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=20=E4=B8=8D=E5=A5=BD=E4=BD=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emergency_personnel/components/list.vue   | 17 ++++++++++++---
 .../assurance_management/components/list.vue  |  3 ---
 .../components/list.vue                       | 19 ++++++++++++-----
 .../components/detail.vue                     |  2 +-
 .../technical_management/components/list.vue  | 21 +++++++++++++------
 .../components/detail.vue                     |  4 +---
 .../components/list.vue                       |  6 ------
 7 files changed, 45 insertions(+), 27 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 ed74799..cb72769 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
@@ -51,7 +51,10 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="性别" prop="GENDER">
-              <el-input v-model="form.GENDER" placeholder="请选择性别" disabled />
+              <el-select v-model="form.GENDER" disabled placeholder="请选择性别" style="width: 100%;">
+                <el-option label="男" value="0" />
+                <el-option label="女" value="1" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -105,7 +108,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户" prop="USER_ID">
+            <el-form-item label="用户" prop="USER_NAME">
               <el-input v-model="form.USER_NAME" placeholder="请选择用户" @click.native="openSelectUser()"/>
             </el-form-item>
           </el-col>
@@ -199,6 +202,7 @@ export default {
         limit: 10
       },
       rules: {
+        ORG_ID: [{ required: true, message: '请选择机构', trigger: 'blur' }],
         USER_NAME: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         GENDER: [{ required: true, message: '请输入性别', trigger: 'blur' }],
         ADMINISTRATIVE_POSITION: [{ required: true, message: '请输入行政职务', trigger: 'blur' }],
@@ -321,7 +325,14 @@ export default {
       this.dialogType = 'saveUser'
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue
index a17c4a3..d4aa3be 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue
@@ -5,9 +5,6 @@
         <el-form-item label="机构名称：" prop="KEYWORDS_ORG_NAME">
           <el-input v-model="KEYWORDS_ORG_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="机构类型：" prop="KEYWORDS_ORG_TYPE">
-          <el-input v-model="KEYWORDS_ORG_TYPE" placeholder="机构类型" class="filter-item" style="width: 200px;" />
-        </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-refresh" @click="resetQuery">重置</el-button>
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue
index 72ff5a7..fcf4119 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.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" />
@@ -893,8 +899,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/security_agency/technical_management/components/detail.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/detail.vue
index c69c873..9d362a4 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/detail.vue
@@ -116,7 +116,7 @@ export default {
     },
     getDetail(id) {
       const params = {
-        id: id
+        ID: id
       }
       requestFN('/skillInstitutions/detail', params).then((response) => {
         const data = response.data
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue
index 388be16..75be453 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.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="SKILL_NAME">
+          <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" />
@@ -490,9 +496,8 @@ export default {
           ISLOAD: data.ISLOAD,
           // 所用燃料
           FUEL: data.FUEL,
-
           // 备注
-          REMARKSS: data.REMARKSS
+          REMARKS: data.REMARKS
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -594,6 +599,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue
index b71fb14..fe9a1ed 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue
@@ -26,9 +26,7 @@
           </tr>
           <tr>
             <td class="tbg">值班电话</td>
-            <td>{{ form.DUTY_PHONE }}</td>
-            <td class="tbg">传真</td>
-            <td>{{ form.FAX }}</td>
+            <td colspan="3">{{ form.DUTY_PHONE }}</td>
           </tr>
           <tr>
             <td class="tbg">所属区域</td>
diff --git a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
index 006d6b2..5a7eb43 100644
--- a/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue
@@ -5,9 +5,6 @@
         <el-form-item label="机构名称：" prop="KEYWORDS_ORG_NAME">
           <el-input v-model="KEYWORDS_ORG_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="机构类型：" prop="KEYWORDS_ORG_TYPE">
-          <el-input v-model="KEYWORDS_ORG_TYPE" placeholder="机构类型" class="filter-item" style="width: 200px;" />
-        </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-refresh" @click="resetQuery">重置</el-button>
@@ -598,13 +595,10 @@ export default {
         lat = this.form.LATITUDE
       }
       var point = new BMap.Point(lng, lat)
-      // var point = new BMap.Point(this.form.LONGITUDE, this.form.LATITUDE)
       const zoom = map.getZoom()
       setTimeout(() => {
         map.centerAndZoom(point, zoom)
       }, 0)
-      // var marker = new BMap.Marker(point) // 创建标注
-      // map.addOverlay(marker) // 将标注添加到地图中
     },
     handleMap() {
       this.dialogFormMap = true