Merge remote-tracking branch 'origin/pet' into dev

src/views/dangerousWork/hotwork/components/hotwork/hotwork_list/components/detail.vue

@@ -114,8 +114,8 @@
               </td>
             </tr>
             <tr>
-              <td colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_PERSON_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_PERSON_PRINCIPAL_TIME }}</td>
-              <td colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
+              <td v-if="pd.HOT_WORK_AFTER_PRINCIPAL" colspan="2">时间：{{ pd.HOT_WORK_AFTER_PRINCIPAL_TIME }}</td>
             </tr>
             <tr>
               <td class="tbg">延时监火记录</td>

src/views/keyproject_evaluation/branch_hazard_assessment/components/list.vue

@@ -50,14 +50,9 @@
           {{ row.checked_count1 }} / {{ row.count1 }}
         </template>
       </el-table-column>
-      <el-table-column label="重点工程安全环保奖惩监管端">
+      <el-table-column label="重点工程安全环保奖惩">
         <template slot-scope="{row}">
-          {{ row.checked_count2 }} / {{ row.count2 }}
+          {{row.CORP_NAME == '秦港股份有限公司' ? row.checked_count2 : row.checked_count3 }} / {{row.CORP_NAME == '秦港股份有限公司' ? row.count2 : row.checked_count3 }}
-        </template>
-      </el-table-column>
-      <el-table-column label="重点工程安全环保奖惩企业端">
-        <template slot-scope="{row}">
-          {{ row.checked_count3 }} / {{ row.count3 }}
         </template>
       </el-table-column>
       <el-table-column prop="CHECK_USER" label="考评组成员"/>

src/views/keyprojects/aiwarning/components/record-list.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="app-container">
+      <el-page-header content="报警记录" @back="back"/>
       <el-form label-width="100px">
         <el-row>
           <el-col :span="5">
@@ -116,6 +117,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'List'
+    },
     checkboxInit(row, index) {
       if (row.STATUS != '0') {
         return 0 // 不可勾选

src/views/keyprojects/inspection/components/record-list.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header @back="back"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="5">
@@ -98,6 +99,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'list'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },

src/views/keyprojects/outsourced/components/edit.vue

@@ -338,7 +338,7 @@
 
         <div class="level-line" />
         <div class="level-title">
-          <h1>处罚相关：</h1>
+          <h1>处罚相关：</h1><span style="color: gray; font-size: 12px;">(AI报警的处罚人员为AI报警的处置人)</span>
         </div>
         <el-divider content-position="left">处罚人员 <el-button type="primary" size="mini" @click="addInspector">添加</el-button></el-divider>
         <el-form-item v-for="(item,index) in inspectorList" :key="index + (Math.random() + '').replace('.', '')" :label="(index+1)+'.'" class="is-required">

src/views/keyprojects/outsourced/components/info.vue

@@ -134,7 +134,7 @@
 
         <div class="level-line" />
         <div class="level-title">
-          <h1>处罚相关：</h1>
+          <h1>处罚相关：</h1><span style="color: gray; font-size: 12px;">(AI报警的处罚人员为AI报警的处置人)</span>
         </div>
         <tr v-for="(item,index) in punishThePerson" :key="index">
           <td class="tbg">处罚人员部门</td>

src/views/keyprojects/punish/components/list.vue

@@ -56,11 +56,6 @@
       <el-table-column v-if="false" prop="CREATOR_NAME" label="下发人" show-overflow-tooltip/>
       <el-table-column v-if="false" prop="OUTSOURCED_NAME" label="被处罚单位" show-overflow-tooltip/>
       <el-table-column v-if="false" prop="PERSON_NAME" label="被处罚人" show-overflow-tooltip/>
-      <el-table-column label="处罚处理状态" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          {{ row.HANDLED === "0" ? "待处理" : "已处理" }}
-        </template>
-      </el-table-column>
       <el-table-column prop="CORP_NAME" label="创建单位" show-overflow-tooltip/>
       <el-table-column prop="FIND_HIDDEN_NUM" label="发现隐患数据" show-overflow-tooltip/>
       <el-table-column prop="END_HIDDEN_NUM" label="处理隐患数" show-overflow-tooltip/>

src/views/keyprojects/punish/components/list2.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header content="处罚记录" @back="back"/>
     <el-form label-width="100px">
       <el-row>
         <el-col :span="4">
@@ -96,6 +97,10 @@ export default {
     this.getList()
   },
   methods: {
+    back() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'List'
+    },
     getRowKey(row) {
       return row.OUTSOURCED_ID
     },

src/views/keyprojects/videomanager/components/video-list.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-page-header content="视频详情" @back="goBack"/>
     <div class="filter-container">
       <el-form label-width="100px">
         <el-row>
@@ -564,7 +565,10 @@ export default {
         this.listLoading = false
       })
     },
-
+    goBack() {
+      this.$parent.CORPINFO_ID = ''
+      this.$parent.activeName = 'list'
+    },
     // 保存
     upload() {
       this.$refs.form.validate(valid => {