From 0560077fe928ddfb89588f8b8af6fa4c1cd9db22 Mon Sep 17 00:00:00 2001
From: dearlin <1261008090@qq.com>
Date: Thu, 23 Nov 2023 11:33:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E8=A7=86=E9=A2=91=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E4=BA=94=E5=88=86=E9=92=9F=E8=87=AA=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E3=80=82add=EF=BC=9A=E8=A7=86=E9=A2=91=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outsourced/components/list.vue            |   1 -
 .../videoinfomanager/components/list.vue      |   4 +-
 .../videomanager/components/bobileCamer.vue   |  12 +-
 .../videomanager/components/list.vue          | 189 +++++++++++++++++-
 .../videomanager/components/video-list.vue    |   8 +-
 src/views/keyprojects/videomanager/index.vue  |   2 +-
 6 files changed, 198 insertions(+), 18 deletions(-)

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index 6ed636c..ce45143 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -70,7 +70,6 @@
         </el-col>
       </el-row>
       <el-row>
-
         <el-col :span="8">
           <el-form-item label="状态">
             <el-select ref="SELECT_STATE" v-model="STATE" style="width: 100%;">
diff --git a/src/views/keyprojects/videoinfomanager/components/list.vue b/src/views/keyprojects/videoinfomanager/components/list.vue
index ce7ad03..6652b7c 100644
--- a/src/views/keyprojects/videoinfomanager/components/list.vue
+++ b/src/views/keyprojects/videoinfomanager/components/list.vue
@@ -180,13 +180,13 @@
         :limit.sync="zdlistQuery.limit"
         @pagination="zdgetList()"/>
     </el-drawer>
-    <el-dialog v-if="dialogVideo" :visible.sync="dialogVideo" title="视频" width="600px">
+    <el-dialog v-if="dialogVideo" :visible.sync="dialogVideo" :show-close="false" title="视频2" width="600px">
       <iframe :src="VIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="back">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog v-if="dialogVideoHLS" :visible.sync="dialogVideoHLS" :before-close="handleBack" title="视频" width="600px">
+    <el-dialog v-if="dialogVideoHLS" :visible.sync="dialogVideoHLS" :before-close="handleBack" :show-close="false" title="视频" width="600px">
       <div id="aLiVideoPlayer" class="prism-player"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="back">取 消</el-button>
diff --git a/src/views/keyprojects/videomanager/components/bobileCamer.vue b/src/views/keyprojects/videomanager/components/bobileCamer.vue
index bbf11c6..5908454 100644
--- a/src/views/keyprojects/videomanager/components/bobileCamer.vue
+++ b/src/views/keyprojects/videomanager/components/bobileCamer.vue
@@ -77,7 +77,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog v-if="dialogVideo" :visible.sync="dialogVideo" title="视频" append-to-body width="600px">
+    <el-dialog v-if="dialogVideo" :visible.sync="dialogVideo" :show-close="false" title="视频" append-to-body width="600px">
       <iframe :src="VIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="back">取 消</el-button>
@@ -124,6 +124,10 @@ export default {
       allCodes: []
     }
   },
+  beforeDestroy() {
+    console.log('页面定时器关闭')
+    clearInterval(this.timer)
+  },
 
   methods: {
     // 五分钟关闭视频播放页面定时任务
@@ -282,11 +286,7 @@ export default {
     closeWindow() {
       this.handleClose()
     }
-  },
-  beforeDestroy() {
-    console.log('页面定时器关闭')
-    clearInterval(this.timer)
-  },
+  }
 }
 
 </script>
diff --git a/src/views/keyprojects/videomanager/components/list.vue b/src/views/keyprojects/videomanager/components/list.vue
index 2f6f420..abd4d82 100644
--- a/src/views/keyprojects/videomanager/components/list.vue
+++ b/src/views/keyprojects/videomanager/components/list.vue
@@ -3,13 +3,98 @@
     <el-page-header content="查看详情" @back="goBack"/>
     <div class="level-title mt-20"/>
     <el-form label-width="100px">
+      <!--      <el-row>-->
+      <!--        <el-col :span="5">-->
+      <!--          <el-form-item label="关键字搜索">-->
+      <!--            <el-input v-model="KEYWORDS" 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-row>
-        <el-col :span="5">
+        <el-col :span="8">
           <el-form-item label="关键字搜索">
-            <el-input v-model="KEYWORDS" placeholder="搜索关键字" />
+            <el-input v-model="KEYWORDS" placeholder="搜索关键字" style="width: 100%;" />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <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="主管部门">
+            <SelectTree
+              ref="deptTree"
+              :clearable="false"
+              :options="treeDataInspectDept"
+              :props="defaultProps"
+              v-model="COMPETENT_DEPT_ID"
+              placeholder="请选择企业主管部门"
+              style="width: 100%"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="施工相关方">
+            <el-select v-model="UNITS_ID" placeholder="请选择施工相关方" style="width: 100%">
+              <el-option
+                v-for="item in unitsList"
+                :key="item.UNITS_ID"
+                :label="item.UNITS_NAME"
+                :value="item.UNITS_ID" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="监管部门">
+            <SelectTree
+              ref="deptTree1"
+              :clearable="false"
+              :options="treeDataInspectDept"
+              :props="defaultProps"
+              v-model="DEPARTMENT_ID"
+              placeholder="请选择股份监管部门"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="合同起止时间">
+            <el-date-picker
+              v-model="CONTRACTTIME"
+              type="daterange"
+              unlink-panels
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              format="yyyy-MM-dd"
+              style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="状态">
+            <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="8">
           <el-form-item label-width="10px">
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
               搜索
@@ -81,9 +166,11 @@
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
+import SelectTree from '@/components/SelectTree'
+
 import waves from '@/directive/waves' // waves directive
 export default {
-  components: { Pagination },
+  components: { Pagination, SelectTree },
   directives: { waves },
   data() {
     return {
@@ -93,14 +180,87 @@ export default {
         limit: 20
       },
       total: 0,
+      form: {},
       KEYWORDS: '',
+      GROUP_UNIT: '',
+      DEPARTMENT_ID: '',
+      COMPETENT_DEPT_ID: '',
+      STATE: '',
+      CONTRACTTIME: ['', ''], // 区间条件
+      stateList: [
+        { ID: '1', NAME: '进行中' },
+        { ID: '2', NAME: '已结束' }
+      ],
+      UNITS_ID: '',
+      groupCorpList: [],
+      unitsList: [],
+      treeDataInspectDept: [],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
       varList: []
     }
   },
+  watch: {
+    CONTRACTTIME: function(newData, oldData) {
+      if (!newData) {
+        this.CONTRACTTIME = ['', '']
+        this.getQuery()
+      }
+    }
+  },
   created() {
     this.getList()
+    this.getUnitsList()
+    this.getCorpList()
+    this.selectDeptOption()
   },
   methods: {
+    getCorpList() {
+      requestFN(
+        '/corpinfo/listAll',
+        {}
+      ).then((data) => {
+        this.corpList = data.varList
+        this.mangeList = data.varList
+        if (!this.$parent.OUTSOURCED_ID) {
+          this.form.MANAGE_NAME = ['133a982a3e93464a9b1de25fe6dd4948']
+        }
+        for (let i = 0; i < data.varList.length; i++) {
+          const corpId = data.varList[i].CORPINFO_ID
+          if (corpId === '1e6dbbe16004402f8d2c0e52afd9a676' ||
+            corpId === '3a854eefa7894e06aaa1a2611bca80f6' ||
+            corpId === '020578a4c1f04bc692ee25145c2efbe5' || corpId === '90966974de3c4b83aca6f8fd6432d5c2') {
+            this.groupCorpList.push(data.varList[i])
+          }
+        }
+      }).catch((e) => {
+      })
+    },
+    selectDeptOption() {
+      // 合并
+      return new Promise((resolve) => {
+        requestFN(
+          '/corpDepartment/listTreeManageAndCorp1',
+        ).then((data) => {
+          this.treeDeptOptions = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          resolve()
+        }).catch((e) => {
+        })
+      })
+    },
+    getUnitsList() {
+      requestFN(
+        '/units/listAll',
+        { UNITS_ID: this.form.UNITS_ID }
+      ).then((data) => {
+        this.unitsList = data.varList
+      }).catch((e) => {
+      })
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },
@@ -115,6 +275,18 @@ export default {
     },
     goKeyReset() {
       this.KEYWORDS = ''
+      this.UNITS_ID = ''
+      this.STATE = ''
+      this.CONTRACT_STIME = ''
+      this.CONTRACT_ETIME = ''
+      this.CONTRACTTIME = ['', '']
+      this.$refs.deptTree.clearHandle()
+      this.$refs.deptTree1.clearHandle()
+      this.INVOLVING_CORP = ''
+      this.DEPARTMENT_ID = ''
+      this.COMPETENT_DEPT_ID = ''
+      this.GROUP_UNIT = ''
+      this.CORP_NAME = ''
       this.getQuery()
     },
     // 获取列表
@@ -124,6 +296,15 @@ export default {
         '/outsourced/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
+          UNITS_ID: this.UNITS_ID,
+          CONTRACT_STIME: this.CONTRACTTIME[0],
+          CONTRACT_ETIME: this.CONTRACTTIME[1],
+          STATE: this.STATE,
+          INVOLVING_CORP: this.INVOLVING_CORP,
+          DEPARTMENT_ID: this.DEPARTMENT_ID,
+          COMPETENT_DEPT_ID: this.COMPETENT_DEPT_ID,
+          GROUP_UNIT: this.GROUP_UNIT,
+          CORP_NAME: this.CORP_NAME,
           CORPINFO_ID: this.$parent.CORPINFO_ID
         }
       ).then((data) => {
diff --git a/src/views/keyprojects/videomanager/components/video-list.vue b/src/views/keyprojects/videomanager/components/video-list.vue
index 67f9176..f34ccfa 100644
--- a/src/views/keyprojects/videomanager/components/video-list.vue
+++ b/src/views/keyprojects/videomanager/components/video-list.vue
@@ -124,28 +124,28 @@
       </div>
     </el-dialog>
 
-    <el-dialog v-if="dialogVideo" :visible.sync="dialogVideo" title="视频" width="600px">
+    <el-dialog v-if="dialogVideo" :visible.sync="dialogVideo" :show-close="false" title="视频" width="600px">
       <iframe :src="VIDEOURL" width="100%" height="380" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="back">取 消</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog v-if="dialogVideoHLS" :visible.sync="dialogVideoHLS" :before-close="handleBack" title="视频" width="600px">
+    <el-dialog v-if="dialogVideoHLS" :visible.sync="dialogVideoHLS" :before-close="handleBack" :show-close="false" title="视频" width="600px">
       <div id="aLiVideoPlayer" class="prism-player"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="back">取 消</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog v-if="dialogVideoBack" :visible.sync="dialogVideoBack" title="视频回放" width="800px">
+    <el-dialog v-if="dialogVideoBack" :visible.sync="dialogVideoBack" :show-close="false" title="视频回放" width="800px">
       <iframe :src="VIDEOURL" width="100%" height="620" allowfullscreen allow="autoplay; fullscreen;microphone" style="position: relative;border:none"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="back">取 消</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" title="视频" width="1200px">
+    <el-dialog v-if="dialogVideoAll" :visible.sync="dialogVideoAll" :before-close="handleBack" :show-close="false" title="视频" width="1200px">
       <!--      <iframe src="http://192.168.192.121:10800/?menu=no/#/screen" width="100%" height="500px" allowfullscreen allow="autoplay; fullscreen" style="position: relative;border:none"/>-->
       <div style="display: flex;flex-wrap: wrap;justify-content: space-between">
         <div v-for="(video,index) in videoList" :key="index" style="margin-bottom: 10px;width: 45%">
diff --git a/src/views/keyprojects/videomanager/index.vue b/src/views/keyprojects/videomanager/index.vue
index 8fc303d..e06bbb8 100644
--- a/src/views/keyprojects/videomanager/index.vue
+++ b/src/views/keyprojects/videomanager/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <OutSourced v-if="activeName=='OutSourced'" ref="outSourced" :other-show="true" active-name="List"/>
-    <List v-if="activeName=='List'" ref="list" />
+    <List v-show="activeName=='List'" ref="list" />
     <videoList v-if="activeName=='videoList'" />
     <!--    <component :is="activeName"/>-->
   </div>

From 37283d3a7acc11550a845aaa768ebf4c1ec85420 Mon Sep 17 00:00:00 2001
From: zhaoyu <zhaoyu>
Date: Thu, 23 Nov 2023 14:06:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=B1=95=E7=A4=BA=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/keyprojects/outsourced/components/list.vue b/src/views/keyprojects/outsourced/components/list.vue
index ce45143..a577cd5 100644
--- a/src/views/keyprojects/outsourced/components/list.vue
+++ b/src/views/keyprojects/outsourced/components/list.vue
@@ -367,7 +367,7 @@ export default {
           if (data.code == '500') {
             this.listLoading = false
             this.$message({
-              message: data.msg,
+              message: data.message,
               type: 'error'
             })
             return