Merge remote-tracking branch 'origin/czks-cmt-gwj地图合并' into dev

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

@@ -156,6 +156,13 @@
             <el-input v-model="addForm.info.REMAKE" style="width: 100%" placeholder="请输入内容"/>
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="所属企业：" prop="CORPINFO_ID">
+            <el-select v-model="addForm.info.CORPINFO_ID" style="width: 100%;">
+              <el-option v-for="item in corpinfoAllList" :key="item.CORPINFO_ID" :value="item.CORPINFO_ID" :label="item.CORP_NAME"/>
+            </el-select>
+          </el-form-item>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="addForm.dialogVisible = false">取 消</el-button>
@@ -213,6 +220,7 @@ export default {
       dialogVideoHLS: false,
       dialogVideoBack: false,
       dialogVideoAll: false,
+      corpinfoAllList: [],
       VIDEOURL: '',
       player: {},
       //
@@ -305,12 +313,22 @@ export default {
   async created() {
     await this.getUnitsList()
     await this.getList()
+    await this.getCoroInfoAll()
   },
   beforeDestroy() {
     console.log('定时器关闭')
     clearInterval(this.timer)
   },
   methods: {
+    getCoroInfoAll() {
+      requestFN(
+        '/corpinfo/listSelect',
+        { }
+      ).then((data) => {
+        this.corpinfoAllList = data.list
+      }).catch((e) => {
+      })
+    },
     // 五分钟关闭视频播放页面定时任务
     start() {
       console.log('定时器开启')
@@ -474,6 +492,7 @@ export default {
       this.addForm.info.PHONE = row.PHONE
       this.addForm.info.PERSON = row.PERSON
       this.addForm.info.REMAKE = row.REMAKE
+      this.addForm.info.CORPINFO_ID = row.CORPINFO_ID
       this.addForm.dialogType = 'edit'
       this.addForm.dialogVisible = true
     },
@@ -543,7 +562,8 @@ export default {
         CODE: '', // 摄像头编号
         REMAKE: '', // 在线情况
         PHONE: '', // 手机号码
-        PERSON: '' // 负责人
+        PERSON: '', // 负责人
+        CORPINFO_ID: '' // 企业ID
       }
     },
     // 搜索

src/views/map/components/cmt_index.vue

@@ -0,0 +1,560 @@
+<template>
+  <div class="gangkou_index">
+
+    <div class="block2">
+      <layout-title title="风险辨识管控"/>
+      <div class="options">
+        <div v-for="(item,index) in block2OptionsList" :key="index" class="option">
+          <img :src="item.img" class="img_top" alt="">
+          <img class="img_bottom" src="../../../assets/map/gangkou_index/bg1.png" alt="">
+          <div class="label">{{ item.label }}</div>
+          <div class="count">
+            <count-to :start-val="0" :end-val="item.count" :duration="3600"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="block3">
+      <layout-title title="人员定位信息"/>
+      <div class="options">
+        <div v-for="(item,index) in block3OptionsList" :key="index" class="option">
+          <img :src="item.img" class="img_top" alt="">
+          <img class="img_bottom" src="../../../assets/map/gangkou_index/img1.png" alt="">
+          <div class="label">{{ item.label }}</div>
+          <div class="count">
+            <count-to :start-val="0" :end-val="item.count" :duration="3600"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="block4">
+      <layout-title title="进出记录管理"/>
+      <div class="options">
+        <div v-for="(item,index) in block4OptionsList" :key="index" class="option">
+          <div class="title">{{ item.title }}</div>
+          <div class="items">
+            <div v-for="(item1,index1) in item.list" :key="index1" class="item">
+              <div class="label">
+                {{ item1.label }}：<count-to :start-val="0" :end-val="item1.count" :duration="3600"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="block1">
+      <layout-title title="气象监测数据"/>
+      <div class="options">
+        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
+          <div class="title">{{ item.title }}</div>
+          <div class="circular">
+            <img :src="item.img" alt="">
+          </div>
+          <div class="label">
+            {{ item.count }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import layoutTitle from './title.vue'
+import CountTo from 'vue-count-to'
+import { requestFN } from '@/utils/request'
+
+export default {
+  components: {
+    layoutTitle,
+    CountTo
+  },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    },
+    gangkou: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      block1OptionsList: [
+        {
+          title: '风速监测',
+          img: require('../../../assets/map/qixiang/ico1.png'),
+          count: 0
+        },
+        {
+          title: '温度监测',
+          img: require('../../../assets/map/qixiang/ico2.png'),
+          count: 0
+        },
+        {
+          title: '风向监测',
+          img: require('../../../assets/map/qixiang/ico3.png'),
+          count: 0
+        },
+        {
+          title: '大气湿度',
+          img: require('../../../assets/map/qixiang/ico4.png'),
+          count: 0
+        }
+      ],
+      block2OptionsList: [
+        {
+          label: '风险单元数',
+          img: require('../../../assets/map/gangkou_index/ico1.png'),
+          count: 0
+        },
+        {
+          label: '辨识部位数',
+          img: require('../../../assets/map/gangkou_index/ico2.png'),
+          count: 0
+        },
+        {
+          label: '风险因素数',
+          img: require('../../../assets/map/gangkou_index/ico3.png'),
+          count: 0
+        }
+      ],
+      block3OptionsList: [
+        {
+          label: '公司人员数',
+          img: require('../../../assets/map/gangkou_index/img1_on.png'),
+          count: 0
+        },
+        {
+          label: '部门人员数',
+          img: require('../../../assets/map/gangkou_index/img2_on.png'),
+          count: 0
+        },
+        {
+          label: '定位在线人员数',
+          img: require('../../../assets/map/gangkou_index/img3_on.png'),
+          count: 0
+        }
+      ],
+      block4OptionsList: [
+        {
+          title: '进出人员',
+          list: [
+            {
+              label: '今日进堆料场人员数',
+              count: 0
+            },
+            {
+              label: '今日出堆料场人员数',
+              count: 0
+            }
+          ]
+        },
+        {
+          title: '进出车辆',
+          list: [
+
+            {
+              label: '今日进堆料场车辆数',
+              count: 0
+            },
+            {
+              label: '今日出堆料场车辆数',
+              count: 0
+            }
+          ]
+        }
+      ]
+    }
+  },
+  created() {
+    this.getRiskIdentificationCount()
+    this.getPersonPositioningCount()
+    this.getDoorManagement()
+    this.start()
+    this.getMeteorologicalinfo()
+  },
+  beforeDestroy() {
+    console.log('定时器关闭')
+    clearInterval(this.timer)
+  },
+  methods: {
+    // 天气数据
+    getMeteorologicalinfo() {
+      this.listLoading = true
+      requestFN(
+        '/map/listbymeteorological',
+        {
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.block1OptionsList[0].count = data.pd.WINDSPEED || '-'
+        this.block1OptionsList[1].count = data.pd.TEMPERATURE || '-'
+        this.block1OptionsList[2].count = this.calculateWindDirection(data.pd.WINDDIRECTION)
+        // this.block1OptionsList[3].count = data.pd.HUMIDITY || '-'
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    calculateWindDirection(angle) {
+      const arr = [
+        {
+          directions: '北',
+          minAngle: '348.76',
+          maxAngle: '11.25'
+        },
+        {
+          directions: '北东北',
+          minAngle: '11.26',
+          maxAngle: '33.75'
+        },
+        {
+          directions: '东北',
+          minAngle: '33.76',
+          maxAngle: '56.25'
+        },
+        {
+          directions: '东东北',
+          minAngle: '56.26',
+          maxAngle: '78.75'
+        },
+        {
+          directions: '东',
+          minAngle: '78.76',
+          maxAngle: '101.25'
+        },
+        {
+          directions: '东东南',
+          minAngle: '101.26',
+          maxAngle: '123.75'
+        },
+        {
+          directions: '东南',
+          minAngle: '123.76',
+          maxAngle: '146.25'
+        },
+        {
+          directions: '南东南',
+          minAngle: '146.26',
+          maxAngle: '168.75'
+        },
+        {
+          directions: '南',
+          minAngle: '168.76',
+          maxAngle: '191.25'
+        },
+        {
+          directions: '南西南',
+          minAngle: '191.26',
+          maxAngle: '213.75'
+        },
+        {
+          directions: '西南',
+          minAngle: '213.76',
+          maxAngle: '236.25'
+        },
+        {
+          directions: '西西南',
+          minAngle: '236.26',
+          maxAngle: '258.75'
+        },
+        {
+          directions: '西',
+          minAngle: '258.76',
+          maxAngle: '281.25'
+        },
+        {
+          directions: '西西北',
+          minAngle: '281.26',
+          maxAngle: '303.75'
+        },
+        {
+          directions: '西北',
+          minAngle: '303.76',
+          maxAngle: '326.25'
+        },
+        {
+          directions: '北西北',
+          minAngle: '326.26',
+          maxAngle: '348.75'
+        }
+      ]
+      for (let i = 0; i < arr.length; i++) {
+        if (+angle >= +arr[i].minAngle && +angle <= +arr[i].maxAngle) {
+          return arr[i].directions + '风'
+        }
+      }
+      return '静风'
+    },
+    // 定时器
+    start() {
+      console.log('定时器开启')
+      this.timer = setInterval(this.getMeteorologicalinfo, 10000) // 注意: 第一个参数为方法名的时候不要加括号;
+    },
+    over() {
+      clearInterval(this.timer)
+    },
+
+    getDoorManagement() {
+      requestFN(
+        '/map/getDoorManagement',
+        {
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou
+        }
+      ).then((data) => {
+        this.block4OptionsList[1].list[0].count = data.varList[1].list[2].count
+        this.block4OptionsList[1].list[1].count = data.varList[1].list[3].count
+        // this.block4OptionsList[1].list[2].count = data.data.carOnSiteCount
+        this.block4OptionsList[0].list[0].count = data.varList[1].list[1].count
+        this.block4OptionsList[0].list[1].count = datadata.varList[1].list[0].count
+      })
+    },
+    getRiskIdentificationCount() {
+      requestFN(
+        '/map/getRiskIdentificationCount',
+        {
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou
+        }
+      ).then((data) => {
+        this.block2OptionsList[0].count = data.riskIdentificationCount[0]
+        this.block2OptionsList[1].count = data.riskIdentificationCount[1]
+        this.block2OptionsList[2].count = data.riskIdentificationCount[2]
+      })
+    },
+    getPersonPositioningCount() {
+      requestFN(
+        '/map/getPersonPositioningCount',
+        {
+          CORPINFO_ID: this.corpInfoId,
+          GANGKOU: this.gangkou
+        }
+      ).then((data) => {
+        this.block3OptionsList[0].count = data.personPositioningCount[0]
+        this.block3OptionsList[1].count = data.personPositioningCount[1]
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.gangkou_index {
+  .block1 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 15px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .title {
+          background-image: url("../../../assets/map/qixiang/label.png");
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
+          width: 88px;
+          height: 25px;
+          font-size: 12px;
+          line-height: 25px;
+          text-align: center;
+          color: #fff;
+        }
+
+        .circular {
+          margin-top: 15px;
+          background-image: url("../../../assets/map/qixiang/imgbg.png");
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
+          width: 67px;
+          height: 48px;
+          text-align: center;
+          padding-top: 13px;
+
+          img {
+            width: 30px;
+            height: 30px;
+            margin-top: -20px;
+            animation: slideY 2s infinite;
+          }
+        }
+
+        .label {
+          margin-top: 5px;
+          font-size: 12px;
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  .block2 {
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 40px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+
+        .img_top {
+          position: absolute;
+          width: 25px;
+          height: 25px;
+          margin-top: 11px;
+          animation: slideY 2s infinite;
+        }
+
+        .img_bottom {
+          position: absolute;
+          width: 50px;
+          height: 50px;
+        }
+
+        .label {
+          margin-top: 60px;
+          color: #fff;
+          font-size: 14px;
+        }
+
+        .count {
+          background-image: linear-gradient(bottom, #5bb4f7, #ffffff);
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+          font-weight: bold;
+          font-size: 26px;
+          margin-top: 0px;
+          font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif;
+        }
+      }
+    }
+  }
+
+  .block3 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      display: flex;
+      justify-content: space-between;
+      padding: 0 40px 10px 40px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+
+        .img_top {
+          position: absolute;
+          width: 75px;
+          height: 75px;
+          animation: slideY 2s infinite;
+        }
+
+        .img_bottom {
+          position: absolute;
+          width: 75px;
+          height: 75px;
+          top: 5px;
+        }
+
+        .label {
+          margin-top: 80px;
+          color: #fff;
+          font-size: 14px;
+        }
+
+        .count {
+          background-image: linear-gradient(bottom, #5bb4f7, #ffffff);
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+          font-weight: bold;
+          font-size: 26px;
+          margin-top: 0px;
+          font-family: "PingFang SC", "Helvetica Neue", "Hiragino Sans GB", "Segoe UI", "Microsoft YaHei", "微软雅黑", sans-serif;
+        }
+      }
+    }
+  }
+
+  .block4 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .options {
+      padding: 10px 15px 10px 15px;
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+
+      .option {
+        .title {
+          background-image: url("../../../assets/map/menjin/title.png");
+          background-size: 100% 100%;
+          background-repeat: no-repeat;
+          width: 113px;
+          height: 26px;
+          font-size: 14px;
+          line-height: 26px;
+          text-align: center;
+          color: #fff;
+
+        }
+
+        .items {
+          display: flex;
+          flex-wrap: wrap;
+          margin-bottom: 10px;
+
+          .item {
+            margin-top: 10px;
+            font-size: 12px;
+            color: #fff;
+            flex-basis: 50%;
+          }
+        }
+      }
+    }
+  }
+}
+
+@keyframes slideY {
+  0% {
+    transform: translateY(0);
+  }
+  50% {
+    transform: translateY(5px);
+  }
+  100% {
+    transform: translateY(0);
+  }
+}
+</style>

src/views/map/components/czks_index.vue

@@ -1,19 +1,5 @@
 <template>
   <div class="fensongsi_index">
-    <div class="block1">
-      <layout-title title="沧州矿石气象监测数据"/>
-      <div class="options">
-        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
-          <div class="title">{{ item.title }}</div>
-          <div class="circular">
-            <img :src="item.img" alt="">
-          </div>
-          <div class="label">
-            {{ item.count }}
-          </div>
-        </div>
-      </div>
-    </div>
     <div class="block2">
       <layout-title title="风险辨识管控"/>
       <div class="options">
@@ -41,7 +27,7 @@
       </div>
     </div>
     <div class="block4">
-      <layout-title title="口门管理"/>
+      <layout-title title="进出记录管理"/>
       <div class="options">
         <div v-for="(item,index) in block4OptionsList" :key="index" class="option">
           <div class="title">{{ item.title }}</div>
@@ -55,6 +41,23 @@
         </div>
       </div>
     </div>
+    <div class="block1">
+      <layout-title title="气象监测数据"/>
+      <div class="options">
+        <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
+          <div class="title">{{ item.title }}</div>
+          <div class="circular">
+            <img :src="item.img" alt="">
+          </div>
+          <div class="label">
+            {{ item.count }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+
+
   </div>
 </template>
 
@@ -138,44 +141,29 @@ export default {
       ],
       block4OptionsList: [
         {
-          title: '风险指数',
+          title: '矿石作业区',
           list: [
             {
-              label: '重大风险点数',
+              label: '今日进矿石作业区车辆数',
-              count: '9'
+              count: 0
             },
             {
-              label: '较大风险点数',
+              label: '今日出矿石作业区车辆数',
-              count: '20'
+              count: 0
-            },
-            {
-              label: '一般风险点数',
-              count: '13'
-            },
-            {
-              label: '低风险性点数',
-              count: '3'
             }
           ]
         },
         {
-          title: '今日情况',
+          title: '杂货作业区',
           list: [
-            {
+
-              label: '今日进矿石作业区车辆数',
-              count: '-'
-            },
-            {
-              label: '今日出矿石作业区车辆数',
-              count: '-'
-            },
             {
               label: '今日进杂货作业区车辆数',
-              count: '-'
+              count: 0
             },
             {
               label: '今日出杂货作业区车辆数',
-              count: '-'
+              count: 0
             }
           ]
         }

src/views/map/components/menjinCzks.vue

@@ -114,24 +114,12 @@ export default {
     return {
       block1OptionsList: [
         {
-          title: '人员闸机',
+          title: '车辆闸机数',
-          img: require('../../../assets/map/menjin/ico1.png'),
-          label1: '今日进数',
-          count1: 0,
-          label2: '今日出数',
-          count2: 0,
-          label3: '今日剩余人数',
-          count3: 0
-        },
-        {
-          title: '车辆闸机',
           img: require('../../../assets/map/menjin/ico2.png'),
-          label1: '今日进数',
+          label1: '在线数',
-          count1: 0,
+          count1: 2
-          label2: '今日出数',
+          // label2: '离线数',
-          count2: 0,
+          // count2: 0
-          label3: '今日剩余车数',
-          count3: 0
         },
         {
           title: '摄像头数',

src/views/map/dialog/index.vue

@@ -26,16 +26,16 @@
       <hotworkFirst v-if="type === 'HOTWORK' && corpInfoId === '035958e685cf4850bc40151c5e0617a6' " :id="id" :type="type" :gangkou="gangkou"/>
       <!--秦港一公司 动火作业 详细页面 end-->
       <!--其他公司 动火作业  详细页面 start-->
-      <hotwork v-if="type === 'HOTWORK'&& corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
+      <hotwork v-if="type === 'HOTWORK' || type === 'HOTWORK00005' && corpInfoId !== '635917e77af8461691d5da5507b56347' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" :gangkou="gangkou"/>
       <!--其他公司 动火作业 详细页面 end-->
       <!--其他七项作业共用一个详细页面 start-->
-      <confinedspace v-if="type === 'CONFINEDSPACE' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <confinedspace v-if="type === 'CONFINEDSPACE' || type === 'CONFINEDSPACE00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
-      <electricityOrder v-if="type === 'ELECTRICITY' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <electricityOrder v-if="type === 'ELECTRICITY' || type === 'ELECTRICITY00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
-      <highworkOrder v-if="type === 'HIGHWORK' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <highworkOrder v-if="type === 'HIGHWORK' || type === 'HIGHWORK00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
-      <hoistingOrder v-if="type === 'HOISTING' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <hoistingOrder v-if="type === 'HOISTING' || type === 'HOISTING00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
-      <blindboardOrder v-if="type === 'BLINDBOARD' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <blindboardOrder v-if="type === 'BLINDBOARD' || type === 'BLINDBOARD00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
-      <cutroadOrder v-if="type === 'CUTROAD' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <cutroadOrder v-if="type === 'CUTROAD' || type === 'CUTROAD00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
-      <breakgroundOrder v-if="type === 'BREAKGROUND' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
+      <breakgroundOrder v-if="type === 'BREAKGROUND' || type === 'BREAKGROUND00005' && corpInfoId !== '635917e77af8461691d5da5507b56347'" :id="id" :type="type" :gangkou="gangkou"/>
       <!--其他七项作业共用一个详细页面 end-->
       <!--曹妃甸东 八项作业  曹实业详细页面 start-->
       <hotworkCfdD v-if="type === 'HOTWORK'&& corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
@@ -47,6 +47,7 @@
       <breakgroundCfdD v-if="type === 'BREAKGROUND' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
       <hoistingCfdD v-if="type === 'HOISTING' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
       <peoplePositionCfdD v-if="type === 'peoplePosition'" :id="id" :type="type" :infoname="infoname"/>
+      <peoplePositionCzks v-if="type === 'peoplePositionCzks'" :id="id" :type="type" />
       <peoplePositionCmt v-if="type === 'peoplePositionCmt'" :id="id" :type="type" :infoname="infoname"/>
       <carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
       <!--曹妃甸东 八项作业 曹实业详细页面 end-->
@@ -54,7 +55,7 @@
       <peoplePositionOne v-if="type === 'peoplePositionOne' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
       <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
       <!-- 重点工程 start -->
-      <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
+      <outSourceInfo v-if="type === 'PROJECT' || type === 'PROJECT00005'" :id="id" :type="type" />
       <outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />
       <!-- 重点工程 end -->
     </el-dialog>
@@ -95,6 +96,7 @@ import cutroadCfdD from './cutroadCfdD.vue'
 import breakgroundCfdD from './breakgroundCfdD.vue'
 import hoistingCfdD from './hoistingCfdD.vue'
 import peoplePositionCfdD from './peoplePositionCfdD.vue'
+import peoplePositionCzks from './peoplePositionCzks.vue'
 import peoplePositionCmt from './peoplePositionCmt.vue'
 import carPositionCfdD from './carPositionCfdD.vue'
 import peoplePositionOne from './peoplePositionOne.vue'
@@ -135,6 +137,7 @@ export default {
     breakgroundCfdD,
     hoistingCfdD,
     MkGateMachineCfd,
+    peoplePositionCzks,
     peoplePositionCfdD,
     peoplePositionCmt,
     carPositionCfdD,

src/views/map/dialog/mkGateMachineCmt.vue

@@ -2,7 +2,7 @@
   <div class="app-container print-work">
     <div class="level-title">
       <h1>卡口信息</h1>
-      <div class="level-btns">卡口编号:{{ id }}</div>
+    <!--      <div class="level-btns">卡口编号:{{ id }}</div>-->
     </div>
     <table class="table-ui">
       <tr>

src/views/map/dialog/peoplePositionCzks.vue

@@ -0,0 +1,80 @@
+<template>
+  <div class="app-container print-work" style="width: 100%">
+    <div class="level-title">
+      <h1>人员信息</h1>
+    </div>
+    <table class="table-ui">
+      <tr>
+        <td class="bbg-transparent">照片</td>
+        <td><img :src="'http://172.16.130.86/gateway-service/fileStatic/'+personPhoto" alt="" width="50" height="50">
+        </td>
+        <td class="bbg-transparent">姓名</td>
+        <td>{{ info ? info.NAME : '' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">部门</td>
+        <td>{{ info ? info.DEPARTMENT_NAME : '' }}</td>
+        <td class="bbg-transparent">岗位</td>
+        <td>{{ info ? info.POST_NAME : '' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">人员类型</td>
+        <td>{{ info ? info.PERSON_TYPE : '' }}</td>
+        <td class="bbg-transparent">是否为隐患确认人</td>
+        <td>{{ info.IS_HAZARDCONFIRMER == 0 ? '否' : '是' }}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+import {requestFN} from '@/utils/request'
+
+export default {
+  props: {
+    id: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    type: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    personPhoto: {
+      type: String,
+      default() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      config: config,
+      info: {}
+    }
+  },
+  created() {
+    console.log('进来了')
+    this.getData()
+  },
+  methods: {
+    getData() {
+      requestFN(
+        '/map/getPersonByCardNo',
+        {
+          CARDNO: this.id
+        }
+      ).then((data) => {
+        this.info = data.pd
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

src/views/map/index.vue

@@ -25,7 +25,7 @@
         <info v-if="!gangkouActive"/>
         <gangkou-index v-if="gangkouActive === '00003' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && !CORP_INFO_ID" :area="area"/>
         <fengongsi-index
-          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
+          v-if="gangkouActive && gangkouActive !== '00004' && gangkouActive !== '00005' && gangkouActive !== '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"
         />
@@ -34,6 +34,11 @@
           :corp-info-id="CORP_INFO_ID"
           :gangkou="gangkouActive"
         />
+        <cmt-index
+          v-if="gangkouActive && gangkouActive === '00005' && bottomOptionsIndex === '' && CORP_INFO_ID"
+          :corp-info-id="CORP_INFO_ID"
+          :gangkou="gangkouActive"
+        />
         <czksIndex
           v-if="gangkouActive && gangkouActive === '00002' && (bottomOptionsIndex === '' || bottomOptionsIndex === 5) && CORP_INFO_ID"
           :corp-info-id="CORP_INFO_ID"
@@ -248,6 +253,7 @@ import gangkouIndex from './components/gangkou_index.vue'
 import fengongsiIndex from './components/fengongsi_index.vue'
 import caofeidianIndex from './components/caofeidian_index.vue'
 import czksIndex from './components/czks_index.vue'
+import cmtIndex from './components/cmt_index.vue'
 import menjinCzks from './components/menjinCzks.vue'
 import renyuanCzks from './components/renyuanCzks.vue'
 import renyuanCmt from './components/renyuanCmt.vue'
@@ -299,6 +305,7 @@ export default {
     AnquanCfd,
     czksIndex,
     menjinCzks,
+    cmtIndex,
     renyuanCzks,
     renyuanCmt,
     // navigation,
@@ -445,16 +452,6 @@ export default {
           containAuthorization: [],
           eliminateAuthorization: [],
           list: [
-            {
-              label: '人员',
-              dialog_width: '800px',
-              check: false,
-              img: require('../../assets/map/gangkou_index/buttom/ico1.png'),
-              checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'),
-              type: 'PERSON',
-              containAuthorization: [],
-              eliminateAuthorization: []
-            },
             {
               label: '车辆',
               dialog_width: '600px',
@@ -1396,6 +1393,16 @@ export default {
             id = pick.id.id
             this.bubble(id)
           }
+          if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
+            const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
+            this.dialog.visible = true
+            this.dialog.title = label
+            this.dialog.type = point_type
+            this.dialog.id = id
+            this.dialog.name = name
+            this.dialog.infoname = infoname
+            this.dialog.corpInfoId = corpInfoId
+          }
           if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) {
             // if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
 
@@ -2455,7 +2462,7 @@ export default {
                 ry_drag.getPosition(czksPerLoc[index])
               } else {
                 const perLoc = {
-                  id: item.cardId,
+                  id: item.cardId + '',
                   name: item.realName,
                   idNumber: item.idNumber,
                   x: item.longitude,
@@ -3019,12 +3026,21 @@ export default {
       if (item && item.list && item.list.length > 0) {
         if (item.label === '消防管控') {
           if (e.label === '消防救援队') {
-            return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+            if (this.gangkouActive === '00005') {
+              return true
+            }else {
+              return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+            }
           }
           if (e.label !== '消防救援队') {
             return (this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
           }
         }
+        if (item.label === '气象监测') {
+          if (e.label === '气象站') {
+            return this.gangkouActive !== '00005'
+          }
+        }
       }
       const CORP_INFO_ID = this.CORP_INFO_ID
       if (e.containAuthorization.length === 0) return true

src/views/safetyenvironmental/chief/components/information.vue

@@ -110,7 +110,7 @@
           <template v-if="row.INSPECTION_STATUS == '0'">待检查人核实</template>
           <template v-else-if="row.INSPECTION_STATUS == '1'">检查人核实中</template>
           <template v-else-if="row.INSPECTION_STATUS == '2'">待被检查人确认</template>
-          <template v-else-if="row.INSPECTION_STATUS == '3'">已归档</template>
+          <template v-else-if="row.INSPECTION_STATUS == '3'">待指派</template>
           <template v-else-if="row.INSPECTION_STATUS == '4'">指派中</template>
           <template v-else-if="row.INSPECTION_STATUS == '5'">指派完成</template>
           <template v-else-if="row.INSPECTION_STATUS == '6'">检查待验收</template>