提交

README.md

@@ -2,6 +2,13 @@
 
 开发文档[曲总本地服务器搭建](http://192.168.3.5:1866)
 大屏设计图地址[作者：黄皖【微信同名】](https://www.figma.com/file/W40Blmucb76UnCgs3WGOEI/%E5%9B%9B%E8%89%B2%E9%A3%8E%E9%99%A9%E5%9B%BE?type=design&node-id=0-1&t=2juVPU2GZJzr3Hgt-0)
-### 启动命令
 
+### 二版
+
+http://syfv.anquanzhuli.com/
+账号  xysfybjy
+密码 888888
+
+
+### 启动命令
 #### yarn dev

src/api/aqpt/reportApi.js

@@ -13,7 +13,7 @@ export function getGridChecklist(params) {
 }
 
 /**
- * 隐患台账
+ * 预警台账
  * @returns {AxiosPromise}
  */
 export function getDangerReport(params) {

src/api/goaf/sensorCatApi.js

@@ -20,7 +20,7 @@ export function createSensorCat(data) {
 // 更新
 export function updateSensorCat(data) {
   return request({
-    url: 'goaf/goafbaseinfo/update',
+    url: '/goaf/sensortypecfg/update',
     method: 'PUT',
     data
   })

src/router/modules/aqpt - 副本.js

@@ -201,7 +201,7 @@ const aqptRouter = [
     name: 'AqptCheck',
     redirect: '/aqpt/check/index',
     meta: {
-      title: '隐患排查',
+      title: '预警排查',
       icon: 'icon-common_task',
       permit: 'aqpt_check_manage'
     },
@@ -235,7 +235,7 @@ const aqptRouter = [
     name: 'AqptDanger',
     redirect: '/aqpt/danger/index',
     meta: {
-      title: '隐患管理',
+      title: '预警管理',
       permit: 'aqpt_danger'
     },
     groupId: [3],
@@ -244,7 +244,7 @@ const aqptRouter = [
         path: 'index',
         component: () => import('@/views/aqpt/danger/index'),
         name: 'aqpt_danger_index',
-        meta: { title: '隐患管理', noCache: true, icon: 'icon-common_riskmanagement', permit: 'aqpt_danger' }
+        meta: { title: '预警管理', noCache: true, icon: 'icon-common_riskmanagement', permit: 'aqpt_danger' }
       }
     ]
   },
@@ -564,7 +564,7 @@ const aqptRouter = [
         path: 'dangerCat',
         component: () => import('@/views/aqpt/setting/dangerCat/index'),
         name: 'aqpt_setting_danger_cat',
-        meta: { title: '隐患类别', noCache: true, permit: 'aqpt_setting_danger_cat' }
+        meta: { title: '预警类别', noCache: true, permit: 'aqpt_setting_danger_cat' }
       },
 
       {

src/router/modules/aqpt.js

@@ -216,7 +216,7 @@ const aqptRouter = [
     name: 'GoafDanger',
     redirect: '/goaf/danger/index',
     meta: {
-      title: '采空区隐患管理',
+      title: '采空区预警管理',
       permit: 'aqpt_danger'
     },
     groupId: [5],
@@ -225,7 +225,7 @@ const aqptRouter = [
         path: 'index',
         component: () => import('@/views/goaf/danger/index'),
         name: 'goaf_danger_index',
-        meta: { title: '采空区隐患管理', noCache: true, icon: 'icon-common_riskmanagement', permit: 'aqpt_danger' }
+        meta: { title: '采空区预警管理', noCache: true, icon: 'icon-common_riskmanagement', permit: 'aqpt_danger' }
       }
     ]
   },
@@ -235,7 +235,7 @@ const aqptRouter = [
     name: 'GoafEquipment',
     redirect: '/goaf/equipment/sensor',
     meta: {
-      title: '设备管理',
+      title: '传感器管理',
       icon: 'icon-common_equipment',
       permit: 'aqpt_equipment'
     },
@@ -246,15 +246,57 @@ const aqptRouter = [
         component: () => import('@/views/goaf/sensor/index'),
         name: 'goaf-sensor',
         meta: {
-          title: '传感器配置',
+          title: '传感器',
+          noCache: true,
+          permit: 'aqpt_danger'
+        }
+      },
+      {
+        path: 'sensor',
+        component: () => import('@/views/goaf/sensor/camera'),
+        name: 'goaf-camera',
+        meta: {
+          title: '摄像头',
+          noCache: true,
+          permit: 'aqpt_danger'
+        }
+      }
+    ]
+  },
+  {
+    path: '/goaf/liveData',
+    component: Layout,
+    name: 'GoafLiveData',
+    redirect: '/goaf/liveData/sensor',
+    meta: {
+      title: '实时数据',
+      icon: 'icon-common_equipment',
+      permit: 'aqpt_equipment'
+    },
+    groupId: [4],
+    children: [
+      {
+        path: 'sensor',
+        component: () => import('@/views/goaf/liveData/sensor'),
+        name: 'liveData-sensor',
+        meta: {
+          title: '传感器',
+          noCache: true,
+          permit: 'aqpt_danger'
+        }
+      },
+      {
+        path: 'camera',
+        component: () => import('@/views/goaf/liveData/camera'),
+        name: 'liveData-camera',
+        meta: {
+          title: '摄像头',
           noCache: true,
-          // icon: 'icon-common_equipment',
           permit: 'aqpt_danger'
         }
       }
     ]
   },
-
   {
     path: '/aqpt/training',
     component: Layout,
@@ -451,7 +493,7 @@ const aqptRouter = [
         path: 'dangerCat',
         component: () => import('@/views/aqpt/setting/dangerCat/index'),
         name: 'aqpt_setting_danger_cat',
-        meta: { title: '隐患类别', noCache: true, permit: 'aqpt_setting_danger_cat' }
+        meta: { title: '预警类别', noCache: true, permit: 'aqpt_setting_danger_cat' }
       },
 
       // {

src/utils/index.js

@@ -710,7 +710,7 @@ export function checkResult(i) {
     '没执行',
     '通过',
     '没通过',
-    '有隐患',
+    '有预警',
     '已完成'
   ]
   return strs[i]
@@ -731,8 +731,8 @@ export function dangerStatus(i) {
 export function dangerLevel(i) {
   const strs = [
     '未知',
-    '一般隐患',
-    '重大隐患'
+    '一般预警',
+    '重大预警'
   ]
   return strs[i]
 }

src/views/aqpt/components/DangerCatSelector/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-select v-model="dangerCatId" value-key="dangerCatId" style="width: 100%" filterable placeholder="请选择隐患类别">
+  <el-select v-model="dangerCatId" value-key="dangerCatId" style="width: 100%" filterable placeholder="请选择预警类别">
     <el-option-group>
       <el-option
         v-for="item in dangerCatList"

src/views/aqpt/components/index.js

@@ -4,7 +4,7 @@ export { default as RiskPointSelector } from '@/views/aqpt/components/RiskPointS
 // 风险点分类选择
 export { default as RiskPointCatSelector } from '@/views/aqpt/components/RiskPointCatSelector/index'
 
-// 隐患分类选择
+// 预警分类选择
 export { default as DangerCatSelector } from '@/views/aqpt/components/DangerCatSelector/index'
 
 // 管控层级选择

src/views/aqpt/danger/activity/Accept.vue

@@ -48,7 +48,7 @@ export default {
   props: {
     title: {
       type: [String],
-      default: '隐患验收'
+      default: '预警验收'
     }
   },
 

src/views/aqpt/danger/activity/Rectify.vue

@@ -65,7 +65,7 @@ export default {
   props: {
     title: {
       type: [String],
-      default: '隐患整改'
+      default: '预警整改'
     }
   },
 
@@ -143,7 +143,7 @@ export default {
       },
       rules: {
         dangerReason: [
-          { required: true, message: '请输入隐患发生原因', trigger: 'blur' }
+          { required: true, message: '请输入预警发生原因', trigger: 'blur' }
         ],
         rectifyMeasure: [
           { required: true, message: '请输入整改措施', trigger: 'blur' }

src/views/aqpt/danger/activity/Submit.vue

@@ -21,11 +21,11 @@
         <div v-show="tabType==='form'">
           <vuescroll :ops="ops" style="height: calc(100vh - 300px)">
             <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
-              <el-form-item label="隐患标题" prop="dangerTitle">
+              <el-form-item label="预警标题" prop="dangerTitle">
                 <el-input v-model="formData.dangerTitle" />
               </el-form-item>
 
-              <el-form-item label="隐患编码" prop="dangerCode">
+              <el-form-item label="预警编码" prop="dangerCode">
                 <el-input v-model="formData.dangerCode" />
               </el-form-item>
 
@@ -33,12 +33,12 @@
                 <risk-point-selector v-model="formData.riskPointId" />
               </el-form-item>
 
-              <el-form-item label="隐患类别" prop="dangerCatId">
+              <el-form-item label="预警类别" prop="dangerCatId">
                 <danger-cat-selector v-model="formData.dangerCatId" />
               </el-form-item>
 
-              <el-form-item label="隐患来源" prop="dangerSource">
-                <el-select v-model="formData.dangerSource" style="width: 100%" filterable placeholder="请选择隐患来源">
+              <el-form-item label="预警来源" prop="dangerSource">
+                <el-select v-model="formData.dangerSource" style="width: 100%" filterable placeholder="请选择预警来源">
                   <el-option label="自查" :value="0" />
                   <el-option label="内部反馈" :value="1" />
                   <el-option label="上级检查" :value="2" />
@@ -46,10 +46,10 @@
                 </el-select>
               </el-form-item>
 
-              <el-form-item label="隐患等级" prop="dangerLevel">
+              <el-form-item label="预警等级" prop="dangerLevel">
                 <el-radio-group v-model="formData.dangerLevel">
-                  <el-radio :label="1">一般事故隐患</el-radio>
-                  <el-radio :label="2">重大事故隐患</el-radio>
+                  <el-radio :label="1">一般事故预警</el-radio>
+                  <el-radio :label="2">重大事故预警</el-radio>
                 </el-radio-group>
               </el-form-item>
 
@@ -66,7 +66,7 @@
               </el-form-item>
 
               <el-form-item label="描述" prop="dangerDesc">
-                <el-input v-model="formData.dangerDesc" type="textarea" :rows="5" placeholder="隐患描述" />
+                <el-input v-model="formData.dangerDesc" type="textarea" :rows="5" placeholder="预警描述" />
               </el-form-item>
             </el-form>
             <work-flow ref="WFlow" />
@@ -124,23 +124,23 @@ export default {
         sceneIcon: '',
         groupId: undefined, // 所属部门
         riskPointId: undefined, // 风险点：所属区域
-        dangerCode: '', // 隐患编码
-        dangerTitle: '', // 隐患标题
-        dangerCatId: undefined, // 隐患类别ID
-        dangerLevel: 1, // 隐患等级
+        dangerCode: '', // 预警编码
+        dangerTitle: '', // 预警标题
+        dangerCatId: undefined, // 预警类别ID
+        dangerLevel: 1, // 预警等级
         dangerDesc: '', // 描述
         dangerDeadLine: '', // 截止时间
-        dangerSource: 0, // 隐患来源
+        dangerSource: 0, // 预警来源
         status: 0, // 状态
         submitRemark: '',
         attachList: []
       },
       rules: {
         dangerTitle: [
-          { required: true, message: '请输入隐患标题', trigger: 'blur' }
+          { required: true, message: '请输入预警标题', trigger: 'blur' }
         ],
         dangerCode: [
-          { required: true, message: '请输入隐患编码', trigger: 'blur' }
+          { required: true, message: '请输入预警编码', trigger: 'blur' }
         ],
         groupId: [
           { required: true, message: '请输入所在部门', trigger: 'blur' }
@@ -149,13 +149,13 @@ export default {
           { required: true, message: '请选择所在部位', trigger: 'blur' }
         ],
         dangerLevel: [
-          { required: true, message: '请输选择隐患等级', trigger: 'blur' }
+          { required: true, message: '请输选择预警等级', trigger: 'blur' }
         ],
         dangerDeadLine: [
           { required: true, message: '截止时间', trigger: 'blur' }
         ],
         dangerCatId: [
-          { required: true, message: '请选择隐患类别', trigger: 'blur' }
+          { required: true, message: '请选择预警类别', trigger: 'blur' }
         ],
         accountIdTo: [
           { required: true, message: '请选择执行人', trigger: 'blur' }
@@ -207,13 +207,13 @@ export default {
         sceneIcon: '',
         groupId: undefined, // 所属部门
         riskPointId: undefined, // 风险点：所属区域
-        dangerCode: '', // 隐患编码
-        dangerTitle: '', // 隐患标题
-        dangerCatId: undefined, // 隐患类别ID
-        dangerLevel: 1, // 隐患等级
+        dangerCode: '', // 预警编码
+        dangerTitle: '', // 预警标题
+        dangerCatId: undefined, // 预警类别ID
+        dangerLevel: 1, // 预警等级
         dangerDesc: '', // 描述
         dangerDeadLine: '', // 截止时间
-        dangerSource: 0, // 隐患来源
+        dangerSource: 0, // 预警来源
         status: 0, // 状态
         submitRemark: '',
         attachList: []

src/views/aqpt/danger/components/DangerInfo.vue

@@ -3,23 +3,23 @@
     <div class="activity-item danger">
       <div v-if="viewData.dangerCode" class="text-row">
         <div v-if="viewData.dangerCode" class="text-item">
-          <span class="text-label right">隐患编码：</span>
+          <span class="text-label right">预警编码：</span>
           <span> {{ viewData.dangerCode }} </span>
         </div>
         <div v-if="viewData.status" class="text-item">
-          <span class="text-label right">隐患状态：</span>
+          <span class="text-label right">预警状态：</span>
           <span> {{ viewData.status | dangerStatusFilter }} </span>
         </div>
         <div v-if="viewData.dangerTitle" class="text-item">
-          <span class="text-label right">隐患名称：</span>
+          <span class="text-label right">预警名称：</span>
           <span> {{ viewData.dangerTitle }} </span>
         </div>
         <div v-if="viewData.dangerTitle" class="text-item">
-          <span class="text-label right">隐患类别：</span>
+          <span class="text-label right">预警类别：</span>
           <span> {{ viewData.dangerCatTitle }} </span>
         </div>
         <div v-if="viewData.dangerLevel" class="text-item">
-          <span class="text-label right">隐患等级：</span>
+          <span class="text-label right">预警等级：</span>
           <span> {{ viewData.dangerLevel | dangerLevelFilter }} </span>
         </div>
         <div v-if="viewData.riskPointTitle" class="text-item">

src/views/aqpt/danger/components/DangerList.vue

@@ -32,7 +32,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="dangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="dangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.dangerTitle }}</span>
           </template>
@@ -90,11 +90,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 
@@ -173,58 +173,58 @@ export default {
 
       switch (action) {
         case 'MyCreated':
-          this.title = '我提交的隐患'
+          this.title = '我提交的预警'
           this.resetConditions()
           this.conditions.submitAccountId = userId
           break
 
         case 'MyHandling':
-          this.title = '我的待处理隐患'
+          this.title = '我的待处理预警'
           this.resetConditions()
           this.conditions.status = 0
           this.conditions.curAccountId = userId
           break
 
         case 'MyHandled':
-          this.title = '我处理完的隐患'
+          this.title = '我处理完的预警'
           this.resetConditions()
           this.conditions.handleAccountId = userId
           break
 
         case 'MyCanceled':
-          this.title = '我撤消的隐患'
+          this.title = '我撤消的预警'
           this.resetConditions()
           this.conditions.submitAccountId = userId
           this.conditions.status = -1
           break
 
         case 'GroupHandling':
-          this.title = '部门待处理的隐患'
+          this.title = '部门待处理的预警'
           this.resetConditions()
           this.conditions.curGroupId = groupId
           this.conditions.status = 0
           break
 
         case 'GroupSubmit':
-          this.title = '部门提交的隐患'
+          this.title = '部门提交的预警'
           this.resetConditions()
           this.conditions.submitGroupId = groupId
           break
 
         case 'GroupReview':
-          this.title = '部门参与评审的隐患'
+          this.title = '部门参与评审的预警'
           this.resetConditions()
           this.conditions.reviewGroupId = groupId
           break
 
         case 'GroupRectify':
-          this.title = '部门整改的隐患'
+          this.title = '部门整改的预警'
           this.resetConditions()
           this.conditions.rectifyGroupId = groupId
           break
 
         case 'GroupAccept':
-          this.title = '部门参与验收的隐患'
+          this.title = '部门参与验收的预警'
           this.resetConditions()
           this.conditions.acceptGroupId = groupId
           break

src/views/aqpt/danger/components/LeftCounter.vue

@@ -5,7 +5,7 @@
     </el-row>
 
     <el-row class="btn-group">
-      <el-button class="send-menu" @click="handleSubmitTask">登记隐患</el-button>
+      <el-button class="send-menu" @click="handleSubmitTask">登记预警</el-button>
     </el-row>
 
     <el-row class="list-group">
@@ -106,7 +106,7 @@
 
       </div>
     </el-row>
-    <submit-task ref="SubmitTask" title="隐患登记" @formSuccess="selectItem(curSel)" />
+    <submit-task ref="SubmitTask" title="预警登记" @formSuccess="selectItem(curSel)" />
   </div>
 </template>
 <script>
@@ -126,7 +126,7 @@ export default {
   },
   data() {
     return {
-      title: '隐患管理',
+      title: '预警管理',
       dangerCounter: {
         myCreatedCount: 0,
         myHandlingCount: 0,

src/views/aqpt/panorama/index.vue

@@ -69,7 +69,7 @@
               预警
             </div>
             <div class="chart-label">
-              隐患
+              预警
             </div>
           </div>
         </div>
@@ -102,7 +102,7 @@
 
       <div class="fixed-group-container">
         <div class="group-title">
-          <span class="left">隐患通报</span>
+          <span class="left">预警通报</span>
           <span class="right">{{ dangerCounter.total }}</span>
         </div>
         <div class="data-grid">
@@ -141,7 +141,7 @@
       </div>
     </div>
     <risk-point-details key="panorama-risk-point-details" ref="RiskPointDetails" title="风险点详情" />
-    <danger-details key="panorama-danger-details" ref="DangerDetails" title="隐患详情" />
+    <danger-details key="panorama-danger-details" ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 
@@ -214,7 +214,7 @@ export default {
       todayTaskTotal: 0,
       warningList: [], // 预警列表
       warningTotal: 0,
-      dangerCounter: { // 隐患统计
+      dangerCounter: { // 预警统计
         rectified: 0,
         accepted: 0,
         total: 0,
@@ -223,7 +223,7 @@ export default {
         levelThree: 0,
         levelFour: 0
       },
-      dangerList: [], // 隐患列表
+      dangerList: [], // 预警列表
       last30DayCounter: [], // 最近30天统计
       dangerItemInfo: {}
     }
@@ -374,7 +374,7 @@ export default {
       const { riskPointId, riskPointTitle } = data
       this.$refs['RiskPointDetails'].showDetailView(riskPointId, riskPointTitle)
     },
-    showDangerDetail(data) { // 显示隐患通报详情
+    showDangerDetail(data) { // 显示预警通报详情
       const { dangerId } = data
       this.$refs['DangerDetails'].showView(dangerId)
     }

src/views/aqpt/report/dangerReport.vue

@@ -3,7 +3,7 @@
     <el-row class="title-bar tool-bar">
       <el-col :span="12" class="left">
         <div class="page-title">
-          隐患台账
+          预警台账
         </div>
       </el-col>
       <el-col :span="12" class="right">
@@ -27,15 +27,15 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="dangerTitle" label="隐患名称" header-align="right" align="right" />
+        <el-table-column prop="dangerTitle" label="预警名称" header-align="right" align="right" />
 
         <el-table-column prop="groupName" label="所属部门" header-align="left" align="left" />
 
         <el-table-column prop="dangerCatTitle" label="类别" header-align="center" align="center" />
         <el-table-column prop="dangerLevel" label="级别" header-align="center" align="center">
           <template slot-scope="{row}">
-            <span v-if="row.dangerLevel===1">一般事故隐患</span>
-            <span v-if="row.dangerLevel===3">重大事故隐患</span>
+            <span v-if="row.dangerLevel===1">一般事故预警</span>
+            <span v-if="row.dangerLevel===3">重大事故预警</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="状态" header-align="center" align="center">

src/views/aqpt/report/index.vue

@@ -24,10 +24,10 @@
           </div>
 
           <el-row class="sub-title-bar">
-            <p class="page-title">隐患治理</p>
+            <p class="page-title">预警治理</p>
           </el-row>
           <div class="list-item" :class="curSel === 'DangerReport' ? 'active' : ''" @click="selectItem('DangerReport')">
-            <p class="title">隐患治理台账</p>
+            <p class="title">预警治理台账</p>
           </div>
         </div>
       </el-col>

src/views/aqpt/riskpoint/index.vue

@@ -85,7 +85,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="left" label="隐患" header-align="center" align="center" width="100">
+        <el-table-column prop="left" label="预警" header-align="center" align="center" width="100">
           <template v-slot="{row}">
             <span v-if="row.dangerNum>0"> {{ row.dangerNum }} </span>
           </template>

src/views/aqpt/setting/dangerCat/index.vue

@@ -3,7 +3,7 @@
     <el-row class="tool-bar">
       <el-col :span="12" class="left">
         <div class="content-title">
-          隐患类别
+          预警类别
         </div>
       </el-col>
       <el-col :span="12" class="right">

src/views/goaf/alert/accept.vue

@@ -80,12 +80,17 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" min-width="120">
+          <template v-slot="{row}">
+            <el-tag v-if=" row.hdangerType===1" type="success" effect="plain" color="rgb(38 69 90)">传感器巡检</el-tag>
+            <el-tag v-else effect="plain" color="rgb(38 69 90)">人员巡检</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center" width="80">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -127,11 +132,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 

src/views/goaf/alert/activity/Accept.vue

@@ -19,14 +19,19 @@
     <div class="content-container">
       <el-row class="content-body">
         <div v-show="tabType==='form'">
-          <VueScroll :ops="ops" style="height: calc(100vh - 400px)">
+          <VueScroll :ops="ops" style="height: calc(100vh - 200px)">
             <DangerInfo :view-data="viewData" class="form" />
+            <el-form label-width="130px">
+              <el-form-item label="预警描述" prop="hdangerDesc">
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="5" placeholder="预警描述" readonly />
+              </el-form-item>
+            </el-form>
             <work-flow ref="WFlow" />
+            <div class="btn-group">
+              <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button @click="dialogVisible = false">取消</el-button>
+            </div>
           </VueScroll>
-          <div class="btn-group">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-          </div>
         </div>
         <div v-show="tabType==='history'">
           <ActivityHandleRecord ref="ActivityHandleRecord" />
@@ -48,7 +53,7 @@ export default {
   props: {
     title: {
       type: [String],
-      default: '隐患验收'
+      default: '预警验收'
     }
   },
 
@@ -144,6 +149,7 @@ export default {
         const { code, data, msg } = resp
         if (code === 0) {
           this.viewData = info || data
+          this.formData.hdangerDesc = data.hdangerDesc
           this.$refs.WFlow.get(hdangerId)
           this.$refs.ActivityHandleRecord.getData(hdangerId)
         } else {
@@ -196,13 +202,6 @@ export default {
       this.formData.acceptRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
-      this.formData.acceptAccountId = flow.user.accountIdTo
-      this.formData.acceptAccountName = flow.user.accountNameTo
-      this.formData.acceptGroupId = flow.user.groupIdTo
-      this.formData.acceptGroupName = flow.user.groupNameTo
-      this.formData.acceptPositionId = flow.user.positionIdTo
-      this.formData.acceptPositionName = flow.user.positionNameTo
-
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp
         if (code === 0) {

src/views/goaf/alert/activity/Rectify.vue

@@ -20,11 +20,11 @@
       <el-row class="content-body">
         <div v-show="tabType==='form'">
 
-          <Vuescroll :ops="ops" style="height: calc(100vh - 300px)">
+          <Vuescroll :ops="ops" style="height: calc(100vh - 200px)">
             <DangerInfo :view-data="viewData" class="form" />
             <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
-              <el-form-item label="隐患描述" prop="s">
-                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="10" placeholder="隐患描述" />
+              <el-form-item label="预警描述" prop="s">
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="2" placeholder="预警描述" readonly />
               </el-form-item>
               <!-- <el-form-item label="整改类型" prop="rectifyCat">
                 <el-select v-model="formData.rectifyCat" style="width: 100%" filterable placeholder="选择整改类型">
@@ -38,11 +38,11 @@
               </el-form-item>
             </el-form>
             <work-flow ref="WFlow" handle-user="验收人" />
+            <div class="btn-group">
+              <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button @click="dialogVisible = false">取消</el-button>
+            </div>
           </Vuescroll>
-          <div class="btn-group">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-          </div>
         </div>
 
         <div v-show="tabType==='history'">
@@ -65,7 +65,7 @@ export default {
   props: {
     title: {
       type: [String],
-      default: '隐患整改'
+      default: '预警整改'
     }
   },
 
@@ -143,7 +143,7 @@ export default {
       },
       rules: {
         hdangerDesc: [
-          { required: true, message: '请输入隐患发生原因', trigger: 'blur' }
+          { required: true, message: '请输入预警发生原因', trigger: 'blur' }
         ],
         rectifyMeasure: [
           { required: true, message: '请输入整改措施', trigger: 'blur' }
@@ -169,6 +169,7 @@ export default {
         const { code, data, msg } = resp
         if (code === 0) {
           this.viewData = data
+          this.formData.hdangerDesc = data.hdangerDesc
           this.$refs.WFlow.get(dangerId)
           this.$refs.ActivityHandleRecord.getData(dangerId)
         } else {
@@ -223,12 +224,12 @@ export default {
       this.formData.rectifyRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
-      this.formData.rectifyAccountId = flow.user.accountIdTo
-      this.formData.rectifyAccountName = flow.user.accountNameTo
-      this.formData.rectifyGroupId = flow.user.groupIdTo
-      this.formData.rectifyGroupName = flow.user.groupNameTo
-      this.formData.rectifyPositionId = flow.user.positionIdTo
-      this.formData.rectifyPositionName = flow.user.positionNameTo
+      this.formData.acceptAccountId = flow.user.accountIdTo
+      this.formData.acceptAccountName = flow.user.accountNameTo
+      this.formData.acceptGroupId = flow.user.groupIdTo
+      this.formData.acceptGroupName = flow.user.groupNameTo
+      this.formData.acceptPositionId = flow.user.positionIdTo
+      this.formData.acceptPositionName = flow.user.positionNameTo
 
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp

src/views/goaf/alert/activity/Review.vue

@@ -19,15 +19,38 @@
     <div class="content-container">
       <el-row class="content-body">
         <div v-show="tabType==='form'">
-          <Vuescroll :ops="ops" style="height: calc(100vh - 400px)">
+          <Vuescroll :ops="ops" style="height: calc(100vh - 200px)">
             <DangerInfo :view-data="viewData" class="form" />
+            <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
+              <el-form-item label="预警描述" prop="hdangerDesc">
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="2" placeholder="预警描述" readonly />
+              </el-form-item>
+              <el-form-item label="预警等级" prop="hdangerLevel">
+                <el-radio-group v-model="formData.hdangerLevel">
+                  <el-radio :label="0">较低</el-radio>
+                  <el-radio :label="1">一般</el-radio>
+                  <el-radio :label="2">较大</el-radio>
+                  <el-radio :label="3">重大</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="整改截止时间" prop="dangerDeadline">
+                <el-date-picker
+                  v-model="formData.dangerDeadline"
+                  type="date"
+                  placeholder="设置截止时间"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+            </el-form>
             <work-flow ref="WFlow" handle-user="整改人" />
+            <div class="btn-group">
+              <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button @click="dialogVisible = false">取消</el-button>
+            </div>
           </Vuescroll>
-
-          <div class="btn-group">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-          </div>
         </div>
 
         <div v-show="tabType==='history'">
@@ -123,6 +146,8 @@ export default {
         formCode: 'review',
         hdangerId: undefined,
         status: 0,
+        hdangerLevel: '',
+        dangerDeadline: '',
         attachList: []
       }
     }
@@ -149,13 +174,14 @@ export default {
         const { code, data, msg } = resp
         if (code === 0) {
           this.viewData = info || data
+          this.formData.hdangerLevel = data.hdangerLevel
+          this.formData.dangerDeadline = data.dangerDeadline
+          this.formData.hdangerDesc = data.hdangerDesc
           this.$refs.WFlow.get(hdangerId)
           this.$refs.ActivityHandleRecord.getData(hdangerId)
         } else {
           this.$message.error(msg)
         }
-      }).catch((error) => {
-        console.log(error)
       })
     },
 
@@ -165,6 +191,8 @@ export default {
         formCode: 'review',
         hdangerId: undefined,
         status: 0,
+        hdangerLevel: '',
+        dangerDeadline: '',
         attachList: []
       }
     },
@@ -199,12 +227,12 @@ export default {
       this.formData.reviewRemark = flow.data.actionRemark
       this.formData.attachList = flow.data.attachList
 
-      this.formData.reviewAccountId = flow.user.accountIdTo
-      this.formData.reviewAccountName = flow.user.accountNameTo
-      this.formData.reviewGroupId = flow.user.groupIdTo
-      this.formData.reviewGroupName = flow.user.groupNameTo
-      this.formData.reviewPositionId = flow.user.positionIdTo
-      this.formData.reviewPositionName = flow.user.positionNameTo
+      this.formData.rectifyAccountId = flow.user.accountIdTo
+      this.formData.rectifyAccountName = flow.user.accountNameTo
+      this.formData.rectifyGroupId = flow.user.groupIdTo
+      this.formData.rectifyGroupName = flow.user.groupNameTo
+      this.formData.rectifyPositionId = flow.user.positionIdTo
+      this.formData.rectifyPositionName = flow.user.positionNameTo
 
       updateDanger(this.formData).then((resp) => {
         const { code, msg } = resp

src/views/goaf/alert/activity/Submit.vue

@@ -17,9 +17,15 @@
         <div v-show="tabType==='form'">
           <vuescroll :ops="ops" style="height: calc(100vh - 300px)">
             <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
-              <el-form-item label="隐患标题" prop="hdangerTitle">
+              <el-form-item label="预警标题" prop="hdangerTitle">
                 <el-input v-model="formData.hdangerTitle" />
               </el-form-item>
+              <el-form-item label="预警类型" required>
+                <el-select v-model="formData.hdangerType" style="width: 100%">
+                  <el-option :value="0" label="人员巡检" />
+                  <el-option :value="1" label="传感器巡检" />
+                </el-select>
+              </el-form-item>
               <el-form-item label="采空区" prop="goafId">
                 <el-select v-model="formData.goafId" filterable placeholder="采空区名称" style="width: 100%">
                   <el-option value="" label="请选择采空区" disabled />
@@ -36,7 +42,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="隐患等级" prop="hdangerLevel">
+              <el-form-item label="预警等级" prop="hdangerLevel">
                 <el-radio-group v-model="formData.hdangerLevel">
                   <el-radio :label="0">较低</el-radio>
                   <el-radio :label="1">一般</el-radio>
@@ -67,7 +73,7 @@
                 />
               </el-form-item>
               <el-form-item label="描述" prop="hdangerDesc">
-                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="5" placeholder="隐患描述" />
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="5" placeholder="预警描述" />
               </el-form-item>
             </el-form>
             <work-flow ref="WFlow" handle-user="评审人" />
@@ -116,10 +122,11 @@ export default {
         'formCode': 'submit',
         'hdangerId': 1,
         'dangerId': undefined,
-        'hdangerTitle': '', // 隐患标题
-        'dangerCatId': undefined, // 隐患类别ID
-        'hdangerLevel': 1, // 隐患等级
+        'hdangerTitle': '', // 预警标题
+        'dangerCatId': undefined, // 预警类别ID
+        'hdangerLevel': 1, // 预警等级
         'hdangerDesc': '', // 描述
+        'hdangerType': 0,
         'submitTime': new Date(),
         'dangerDeadline': '', // 截止时间
         'goafId': undefined,
@@ -135,7 +142,7 @@ export default {
       checklist: [],
       rules: {
         hdangerTitle: [
-          { required: true, message: '请输入隐患标题', trigger: 'blur' }
+          { required: true, message: '请输入预警标题', trigger: 'blur' }
         ],
         goafId: [
           { required: true, message: '请选择采空区', trigger: 'change' }
@@ -144,7 +151,7 @@ export default {
           { required: true, message: '请选择检查表', trigger: 'change' }
         ],
         hdangerLevel: [
-          { required: true, message: '请输选择隐患等级', trigger: 'blur' }
+          { required: true, message: '请输选择预警等级', trigger: 'blur' }
         ],
         submitTime: [
           { required: true, message: '发生时间', trigger: 'blur' }
@@ -166,7 +173,7 @@ export default {
   methods: {
 
     // 启动
-    start() {
+    start(params) {
       const wfDefId = 1
       this.dialogVisible = true
       const userData = JSON.parse(JSON.stringify(this.userData))
@@ -187,6 +194,12 @@ export default {
           }
         })
       })
+      if (params) {
+        this.formData.checklistId = params.checklistId
+        this.formData.goafId = params.goafId
+        this.formData.hdangerDesc = params.checkItemNopass
+        this.formData.hdangerTitle = params.checkItemNopass
+      }
     },
 
     // 显示窗口
@@ -211,13 +224,14 @@ export default {
         'formCode': 'submit',
         'hdangerId': 1,
         'dangerId': undefined,
-        'hdangerTitle': '', // 隐患标题
-        'dangerCatId': undefined, // 隐患类别ID
-        'hdangerLevel': 1, // 隐患等级
+        'hdangerTitle': '', // 预警标题
+        'dangerCatId': undefined, // 预警类别ID
+        'hdangerLevel': 1, // 预警等级
         'hdangerDesc': '', // 描述
         'submitTime': new Date(),
         'dangerDeadline': '', // 截止时间
         'goafId': undefined,
+        'hdangerType': 0,
         'submitGroupId': '',
         'submitGroupName': '',
         'submitPositionId': '',
@@ -254,12 +268,18 @@ export default {
         this.formData.scenePhoto = attach.fileUrl
         this.formData.sceneIcon = attach.fileIcon
       }
-      this.formData.submitGroupId = this.userData.groupId
-      this.formData.submitGroupName = this.userData.groupName
-      this.formData.submitPositionId = this.userData.positionId
-      this.formData.submitPositionName = this.userData.positionName
-      this.formData.submitAccountId = this.userData.userId
-      this.formData.submitAccountName = this.userData.userName
+      // this.formData.submitGroupId = this.userData.groupId
+      // this.formData.submitGroupName = this.userData.groupName
+      // this.formData.submitPositionId = this.userData.positionId
+      // this.formData.submitPositionName = this.userData.positionName
+      // this.formData.submitAccountId = this.userData.userId
+      // this.formData.submitAccountName = this.userData.userName
+      this.formData.reviewAccountId = flow.user.accountIdTo
+      this.formData.reviewAccountName = flow.user.accountNameTo
+      this.formData.reviewGroupId = flow.user.groupIdTo
+      this.formData.reviewGroupName = flow.user.groupNameTo
+      this.formData.reviewPositionId = flow.user.positionIdTo
+      this.formData.reviewPositionName = flow.user.positionNameTo
 
       if (flow.curActivityCode === 'review') {
         this.formData.status = 1

src/views/goaf/alert/checkList.vue

@@ -20,12 +20,17 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" min-width="120">
+          <template v-slot="{row}">
+            <el-tag v-if=" row.hdangerType===1" type="success" effect="plain" color="rgb(38 69 90)">传感器巡检</el-tag>
+            <el-tag v-else effect="plain" color="rgb(38 69 90)">人员巡检</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -55,11 +60,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 

src/views/goaf/alert/checkList_warning.vue

@@ -20,12 +20,17 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" min-width="120">
+          <template v-slot="{row}">
+            <el-tag v-if=" row.hdangerType===1" type="success" effect="plain" color="rgb(38 69 90)">传感器巡检</el-tag>
+            <el-tag v-else effect="plain" color="rgb(38 69 90)">人员巡检</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center" width="80">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -56,11 +61,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 

src/views/goaf/alert/components/DangerInfo.vue

@@ -1,38 +1,33 @@
 <template>
   <div class="text-block" :style="styles">
     <div class="activity-item danger">
-      <div v-if="viewData&&viewData.dangerCode" class="text-row">
+      <div v-if="viewData" class="text-row">
         <div v-if="viewData.dangerCode" class="text-item">
-          <span class="text-label right">隐患编码：</span>
+          <span class="text-label right">预警编码：</span>
           <span> {{ viewData.dangerCode }} </span>
         </div>
         <div v-if="viewData.status" class="text-item">
-          <span class="text-label right">隐患状态：</span>
+          <span class="text-label right">预警状态：</span>
           <span> {{ viewData.status | dangerStatusFilter }} </span>
         </div>
-        <div v-if="viewData.dangerTitle" class="text-item">
-          <span class="text-label right">隐患名称：</span>
-          <span> {{ viewData.dangerTitle }} </span>
+        <div v-if="viewData.hdangerTitle" class="text-item">
+          <span class="text-label right">预警名称：</span>
+          <span> {{ viewData.hdangerTitle }} </span>
         </div>
-        <div v-if="viewData.dangerTitle" class="text-item">
-          <span class="text-label right">隐患类别：</span>
-          <span> {{ viewData.dangerCatTitle }} </span>
+        <div v-if="viewData.hdangerType" class="text-item">Z
+          <span> {{ viewData.hdangerType===1?'传感器巡检':"人员巡检" }} </span>
         </div>
-        <div v-if="viewData.dangerLevel" class="text-item">
-          <span class="text-label right">隐患等级：</span>
-          <span> {{ viewData.dangerLevel | dangerLevelFilter }} </span>
-        </div>
-        <div v-if="viewData.riskPointTitle" class="text-item">
-          <span class="text-label right">所在位置：</span>
-          <span> {{ viewData.riskPointTitle }}</span>
+        <div v-if="viewData.hdangerLevel" class="text-item">
+          <span class="text-label right">预警等级：</span>
+          <span> {{ viewData.hdangerLevel | dangerLevelFilter }} </span>
         </div>
         <div v-if="viewData.dangerDeadLine" class="text-item">
           <span class="text-label right">整改期限：</span>
           <span> {{ viewData.dangerDeadLine }}</span>
         </div>
-        <div v-if="viewData.dangerDesc" class="text-item">
-          <span class="text-label right">描述：</span>
-          <span> {{ viewData.dangerDesc }} </span>
+        <div v-if="viewData.hdangerDesc" class="text-item">
+          <span class="text-label right">预警描述：</span>
+          <span> {{ viewData.hdangerDesc }} </span>
         </div>
       </div>
     </div>
@@ -40,7 +35,8 @@
       <div v-if="viewData.submitAccountName" class="text-row">
         <div v-if="viewData.submitAccountName" class="text-item">
           <span class="text-label right">提交人员：</span>
-          <span> {{ viewData.submitAccountName }}( {{ viewData.submitPositionName }} ) </span>
+          <span> {{ viewData.submitAccountName }}</span>
+          <span v-if="viewData.submitPositionName">( {{ viewData.submitPositionName }} ) </span>
         </div>
         <div v-if="viewData.submitGroupName" class="text-item">
           <span class="text-label right">所在部位：</span>
@@ -86,7 +82,7 @@
   </div>
 </template>
 <script>
-import { dangerLevel, dangerSource, dangerStatus, rectifyCat } from '@/utils'
+import { dangerSource, rectifyCat } from '@/utils'
 export default {
   name: 'DangerInfo',
   components: { },
@@ -94,11 +90,13 @@ export default {
     dangerSourceFilter(ival) {
       return dangerSource(ival)
     },
-    dangerLevelFilter(ival) {
-      return dangerLevel(ival)
+    dangerLevelFilter(val) {
+      const status = ['较低', '一般', '较大', '重大']
+      return status[val]
     },
-    dangerStatusFilter(ival) {
-      return dangerStatus(ival)
+    dangerStatusFilter(val) {
+      const status = ['待提交', '待评审', '待整改', '待验收', '完成']
+      return val === -1 ? '撤销' : status[val]
     },
     rectifyFilter(ival) {
       return rectifyCat(ival)

src/views/goaf/alert/components/DangerList.vue

@@ -20,12 +20,16 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" width="80">
+          <template v-slot="{row}">
+            <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerType===1?'传感器巡检':"人员巡检" }}</el-tag></span>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center" width="80">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -68,11 +72,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 
@@ -104,7 +108,7 @@ export default {
   },
   data() {
     return {
-      title: '隐患',
+      title: '预警',
       dataList: [],
       total: 0,
       listLoading: false,

src/views/goaf/alert/components/LeftCounter.vue

@@ -5,7 +5,7 @@
     </el-row>
 
     <el-row class="btn-group">
-      <el-button class="send-menu" @click="handleSubmitTask">登记隐患</el-button>
+      <el-button class="send-menu" @click="handleSubmitTask">登记预警</el-button>
     </el-row>
 
     <!-- <el-row class="list-group">
@@ -32,7 +32,7 @@
         </div>
       </div>
     </el-row> -->
-    <submit-task ref="SubmitTask" title="隐患登记" @formSuccess="selectItem(curSel)" />
+    <submit-task ref="SubmitTask" title="预警登记" @formSuccess="selectItem(curSel)" />
   </div>
 </template>
 <script>
@@ -52,7 +52,7 @@ export default {
   },
   data() {
     return {
-      title: '隐患管理',
+      title: '预警管理',
       dangerCounter: {
         myCreatedCount: 0,
         myHandlingCount: 0,

src/views/goaf/alert/index.vue

@@ -80,12 +80,17 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" min-width="120">
+          <template v-slot="{row}">
+            <el-tag v-if=" row.hdangerType===1" type="success" effect="plain" color="rgb(38 69 90)">传感器巡检</el-tag>
+            <el-tag v-else effect="plain" color="rgb(38 69 90)">人员巡检</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center" width="80">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -127,11 +132,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 

src/views/goaf/alert/rectify.vue

@@ -80,12 +80,17 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" min-width="120">
+          <template v-slot="{row}">
+            <el-tag v-if=" row.hdangerType===1" type="success" effect="plain" color="rgb(38 69 90)">传感器巡检</el-tag>
+            <el-tag v-else effect="plain" color="rgb(38 69 90)">人员巡检</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center" width="80">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -127,11 +132,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 

src/views/goaf/checkTask/manage/ChecklistItem.vue

@@ -37,7 +37,7 @@
           </div>
         </vuescroll>
       </el-card>
-      <submit-activity ref="submit" title="登记隐患" />
+      <submit-activity ref="submit" title="登记预警" />
     </div>
   </el-drawer>
 </template>
@@ -108,12 +108,12 @@ export default {
       let checkItemPass = ''
       const selectionItemIds = []
       this.selection.forEach((item) => {
-        checkItemPass += item.checklistItemContent + '，'
+        checkItemPass += item.checklistItemContent + '通过;'
         selectionItemIds.push(item.checklistItemId)
       })
       this.dataList.forEach(item => {
         if (selectionItemIds.indexOf(item.checklistItemId) < 0) {
-          checkItemNopass += item.checklistItemContent + '不通过，'
+          checkItemNopass += item.checklistItemContent + '不通过;'
         }
       })
       checkItemPass = checkItemPass.substring(0, checkItemPass.length - 1)

src/views/goaf/checkTask/plan/components/GoafList.vue

@@ -15,13 +15,18 @@
           :highlight-current="true"
           :default-expanded-keys="expandDefault"
           @node-click="handleNodeClick"
-        />
+        >
+          <span slot-scope="{ data }" class="custom-tree-node">
+            <span :title="formatNodeName(data)">{{ formatNodeName(data) }}</span>
+          </span>
+        </el-tree>
+
       </vuescroll>
     </div>
   </div>
 </template>
 <script>
-
+import { NumConvertLM } from '@/utils'
 import Vuescroll from 'vuescroll'
 import { getGoafBaseInfo } from '@/api/goaf/info'
 export default {
@@ -57,6 +62,10 @@ export default {
     this.getData()
   },
   methods: {
+    NumConvertLM,
+    formatNodeName(data) {
+      return `${this.NumConvertLM(data.goafOrebelt)}-${data.goafOrebody}-${data.goafOreheight}-${data.goafName}`
+    },
     getData() {
       getGoafBaseInfo().then((resp) => {
         const { code, data } = resp

src/views/goaf/checkTask/record/detail.vue

@@ -0,0 +1,111 @@
+<template>
+  <el-drawer
+    :title="title"
+    :modal-append-to-body="false"
+    :modal="false"
+    :wrapper-closable="false"
+    size="80%"
+    :visible.sync="dialogVisible"
+  >
+    <el-table class="page-table" border :data="dataList" height="calc(100vh - 240px)">
+      <el-table-column type="index" label="序号" header-align="center" align="center" width="80" />
+      <el-table-column prop="riskPointTitle" label="任务名称" header-align="center" align="center" min-width="120">
+        <template v-slot="{row}">
+          <span>{{ row.taskTitle }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="chekListItem" label="检查内容" header-align="center" align="center" />
+      <el-table-column prop="accountName" label="检查人员" header-align="center" align="center" min-width="100">
+        <template v-slot="{row}">
+          <el-popover trigger="hover" placement="top">
+            <p>部门: {{ row.handleGroupName }}</p>
+            <p>岗位: {{ row.handlePositionName }}</p>
+            <div slot="reference" class="name-wrapper">
+              <i class="el-icon-user" /> {{ row.handleAccountName }}
+            </div>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column prop="checkTime" label="检查时间" header-align="center" align="center" min-width="200">
+        <template v-slot="{row}">
+          <span><i class="el-icon-time" /> {{ row.checkTime }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="检查结果" header-align="center" align="center" min-width="90">
+        <template v-slot="{row}">
+          <span v-if="row.status===-1" style="color: #20f704">未检查</span>
+          <span v-if="row.status===0" style="color: #20f704">通过</span>
+          <span v-if="row.status===1" style="color: #fc5c04">不通过</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-wrap">
+      <pagination v-show="total===-1" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: 'RecordDetail',
+  components: { Pagination },
+  data() {
+    return {
+      title: '检查表详情',
+      dialogVisible: false,
+      total: 0,
+      dataList: [],
+      conditions: {
+        page: 1,
+        limit: 10
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'userData'
+    ])
+  },
+  methods: {
+
+    // 加载数据
+    loadData(data) {
+      this.dialogVisible = true
+      this.title = '检查表详情'
+      if (data.checkItemNopass === null && data.checkItemPass === null) {
+        return
+      }
+      let checkItemNopass = []
+      let checkItemPass = []
+      if (data.checkItemNopass !== null) {
+        checkItemNopass = data.checkItemNopass.split('不通过;')
+        checkItemNopass = checkItemNopass.map(item => {
+          return {
+            ...data,
+            chekListItem: item,
+            status: 1
+          }
+        })
+      }
+      if (data.checkItemPass !== null) {
+        checkItemPass = data.checkItemPass.split('不通过;')
+        checkItemPass = checkItemPass.map(item => {
+          return {
+            ...data,
+            chekListItem: item,
+            status: 0
+          }
+        })
+      }
+      this.dataList = checkItemNopass.concat(checkItemPass)
+    },
+    getData() {
+
+    }
+  }
+}
+</script>

src/views/goaf/checkTask/record/index.vue

@@ -43,9 +43,7 @@
 
         <el-table-column prop="status" label="检查结果" header-align="center" align="center" min-width="90">
           <template v-slot="{row}">
-            <span v-if="row.status===-1" style="color: #20f704">未检查</span>
-            <span v-if="row.status===0" style="color: #20f704">通过</span>
-            <span v-if="row.status===1" style="color: #fc5c04">不通过</span>
+            <el-button size="mini" type="primary" @click="showDetail(row)">检查项目详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -54,18 +52,19 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
+    <record-detail ref="record-detail" />
   </div>
 </template>
 
 <script>
 import { getCheckRecordByPage, getCheckRecordByList } from '@/api/goaf/checkRecordApi'
 import { checkResult } from '@/utils'
-import Pagination from '@/components/Pagination'
 import { mapGetters } from 'vuex'
-
+import Pagination from '@/components/Pagination'
+import RecordDetail from './detail.vue'
 export default {
   name: 'RecordList',
-  components: { Pagination },
+  components: { Pagination, RecordDetail },
   data() {
     return {
       dataList: [],
@@ -90,7 +89,7 @@ export default {
   },
   mounted() {
     this.accountId = this.userData.userId
-    this.loadData('MyTotal')
+    this.getData()
   },
   methods: {
 
@@ -101,14 +100,6 @@ export default {
         limit: 10
       }
     },
-
-    // 加载数据
-    loadData(action) {
-      // this.action = action
-      // const groupId = this.userData.groupId
-      // const userId = this.userData.userId
-      this.getData()
-    },
     // 加载数据
     getData() {
       this.listLoading = true
@@ -155,6 +146,9 @@ export default {
           return v[j]
         }
       }))
+    },
+    showDetail(data) {
+      this.$refs['record-detail'].loadData(JSON.parse(JSON.stringify(data)))
     }
   }
 }

src/views/goaf/checklist/config.vue

@@ -1,15 +1,25 @@
 <template>
   <div class="content-container goaf">
     <el-row class="tool-bar">
-      <el-col :span="12" class="left">
+      <el-col :span="3" class="left">
         <div class="content-title">
           采空区
         </div>
       </el-col>
-      <el-col :span="12" class="right">
-        <el-input v-model="conditions.goafName" class="search-input m-right-15" placeholder="请输入采空区名称">
-          <el-button slot="append" icon="el-icon-search" @click="getData()" />
-        </el-input>
+      <el-col :span="21" class="right">
+        <el-select v-model="conditions.goafOrebelt" class="search-input m-right-15" filterable placeholder="矿带" clearable @change="changeArea(1)">
+          <el-option v-for="(item,index) in goafOrebelts" :key="index" :value="item" :label="item" />
+        </el-select>
+        <el-select v-model="conditions.goafOrebody" class="search-input m-right-15" filterable placeholder="矿体" clearable @change="changeArea(2)">
+          <el-option v-for="(item,index) in goafOrebodys" :key="index" :value="item.goafOrebody" :label="item.goafOrebody" />
+        </el-select>
+        <el-select v-model="conditions.goafOreheight" class="search-input m-right-15" filterable placeholder="中段" clearable @change="changeArea(3)">
+          <el-option v-for="(item,index) in goafOreheights" :key="index" :value="item.goafOreheight" :label="item.goafOreheight" />
+        </el-select>
+        <el-select v-model="conditions.goafId" class="search-input m-right-15" filterable placeholder="采空区编号" clearable @change="changeArea(4)">
+          <el-option v-for="item in goafNames" :key="item.goafId" :value="item.goafId" :label="item.goafName" />
+        </el-select>
+        <el-button type="primary" style="margin-right: 10px;" @click="getData">查询</el-button>
         <!-- <el-button type="primary" @click="batchDown">批量下载二维码</el-button> -->
       </el-col>
     </el-row>
@@ -61,7 +71,7 @@ import html2canvas from 'html2canvas'
 import JSZip from 'jszip'
 import saveAs from 'file-saver'
 import QRCode from 'qrcodejs2'
-import { getGoafBaseInfoByPage, updateGoaf } from '@/api/goaf/info'
+import { getGoafBaseInfoByPage, updateGoaf, getGoafBaseInfo } from '@/api/goaf/info'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
 import { QrCode } from '@/components'
@@ -76,15 +86,28 @@ export default {
       dataList: [],
       total: 0,
       listLoading: false,
+      goafList: [],
+      goafOrebelts: [],
+      goafOrebodys: [],
+      goafOreheights: [],
+      goafNames: [],
       conditions: {
         page: 1,
         limit: 10,
-        goafName: ''
+        goafId: '',
+        goafOrebelt: '',
+        goafOrebody: '',
+        goafOreheight: ''
       }
     }
   },
   created() {
     this.getData()
+    getGoafBaseInfo().then((res) => {
+      const goafOrebelts = res.data.map(item => item.goafOrebelt)
+      this.goafOrebelts = [...new Set(goafOrebelts)]
+      this.goafList = res.data
+    })
   },
   methods: {
     convertNum(num) {
@@ -92,6 +115,10 @@ export default {
     },
     getData() {
       this.listLoading = true
+      if (this.conditions.goafOrebelt === '') delete this.conditions.goafOrebelt
+      if (this.conditions.goafOrebody === '') delete this.conditions.goafOrebody
+      if (this.conditions.goafOreheight === '') delete this.conditions.goafOreheight
+      if (this.conditions.goafName === '') delete this.conditions.goafName
       getGoafBaseInfoByPage(this.conditions).then((resp) => {
         this.listLoading = false
         const { code, msg, data, total } = resp
@@ -103,6 +130,41 @@ export default {
         }
       })
     },
+    changeArea(type) {
+      const goafs = this.deeepClone(this.goafList)
+      let goafOrebodys = this.deeepClone(this.goafOrebodys)
+      let goafOreheights = this.deeepClone(this.goafOreheights)
+      let goafNames = this.deeepClone(this.goafNames)
+      if (type === 1) {
+        goafOrebodys = goafs.filter(item => item.goafOrebelt === this.conditions.goafOrebelt)
+        this.goafOrebodys = goafOrebodys
+        this.goafOreheights = []
+        this.goafNames = []
+        this.conditions.goafOrebody = ''
+        this.conditions.goafOreheight = ''
+        this.conditions.goafName = ''
+        this.conditions.goafId = ''
+      } else if (type === 2) {
+        goafOreheights = goafs.filter(item => (item.goafOrebody === this.conditions.goafOrebody) && (item.goafOrebelt === this.conditions.goafOrebelt))
+        this.goafOreheights = goafOreheights
+        this.goafNames = []
+        this.conditions.goafOreheight = ''
+        this.conditions.goafName = ''
+        this.conditions.goafId = ''
+      } else if (type === 3) {
+        goafNames = goafs.filter(item => (item.goafOreheight === this.conditions.goafOreheight) && (item.goafOrebody === this.conditions.goafOrebody) && (item.goafOrebelt === this.conditions.goafOrebelt))
+        this.goafNames = goafNames
+        this.conditions.goafName = ''
+        this.conditions.goafId = ''
+      } else {
+        for (let i = 0; i < goafNames.length; i++) {
+          if (this.conditions.goafId === goafNames[i].goafId) {
+            this.conditions.goafName = goafNames[i].goafName
+          }
+        }
+      }
+      this.$forceUpdate()
+    },
     isNull(val) {
       if (val !== undefined && val !== 'undefined' && val !== null && val !== '' && val !== ' ') {
         return false
@@ -208,6 +270,9 @@ export default {
       }).catch(() => {
         this.$message.info('已取消删除')
       })
+    },
+    deeepClone(params) {
+      return JSON.parse(JSON.stringify(params))
     }
   }
 }
@@ -249,7 +314,7 @@ export default {
               }
 
               .search-input {
-                  width: 300px;
+                  width: 200px !important;
               }
           }
 

src/views/goaf/danger/activity/Accept.vue

@@ -19,14 +19,19 @@
     <div class="content-container">
       <el-row class="content-body">
         <div v-show="tabType==='form'">
-          <VueScroll :ops="ops" style="height: calc(100vh - 400px)">
+          <VueScroll :ops="ops" style="height: calc(100vh - 200px)">
             <DangerInfo :view-data="viewData" class="form" />
+            <el-form label-width="130px">
+              <el-form-item label="预警描述" prop="hdangerDesc">
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="5" placeholder="预警描述" readonly />
+              </el-form-item>
+            </el-form>
             <work-flow ref="WFlow" />
+            <div class="btn-group">
+              <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button @click="dialogVisible = false">取消</el-button>
+            </div>
           </VueScroll>
-          <div class="btn-group">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-          </div>
         </div>
         <div v-show="tabType==='history'">
           <ActivityHandleRecord ref="ActivityHandleRecord" />
@@ -48,7 +53,7 @@ export default {
   props: {
     title: {
       type: [String],
-      default: '隐患验收'
+      default: '预警验收'
     }
   },
 
@@ -144,6 +149,7 @@ export default {
         const { code, data, msg } = resp
         if (code === 0) {
           this.viewData = info || data
+          this.formData.hdangerDesc = data.hdangerDesc
           this.$refs.WFlow.get(hdangerId)
           this.$refs.ActivityHandleRecord.getData(hdangerId)
         } else {

src/views/goaf/danger/activity/Rectify.vue

@@ -20,11 +20,11 @@
       <el-row class="content-body">
         <div v-show="tabType==='form'">
 
-          <Vuescroll :ops="ops" style="height: calc(100vh - 300px)">
+          <Vuescroll :ops="ops" style="height: calc(100vh - 200px)">
             <DangerInfo :view-data="viewData" class="form" />
             <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
-              <el-form-item label="隐患描述" prop="s">
-                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="10" placeholder="隐患描述" />
+              <el-form-item label="预警描述" prop="s">
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="2" placeholder="预警描述" readonly />
               </el-form-item>
               <!-- <el-form-item label="整改类型" prop="rectifyCat">
                 <el-select v-model="formData.rectifyCat" style="width: 100%" filterable placeholder="选择整改类型">
@@ -38,11 +38,11 @@
               </el-form-item>
             </el-form>
             <work-flow ref="WFlow" handle-user="验收人" />
+            <div class="btn-group">
+              <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button @click="dialogVisible = false">取消</el-button>
+            </div>
           </Vuescroll>
-          <div class="btn-group">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-          </div>
         </div>
 
         <div v-show="tabType==='history'">
@@ -65,7 +65,7 @@ export default {
   props: {
     title: {
       type: [String],
-      default: '隐患整改'
+      default: '预警整改'
     }
   },
 
@@ -143,7 +143,7 @@ export default {
       },
       rules: {
         hdangerDesc: [
-          { required: true, message: '请输入隐患发生原因', trigger: 'blur' }
+          { required: true, message: '请输入预警发生原因', trigger: 'blur' }
         ],
         rectifyMeasure: [
           { required: true, message: '请输入整改措施', trigger: 'blur' }
@@ -169,6 +169,7 @@ export default {
         const { code, data, msg } = resp
         if (code === 0) {
           this.viewData = data
+          this.formData.hdangerDesc = data.hdangerDesc
           this.$refs.WFlow.get(dangerId)
           this.$refs.ActivityHandleRecord.getData(dangerId)
         } else {

src/views/goaf/danger/activity/Review.vue

@@ -19,15 +19,38 @@
     <div class="content-container">
       <el-row class="content-body">
         <div v-show="tabType==='form'">
-          <Vuescroll :ops="ops" style="height: calc(100vh - 400px)">
+          <Vuescroll :ops="ops" style="height: calc(100vh - 200px)">
             <DangerInfo :view-data="viewData" class="form" />
             <work-flow ref="WFlow" handle-user="整改人" />
+            <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
+              <el-form-item label="预警描述" prop="hdangerDesc">
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="2" placeholder="预警描述" readonly />
+              </el-form-item>
+              <el-form-item label="预警等级" prop="hdangerLevel">
+                <el-radio-group v-model="formData.hdangerLevel">
+                  <el-radio :label="0">较低</el-radio>
+                  <el-radio :label="1">一般</el-radio>
+                  <el-radio :label="2">较大</el-radio>
+                  <el-radio :label="3">重大</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="整改截止时间" prop="dangerDeadline">
+                <el-date-picker
+                  v-model="formData.dangerDeadline"
+                  type="date"
+                  placeholder="设置截止时间"
+                  format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  clearable
+                  style="width: 100%"
+                />
+              </el-form-item>
+            </el-form>
+            <div class="btn-group">
+              <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+              <el-button @click="dialogVisible = false">取消</el-button>
+            </div>
           </Vuescroll>
-
-          <div class="btn-group">
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-          </div>
         </div>
 
         <div v-show="tabType==='history'">
@@ -123,6 +146,8 @@ export default {
         formCode: 'review',
         hdangerId: undefined,
         status: 0,
+        hdangerLevel: '',
+        dangerDeadline: '',
         attachList: []
       }
     }
@@ -149,13 +174,14 @@ export default {
         const { code, data, msg } = resp
         if (code === 0) {
           this.viewData = info || data
+          this.formData.hdangerLevel = data.hdangerLevel
+          this.formData.dangerDeadline = data.dangerDeadline
+          this.formData.hdangerDesc = data.hdangerDesc
           this.$refs.WFlow.get(hdangerId)
           this.$refs.ActivityHandleRecord.getData(hdangerId)
         } else {
           this.$message.error(msg)
         }
-      }).catch((error) => {
-        console.log(error)
       })
     },
 
@@ -165,6 +191,8 @@ export default {
         formCode: 'review',
         hdangerId: undefined,
         status: 0,
+        hdangerLevel: '',
+        dangerDeadline: '',
         attachList: []
       }
     },

src/views/goaf/danger/activity/Submit.vue

@@ -17,9 +17,15 @@
         <div v-show="tabType==='form'">
           <vuescroll :ops="ops" style="height: calc(100vh - 300px)">
             <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="130px">
-              <el-form-item label="隐患标题" prop="hdangerTitle">
+              <el-form-item label="预警标题" prop="hdangerTitle">
                 <el-input v-model="formData.hdangerTitle" />
               </el-form-item>
+              <el-form-item label="预警类型" required>
+                <el-select v-model="formData.hdangerType" style="width: 100%">
+                  <el-option :value="0" label="人员巡检" />
+                  <el-option :value="1" label="传感器巡检" />
+                </el-select>
+              </el-form-item>
               <el-form-item label="采空区" prop="goafId">
                 <el-select v-model="formData.goafId" filterable placeholder="采空区名称" style="width: 100%">
                   <el-option value="" label="请选择采空区" disabled />
@@ -36,7 +42,7 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item label="隐患等级" prop="hdangerLevel">
+              <el-form-item label="预警等级" prop="hdangerLevel">
                 <el-radio-group v-model="formData.hdangerLevel">
                   <el-radio :label="0">较低</el-radio>
                   <el-radio :label="1">一般</el-radio>
@@ -67,7 +73,7 @@
                 />
               </el-form-item>
               <el-form-item label="描述" prop="hdangerDesc">
-                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="5" placeholder="隐患描述" />
+                <el-input v-model="formData.hdangerDesc" type="textarea" :rows="5" placeholder="预警描述" />
               </el-form-item>
             </el-form>
             <work-flow ref="WFlow" handle-user="评审人" />
@@ -116,10 +122,11 @@ export default {
         'formCode': 'submit',
         'hdangerId': 1,
         'dangerId': undefined,
-        'hdangerTitle': '', // 隐患标题
-        'dangerCatId': undefined, // 隐患类别ID
-        'hdangerLevel': 1, // 隐患等级
+        'hdangerTitle': '', // 预警标题
+        'dangerCatId': undefined, // 预警类别ID
+        'hdangerLevel': 1, // 预警等级
         'hdangerDesc': '', // 描述
+        'hdangerType': 0,
         'submitTime': new Date(),
         'dangerDeadline': '', // 截止时间
         'goafId': undefined,
@@ -135,7 +142,7 @@ export default {
       checklist: [],
       rules: {
         hdangerTitle: [
-          { required: true, message: '请输入隐患标题', trigger: 'blur' }
+          { required: true, message: '请输入预警标题', trigger: 'blur' }
         ],
         goafId: [
           { required: true, message: '请选择采空区', trigger: 'change' }
@@ -144,7 +151,7 @@ export default {
           { required: true, message: '请选择检查表', trigger: 'change' }
         ],
         hdangerLevel: [
-          { required: true, message: '请输选择隐患等级', trigger: 'blur' }
+          { required: true, message: '请输选择预警等级', trigger: 'blur' }
         ],
         submitTime: [
           { required: true, message: '发生时间', trigger: 'blur' }
@@ -217,13 +224,14 @@ export default {
         'formCode': 'submit',
         'hdangerId': 1,
         'dangerId': undefined,
-        'hdangerTitle': '', // 隐患标题
-        'dangerCatId': undefined, // 隐患类别ID
-        'hdangerLevel': 1, // 隐患等级
+        'hdangerTitle': '', // 预警标题
+        'dangerCatId': undefined, // 预警类别ID
+        'hdangerLevel': 1, // 预警等级
         'hdangerDesc': '', // 描述
         'submitTime': new Date(),
         'dangerDeadline': '', // 截止时间
         'goafId': undefined,
+        'hdangerType': 0,
         'submitGroupId': '',
         'submitGroupName': '',
         'submitPositionId': '',

src/views/goaf/danger/components/DangerInfo.vue

@@ -1,38 +1,34 @@
 <template>
   <div class="text-block" :style="styles">
     <div class="activity-item danger">
-      <div v-if="viewData&&viewData.dangerCode" class="text-row">
+      <div v-if="viewData" class="text-row">
         <div v-if="viewData.dangerCode" class="text-item">
-          <span class="text-label right">隐患编码：</span>
+          <span class="text-label right">预警编码：</span>
           <span> {{ viewData.dangerCode }} </span>
         </div>
         <div v-if="viewData.status" class="text-item">
-          <span class="text-label right">隐患状态：</span>
+          <span class="text-label right">预警状态：</span>
           <span> {{ viewData.status | dangerStatusFilter }} </span>
         </div>
-        <div v-if="viewData.dangerTitle" class="text-item">
-          <span class="text-label right">隐患名称：</span>
-          <span> {{ viewData.dangerTitle }} </span>
+        <div v-if="viewData.hdangerTitle" class="text-item">
+          <span class="text-label right">预警名称：</span>
+          <span> {{ viewData.hdangerTitle }} </span>
         </div>
-        <div v-if="viewData.dangerTitle" class="text-item">
-          <span class="text-label right">隐患类别：</span>
-          <span> {{ viewData.dangerCatTitle }} </span>
+        <div v-if="viewData.hdangerType" class="text-item">
+          <span class="text-label right">预警类别：</span>
+          <span> {{ viewData.hdangerType===1?'传感器巡检':"人员巡检" }} </span>
         </div>
-        <div v-if="viewData.dangerLevel" class="text-item">
-          <span class="text-label right">隐患等级：</span>
-          <span> {{ viewData.dangerLevel | dangerLevelFilter }} </span>
-        </div>
-        <div v-if="viewData.riskPointTitle" class="text-item">
-          <span class="text-label right">所在位置：</span>
-          <span> {{ viewData.riskPointTitle }}</span>
+        <div v-if="viewData.hdangerLevel" class="text-item">
+          <span class="text-label right">预警等级：</span>
+          <span> {{ viewData.hdangerLevel | dangerLevelFilter }} </span>
         </div>
         <div v-if="viewData.dangerDeadLine" class="text-item">
           <span class="text-label right">整改期限：</span>
           <span> {{ viewData.dangerDeadLine }}</span>
         </div>
-        <div v-if="viewData.dangerDesc" class="text-item">
-          <span class="text-label right">描述：</span>
-          <span> {{ viewData.dangerDesc }} </span>
+        <div v-if="viewData.hdangerDesc" class="text-item">
+          <span class="text-label right">预警描述：</span>
+          <span> {{ viewData.hdangerDesc }} </span>
         </div>
       </div>
     </div>
@@ -40,10 +36,11 @@
       <div v-if="viewData.submitAccountName" class="text-row">
         <div v-if="viewData.submitAccountName" class="text-item">
           <span class="text-label right">提交人员：</span>
-          <span> {{ viewData.submitAccountName }}( {{ viewData.submitPositionName }} ) </span>
+          <span> {{ viewData.submitAccountName }}</span>
+          <span v-if="viewData.submitPositionName">( {{ viewData.submitPositionName }} ) </span>
         </div>
         <div v-if="viewData.submitGroupName" class="text-item">
-          <span class="text-label right">所在部位：</span>
+          <span class="text-label right">所在部门：</span>
           <span> {{ viewData.submitGroupName }} </span>
         </div>
       </div>
@@ -86,7 +83,7 @@
   </div>
 </template>
 <script>
-import { dangerLevel, dangerSource, dangerStatus, rectifyCat } from '@/utils'
+import { dangerSource, rectifyCat } from '@/utils'
 export default {
   name: 'DangerInfo',
   components: { },
@@ -94,11 +91,13 @@ export default {
     dangerSourceFilter(ival) {
       return dangerSource(ival)
     },
-    dangerLevelFilter(ival) {
-      return dangerLevel(ival)
+    dangerLevelFilter(val) {
+      const status = ['较低', '一般', '较大', '重大']
+      return status[val]
     },
-    dangerStatusFilter(ival) {
-      return dangerStatus(ival)
+    dangerStatusFilter(val) {
+      const status = ['待提交', '待评审', '待整改', '待验收', '完成']
+      return val === -1 ? '撤销' : status[val]
     },
     rectifyFilter(ival) {
       return rectifyCat(ival)

src/views/goaf/danger/components/DangerList.vue

@@ -20,12 +20,17 @@
       <el-table v-loading="listLoading" class="page-table" border :data="dataList" height="calc(100vh - 230px)">
 
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />>
-        <el-table-column prop="hdangerTitle" label="隐患名称" header-align="left" align="left">
+        <el-table-column prop="hdangerTitle" label="预警名称" header-align="left" align="left">
           <template v-slot="{row}">
             <span>{{ row.hdangerTitle }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column prop="hdangerType" label="类型" header-align="center" align="center" min-width="120">
+          <template v-slot="{row}">
+            <el-tag v-if=" row.hdangerType===1" type="success" effect="plain" color="rgb(38 69 90)">传感器巡检</el-tag>
+            <el-tag v-else effect="plain" color="rgb(38 69 90)">人员巡检</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="hdangerLevel" label="级别" header-align="center" align="center" width="80">
           <template v-slot="{row}">
             <span><el-tag type="success" effect="plain" color="rgb(38 69 90)">{{ row.hdangerLevel | dangerLevelFilter }}</el-tag></span>
@@ -69,11 +74,11 @@
         <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
       </div>
     </el-row>
-    <submit-activity ref="submit" title="登记隐患" @formSuccess="formSuccess" />
-    <review-activity ref="review" title="隐患评审" @formSuccess="formSuccess" />
-    <rectify-activity ref="rectify" title="隐患整改" @formSuccess="formSuccess" />
-    <accept-activity ref="accept" title="隐患验收" @formSuccess="formSuccess" />
-    <danger-details ref="DangerDetails" title="隐患详情" />
+    <submit-activity ref="submit" title="登记预警" @formSuccess="formSuccess" />
+    <review-activity ref="review" title="预警评审" @formSuccess="formSuccess" />
+    <rectify-activity ref="rectify" title="预警整改" @formSuccess="formSuccess" />
+    <accept-activity ref="accept" title="预警验收" @formSuccess="formSuccess" />
+    <danger-details ref="DangerDetails" title="预警详情" />
   </div>
 </template>
 
@@ -105,7 +110,7 @@ export default {
   },
   data() {
     return {
-      title: '隐患',
+      title: '预警',
       dataList: [],
       total: 0,
       listLoading: false,

src/views/goaf/danger/components/LeftCounter.vue

@@ -5,7 +5,7 @@
     </el-row>
 
     <el-row class="btn-group">
-      <el-button class="send-menu" @click="handleSubmitTask">登记隐患</el-button>
+      <el-button class="send-menu" @click="handleSubmitTask">登记预警</el-button>
     </el-row>
 
     <!-- <el-row class="list-group">
@@ -32,7 +32,7 @@
         </div>
       </div>
     </el-row> -->
-    <submit-task ref="SubmitTask" title="隐患登记" @formSuccess="selectItem" />
+    <submit-task ref="SubmitTask" title="预警登记" @formSuccess="selectItem" />
   </div>
 </template>
 <script>
@@ -52,7 +52,7 @@ export default {
   },
   data() {
     return {
-      title: '隐患管理',
+      title: '预警管理',
       dangerCounter: {
         myCreatedCount: 0,
         myHandlingCount: 0,

src/views/goaf/info/components/GoafInfo.vue

@@ -142,16 +142,19 @@ export default {
         this.conditions.goafOrebody = ''
         this.conditions.goafOreheight = ''
         this.conditions.goafName = ''
+        this.conditions.goafId = ''
       } else if (type === 2) {
         goafOreheights = goafs.filter(item => (item.goafOrebody === this.conditions.goafOrebody) && (item.goafOrebelt === this.conditions.goafOrebelt))
         this.goafOreheights = goafOreheights
         this.goafNames = []
         this.conditions.goafOreheight = ''
         this.conditions.goafName = ''
+        this.conditions.goafId = ''
       } else if (type === 3) {
         goafNames = goafs.filter(item => (item.goafOreheight === this.conditions.goafOreheight) && (item.goafOrebody === this.conditions.goafOrebody) && (item.goafOrebelt === this.conditions.goafOrebelt))
         this.goafNames = goafNames
         this.conditions.goafName = ''
+        this.conditions.goafId = ''
       } else {
         for (let i = 0; i < goafNames.length; i++) {
           if (this.conditions.goafId === goafNames[i].goafId) {
@@ -192,20 +195,11 @@ export default {
       this.downloadLoading = true
       const tHeader = Object.values(this.getEnums())
       const filterVal = Object.keys(this.getEnums())
-      const list = this.dataList
+      const list = JSON.parse(JSON.stringify(this.dataList))
       list.sort((a, b) => {
         return a['goafOrebelt'] - b['goafOrebelt']
       })
-      const merges = []
-      let temp = ''
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].goafOrebelt !== temp) {
-          temp = list[i].goafOrebelt
-          const start = i + 2
-          const end = i + 1 + list.filter(item => item.goafOrebelt === list[i].goafOrebelt).length
-          merges.push(`A${start}:A${end}`)
-        }
-      }
+      const merges = this.mergesJson(list)
       const data = this.formatJson(filterVal, list)
       if (list.length < 1) {
         this.$message.error('没有数据可供导出！')
@@ -224,6 +218,23 @@ export default {
         this.downloadLoading = false
       })
     },
+    mergesJson(list = [], filterVal = ['goafOrebelt']) {
+      const rowIndexs = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
+      const merges = []
+      const keys = filterVal
+      for (let j = 0; j < keys.length; j++) {
+        let temp = ''
+        for (let i = 0; i < list.length; i++) {
+          if (list[i][keys[j]] !== temp) {
+            temp = list[i][keys[j]]
+            const start = i + 2
+            const end = i + 1 + list.filter(item => item[keys[j]] === list[i][keys[j]]).length
+            merges.push(`${rowIndexs[j]}${start}:${rowIndexs[j]}${end}`)
+          }
+        }
+      }
+      return merges
+    },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
         if (j === 'goafIsFill' || j === 'goafAvexHeight' || j === 'goafVoidVolume') {

src/views/goaf/info/components/detail.vue

@@ -24,7 +24,7 @@
         <tr>
           <td class="lable">水平断面均暴露面积（㎡）</td>
           <td class="cont">{{ viewData.goafAvexArea | isEmpty }}</td>
-          <td class="lable">平均倾向宽度</td>
+          <td class="lable">平均倾向宽度（m）</td>
           <td class="cont">{{ viewData.goafAvinWidth | isEmpty }}</td>
         </tr>
         <tr>
@@ -72,6 +72,8 @@
         <tr>
           <td class="lable">备注</td>
           <td class="cont">{{ viewData.goafInfoRemak | isEmpty }}</td>
+          <td class="lable">检查表</td>
+          <td class="cont">{{ viewData.goafChecklistTitle | isEmpty }}</td>
         </tr>
       </table>
     </div>

src/views/goaf/sensor/Model.vue

@@ -177,6 +177,7 @@ export default {
         goafDevTypename: '',
         goafDevTypeId: '',
         goafDevAccountId: undefined,
+        goafDevGroupid: '',
         goafDevAccountName: '',
         goafInstallTime: '',
         goafAlarmThreshold: 0
@@ -191,7 +192,8 @@ export default {
       goafOrebelts: [],
       goafOrebodys: [],
       goafOreheights: [],
-      goafNames: []
+      goafNames: [],
+      groupList: []
     }
   },
   mounted() {
@@ -226,6 +228,7 @@ export default {
             }
           )
           this.treeData = temp
+          this.groupList = data
         }
       })
       getUserByPage({
@@ -237,6 +240,8 @@ export default {
       })
     },
     handleChange(groupId) {
+      this.formData.goafDevAccountId = ''
+      this.formData.goafDevAccountName = ''
       getUserByPage({
         page: 1,
         limit: 999999,
@@ -325,7 +330,8 @@ export default {
         goafDevAccountId: undefined,
         goafDevAccountName: '',
         goafInstallTime: '',
-        goafAlarmThreshold: 0
+        goafAlarmThreshold: 0,
+        goafDevGroupid: ''
       }
     },
     handleUserSelect(accountId) {
@@ -339,6 +345,7 @@ export default {
     },
     // 提交
     submitForm(formName) {
+      this.formData.goafDevGroupname = this.groupList.filter(item => item.groupId === this.formData.goafDevGroupid)[0].groupName
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (

src/views/goaf/sensor/index.vue

@@ -24,8 +24,10 @@
           </template>
         </el-table-column>
         <el-table-column prop="goafDevLocation" label="安装地点" />
-        <el-table-column prop="goafDevTypename" label="设备类型名称" />
+        <el-table-column prop="goafDevTypename" label="设备类型" />
+        <el-table-column prop="goafDevGroupname" label="设备负责人部门" />
         <el-table-column prop="goafDevAccountName" label="设备责任人" />
+        <el-table-column prop="goafAlarmThreshold" label="告警阈值 " />
         <el-table-column prop="goafInstallTime" label="安装时间" />
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">

src/views/system/workflow/example/task/submit.vue

@@ -80,7 +80,7 @@ export default {
 
       formData: {
         exampleId: undefined,
-        exampleTitle: '', // 隐患标题
+        exampleTitle: '', // 预警标题
         exampleDesc: '', // 描述
 
         wfDefId: undefined,
@@ -183,7 +183,7 @@ export default {
     resetFormData() {
       this.formData = {
         exampleId: undefined,
-        exampleTitle: '', // 隐患标题
+        exampleTitle: '', // 预警标题
         exampleDesc: '', // 描述
         actionRemark: '', // 说明
         accountIdTo: undefined, // 执行人