Merge branch 'dev' into limingyu-20240416-一公司动火作业地图

src/views/map/components/renyuan.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="renyuan">
-    <div v-if="false" class="block1">
+    <div class="block1">
       <layout-title title="定位基础信息"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
@@ -10,7 +10,6 @@
           <div class="info">
             <div class="label">{{ item.title }}</div>
             <div class="text">{{ item.count }}</div>
-            <!--            <div class="text"><count-to :start-val="0" :end-val="item.count" :duration="3600"/></div>-->
           </div>
         </div>
       </div>
@@ -156,7 +155,13 @@ export default {
           facount: '-'
         }
       ],
-      block4List: []
+      block4List: [],
+      message: {
+        onlineDeviceNum: '',
+        UwbBQ: '',
+        UwbJiZhan: '',
+        tklyr: ''
+      }
     }
   },
   created() {
@@ -168,10 +173,37 @@ export default {
     },
     getData() {
       requestFN(
-        '/map/getAlarmList',
+        '/map/getAllDwMessage',
         { corpId: this.corpInfoId }
       ).then((data) => {
-        this.block4List = data.list
+        this.block4List = data.alarmList.list
+        this.block1OptionsList = [
+          {
+            title: '在线设备数',
+            img: require('../../../assets/map/renyuan/ico1.png'),
+            count: data.orthermessage.onlineDeviceNum
+          },
+          {
+            title: '在线人员',
+            img: require('../../../assets/map/renyuan/img1ico1.png'),
+            count: data.orthermessage.infoList.UwbBQ.num
+          },
+          {
+            title: '在线基站数',
+            img: require('../../../assets/map/renyuan/ico3.png'),
+            count: data.orthermessage.infoList.UwbJiZhan.num
+          },
+          {
+            title: '在线摄像头数',
+            img: require('../../../assets/map/renyuan/ico4.png'),
+            count: data.orthermessage.infoList.HKcamera.num
+          },
+          {
+            title: '在线报警设备数',
+            img: require('../../../assets/map/renyuan/ico5.png'),
+            count: data.orthermessage.infoList.tklyr.num
+          }
+        ]
       }).catch((e) => {
         this.$message.error(e)
       })

src/views/map/dialog/peoplePositionYGS.vue

@@ -3,7 +3,7 @@
     <div class="level-title">
       <h1>人员信息</h1>
     </div>
-    <table class="table-ui">
+    <table v-if="false" class="table-ui">
       <tr>
         <td class="bbg-transparent">照片</td>
         <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
@@ -29,6 +29,25 @@
         <td>{{ otherInfo?otherInfo.postName:'' }}</td>
       </tr>
     </table>
+    <table class="table-ui">
+      <tr>
+        <td class="bbg-transparent">姓名</td>
+        <td >{{ info?info.userName:'' }}</td>
+      </tr>
+
+      <tr>
+        <td class="bbg-transparent">定位卡号:</td>
+        <td >{{ info?info.id:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">定位卡电量</td>
+        <td >{{ info?otherInfo.data[3].currentValBody.val:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">部门</td>
+        <td>{{ info?info.departmentName:'' }}</td>
+      </tr>
+    </table>
   </div>
 </template>
 
@@ -69,14 +88,14 @@ export default {
   methods: {
     getData() {
       requestFN(
-        '/map/getPersonByCardNo',
+        '/map/getLastProp',
         {
           CARDNO: this.id,
           corpId: this.corpId
         }
       ).then((data) => {
-        this.info = data.info.required
+        this.info = data.userInfo
-        this.otherInfo = data.otherInfo
+        this.otherInfo = data.statusInfo
       }).catch((e) => {
       })
     }

src/views/map/index.vue

@@ -2047,9 +2047,6 @@ export default {
         }
         // 人员定位关闭实时获取定位websocket 并关闭人员对比定时器（曹妃甸使用）
         if (this.gangkouActive === '00004' && urlType === 'peoplePosition') {
-          // if (this.fwebsocket) {
-          //   this.fwebsocket.close()
-          // }
           if (this.timer) {
             clearInterval(this.timer)
           }

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

@@ -258,7 +258,6 @@
                 :preview-src-list="new Array(config.fileUrl + pd.INSPECTED_SITEUSER_SIGN_IMG)"
                 style="width: 100px; height: 100px"/>
             </div>
-            <span>{{ pd.INSPECTED_SITEUSER_SIGN_TIME }}</span>
           </div>
         </div>
       </div>

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

@@ -59,6 +59,20 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="7">
+          <el-form-item label="添加时间">
+            <el-date-picker
+            v-model="ADDTIME"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            class="filter-item"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <el-table
       v-loading="listLoading"
@@ -136,7 +150,8 @@ export default {
       varList: [],
       levelList: [],
       treeData: [],
-      treeData1: []
+      treeData1: [],
+      ADDTIME: []
     }
   },
   created() {
@@ -180,6 +195,9 @@ export default {
     },
     // 搜索
     getQuery() {
+      if (this.ADDTIME == null | this.ADDTIME == undefined ){
+        this.ADDTIME = []
+      }
       this.getList()
     },
     // 搜索
@@ -188,6 +206,7 @@ export default {
       this.LEVEL = ''
       this.DEPARTMENT_ID = []
       this.CORPDEPARTMENT_ID = []
+      this.ADDTIME = []
       this.listQuery = {
         page: 1,
         limit: 20
@@ -204,7 +223,9 @@ export default {
           KEYWORDS: this.KEYWORDS,
           DEPARTMENT_ID: this.DEPARTMENT_ID.join(','),
           CORPDEPARTMENT_ID: this.CORPDEPARTMENT_ID.join(','),
-          LEVEL: this.LEVEL
+          LEVEL: this.LEVEL,
+          ADDSTART: this.ADDTIME==undefined?'':this.ADDTIME[0],
+          ADDEND: this.ADDTIME==undefined?'':this.ADDTIME[1]
         }
       ).then((data) => {
         this.listLoading = false