From ab28e7148db67161d8db9a209208343434992321 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Tue, 15 Oct 2024 18:14:18 +0800
Subject: [PATCH 1/3] 11111

---
 src/components/OutSourced/index.vue           | 62 ++++++++++++++-
 .../accident/records/components/list.vue      |  2 +-
 .../components/list.vue                       | 22 ++++++
 .../keyprojects/hidden/components/list.vue    | 49 ++++++++++++
 .../inspection/components/list.vue            | 18 ++++-
 .../insert/components/corpInfoList.vue        |  3 +-
 .../inspection/components/list.vue            | 79 ++++++++++++++++++-
 7 files changed, 225 insertions(+), 10 deletions(-)

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index da5f635..a703760 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -20,6 +20,9 @@
             <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="info" icon="el-icon-download" @click="exportExcel">
+              导出
+            </el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -34,9 +37,10 @@
         'color': '#000'
       }"
       tooltip-effect="dark"
+      highlight-current-row
       border
       fit
-      highlight-current-row
+      @current-change="handleCurrentChange"
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="公司名称" show-overflow-tooltip />
@@ -89,7 +93,9 @@
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
-import waves from '@/directive/waves' // waves directive
+import waves from '@/directive/waves'
+import axios from 'axios'
+import dayjs from 'dayjs' // waves directive
 export default {
   name: 'IndexVue',
   components: { Pagination },
@@ -115,7 +121,8 @@ export default {
       total: 0,
       OUTSOURCED_NAME: '',
       CORP_NAME: '',
-      varList: []
+      varList: [],
+      row: null
     }
   },
   created() {
@@ -155,6 +162,55 @@ export default {
     goDetail(ID) {
       this.$parent.CORPINFO_ID = ID
       this.$parent.activeName = this.activeName
+    },
+
+    handleCurrentChange(row) {
+      this.row = row
+    },
+
+    exportExcel() {
+      if (this.row == null || this.row.CORPINFO_ID == null || this.row.CORPINFO_ID === '') {
+        this.$message.error('请选择公司')
+        return
+      }
+      this.$confirm('确定要下载' + this.row.CORP_NAME + '的检查数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = false
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        axios.get(config.httpurl + '/keyprojectcheck/export/excel/' + this.row.CORPINFO_ID, {
+          responseType: 'blob'
+        }).then(res => {
+          setTimeout(() => {
+            const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            const downloadElement = document.createElement('a')
+            const href = window.URL.createObjectURL(blob)
+            downloadElement.style.display = 'none'
+            downloadElement.href = href
+            downloadElement.download = this.row.CORP_NAME
+            document.body.appendChild(downloadElement)
+            downloadElement.click()
+            document.body.removeChild(downloadElement)
+            window.URL.revokeObjectURL(href)
+            this.$emit('getResult', '')
+            loading.close()
+            this.close()
+          }, 2000)
+        }).catch((e) => {
+          console.log(e)
+          loading.close()
+          this.$message.error('导出失败,或未查询到隐患')
+        })
+      }).catch(() => {
+        this.listLoading = false
+      })
     }
   }
 }
diff --git a/src/views/accident/records/components/list.vue b/src/views/accident/records/components/list.vue
index e0c2b0b..8c0b55a 100644
--- a/src/views/accident/records/components/list.vue
+++ b/src/views/accident/records/components/list.vue
@@ -91,7 +91,7 @@
 import Pagination from '@/components/Pagination'
 import waves from '@/directive/waves'
 import formatDate from '../../../../utils/dateformat'
-import { requestFN } from '../../../../utils/request'
+import { requestFN } from '@/utils/request'
 
 export default {
   components: { Pagination },
diff --git a/src/views/keyproject_evaluation/personnel_evaluation_status/components/list.vue b/src/views/keyproject_evaluation/personnel_evaluation_status/components/list.vue
index 501f5ec..9e88c05 100644
--- a/src/views/keyproject_evaluation/personnel_evaluation_status/components/list.vue
+++ b/src/views/keyproject_evaluation/personnel_evaluation_status/components/list.vue
@@ -19,6 +19,20 @@
             <el-input v-model="searchForm.KEYWORDS" placeholder="请输入关键字"/>
           </el-form-item>
         </el-col>
+        <el-col :span="5">
+          <el-form-item label="考评时间" prop="incidentDates">
+            <el-date-picker
+              v-model="searchForm.incidentDates"
+              :default-time="['00:00:00', '23:59:59']"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd"
+              style="width: 100%"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期" />
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getList">
@@ -101,6 +115,9 @@ export default {
       searchForm: {
         KEYWORDS: '',
         TYPE: '',
+        incidentDates: [],
+        START_TIME: '',
+        END_TIME: '',
         DEPARTMENT_ID: null
       }
     }
@@ -129,6 +146,11 @@ export default {
     // 获取列表
     getList() {
       this.listLoading = true
+      const dates = this.searchForm.incidentDates
+      if (dates != null && dates.length === 2) {
+        this.searchForm.START_TIME = dates[0]
+        this.searchForm.END_TIME = dates[1]
+      }
       requestFN(
         '/keyProject/evaluationscore/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue
index 52e290b..a33fc66 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -50,6 +50,9 @@
             <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>
@@ -67,6 +70,7 @@
       border
       fit
       highlight-current-row
+      @selection-change="handleSelectionChange"
     >
       <el-table-column
         :reserve-selection="true"
@@ -141,6 +145,8 @@ export default {
       ISCHECK: '',
       ISPUNISH: '',
       varList: [],
+      /** 当前选中行 */
+      multipleSelection: [],
       stateList: [
         // { ID: '0', NAME: '未申请' },
         // { ID: '1', NAME: '申请中' },
@@ -226,6 +232,49 @@ export default {
     goDetail(ID) {
       this.$parent.HIDDEN_ID = ID
       this.$parent.activeName = 'Info'
+    },
+    /**
+     * 批量删除
+     */
+    handleBatchDel() {
+      // 获取选中的行数据
+      const selectedRows = this.multipleSelection
+      // 如果没有选中任何行，则提示用户
+      if (this.multipleSelection === '' || selectedRows.length === 0) {
+        this.$message.warning('请选择要删除的行')
+        return
+      }
+      // 弹出确认框
+      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) => {
+          // 删除成功后的处理
+          this.$message.success('删除成功')
+          this.getList()
+          // eslint-disable-next-line handle-callback-err
+        }).catch(() => {
+          this.$message.error('删除失败')
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          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 97919c7..351de04 100644
--- a/src/views/keyprojects/inspection/components/list.vue
+++ b/src/views/keyprojects/inspection/components/list.vue
@@ -9,18 +9,28 @@
         <!--            <el-input v-model="KEYWORDS" placeholder="搜索关键字" />-->
         <!--          </el-form-item>-->
         <!--        </el-col>-->
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item label="重点工程名称">
             <el-input v-model="KEYWORDS" placeholder="搜索重点工程名称" />
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item label="状态" label-width="50px">
             <el-select ref="SELECT_STATE" v-model="STATE" style="width: 100%;">
               <el-option v-for="item in stateList" :key="item.ID" :label="item.NAME" :value="item.ID" />
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="4">
+          <el-form-item label="负责人姓名">
+            <el-input v-model="UNITS_PIC_NAME" placeholder="搜索负责人姓名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="负责人手机号">
+            <el-input v-model="UNITS_PHONE" placeholder="搜索负责人手机号" />
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label-width="10px">
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
@@ -93,6 +103,8 @@ export default {
       },
       STATE: '',
       total: 0,
+      UNITS_PIC_NAME: '',
+      UNITS_PHONE: '',
       KEYWORDS: '',
       OUTSOURCED_NAME: '',
       stateList: [
@@ -134,6 +146,8 @@ export default {
         '/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
+          UNITS_PIC_NAME: this.UNITS_PIC_NAME,
+          UNITS_PHONE: this.UNITS_PHONE,
           CORPINFO_ID: this.$parent.CORPINFO_ID,
           STATE: this.STATE
         }
diff --git a/src/views/relevantunits/insert/components/corpInfoList.vue b/src/views/relevantunits/insert/components/corpInfoList.vue
index 507d1e5..faa1f0d 100644
--- a/src/views/relevantunits/insert/components/corpInfoList.vue
+++ b/src/views/relevantunits/insert/components/corpInfoList.vue
@@ -220,10 +220,11 @@ export default {
     }
   },
   created() {
-    // this.ROLE_ID
+    console.log(this.$data)
     this.getList()
     this.getDict()
     this.getTreeList()
+    // this.ROLE_ID
   },
   methods: {
     onChange(value) {
diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue
index b5ca0b3..9efc919 100644
--- a/src/views/safetyenvironmental/inspection/components/list.vue
+++ b/src/views/safetyenvironmental/inspection/components/list.vue
@@ -73,14 +73,19 @@
             <el-input v-model="search.INSPECTION_CASE" placeholder="检查情况" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label-width="10px">
+      </el-row>
+      <el-row>
+        <el-col>
+          <el-form-item label-width="20px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">
               搜索
             </el-button>
             <el-button v-waves type="success" icon="el-icon-refresh" @click="goKeyReset">
               重置
             </el-button>
+            <el-button v-waves class="filter-item" type="info" icon="el-icon-download" @click="exportExcel">
+              导出
+            </el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -230,6 +235,7 @@ import waves from '@/directive/waves' // waves directive
 import WriteSign from '@/components/WriteSign'
 import safetyFlowChart from '../../../hiddenUtil/safetyFlowChart'
 import SelectTree from '@/components/SelectTree'
+import axios from 'axios'
 export default {
   components: { Pagination, WriteSign, safetyFlowChart, SelectTree },
   directives: { waves },
@@ -258,7 +264,7 @@ export default {
         INSPECTION_TIME: ['', ''], // 检查时间
         INSPECTION_STATUS: '', // 检查状态
         INSPECTION_SUBJECT: '', // 检查题目
-        INSPECTION_CASE:'' // 检查情况
+        INSPECTION_CASE: '' // 检查情况
       },
       statusList: [
         { ID: '', NAME: '请选择' },
@@ -557,6 +563,73 @@ export default {
         INSPECTION_ORIGINATOR_SIGN_IMG: '' // 被检查单位现场负责人签字
         // INSPECTION_ORIGINATOR_SIGN_TIME: '', // 被检查单位现场负责人签字时间
       }
+    },
+    exportExcel() {
+      this.$confirm('确定要下载检查记录吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        const object = {
+          ...this.search,
+          INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
+          INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
+        }
+        const formData = new FormData()
+        Object.keys({
+          ...this.search,
+          INSPECTION_TIME_START: this.search.INSPECTION_TIME[0],
+          INSPECTION_TIME_END: this.search.INSPECTION_TIME[1]
+        }).forEach(key => {
+          const value = object[key]
+          if (Array.isArray(value)) {
+            value.forEach((subValue, i) => {
+              formData.append(key + `[${i}]`, subValue)
+            })
+          } else {
+            formData.append(key, object[key])
+          }
+        })
+        console.log(formData)
+        axios({
+          url: config.httpurl + 'safetyenvironmental/export/excel',
+          method: 'post',
+          headers: { 'content-type': 'application/x-www-form-urlencoded' },
+          responseType: 'blob',
+          data: formData
+        }).then(res => {
+          console.log('+++++++++++++++++++++++++++++')
+          const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob)
+          downloadElement.style.display = 'none'
+          downloadElement.href = href
+          downloadElement.download = '检查记录'
+
+          // 减少DOM操作次数
+          document.body.appendChild(downloadElement)
+          downloadElement.click()
+          document.body.removeChild(downloadElement)
+          window.URL.revokeObjectURL(href)
+          loading.close()
+        }).catch((e) => {
+          console.error(e)
+          loading.close()
+          if (e.response && e.response.status === 404) {
+            this.$message.error('未查询到数据')
+          } else {
+            this.$message.error('导出失败，请稍后再试')
+          }
+        })
+      }).catch(() => {
+        this.$message.warning('取消导出')
+      })
     }
   }
 }

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 2/3] 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>

From 4dcae30533dabe669b2479fc4de5da179070b034 Mon Sep 17 00:00:00 2001
From: shanao <wangpeng@zcloudchina.com>
Date: Wed, 23 Oct 2024 14:31:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E4=BF=AE=E5=A4=8D=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OutSourced/index.vue           | 33 ++++++++++++++-----
 .../keyprojects/meteorological/index.vue      |  2 +-
 .../keyprojects/meteorologicalinfo/index.vue  |  2 +-
 .../personBaseInfo/index.vue                  |  2 +-
 src/views/xgf/licensed_server/index.vue       |  2 +-
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index a703760..0bc0801 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -41,7 +41,9 @@
       border
       fit
       @current-change="handleCurrentChange"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="40"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="公司名称" show-overflow-tooltip />
       <!--      <el-table-column prop="STARTTIME" label="属地" show-overflow-tooltip>
@@ -95,7 +97,6 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves'
 import axios from 'axios'
-import dayjs from 'dayjs' // waves directive
 export default {
   name: 'IndexVue',
   components: { Pagination },
@@ -122,7 +123,9 @@ export default {
       OUTSOURCED_NAME: '',
       CORP_NAME: '',
       varList: [],
-      row: null
+      row: null,
+      /** 当前选中行 */
+      multipleSelection: []
     }
   },
   created() {
@@ -168,12 +171,22 @@ export default {
       this.row = row
     },
 
+    /**
+     * 表格行选择器处理
+     */
+    handleSelectionChange(val) {
+      console.log('表格行选择器处理')
+      this.multipleSelection = val
+    },
+
     exportExcel() {
-      if (this.row == null || this.row.CORPINFO_ID == null || this.row.CORPINFO_ID === '') {
-        this.$message.error('请选择公司')
+      const selectedRows = this.multipleSelection
+      // 如果没有选中任何行，则提示用户
+      if (selectedRows === [] || selectedRows.length === 0) {
+        this.$message.warning('请选择要导出的公司')
         return
       }
-      this.$confirm('确定要下载' + this.row.CORP_NAME + '的检查数据吗?', {
+      this.$confirm('确定要下载' + selectedRows[0].CORP_NAME + '等的检查数据吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
@@ -185,16 +198,20 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         })
-        axios.get(config.httpurl + '/keyprojectcheck/export/excel/' + this.row.CORPINFO_ID, {
+        let ids = ''
+        selectedRows.forEach(row => {
+          ids += row.CORPINFO_ID + ','
+        })
+        axios.get(config.httpurl + '/keyprojectcheck/export/excel/' + ids, {
           responseType: 'blob'
         }).then(res => {
           setTimeout(() => {
-            const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+            const blob = new Blob([res.data], { type: res.headers['content-type'] })
             const downloadElement = document.createElement('a')
             const href = window.URL.createObjectURL(blob)
             downloadElement.style.display = 'none'
             downloadElement.href = href
-            downloadElement.download = this.row.CORP_NAME
+            downloadElement.download = '导出数据'
             document.body.appendChild(downloadElement)
             downloadElement.click()
             document.body.removeChild(downloadElement)
diff --git a/src/views/keyprojects/meteorological/index.vue b/src/views/keyprojects/meteorological/index.vue
index b41d958..7c93b79 100644
--- a/src/views/keyprojects/meteorological/index.vue
+++ b/src/views/keyprojects/meteorological/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <keep-alive>
+    <keep-alive exclude="meteorologicalList,meteorologicalHistory">
       <component :is="activeName"/>
     </keep-alive>
   </div>
diff --git a/src/views/keyprojects/meteorologicalinfo/index.vue b/src/views/keyprojects/meteorologicalinfo/index.vue
index b42b849..8b096c4 100644
--- a/src/views/keyprojects/meteorologicalinfo/index.vue
+++ b/src/views/keyprojects/meteorologicalinfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <keep-alive>
+    <keep-alive exclude="meteorologicalinfoList">
       <component :is="activeName"/>
     </keep-alive>
   </div>
diff --git a/src/views/relativeUnitPerson/personBaseInfo/index.vue b/src/views/relativeUnitPerson/personBaseInfo/index.vue
index 1a8d750..0db254b 100644
--- a/src/views/relativeUnitPerson/personBaseInfo/index.vue
+++ b/src/views/relativeUnitPerson/personBaseInfo/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <keep-alive>
+  <keep-alive exclude="CorpUserList,CorpUserDetail">
     <component :is="activeName" />
   </keep-alive>
 </template>
diff --git a/src/views/xgf/licensed_server/index.vue b/src/views/xgf/licensed_server/index.vue
index da07028..bfc1350 100644
--- a/src/views/xgf/licensed_server/index.vue
+++ b/src/views/xgf/licensed_server/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <keep-alive>
+  <keep-alive exclude="CorpUserList">
     <component :is="activeName" />
   </keep-alive>
 </template>