From 38d63aae1d955a1332483b0d9914f379a9d1d15c Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Wed, 8 Nov 2023 17:46:40 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=A8=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/relevantunits/audit/components/corpInfoEdit.vue | 3 +++
 src/views/relevantunits/audit/components/edit.vue         | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/src/views/relevantunits/audit/components/corpInfoEdit.vue b/src/views/relevantunits/audit/components/corpInfoEdit.vue
index 274b963..9a3829a 100644
--- a/src/views/relevantunits/audit/components/corpInfoEdit.vue
+++ b/src/views/relevantunits/audit/components/corpInfoEdit.vue
@@ -29,6 +29,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
+              <el-form-item label="集团单位" prop="corpTypeName">
+                <el-input id="corpTypeName" ref="corpTypeName" v-model="dataForm.corpTypeName" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
+              </el-form-item>
               <el-form-item label="开户人" prop="CREATOR">
                 <el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
               </el-form-item>
diff --git a/src/views/relevantunits/audit/components/edit.vue b/src/views/relevantunits/audit/components/edit.vue
index 33c727f..96ea974 100644
--- a/src/views/relevantunits/audit/components/edit.vue
+++ b/src/views/relevantunits/audit/components/edit.vue
@@ -47,6 +47,11 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="集团单位" prop="corpTypeName">
+                <el-input id="corpTypeName" ref="corpTypeName" v-model="dataForm.corpTypeName" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="开户人" prop="CREATOR">
                 <el-input id="CREATOR" ref="CREATOR" v-model="dataForm.USER_NAME" disabled maxlength="255" placeholder="这里输入开户人..." title="开户人"/>

From c4a52b3bd231c687b6c2e84f01304aa436e48833 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 9 Nov 2023 09:42:11 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/group/user/index.vue | 28 ++++++---------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/views/system/group/user/index.vue b/src/views/system/group/user/index.vue
index f70fd06..db9fd7b 100644
--- a/src/views/system/group/user/index.vue
+++ b/src/views/system/group/user/index.vue
@@ -100,7 +100,7 @@
         </div>
       </el-main>
     </el-container>
-    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
+    <el-dialog v-loading="editloading" :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
       <el-form ref="form" :rules="rules" :model="pd" label-width="110px" style="width: 500px;">
         <el-form-item label="角色" prop="ROLE_ID">
           <el-select v-model="pd.ROLE_ID" multiple placeholder="请选择角色">
@@ -246,6 +246,7 @@ export default {
       keyDepeName: '',
       keyJobLeven: '',
       dialogFormEdit: false,
+      editloading: false,
       dialogType: 'add',
       rules: {
         EMAIL: [
@@ -357,6 +358,7 @@ export default {
               }))
               resolve(nodes) // 通过调用resolve将子节点数据返回，通知组件数据加载完成
             }).catch((e) => {
+              this.editloading = false
               this.listLoading = false
             })
           }, 500)
@@ -588,8 +590,6 @@ export default {
       console.log(row)
       this.dialogType = 'editUser'
       this.pd = JSON.parse(JSON.stringify(row))
-      this.dialogFormEdit = true
-      await this.$nextTick()
       const areaRefID = []
       if (this.pd.PROVINCE) {
         areaRefID.push(this.pd.PROVINCE)
@@ -609,14 +609,6 @@ export default {
       refDeptLevelVal.id = this.pd.deptLevenlID
       const deptRefsValue = {}
       deptRefsValue.id = this.pd.DEPARTMENT_ID
-      // this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
-      //   if (this.$refs.refFromDeptTypeID) {
-      //     this.$refs.refFromDeptTypeID.handleNodeClick(refDeptLevelVal)
-      //   }
-      //   if (this.$refs.deptTree) {
-      //     this.$refs.deptTree.handleNodeClick(deptRefsValue)
-      //   }
-      // }
       var arrString = []
       if (this.pd.ROLE_ID != null && this.pd.ROLE_ID != '') {
         arrString.push(this.pd.ROLE_ID)
@@ -631,17 +623,9 @@ export default {
         }
       }
       this.pd.ROLE_ID = arrString
-      // var roleIds = []
-      // if (this.pd.ROLE_ID) {
-      //   roleIds.push(this.pd.ROLE_ID)
-      //   if (this.pd.ROLE_IDS) {
-      //     var roleIDS = this.pd.ROLE_IDS.split(',')
-      //     roleIDS.forEach((item) => {
-      //       roleIds.push(item)
-      //     })
-      //   }
-      // }
-      // this.pd.ROLE_ID = roleIds
+      this.dialogFormEdit = true
+      await this.$nextTick()
+
     },
     handleEditStatus(row, type) {
       const typeName = type == '1' ? '禁用' : '启用'

From ed3cea71b7f3f88da129a1cd41519516fc4bc655 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 9 Nov 2023 09:46:25 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=2012714=20=E8=AF=A6=E6=83=85=E4=B8=AD=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=E5=BA=94=E8=AF=A5=E6=98=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=88=B0=E7=AC=AC=E4=BA=8C=E5=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E5=88=B0?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=80=E5=B1=82=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/punish/components/hiddenInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/keyprojects/punish/components/hiddenInfo.vue b/src/views/keyprojects/punish/components/hiddenInfo.vue
index 6ecf706..1366767 100644
--- a/src/views/keyprojects/punish/components/hiddenInfo.vue
+++ b/src/views/keyprojects/punish/components/hiddenInfo.vue
@@ -200,7 +200,7 @@ export default {
       this.$refs.hdVideoPlayer.player.pause()
     },
     goBack() {
-      this.$parent.activeName = 'List'
+      this.$parent.activeName = 'List2'
       this.$parent.HIDDEN_ID = ''
     }
   }

From 4d2865a5edff2c60844e4fde5258e794df81124e Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 9 Nov 2023 10:26:42 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=90=8E=20=E5=AE=9A=E6=97=B6=E5=99=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoinfomanager/components/list.vue      |  4 ++-
 .../videomanager/components/bobileCamer.vue   | 25 +++++++++++++++++--
 .../videomanager/components/video-list.vue    |  4 ++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/views/keyprojects/videoinfomanager/components/list.vue b/src/views/keyprojects/videoinfomanager/components/list.vue
index f2abc65..ce7ad03 100644
--- a/src/views/keyprojects/videoinfomanager/components/list.vue
+++ b/src/views/keyprojects/videoinfomanager/components/list.vue
@@ -318,7 +318,7 @@ export default {
     },
     over() {
       // 定时器手动关闭
-      console.log('定时器手动关闭')
+      console.log('定时器自动关闭')
       this.$message.warning('单次播放时长已到5分钟自动关闭')
       clearInterval(this.timer)
     },
@@ -363,6 +363,8 @@ export default {
       }
     },
     back() {
+      console.log('手动关闭定时器')
+      clearInterval(this.timer)
       if (this.dialogVideo) this.dialogVideo = false
       if (this.dialogVideoBack) this.dialogVideoBack = false
       if (this.dialogVideoAll) {
diff --git a/src/views/keyprojects/videomanager/components/bobileCamer.vue b/src/views/keyprojects/videomanager/components/bobileCamer.vue
index 46f4294..bbf11c6 100644
--- a/src/views/keyprojects/videomanager/components/bobileCamer.vue
+++ b/src/views/keyprojects/videomanager/components/bobileCamer.vue
@@ -100,6 +100,7 @@ export default {
       dialogVideoBack: false,
       dialogVideoAll: false,
       VIDEOURL: '',
+      timer: '',
       player: {},
       //
       config: config,
@@ -125,6 +126,18 @@ export default {
   },
 
   methods: {
+    // 五分钟关闭视频播放页面定时任务
+    start() {
+      console.log('定时器开启')
+      this.timer = setInterval(this.over, (5 * 60 * 1000)) // 5分钟;
+    },
+    over() {
+      // 定时器手动关闭
+      console.log('定时器自动关闭')
+      this.$message.warning('单次播放时长已到5分钟自动关闭')
+      this.back()
+      clearInterval(this.timer)
+    },
     async init(UNITS_ID) {
       this.visible = true
       this.UNITS_ID = UNITS_ID
@@ -172,6 +185,8 @@ export default {
       }
     },
     back() {
+      console.log('定时器手动关闭')
+      clearInterval(this.timer)
       if (this.dialogVideo) this.dialogVideo = false
       if (this.dialogVideoBack) this.dialogVideoBack = false
       if (this.dialogVideoAll) {
@@ -187,6 +202,8 @@ export default {
       }
     },
     showVideo(row) {
+      this.$message.warning('单次播放最多五分钟')
+      this.start()
       if (!row.PLATFORMVIDEOMANAGEMENT_ID) {
         this.VIDEOURL = row.VIDEOURL
         this.dialogVideo = true
@@ -217,6 +234,7 @@ export default {
             })
           })
         }).catch((e) => {
+          this.over()
           this.listLoading = false
         })
       }
@@ -264,8 +282,11 @@ export default {
     closeWindow() {
       this.handleClose()
     }
-  }
-
+  },
+  beforeDestroy() {
+    console.log('页面定时器关闭')
+    clearInterval(this.timer)
+  },
 }
 
 </script>
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index a709776..67f9176 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -249,7 +249,7 @@ export default {
     },
     over() {
       // 定时器手动关闭
-      console.log('定时器手动关闭')
+      console.log('定时器自动关闭')
       clearInterval(this.timer)
     },
     closeVideoStart() {
@@ -702,6 +702,8 @@ export default {
       })
     },
     back() {
+      console.log('手动关闭定时器')
+      clearInterval(this.timer)
       if (this.dialogVideo) this.dialogVideo = false
       if (this.dialogVideoBack) this.dialogVideoBack = false
       if (this.dialogVideoAll) {

From ab35406727fc02bcfea78c1fbc58b81f420954a9 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Fri, 10 Nov 2023 16:07:21 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=AE=89=E5=85=A8=E7=8E=AF=E4=BF=9D?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=AE=A1=E7=90=86=EF=BC=8C=E9=9A=90=E6=82=A3?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=A4=84=E7=BD=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=82=E6=8C=89=E7=85=A7=E5=88=86=E5=85=AC=E5=8F=B8=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=9A=84=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=86=8D?=
 =?UTF-8?q?=E5=8C=85=E4=B8=80=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OutSourced/index.vue           | 135 ++++++++++++++++++
 .../keyprojects/hidden/components/list.vue    |  26 ++--
 src/views/keyprojects/hidden/index.vue        |   5 +-
 .../inspection/components/list.vue            |  10 +-
 src/views/keyprojects/inspection/index.vue    |  16 ++-
 .../outsourced/components/list.vue            |  22 +--
 src/views/keyprojects/outsourced/index.vue    |   8 +-
 .../keyprojects/punish/components/list.vue    |  10 +-
 src/views/keyprojects/punish/index.vue        |   5 +-
 9 files changed, 212 insertions(+), 25 deletions(-)
 create mode 100644 src/components/OutSourced/index.vue

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
new file mode 100644
index 0000000..3ca990d
--- /dev/null
+++ b/src/components/OutSourced/index.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="100px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="企业名字">
+            <el-input v-model="CORP_NAME" placeholder="搜索企业名字" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="重点工程名称">
+            <el-input v-model="OUTSOURCED_NAME" 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">
+              搜索
+            </el-button>
+            <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      v-loading="listLoading"
+      ref="multipleTable"
+      :data="varList"
+      :row-key="getRowKey"
+      :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" />
+      <el-table-column prop="CORP_NAME" label="公司名称" show-overflow-tooltip />
+      <el-table-column prop="STARTTIME" label="属地" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip />
+      <el-table-column prop="OUTSOURCED_COUNT" label="包含重点工程数" />
+      <el-table-column label="操作" align="center" width="100">
+        <template slot-scope="{row}">
+          <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row.CORPINFO_ID)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+export default {
+  name: 'IndexVue',
+  components: { Pagination },
+  directives: { waves },
+  props: {
+    activeName: {
+      type: String,
+      default: ''
+    }
+
+  },
+  data() {
+    return {
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      OUTSOURCED_NAME: '',
+      CORP_NAME: '',
+      varList: []
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CORPINFO_ID
+    },
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.CORP_NAME = ''
+      this.OUTSOURCED_NAME = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        'api/outsourced/listByCorp?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          CORP_NAME: this.CORP_NAME,
+          OUTSOURCED_NAME: this.OUTSOURCED_NAME
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 查看
+    goDetail(ID) {
+      this.$parent.CORPINFO_ID = ID
+      this.$parent.activeName = this.activeName
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue
index 7b93ee0..112a822 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -1,44 +1,48 @@
 <template>
   <div class="app-container">
+    <el-page-header content="隐患管理" @back="back"/>
+    <div class="level-title mt-20"/>
     <el-form label-width="100px">
       <el-row>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="重点工程名称">
             <el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="隐患来源">
             <el-select ref="SOURCE" v-model="SOURCE" style="width: 100%;">
               <el-option v-for="item in SOURCEList" :key="item.ID" :label="item.NAME" :value="item.ID" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="隐患发现人">
             <el-input v-model="CREATOR_NAME" placeholder="搜索隐患发现人" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="隐患整改人">
             <el-input v-model="RECTIFICATIONOR_NAME" placeholder="搜索隐患整改人" />
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+      </el-row>
+      <el-row>
+        <el-col :span="6">
           <el-form-item label="隐患状态">
             <el-select ref="STATE" v-model="STATE" style="width: 100%;">
               <el-option v-for="item in zList" :key="item.ID" :label="item.NAME" :value="item.ID" />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
           <el-form-item label="是否处罚">
             <el-select ref="ISPUNISH" v-model="ISPUNISH" 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-col :span="6">
           <el-form-item label-width="10px">
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
               搜索
@@ -47,7 +51,8 @@
               重置
             </el-button>
           </el-form-item>
-      </el-col></el-row>
+        </el-col>
+      </el-row>
     </el-form>
     <el-table
       v-loading="listLoading"
@@ -174,6 +179,10 @@ export default {
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'OutSourced'
+    },
     // 搜索
     getQuery() {
       this.$refs.multipleTable.clearSelection()
@@ -200,6 +209,7 @@ export default {
           OUTSOURCED_NAME: this.OUTSOURCED_NAME,
           ISCHECK: this.ISCHECK,
           ISPUNISH: this.ISPUNISH,
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
           RECTIFICATIONOR_NAME: this.RECTIFICATIONOR_NAME,
           CREATOR_NAME: this.CREATOR_NAME,
           STATE: this.STATE,
diff --git a/src/views/keyprojects/hidden/index.vue b/src/views/keyprojects/hidden/index.vue
index 1e16276..c5341aa 100644
--- a/src/views/keyprojects/hidden/index.vue
+++ b/src/views/keyprojects/hidden/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
     <component :is="activeName"/>
   </div>
 </template>
@@ -7,15 +8,17 @@
 <script>
 import List from './components/list'
 import Info from './components/info'
+import OutSourced from '@/components/OutSourced/index'
 
 export default {
   components: {
     List: List,
+    OutSourced: OutSourced,
     Info: Info
   },
   data() {
     return {
-      activeName: 'List',
+      activeName: 'OutSourced',
       HIDDEN_ID: ''
     }
   }
diff --git a/src/views/keyprojects/inspection/components/list.vue b/src/views/keyprojects/inspection/components/list.vue
index 5b61959..0d499b6 100644
--- a/src/views/keyprojects/inspection/components/list.vue
+++ b/src/views/keyprojects/inspection/components/list.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <el-page-header content="安全环保检查" @back="back"/>
+    <div class="level-title mt-20"/>
     <el-form label-width="100px">
       <el-row>
         <!--        <el-col :span="5">-->
@@ -73,7 +75,8 @@
       <div/>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
-</div></template>
+  </div>
+</template>
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
@@ -106,6 +109,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'OutSourced'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
@@ -128,6 +135,7 @@ export default {
         {
           KEYWORDS: this.KEYWORDS,
           OUTSOURCED_NAME: this.OUTSOURCED_NAME,
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
           STATE: this.STATE
         }
       ).then((data) => {
diff --git a/src/views/keyprojects/inspection/index.vue b/src/views/keyprojects/inspection/index.vue
index 9f62e75..ec18fa1 100644
--- a/src/views/keyprojects/inspection/index.vue
+++ b/src/views/keyprojects/inspection/index.vue
@@ -1,6 +1,9 @@
 <template>
   <div>
-    <component :is="activeName"/>
+    <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
+    <List v-if="activeName=='List'" ref="list" />
+    <Info v-if="activeName=='Info'" />
+    <recordList v-if="activeName=='recordList'" />
   </div>
 </template>
 
@@ -8,19 +11,28 @@
 import List from './components/list'
 import Info from './components/info'
 import recordList from './components/record-list'
+import OutSourced from '@/components/OutSourced/index'
 
 export default {
   components: {
     List: List,
+    OutSourced: OutSourced,
     Info: Info,
     recordList: recordList
   },
   data() {
     return {
-      activeName: 'List',
+      activeName: 'OutSourced',
       OUTSOURCED_ID: '',
       KEYPROJECTCHECK_ID: ''
     }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'OutSourced') {
+        this.$refs.outSourced.getQuery()
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 185031b..726f257 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <el-page-header content="重点工程" @back="back"/>
+    <div class="level-title mt-20"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="8">
@@ -8,8 +10,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="创建单位">
-            <el-input v-model="CORP_NAME" placeholder="创建单位" style="width: 100%;" />
+          <el-form-item label="集团单位">
+            <el-select v-model="GROUP_UNIT" placeholder="请选择集团单位" style="width: 100%;">
+              <el-option v-for="item in groupCorpList" :key="item.CORPINFO_ID" :label="item.CORP_NAME" :value="item.CORPINFO_ID" />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -66,13 +70,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
-          <el-form-item label="集团单位">
-            <el-select v-model="GROUP_UNIT" placeholder="请选择集团单位" style="width: 100%;">
-              <el-option v-for="item in groupCorpList" :key="item.CORPINFO_ID" :label="item.CORP_NAME" :value="item.CORPINFO_ID" />
-            </el-select>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="8">
           <el-form-item label="状态">
             <el-select ref="SELECT_STATE" v-model="STATE" style="width: 100%;">
@@ -112,7 +110,6 @@
         width="55"
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip />
       <el-table-column prop="OUTSOURCED_NAME" label="重点工程名称" show-overflow-tooltip />
       <el-table-column prop="UNITS_NAME" label="施工相关方" width="250" show-overflow-tooltip />
       <el-table-column label="辖区单位" show-overflow-tooltip >
@@ -298,6 +295,7 @@ export default {
           CONTRACT_STIME: this.CONTRACTTIME[0],
           CONTRACT_ETIME: this.CONTRACTTIME[1],
           STATE: this.STATE,
+          CORPINFO_ID: this.$parent.CORPINFO_ID,
           INVOLVING_CORP: this.INVOLVING_CORP,
           DEPARTMENT_ID: this.DEPARTMENT_ID,
           COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID,
@@ -509,6 +507,10 @@ export default {
         this.listLoading = false
       })
     },
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'OutSourced'
+    },
     // 获取数据字典数据
     getDict: function() {
     },
diff --git a/src/views/keyprojects/outsourced/index.vue b/src/views/keyprojects/outsourced/index.vue
index d5f20e4..aed303a 100644
--- a/src/views/keyprojects/outsourced/index.vue
+++ b/src/views/keyprojects/outsourced/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
     <List v-show="activeName=='List'" ref="list" />
     <Edit v-if="activeName=='Edit'" />
     <Info v-if="activeName=='Info'" />
@@ -10,16 +11,18 @@
 import List from './components/list'
 import Edit from './components/edit'
 import Info from './components/info'
+import OutSourced from '@/components/OutSourced/index'
 
 export default {
   components: {
     List: List,
     Edit: Edit,
+    OutSourced: OutSourced,
     Info: Info
   },
   data() {
     return {
-      activeName: 'List'
+      activeName: 'OutSourced'
     }
   },
   watch: {
@@ -27,6 +30,9 @@ export default {
       if (val == 'List') {
         this.$refs.list.getQuery()
       }
+      if (val == 'OutSourced') {
+        this.$refs.outSourced.getQuery()
+      }
     }
   }
 }
diff --git a/src/views/keyprojects/punish/components/list.vue b/src/views/keyprojects/punish/components/list.vue
index 4ac43f4..03bbb69 100644
--- a/src/views/keyprojects/punish/components/list.vue
+++ b/src/views/keyprojects/punish/components/list.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <el-page-header content="处罚管理" @back="back"/>
+    <div class="level-title mt-20"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="4">
@@ -110,6 +112,10 @@ export default {
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'OutSourced'
+    },
     // 搜索
     getQuery() {
       this.$refs.multipleTable.clearSelection()
@@ -143,7 +149,9 @@ export default {
       requestFN(
         '/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          KEYWORDS: this.KEYWORDS
+          KEYWORDS: this.KEYWORDS,
+          CORPINFO_ID: this.$parent.CORPINFO_ID
+
         }
       ).then((data) => {
         this.listLoading = false
diff --git a/src/views/keyprojects/punish/index.vue b/src/views/keyprojects/punish/index.vue
index 0dd7220..c5c501e 100644
--- a/src/views/keyprojects/punish/index.vue
+++ b/src/views/keyprojects/punish/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
     <List v-show="activeName=='List'" ref="list" />
     <List2 v-if="activeName=='List2'" />
     <Info v-if="activeName=='Info'" />
@@ -12,17 +13,19 @@ import List from './components/list'
 import Info from './components/info'
 import List2 from './components/list2'
 import HiddenInfo from './components/hiddenInfo.vue'
+import OutSourced from '@/components/OutSourced/index'
 
 export default {
   components: {
     HiddenInfo: HiddenInfo,
+    OutSourced: OutSourced,
     List: List,
     Info: Info,
     List2: List2
   },
   data() {
     return {
-      activeName: 'List',
+      activeName: 'OutSourced',
       KEYPROJECTPUNISH_ID: '',
       HIDDEN_ID: ''
     }

From 2131214127da1e5ed7821dc301c5e90d8924bba7 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Mon, 13 Nov 2023 11:03:24 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=E5=B1=95=E7=A4=BA=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E7=9B=B8=E5=90=8C=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/hidden/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/keyprojects/hidden/index.vue b/src/views/keyprojects/hidden/index.vue
index c5341aa..957f15e 100644
--- a/src/views/keyprojects/hidden/index.vue
+++ b/src/views/keyprojects/hidden/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <OutSourced v-show="activeName=='OutSourced'" ref="outSourced" active-name="List"/>
-    <component :is="activeName"/>
+    <List v-if="activeName=='List'" />
+    <Info v-if="activeName=='Info'"/>
   </div>
 </template>
 

From 167f4c9e7e57e9ae2b979d50cdc30216fdbfe3c8 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Mon, 13 Nov 2023 17:51:14 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=A4=84=E7=BD=9A=E7=9B=B8=E5=85=B3bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../corpInfo/info/components/indexAdd.vue     | 58 ++++++++++---------
 .../keyprojects/hidden/components/list.vue    |  4 +-
 .../inspection/components/list.vue            |  3 +-
 .../keyprojects/punish/components/list.vue    |  8 ---
 .../keyprojects/punish/components/list2.vue   |  4 +-
 5 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/src/views/corpInfo/info/components/indexAdd.vue b/src/views/corpInfo/info/components/indexAdd.vue
index cc43fc4..8f3524a 100644
--- a/src/views/corpInfo/info/components/indexAdd.vue
+++ b/src/views/corpInfo/info/components/indexAdd.vue
@@ -271,7 +271,7 @@ export default {
         CORP_NAME: [{ required: true, message: '分公司名称不能为空', trigger: 'blur' }],
         shudi: [{ required: true, message: '属地不能为空', trigger: 'blur' }],
         // POSTAL_CODE: [{ required: true, message: '邮政编码不能为空', trigger: 'blur' }],
-        CODE: [{ required: true, message: '统一社会信用代码不能为空', trigger: 'blur' }],
+        CODE: [{ required: false, message: '统一社会信用代码不能为空', trigger: 'blur' }],
         INDUSTRY: [{ required: true, message: '所属行业不能为空', trigger: 'blur' }],
         ECO_TYPE: [{ required: true, message: '经济类型不能为空', trigger: 'blur' }],
         // ADDRESS_BUSINESS: [{ required: true, message: '企事业单位经营地址不能为空', trigger: 'blur' }],
@@ -509,31 +509,37 @@ export default {
     },
     // 保存
     confirm() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
-            this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
-            this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
-            this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
-            this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
-          }
-          requestFN(
-            this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
-            {
-              ...this.form,
-              PROVINCE: this.form.shudi[0],
-              CITY: this.form.shudi[1],
-              COUNTRY: this.form.shudi[2],
-              ISDELETE: Number(this.form.ISDELETE)
+      this.$confirm('此操作将会修改企业登录密码为Aa@123456789是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            if (this.form.INDUSTRYALL && this.form.INDUSTRYALL.length > 0) {
+              this.form.CORP_TYPE = this.form.INDUSTRYALL[0] || ''
+              this.form.CORP_TYPE2 = this.form.INDUSTRYALL[1] || ''
+              this.form.CORP_TYPE3 = this.form.INDUSTRYALL[2] || ''
+              this.form.CORP_TYPE4 = this.form.INDUSTRYALL[3] || ''
             }
-          ).then((data) => {
-            this.uploadImg()
-            this.$message.success('新建成功')
-            this.goBack()
-          }).catch((e) => { })
-        } else {
-          return false
-        }
+            requestFN(
+              this.$parent.indexVal ? '/corpinfo/edit' : '/corpinfo/add',
+              {
+                ...this.form,
+                PROVINCE: this.form.shudi[0],
+                CITY: this.form.shudi[1],
+                COUNTRY: this.form.shudi[2],
+                ISDELETE: Number(this.form.ISDELETE)
+              }
+            ).then((data) => {
+              this.uploadImg()
+              this.$message.success('新建成功')
+              this.goBack()
+            }).catch((e) => { })
+          } else {
+            return false
+          }
+        })
       })
     },
 
@@ -607,7 +613,7 @@ export default {
         }
         this.form.jinweidu = data.pd.LONGITUDE + ' , ' + data.pd.LATITUDE
         this.form.shudi = [data.pd.PROVINCE, data.pd.CITY, data.pd.COUNTRY]
-        this.shudiPlaceholder = data.pd.PROVINCE_VAL + "-" + data.pd.CITY_VAL + "-" + data.pd.COUNTRY_VAL
+        this.shudiPlaceholder = data.pd.PROVINCE_VAL + '-' + data.pd.CITY_VAL + '-' + data.pd.COUNTRY_VAL
         this.hImgs = data.hImgs
         this.$forceUpdate()
         this.listLoading = false
diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue
index 112a822..04fe43d 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -150,7 +150,6 @@ export default {
       ],
       sourceState: {
         1: 'AI报警',
-        2: 'AI报警(企业端)',
         4: '安全环保检查(监管端)',
         5: '安全环保检查(企业端)'
       },
@@ -160,8 +159,7 @@ export default {
         4: '已验收'
       },
       SOURCEList: [
-        { ID: '1', NAME: 'AI报警(监管端)' },
-        { ID: '2', NAME: 'AI报警(企业端)' },
+        { ID: '1', NAME: 'AI报警' },
         { ID: '4', NAME: '安全环保检查(监管端)' },
         { ID: '5', NAME: '安全环保检查(企业端)' }
       ],
diff --git a/src/views/keyprojects/inspection/components/list.vue b/src/views/keyprojects/inspection/components/list.vue
index 0d499b6..97919c7 100644
--- a/src/views/keyprojects/inspection/components/list.vue
+++ b/src/views/keyprojects/inspection/components/list.vue
@@ -11,7 +11,7 @@
         <!--        </el-col>-->
         <el-col :span="5">
           <el-form-item label="重点工程名称">
-            <el-input v-model="OUTSOURCED_NAME" placeholder="搜索重点工程名称" />
+            <el-input v-model="KEYWORDS" placeholder="搜索重点工程名称" />
           </el-form-item>
         </el-col>
         <el-col :span="5">
@@ -134,7 +134,6 @@ export default {
         '/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
-          OUTSOURCED_NAME: this.OUTSOURCED_NAME,
           CORPINFO_ID: this.$parent.CORPINFO_ID,
           STATE: this.STATE
         }
diff --git a/src/views/keyprojects/punish/components/list.vue b/src/views/keyprojects/punish/components/list.vue
index 03bbb69..cfd86b6 100644
--- a/src/views/keyprojects/punish/components/list.vue
+++ b/src/views/keyprojects/punish/components/list.vue
@@ -9,14 +9,6 @@
             <el-input v-model="KEYWORDS" placeholder="搜索关键字"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="处罚状态">
-            <el-select v-model="HANDLED">
-              <el-option value="1" label="待反馈处罚"/>
-              <el-option value="2" label="已完成处罚"/>
-            </el-select>
-          </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">
diff --git a/src/views/keyprojects/punish/components/list2.vue b/src/views/keyprojects/punish/components/list2.vue
index c6b4c87..93cb6c8 100644
--- a/src/views/keyprojects/punish/components/list2.vue
+++ b/src/views/keyprojects/punish/components/list2.vue
@@ -10,8 +10,8 @@
         <el-col :span="4">
           <el-form-item label="处罚状态">
             <el-select v-model="HANDLED">
-              <el-option value="1" label="待反馈处罚"/>
-              <el-option value="2" label="已完成处罚"/>
+              <el-option value="0" label="待反馈处罚"/>
+              <el-option value="1" label="已完成处罚"/>
             </el-select>
           </el-form-item>
         </el-col>

From fdf420953483ed31bb13e6cc2570ffe6a112b9bc Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Tue, 14 Nov 2023 11:09:27 +0800
Subject: [PATCH 08/11] =?UTF-8?q?1.=E2=80=9C=E9=87=8D=E7=82=B9=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E7=8E=B0=E5=9C=BA=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9C=E7=9B=B8=E5=85=B3=E6=96=B9?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E2=80=9D=E6=98=BE=E7=A4=BA=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E4=BA=8E=20=E2=80=9C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E4=BF=A1=E7=94=A8=E4=BB=A3=E7=A0=81=E2=80=9D?=
 =?UTF-8?q?=E5=9C=A8=E6=98=BE=E7=A4=BA=E9=A1=B5=E9=9D=A2=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E4=B8=8D=E4=BA=88=E6=98=BE=E7=A4=BA=E3=80=82=EF=BC=88=E5=90=84?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=9C=89=E5=A1=AB=E5=86=99=E4=B9=9F=E6=9C=89?=
 =?UTF-8?q?=E6=9C=AA=E5=A1=AB=E5=86=99=E6=83=85=E5=86=B5=EF=BC=89=202.=20?=
 =?UTF-8?q?=E2=80=9C=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=8E=B0=E5=9C=BA?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=E2=80=9D=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E2=80=9C=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E2=80=9D=E6=98=BE=E7=A4=BA=E7=95=8C=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E7=BB=9F=E4=B8=80=E5=A1=AB=E5=86=99=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=A1=AB=E5=86=99=E5=86=85=E5=AE=B9=E5=BA=94?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E3=80=82=203.=20?=
 =?UTF-8?q?=E2=80=9C=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E7=8E=B0=E5=9C=BA?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=AE=A1=E7=90=86=E2=80=9D=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E2=80=9C=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E2=80=9D=E4=B8=AD=E5=A6=82=E6=B6=89=E5=8F=8A?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E2=80=9C=E7=9B=91=E7=90=86=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E2=80=9D=E7=9A=84=E5=BA=94=E6=98=BE=E7=A4=BA=E2=80=9C=E6=97=A0?=
 =?UTF-8?q?=E2=80=9D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/outsourced/components/list.vue | 7 ++++++-
 src/views/keyprojects/personnelmanagement/index.vue  | 8 ++++----
 src/views/keyprojects/units/components/list.vue      | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 726f257..fcf3c44 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -130,7 +130,12 @@
           <span v-else>{{ row.DEPARTMENT_NAME }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="MANAGE_CORPS_NAME" label="监理单位" show-overflow-tooltip />
+      <el-table-column label="监理单位" show-overflow-tooltip >
+        <template slot-scope="{row}">
+          <span v-if="row.MANAGE_CORPS_NAME"> {{ row.MANAGE_CORPS_NAME }} </span>
+          <span v-else>无</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="STATE" label="状态" width="100" >
         <template slot-scope="{row}">
           <span v-if="row.STATE == 1">进行中</span>
diff --git a/src/views/keyprojects/personnelmanagement/index.vue b/src/views/keyprojects/personnelmanagement/index.vue
index 2819c4f..4283f76 100644
--- a/src/views/keyprojects/personnelmanagement/index.vue
+++ b/src/views/keyprojects/personnelmanagement/index.vue
@@ -66,12 +66,12 @@
           </template>
         </template>
       </el-table-column>
-      <el-table-column prop="JOBTYPE" label="作业类别" />
-      <el-table-column prop="OPERATIONITEM" label="操作项目" />
+      <!--<el-table-column prop="JOBTYPE" label="作业类别" />
+      <el-table-column prop="OPERATIONITEM" label="操作项目" />-->
       <el-table-column prop="NAME" label="姓名" width="100" />
-      <el-table-column prop="SEX" label="性别" width="50" />
+      <!--<el-table-column prop="SEX" label="性别" width="50" />
       <el-table-column prop="CERTIFICATE_NUM" label="作业证书编号" />
-      <el-table-column prop="REVIEWTIME" label="复审时间" width="120" />
+      <el-table-column prop="REVIEWTIME" label="复审时间" width="120" />-->
       <el-table-column label="操作" align="left" width="400">
         <template slot-scope="{row}">
           <el-button v-show="edit" type="success" icon="el-icon-edit" size="mini" @click="resetPwd(row.PERSONNELMANAGEMENT_ID,row.NAME)">重置密码</el-button>
diff --git a/src/views/keyprojects/units/components/list.vue b/src/views/keyprojects/units/components/list.vue
index e51ce26..b72577f 100644
--- a/src/views/keyprojects/units/components/list.vue
+++ b/src/views/keyprojects/units/components/list.vue
@@ -48,7 +48,7 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="UNITS_NAME" label="相关方单位名称" show-overflow-tooltip />
-      <el-table-column prop="CODE" label="统一社会信用代码" width="200" />
+      <!--<el-table-column prop="CODE" label="统一社会信用代码" width="200" />-->
       <el-table-column prop="CONTACTS" label="联系人" width="150" show-overflow-tooltip />
       <el-table-column prop="CONTACTS_PHONE" label="联系人电话" width="100" />
       <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip />

From 51e543b8420679a5a88282cab1dd31db89818762 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Tue, 14 Nov 2023 16:16:52 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=20?=
 =?UTF-8?q?=E9=9A=90=E6=82=A3=E7=AE=A1=E7=90=86=20=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=A4=84=E7=BD=9A=E6=90=9C=E7=B4=A2=E6=A1=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/keyprojects/hidden/components/list.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/keyprojects/hidden/components/list.vue b/src/views/keyprojects/hidden/components/list.vue
index 04fe43d..52e290b 100644
--- a/src/views/keyprojects/hidden/components/list.vue
+++ b/src/views/keyprojects/hidden/components/list.vue
@@ -102,7 +102,7 @@
       </el-table-column>
       <el-table-column label="是否处罚">
         <template slot-scope="{row}">
-          {{ row.ISPUNISH && (row.ISPUNISH === "1" ? "是" : "否") }}
+          {{ row.ISPUNISH === "1" ? "是" : row.ISPUNISH === "2" ?"否":"处罚人未处理" }}
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="100">
@@ -146,7 +146,8 @@ export default {
         // { ID: '1', NAME: '申请中' },
         // { ID: '2', NAME: '已完成' }
         { ID: '1', NAME: '是' },
-        { ID: '2', NAME: '否' }
+        { ID: '2', NAME: '否' },
+        { ID: '3', NAME: '处罚人未处理' }
       ],
       sourceState: {
         1: 'AI报警',

From f1b38ffc8c442757248cd899376ddc36c35fe9f2 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Wed, 15 Nov 2023 11:57:56 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=8C=85=E4=B8=80=E5=B1=82=E7=A7=A6=E6=B8=AF=E8=82=A1=E4=BB=BD?=
 =?UTF-8?q?=E6=9C=89=E9=99=90=E5=85=AC=E5=8F=B8=E5=B1=9E=E5=9C=B0=E4=B8=8E?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E8=A1=8C=E4=B8=9A=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OutSourced/index.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index 3ca990d..76c4676 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -41,11 +41,26 @@
       <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>
+        <template slot-scope="{row}"/>
         <template slot-scope="{row}">
-          {{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
+          <span v-if="row.CORPINFO_ID !='1'">
+            {{ row.prvinceName }} -- {{ row.cityName }} -- {{ row.countryName }}
+          </span>
+          <span v-else>
+            河北省 -- 秦皇岛市 -- 海港区
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip >
+        <template slot-scope="{row}">
+          <span v-if="row.CORPINFO_ID !='1'">
+            {{ row.INDUSTRY_NAME }}
+          </span>
+          <span v-else>
+            交通运输、仓储和邮政业
+          </span>
         </template>
       </el-table-column>
-      <el-table-column prop="INDUSTRY_NAME" label="所属行业" show-overflow-tooltip />
       <el-table-column prop="OUTSOURCED_COUNT" label="包含重点工程数" />
       <el-table-column label="操作" align="center" width="100">
         <template slot-scope="{row}">

From 3882a8343a11455ee279a4bb9ddf0f18a8a9934e Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Wed, 15 Nov 2023 13:33:30 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix=EF=BC=9A=E9=A9=BE=E9=A9=B6=E8=88=B1?=
 =?UTF-8?q?=E7=A7=A6=E6=B8=AF=E8=82=A1=E4=BB=BD=E6=A3=80=E6=9F=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=95=B0=E9=87=8F=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/BI/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/BI/index.vue b/src/views/BI/index.vue
index 06c0c50..767e680 100644
--- a/src/views/BI/index.vue
+++ b/src/views/BI/index.vue
@@ -1056,8 +1056,8 @@ export default {
             labelLine: {
               normal: {
                 show: true,
-                length: 15,
-                length2: 15
+                length: 10,
+                length2: 10
               }
             },
             label: {