From 4270d8e78f16d262caabc65a493fa51427993f95 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Wed, 22 Nov 2023 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E9=87=8D=E7=82=B9=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7=E5=A4=96=E5=B1=82?=
 =?UTF-8?q?=E6=96=B0=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OutSourced/index.vue            | 11 ++++++++++-
 .../corpinfodept/components/indexList.vue      |  8 ++++----
 .../corpinfouser/components/indexList.vue      |  8 ++++----
 .../retrieval/components/indexList.vue         | 16 ++++++++--------
 .../videomanager/components/list.vue           |  9 ++++++++-
 src/views/keyprojects/videomanager/index.vue   | 10 ++++++++--
 .../risk/corpinfo/components/corpInfo.vue      | 18 ++++++++----------
 7 files changed, 50 insertions(+), 30 deletions(-)

diff --git a/src/components/OutSourced/index.vue b/src/components/OutSourced/index.vue
index 76c4676..3f4723c 100644
--- a/src/components/OutSourced/index.vue
+++ b/src/components/OutSourced/index.vue
@@ -61,7 +61,12 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column prop="OUTSOURCED_COUNT" label="包含重点工程数" />
+      <el-table-column prop="OUTSOURCED_COUNT" label="重点工程创建数量" />
+      <el-table-column v-if="otherShow" prop="CHECK_COUNT" label="检查次数" />
+      <el-table-column v-if="otherShow" prop="HIDDEN_COUNT" label="发现隐患数量" />
+      <el-table-column v-if="otherShow" prop="PUNISH_COUNT" label="违约处罚次数" />
+      <el-table-column v-if="otherShow" prop="AMOUT_SUM" label="违约处罚金额" />
+      <el-table-column v-if="otherShow" prop="VIDEO_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>
@@ -87,6 +92,10 @@ export default {
     activeName: {
       type: String,
       default: ''
+    },
+    otherShow: {
+      type: Boolean,
+      default: false
     }
 
   },
diff --git a/src/views/corpInfo/corpinfodept/components/indexList.vue b/src/views/corpInfo/corpinfodept/components/indexList.vue
index 8d5e2d4..4cd733a 100644
--- a/src/views/corpInfo/corpinfodept/components/indexList.vue
+++ b/src/views/corpInfo/corpinfodept/components/indexList.vue
@@ -62,10 +62,10 @@
       <!--          <span v-if="row.villageName"> &#45;&#45; {{ row.villageName }}</span>-->
       <!--        </template>-->
       <!--      </el-table-column>-->
-      <el-table-column prop="INDUSTRY" label="所属行业">
-        <template slot-scope="{row}">
-          {{ translate(industryList,row.INDUSTRY) }}
-        </template>
+      <el-table-column prop="INDUSTRYALL" label="所属行业">
+        <!--        <template slot-scope="{row}">-->
+        <!--          {{ translate(industryList,row.INDUSTRY) }}-->
+        <!--        </template>-->
       </el-table-column>
       <el-table-column prop="changCount" label="厂级部门数" />
       <el-table-column prop="keCount" label="科/队部门数" />
diff --git a/src/views/corpInfo/corpinfouser/components/indexList.vue b/src/views/corpInfo/corpinfouser/components/indexList.vue
index b4eb127..fc59d65 100644
--- a/src/views/corpInfo/corpinfouser/components/indexList.vue
+++ b/src/views/corpInfo/corpinfouser/components/indexList.vue
@@ -48,10 +48,10 @@
           <span v-if="row.villageName"> -- {{ row.villageName }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="INDUSTRY" label="所属行业">
-        <template slot-scope="{row}">
-          {{ translate(industryList,row.INDUSTRY) }}
-        </template>
+      <el-table-column prop="INDUSTRYALL" label="所属行业">
+        <!--        <template slot-scope="{row}">-->
+        <!--          {{ translate(industryList,row.INDUSTRY) }}-->
+        <!--        </template>-->
       </el-table-column>
       <el-table-column prop="count" label="人数"/>
       <el-table-column prop="CORP_STATE" label="分公司状态">
diff --git a/src/views/corpInfo/retrieval/components/indexList.vue b/src/views/corpInfo/retrieval/components/indexList.vue
index 5052401..f6dae83 100644
--- a/src/views/corpInfo/retrieval/components/indexList.vue
+++ b/src/views/corpInfo/retrieval/components/indexList.vue
@@ -7,13 +7,13 @@
             <el-input v-model="KEYWORDS" placeholder="企业名称"/>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item label="所属行业">
-            <el-select v-model="KEYQYLX" clearable placeholder="请选择类型" style="width: 100%;" >
-              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>
-            </el-select>
-          </el-form-item>
-        </el-col>
+        <!--        <el-col :span="4">-->
+        <!--          <el-form-item label="所属行业">-->
+        <!--            <el-select v-model="KEYQYLX" clearable placeholder="请选择类型" style="width: 100%;" >-->
+        <!--              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
         <el-col :span="4">
           <el-form-item label="隶属关系">
             <el-select v-model="KEYLS" clearable placeholder="请选隶属关系" style="width: 100%;" @click.native="getDicForClick('lsgxList','1a13f574d4c44cd2ac2034f8e3259f9b')" >
@@ -496,7 +496,7 @@
           <span v-if="row.villageName"> -- {{ row.villageName }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="INDUSTRY_NAME" label="所属行业" />
+      <el-table-column prop="INDUSTRYALL" label="所属行业" />
       <el-table-column prop="corpStateName" label="分公司状态" />
       <el-table-column label="状态" >
         <template slot-scope="{row}">
diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue
index 4d5a01d..2f6f420 100644
--- a/src/views/keyprojects/videomanager/components/list.vue
+++ b/src/views/keyprojects/videomanager/components/list.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-container">
+    <el-page-header content="查看详情" @back="goBack"/>
+    <div class="level-title mt-20"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="5">
@@ -102,6 +104,10 @@ export default {
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
+    goBack() {
+      this.$parent.activeName = 'OutSourced'
+      this.$parent.OUTSOURCED_ID = ''
+    },
     // 搜索
     getQuery() {
       this.$refs.multipleTable.clearSelection()
@@ -117,7 +123,8 @@ 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/videomanager/index.vue b/src/views/keyprojects/videomanager/index.vue
index 1c43ae1..8fc303d 100644
--- a/src/views/keyprojects/videomanager/index.vue
+++ b/src/views/keyprojects/videomanager/index.vue
@@ -1,21 +1,27 @@
 <template>
   <div>
-    <component :is="activeName"/>
+    <OutSourced v-if="activeName=='OutSourced'" ref="outSourced" :other-show="true" active-name="List"/>
+    <List v-if="activeName=='List'" ref="list" />
+    <videoList v-if="activeName=='videoList'" />
+    <!--    <component :is="activeName"/>-->
   </div>
 </template>
 
 <script>
+import OutSourced from '@/components/OutSourced/index'
+
 import List from './components/list'
 import videoList from './components/video-list'
 
 export default {
   components: {
     List: List,
+    OutSourced: OutSourced,
     videoList: videoList
   },
   data() {
     return {
-      activeName: 'List',
+      activeName: 'OutSourced',
       UNITS_ID: '',
       OUTSOURCED_ID: ''
     }
diff --git a/src/views/risk/corpinfo/components/corpInfo.vue b/src/views/risk/corpinfo/components/corpInfo.vue
index bb8942d..6e42398 100644
--- a/src/views/risk/corpinfo/components/corpInfo.vue
+++ b/src/views/risk/corpinfo/components/corpInfo.vue
@@ -6,14 +6,13 @@
           <el-form-item label="企业名称">
             <el-input v-model="KEYWORDS" placeholder="企业名称"/>
           </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="所属行业">
-            <el-select v-model="CORP_OF_TYPE2" placeholder="类型" clearable style="width: 100%">
-              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>
-            </el-select>
-          </el-form-item>
-        </el-col>
+        </el-col><!--        <el-col :span="4">-->
+        <!--          <el-form-item label="所属行业">-->
+        <!--            <el-select v-model="CORP_OF_TYPE2" placeholder="类型" clearable style="width: 100%">-->
+        <!--              <el-option v-for="item in industryList" :key="item.DICTIONARIES_ID" :label="item.NAME" :value="item.DICTIONARIES_ID"/>-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
         <!--        <el-col :span="4">-->
         <!--          <el-form-item label="属地">-->
         <!--            <el-select v-model="COUNTRY" placeholder="区/县" clearable style="width: 100%">-->
@@ -58,7 +57,7 @@
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="企业名称" />
-      <el-table-column prop="TYPE_NAME" label="企业类型" />
+      <el-table-column prop="INDUSTRYALL" label="行业类型" />
       <el-table-column label="属地" >
         <template slot-scope="{row}">
           {{ row.CITY_NAME }} {{ row.COUNTRY_NAME?('-- '+ row.COUNTRY_NAME ):'' }} {{ row.VILLAGE_NAME?(' -- '+row.VILLAGE_NAME):'' }}
@@ -120,7 +119,6 @@ export default {
       countryList: [],
       industryList: [],
       COUNTRY: '',
-      panelData: '',
       villageList: [],
       VILLAGE: '',
       varList: [],