1、修复安全环保检查编辑成功后不退出，没有提示；2、监管端新增气象监测菜单；3、安全环保检查列表新增检查人字段，查询条件新增手机号和检查人

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

@@ -74,6 +74,7 @@
       <el-table-column label="操作" align="center" width="230" >
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID)">查看</el-button>
+          <el-button v-if="loginUserId == '1'" type="danger" icon="el-icon-delete" size="mini" @click="goDelete(row.HOTWORKAPPLICATION_ID)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -169,7 +170,8 @@ export default {
         { id: '-6', name: '超期未动火' }
       ],
       STATUS: '',
-      DEPTIDS: ''
+      DEPTIDS: '',
+      loginUserId: JSON.parse(sessionStorage.getItem('user')).USER_ID
     }
   },
   created() {
@@ -360,6 +362,32 @@ export default {
         }
         return keyVal.substring(0, (keyVal.length - 1))
       }
+    },
+    goDelete(id) {
+      this.$confirm('是否确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/dangerousWork/hotwork/deleteHotwork',
+          {
+            HOTWORKAPPLICATION_ID: id,
+            loginUserId: this.loginUserId
+          }
+        ).then((data) => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.getQuery()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     }
   }
 }

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

@@ -64,6 +64,16 @@
               <span v-else>{{ row.ITEM_COUNT }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="ONLINE_STATUS" label="在线状态" width="80">
+            <template slot-scope="{row}">
+              <span v-if="row.ONLINE_STATUS == 0">
+                <el-tag type="success">在线</el-tag>
+              </span>
+              <span v-else>
+                <el-tag type="danger">离线</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="CORP_NAME" label="创建人单位"/>
           <el-table-column prop="CREATOR_NAME" label="创建人"/>
           <el-table-column label="操作" width="300px">
@@ -89,6 +99,7 @@
           <div>
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleBatchDel">批量删除</el-button>
+            <el-button type="info" icon="el-icon-refresh" @click="refreshOnlineStatus">刷新在线状态</el-button>
           </div>
           <pagination
             :total="total"
@@ -136,6 +147,11 @@
             <el-input v-model="addForm.info.VIDEOURL" style="width: 100%" placeholder="请输入内容"/>
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="设备国标编号：" prop="NATIONAL_STANDARD_ID">
+            <el-input v-model="addForm.info.NATIONAL_STANDARD_ID" style="width: 100%" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-row>
         <el-row>
           <el-form-item label="摄像头编号：" prop="CODE">
             <el-input v-model="addForm.info.CODE" style="width: 100%" placeholder="请输入内容"/>
@@ -249,7 +265,8 @@ export default {
           PERSON: [{ required: true, message: '不可为空', trigger: 'blur' }],
           PHONE: [{ required: true, message: '不可为空', trigger: 'blur' }],
           VIDEOURL: [{ required: true, message: '不可为空', trigger: 'blur' }],
-          CODE: [{ required: true, message: '不可为空', trigger: 'blur' }]
+          CODE: [{ required: true, message: '不可为空', trigger: 'blur' }],
+          NATIONAL_STANDARD_ID: [{ required: true, message: '不可为空', trigger: 'blur' }]
         },
         info: {
           VIDEO_RESOURCES_ID: '', // 主键
@@ -261,7 +278,8 @@ export default {
           CODE: '', // 摄像头编号
           PHONE: '', // 手机号码
           REMAKE: '', // 在线情况
-          PERSON: '' // 负责人
+          PERSON: '', // 负责人
+          NATIONAL_STANDARD_ID: '' // 设备国标编号
         }
       },
       typeData: [],
@@ -499,6 +517,19 @@ export default {
     getRowKey(row) {
       return row.VIDEO_RESOURCES_ID
     },
+    refreshOnlineStatus() {
+      console.log(1)
+      requestFN(
+        '/videoResources/videoDevicesUpdateOnlineStatus'
+      ).then((data) => {
+        this.$message({
+          message: '刷新成功',
+          type: 'success'
+        })
+        this.getList()
+      }).catch((e) => {
+      })
+    },
     // 批量删除
     handleBatchDel(row) {
       const DATA_IDS = []

src/views/meteorologicalMonitoring/meteorologicalMonitoringDisplay/index.vue

@@ -0,0 +1,32 @@
+<template>
+  <div class="iframe-container">
+    <iframe
+      :src="'https://mp.usr.cn/usr-draw/show.html?lightbox=1&highlight=0000ff&layers=1&nav=1&title=%E6%99%BA%E8%83%BD%E6%B0%94%E8%B1%A1%E7%AB%99&usr_id=207946&usr_link=Wt2OfbLeouZN&usr_model=0&share=48731e90a0f82a912c7b63b9fa5e34f8c2c8639d6146b9bde2e91b42fce5c7e74684b277c157c298bfbca1da5b94667e12a65a91d94f70a0bb875763f73320854738c931dd1c1e87d15c65936e9217568bf33e33130b990a8a6d0434d0395eea2b9cd07ff34b52293eccc74a12aae785c364f78b050532881ee42818d883025f0a72d8056995c0485f48dcd48e8d0479a6989a818775df7cea20238731742b3cee699873b4fc46a1dd3ed15484b849bd5f65c4df7f9810e803c1e96a69cb6aea633f22ba2f4b0d1c025cd49f046bfbb15a1d14a974297fe1aab4675a08d8c37f6af2fffaa4af012ca7683ecd80f98e5527c7fabac9c0914b04e049451d33ad0b37bc0d9602e37033f32bdc9c540dccc011e43e79f2800015bb16916701a1ab0f#A'"
+      width="100%"
+      height="100%"
+      allowfullscreen
+      style="overflow-y:hidden;overflow-x:hidden;"/>
+  </div>
+</template>
+
+<script>
+
+export default {
+  components: {
+  },
+  data() {
+    return {
+    }
+  }
+}
+</script>
+
+<style scoped>
+.iframe-container {
+  position: fixed;
+  top: 10;
+  left: 0;
+  width: 100%;
+  height: 90%;
+}
+</style>

src/views/safetyenvironmental/archive/components/info.vue

@@ -126,8 +126,9 @@
                       <td>{{ item.HIDDENDESCR }}</td>
                       <td class="tbg">隐患部位</td>
                       <td>{{ item.HIDDENPART_NAME?item.HIDDENPART_NAME:item.HIDDENPART }}</td>
-                      <td class="tbg">
+                      <td class="tbg" style="width: 200px">
                         <el-button type="success" icon="el-icon-check" size="mini" @click="goView(item.HIDDEN_ID)">查看</el-button>
+                        <el-button v-if="pd.INSPECTION_STATUS == '0' || pd.INSPECTION_STATUS == '2'" type="danger" icon="el-icon-close" size="mini" @click="goDelete(item.HIDDEN_ID)">删除</el-button>
                       </td>
                     </tr>
                   </tbody>
@@ -443,6 +444,34 @@ export default {
       this.$parent.INSPECTION_ID = ''
       this.$parent.activeName = 'List'
     },
+    goDelete(ID) {
+      this.$confirm('确定要删除此隐患吗？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/safetyenvironmental/deleteHiddenForSafetyenvironmental',
+          {
+            HIDDEN_ID: ID,
+            tm: new Date().getTime()
+          }
+        ).then((res) => {
+          if (res.result === 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
+          } else {
+            this.$message({
+              message: res.codeMsg,
+              type: 'error'
+            })
+          }
+          this.getData()
+        }).catch((e) => {})
+      }).catch(() => {})
+    },
     goView(id) {
       this.$refs.information.init(id)
     }

src/views/safetyenvironmental/inspection/components/add.vue

@@ -854,17 +854,19 @@ export default {
             '/safetyenvironmental/' + this.dialogType,
             { ...this.form }
           ).then((data) => {
-            for (let i = 0; i < data.pd.hiddenList.length; i++) {
-              this.uploadImg(this.hdFile[i]['fileHdImgList'], data.pd.hiddenList[i].HIDDEN_ID)
-              this.uploadVideo(this.hdFile[i]['fileVideoList'], data.pd.hiddenList[i].HIDDEN_ID)
-            }
             this.$message({
               message: '保存成功',
               type: 'success'
             })
+            for (let i = 0; i < data.pd.hiddenList.length; i++) {
+              this.uploadImg(this.hdFile[i]['fileHdImgList'], data.pd.hiddenList[i].HIDDEN_ID)
+              this.uploadVideo(this.hdFile[i]['fileVideoList'], data.pd.hiddenList[i].HIDDEN_ID)
+            }
             this.listLoading = false
             loading.close()
-            this.goBack()
+            // this.goBack()
+            this.$parent.INSPECTION_ID = ''
+            this.$parent.activeName = 'List'
           }).catch((e) => {
             this.listLoading = false
             loading.close()

src/views/safetyenvironmental/inspection/components/list.vue

@@ -12,6 +12,16 @@
             <el-input v-model="search.INSPECTION_DEPARTMENT_NAME" placeholder="检查部门..." />
           </el-form-item>
         </el-col>
+        <el-col :span="4">
+          <el-form-item label="检查人员">
+            <el-input v-model="search.INSPECTION_USER_NAME" placeholder="检查人员..." />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="检查人手机">
+            <el-input v-model="search.INSPECTION_USER_PHONE" placeholder="检查人员手机号..." />
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label="检查发起人">
             <el-input v-model="search.INSPECTION_ORIGINATOR_NAME" placeholder="检查发起人..." />
@@ -30,6 +40,8 @@
               children-name="nodes" />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="8">
           <el-form-item label="检查时间">
             <el-date-picker
@@ -42,8 +54,6 @@
               end-placeholder="结束日期"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row>
         <el-col :span="4">
           <el-form-item label="检查状态">
             <el-select v-model="search.INSPECTION_STATUS" placeholder="隐患状态" clearable style="width: 100%">
@@ -100,6 +110,13 @@
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="INSPECTED_CORPINFO_ID_NAME" label="被检查单位" align="center" />
       <el-table-column prop="INSPECTION_DEPARTMENT_NAME" label="检查部门" align="center" />
+      <el-table-column width="200" prop="SHOW_INSPECTION_USER_NAME" label="检查人员" align="center" >
+        <template slot-scope="{row}">
+          <span v-for="(item,index) in row.SHOW_INSPECTION_USER_NAME === undefined ? [] : row.SHOW_INSPECTION_USER_NAME.split(',')" :key="item">
+            {{ item }}<br>
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" />
       <!--      <el-table-column prop="INSPECTED_SITEUSER_NAME" label="被检查单位现场负责人" align="center" />-->
       <el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" align="center" />
@@ -125,7 +142,7 @@
           <template v-else>{{ row.INSPECTION_STATUS }}</template>
         </template>
       </el-table-column>
-      <el-table-column prop="INSPECTION_SUBJECT" label="检查题目" align="center" />
+      <el-table-column width="100" prop="INSPECTION_SUBJECT" label="检查题目" align="center" />
       <el-table-column label="操作" align="center" width="400">
         <template slot-scope="{row}">
           <el-button type="success" icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button>
@@ -229,6 +246,8 @@ export default {
       search: {
         INSPECTED_DEPARTMENT_NAME: '', // 被检查单位
         INSPECTION_DEPARTMENT_NAME: '', // 检查部门
+        INSPECTION_USER_NAME: '', // 检查人员
+        INSPECTION_USER_PHONE: '', // 检查人员手机
         INSPECTION_ORIGINATOR_NAME: '', // 检查发起人
         INSPECTION_TYPE: '', // 检查类型
         INSPECTION_TIME: ['', ''], // 检查时间
@@ -514,6 +533,8 @@ export default {
       this.search = {
         INSPECTED_DEPARTMENT_NAME: '', // 被检查单位
         INSPECTION_DEPARTMENT_NAME: '', // 检查部门
+        INSPECTION_USER_NAME: '', // 检查人员
+        INSPECTION_USER_PHONE: '', // 检查人员手机
         INSPECTION_ORIGINATOR_NAME: '', // 检查发起人
         INSPECTION_TYPE: '', // 检查类型
         INSPECTION_TIME: ['', ''], // 检查时间

src/views/security_commitment/promise_book_issued/components/add.vue

@@ -721,7 +721,8 @@ export default {
             }
           ).then((data) => {
             this.$message.success('提交成功')
-            this.goBack()
+            // this.goBack()
+            this.$parent.activeName = 'List'
           }).catch((e) => {
             this.$message.error('提交失败')
           })