From f8cb7da6f7f906428c09baf9560e98e248849d54 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Sat, 19 Oct 2024 17:35:10 +0800
Subject: [PATCH] 11111

---
 .../keyprojects/hidden/components/list.vue    | 45 +++++--------------
 .../inspection/components/list.vue            |  2 +
 .../keyprojects/meteorological/index.vue      |  9 ++--
 .../keyprojects/meteorologicalinfo/index.vue  |  4 +-
 .../personBaseInfo/index.vue                  |  4 +-
 .../inspection/components/confirm.vue         | 14 +++---
 .../inspection/components/list.vue            |  5 ++-
 src/views/xgf/licensed_server/index.vue       |  4 +-
 8 files changed, 38 insertions(+), 49 deletions(-)

diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue
index a33fc66..9bc565b 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -50,9 +50,6 @@
             <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
               重置
             </el-button>
-            <el-button v-waves class="filter-item" type="danger" icon="el-icon-delete" @click="handleBatchDel">
-              删除
-            </el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -70,13 +67,8 @@
       border
       fit
       highlight-current-row
-      @selection-change="handleSelectionChange"
+
     >
-      <el-table-column
-        :reserve-selection="true"
-        type="selection"
-        width="55"
-        align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip>
         <template slot-scope="{row}">
@@ -109,9 +101,12 @@
           {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="100">
+      <el-table-column label="操作" align="center" width="170">
         <template slot-scope="{row}">
-          <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.HIDDEN_ID)">查看</el-button>
+          <div style="display: flex; justify-content: space-between;">
+            <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.HIDDEN_ID)">查看</el-button>
+            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleBatchDel(row.HIDDEN_ID)">删除</el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -145,8 +140,6 @@ export default {
       ISCHECK: '',
       ISPUNISH: '',
       varList: [],
-      /** 当前选中行 */
-      multipleSelection: [],
       stateList: [
         // { ID: '0', NAME: '未申请' },
         // { ID: '1', NAME: '申请中' },
@@ -234,28 +227,18 @@ export default {
       this.$parent.activeName = 'Info'
     },
     /**
-     * 批量删除
+     * 删除
      */
-    handleBatchDel() {
-      // 获取选中的行数据
-      const selectedRows = this.multipleSelection
-      // 如果没有选中任何行，则提示用户
-      if (this.multipleSelection === '' || selectedRows.length === 0) {
-        this.$message.warning('请选择要删除的行')
-        return
-      }
+    handleBatchDel(HIDDEN_ID) {
       // 弹出确认框
-      this.$confirm('确定要删除这些记录吗？', '提示', {
+      this.$confirm('确定要删除吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        // 获取所有选中行的 ID
-        let ids = ''
-        selectedRows.forEach(row => { ids += row.HIDDEN_ID + ',' })
         // 发送批量删除请求
-        const url = '/keyprojectcheck/delete/hidden/all'
-        requestFN(url, { DATA_IDS: ids }).then((response) => {
+        const url = '/keyprojectcheck/delete/hidden/id/' + HIDDEN_ID
+        requestFN(url).then((response) => {
           // 删除成功后的处理
           this.$message.success('删除成功')
           this.getList()
@@ -269,12 +252,6 @@ export default {
           message: '已取消删除'
         })
       })
-    },
-    /**
-     * 表格行选择器处理
-     */
-    handleSelectionChange(val) {
-      this.multipleSelection = val
     }
   }
 }
diff --git a/src/views/keyprojects/inspection/components/list.vue b/src/views/keyprojects/inspection/components/list.vue
index 351de04..6565c4e 100644
--- a/src/views/keyprojects/inspection/components/list.vue
+++ b/src/views/keyprojects/inspection/components/list.vue
@@ -137,6 +137,8 @@ export default {
       this.KEYWORDS = ''
       this.STATE = ''
       this.OUTSOURCED_NAME = ''
+      this.UNITS_PIC_NAME = ''
+      this.UNITS_PHONE = ''
       this.getQuery()
     },
     // 获取列表
diff --git a/src/views/keyprojects/meteorological/index.vue b/src/views/keyprojects/meteorological/index.vue
index d6b61af..b41d958 100644
--- a/src/views/keyprojects/meteorological/index.vue
+++ b/src/views/keyprojects/meteorological/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <component :is="activeName"/>
+    <keep-alive>
+      <component :is="activeName"/>
+    </keep-alive>
   </div>
 </template>
 
@@ -13,13 +15,14 @@ export default {
   components: {
     List: List,
     meteorologicalList: meteorologicalList,
-    meteorologicalHistory: meteorologicalHistory,
+    meteorologicalHistory: meteorologicalHistory
   },
   data() {
     return {
       activeName: 'List',
       CORPINFO_ID: '',
-      CODE: ''
+      CODE: '',
+      KEYWORDS: ''
     }
   }
 }
diff --git a/src/views/keyprojects/meteorologicalinfo/index.vue b/src/views/keyprojects/meteorologicalinfo/index.vue
index e8be846..b42b849 100644
--- a/src/views/keyprojects/meteorologicalinfo/index.vue
+++ b/src/views/keyprojects/meteorologicalinfo/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div>
-    <component :is="activeName"/>
+    <keep-alive>
+      <component :is="activeName"/>
+    </keep-alive>
   </div>
 </template>
 
diff --git a/src/views/relativeUnitPerson/personBaseInfo/index.vue b/src/views/relativeUnitPerson/personBaseInfo/index.vue
index 09506bd..1a8d750 100644
--- a/src/views/relativeUnitPerson/personBaseInfo/index.vue
+++ b/src/views/relativeUnitPerson/personBaseInfo/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <component :is="activeName" />
+  <keep-alive>
+    <component :is="activeName" />
+  </keep-alive>
 </template>
 
 <script>
diff --git a/src/views/safetyenvironmental/inspection/components/confirm.vue b/src/views/safetyenvironmental/inspection/components/confirm.vue
index 6cfd8b2..5ecf65f 100644
--- a/src/views/safetyenvironmental/inspection/components/confirm.vue
+++ b/src/views/safetyenvironmental/inspection/components/confirm.vue
@@ -5,9 +5,9 @@
         <el-form-item label="检查人意见" prop="INSPECTION_USER_OPINION">
           <el-input v-model="form.INSPECTION_USER_OPINION" :autosize="{ minRows: 1}" type="textarea" maxlength="2000" placeholder="这里输入检查人意见（有异议时必填）..." title="检查人意见（有异议时必填）"/>
         </el-form-item>
-        <el-form-item label="检查人">
-          <el-button data-target="Modal" type="primary" @click="showModal">手写签字</el-button>
-        </el-form-item>
+        <!--        <el-form-item label="检查人">-->
+        <!--          <el-button data-target="Modal" type="primary" @click="showModal">手写签字</el-button>-->
+        <!--        </el-form-item>-->
         <div v-show="form.INSPECTION_USER_SIGN_IMG != ''" class="demo-image__preview">
           <el-image
             :src="form.INSPECTION_USER_SIGN_IMG"
@@ -112,10 +112,10 @@ export default {
       if (!this.form.INSPECTION_USER_OPINION) {
         this.$message.error('您还未填写意见')
       }
-      if (!this.form.INSPECTION_USER_SIGN_IMG) {
-        this.$message.error('您还未签字')
-        return
-      }
+      // if (!this.form.INSPECTION_USER_SIGN_IMG) {
+      //   this.$message.error('您还未签字')
+      //   return
+      // }
       this.$emit('getProposal', this.form)
       this.dialogVisible = false
     },
diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue
index 9efc919..4e92e3d 100644
--- a/src/views/safetyenvironmental/inspection/components/list.vue
+++ b/src/views/safetyenvironmental/inspection/components/list.vue
@@ -56,7 +56,7 @@
         </el-col>
         <el-col :span="4">
           <el-form-item label="检查状态">
-            <el-select v-model="search.INSPECTION_STATUS" placeholder="隐患状态" clearable style="width: 100%">
+            <el-select v-model="search.INSPECTION_STATUS" placeholder="请选择" clearable style="width: 100%">
               <el-option v-for="item in statusList" :key="item.ID" :label="item.NAME" :value="item.ID" />
             </el-select>
           </el-form-item>
@@ -267,7 +267,7 @@ export default {
         INSPECTION_CASE: '' // 检查情况
       },
       statusList: [
-        { ID: '', NAME: '请选择' },
+        // { ID: '', NAME: '请选择' },
         { ID: '0', NAME: '待检查人核实' },
         { ID: '1', NAME: '检查人核实中' },
         { ID: '2', NAME: '待被检查人确认' },
@@ -576,6 +576,7 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         })
+        this.search.INSPECTION_TYPE = this.search.INSPECTION_TYPE == null ? '' : this.search.INSPECTION_TYPE
         const object = {
           ...this.search,
           INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
diff --git a/src/views/xgf/licensed_server/index.vue b/src/views/xgf/licensed_server/index.vue
index f7db3c3..da07028 100644
--- a/src/views/xgf/licensed_server/index.vue
+++ b/src/views/xgf/licensed_server/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <component :is="activeName" />
+  <keep-alive>
+    <component :is="activeName" />
+  </keep-alive>
 </template>
 
 <script>