Merge remote-tracking branch 'origin/master'

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventReceive.java

@@ -78,6 +78,16 @@ public class TEventReceive extends BaseEntity
     @Excel(name = "状态")
     private Integer status;
 
+    private TEventHandle handleList;
+
+    public TEventHandle getHandleList() {
+        return handleList;
+    }
+
+    public void setHandleList(TEventHandle handleList) {
+        this.handleList = handleList;
+    }
+
     public Integer getCompanyRead() {
         return companyRead;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TEventHandleMapper.java

@@ -58,4 +58,6 @@ public interface TEventHandleMapper
      * @return 结果
      */
     public int deleteTEventHandleByIds(Long[] handleIds);
+
+    public TEventHandle selectByLast(int eventId);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TEventReceiveServiceImpl.java

@@ -5,6 +5,8 @@ import java.util.List;
 import com.alibaba.fastjson.JSONObject;
 import com.zehong.common.utils.DateUtils;
 import com.zehong.system.controller.WebSocketController;
+import com.zehong.system.domain.TEventHandle;
+import com.zehong.system.mapper.TEventHandleMapper;
 import com.zehong.system.service.WebSocketServer;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,8 @@ public class TEventReceiveServiceImpl implements ITEventReceiveService
     @Autowired
     private TEventReceiveMapper tEventReceiveMapper;
     @Autowired
+    private TEventHandleMapper tEventHandleMapper;
+    @Autowired
     private WebSocketServer webSocketServer;
 
     /**
@@ -49,7 +53,12 @@ public class TEventReceiveServiceImpl implements ITEventReceiveService
     @Override
     public List<TEventReceive> selectTEventReceiveList(TEventReceive tEventReceive)
     {
-        return tEventReceiveMapper.selectTEventReceiveList(tEventReceive);
+        List<TEventReceive> list = tEventReceiveMapper.selectTEventReceiveList(tEventReceive);
+        for (TEventReceive t:list){
+            TEventHandle h = tEventHandleMapper.selectByLast(t.getId());
+            t.setHandleList(h);
+        }
+        return list;
     }
 
     /**

gassafetyprogress-system/src/main/resources/mapper/system/TEventHandleMapper.xml

@@ -102,4 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{handleId}
         </foreach>
     </delete>
+    <select id="selectByLast" resultMap="TEventHandleResult">
+        SELECT * FROM t_event_handle WHERE is_del=0 and event_id =#{eventId}
+        order by create_time desc limit 1
+    </select>
 </mapper>
\ No newline at end of file

gassafetyprogress-web/src/components/bigWindow/Cz.vue

@@ -76,11 +76,11 @@
           >
             {{ deviceData.stationAddr || "-" }}
           </div>
-          <div v-else>-</div>
+          <div v-else class="right last zzz">-</div>
         </div>
       </div>
       <div class="top-right">
-        
+
         <el-image
           v-if="deviceData.pictureAddress"
           style="width: 100px; height: 100px"
@@ -237,7 +237,7 @@ export default {
   background-color: rgba(9, 18, 32, 0.6);
   padding: 10px;
   position: relative;
-  width: 600px;
+  width: 500px;
   .title {
     // padding-top: 10px;
     // padding-left: 10px;
@@ -258,7 +258,7 @@ export default {
     border: 1px solid #cccccc;
     box-sizing: border-box;
     .top-left {
-      flex: 1;
+      flex: 1.8;
       .group {
         height: 40px;
         flex: 1;
@@ -283,6 +283,9 @@ export default {
           text-align: right;
           background-color: rgba(255, 255, 255, 0.1);
         }
+        .right {
+          flex:2;
+        }
       }
     }
     .top-right {

gassafetyprogress-web/src/components/bigWindow/Device.vue

@@ -50,7 +50,7 @@
         </div>
       </div>
       <div class="top-right">
-        
+
         <el-image
           v-if="deviceData.iconUrl"
           style="width: 100px; height: 100px"
@@ -220,7 +220,7 @@ export default {
   background-color: rgba(9, 18, 32, 0.6);
   padding: 10px;
   position: relative;
-  width: 600px;
+  width: 500px;
   .title {
     // padding-top: 10px;
     // padding-left: 10px;
@@ -241,7 +241,7 @@ export default {
     border: 1px solid #cccccc;
     box-sizing: border-box;
     .top-left {
-      flex: 1;
+      flex: 1.8;
       .group {
         height: 40px;
         flex: 1;
@@ -266,6 +266,9 @@ export default {
           text-align: right;
           background-color: rgba(255, 255, 255, 0.1);
         }
+        .right {
+          flex:2;
+        }
       }
     }
     .top-right {

gassafetyprogress-web/src/components/emergency/Timeline.vue

 <template>
   <ul class="timeline-wrapper">
-    <li class="timeline-item" >
+    <li class="timeline-item" style="margin-top: 10px;">
       <div class="timeline-box">
         <div class="out-circle">
           <div class="in-circle"></div>
@@ -10,7 +10,7 @@
       <div class="timeline-content">
         <div class="timeline-date el-form-div">
           <div style="width: 180px">{{nowItem.createTime}}</div>
-          <div >事件发布</div>
+          <div class="classType">事件发布</div>
         </div>
         <div class="timeline-title">{{ nowItem.eventName}}</div>
         <div class="timeline-title">地址：{{ nowItem.address}}</div>
@@ -26,8 +26,8 @@
       <div class="timeline-content">
         <div class="timeline-date el-form-div">
           <div style="width: 180px">{{t.createTime}}</div>
-          <div  v-if="t.eventType==2">预案指引</div>
-          <div v-if="t.eventType==1">信息处置</div>
+          <div class="classType"  v-if="t.eventType==2">预案指引</div>
+          <div class="classType" v-if="t.eventType==1">信息处置</div>
         </div>
         <div class="timeline-title">{{ t.management}}</div>
         <div class="timeline-desc">
@@ -82,6 +82,7 @@
   /* 时间线 */
   .timeline-item {
     position: relative;
+    min-height: 10px;
 
     .timeline-box {
       text-align: center;
@@ -109,7 +110,7 @@
 
       .long-line {
         width: 1px;
-        height: 98px;
+        min-height: 98px;
         background: #000000;
         box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
         opacity: 0.5;
@@ -120,15 +121,15 @@
     .timeline-content {
       box-sizing: border-box;
       margin-left: 20px;
-      height: 86px;
+      min-height: 86px;
       padding: 6px 0 0 20px;
       text-align: left;
-      margin-bottom: 30px;
+      margin-bottom: 10px;
 
       .timeline-title {
         font-size: 15px;
         word-break: break-all;
-        margin-bottom: 16px;
+        margin-bottom: 5px;
         color: #000000;
         font-weight: 500;
         /*display: inline;*/
@@ -138,7 +139,7 @@
         font-size: 13px;
         color: #000000;
         font-weight: 500;
-        margin-bottom: 16px;
+        margin-bottom: 5px;
       }
       .timeline-desc {
         font-size: 14px;
@@ -162,4 +163,10 @@
   .timeline-item:last-of-type .timeline-content {
     margin-bottom: 0;
   }
+  .classType{
+    border: 1px solid #1c84c6;
+    background: #1c84c6;
+    color: white;
+    border-radius: 3px;
+  }
 </style>

gassafetyprogress-web/src/components/emergency/rightBar.vue

@@ -23,7 +23,7 @@
           <div v-if="item.status==4" style="width: 80%;margin-left: 5px;">已完结</div>
           <div style="height:30px;color: red;cursor:pointer;" v-if="userType==-2" @click="handleDelete(item.id)">关闭事件</div>
         </div>
-        <div class="content-div el-form-div" style="margin-top: -5px;overflow:hidden;">
+        <div class="content-div el-form-div" style="margin-top: 10px;overflow:hidden;">
             <div style="width: 65%; white-space:nowrap;
             text-overflow:ellipsis;
             -o-text-overflow:ellipsis;
@@ -35,7 +35,7 @@
           <div>事件级别：{{item.eventGradeName}}</div>
         </div>
         <div class="content-div">事件地点：{{item.address}}</div>
-        <div class="content-div">最新进展：</div>
+        <div class="content-div">最新进展：<span v-if="item.handleList!=null">{{item.handleList.management}}</span></div>
         <div class="el-form-div">
           <div v-if="item.status==1 && userType==-2" class="button-div" @click="assignTask(item)">任务指派</div>
           <div v-if="userType==-2" class="button-div" @click="showList(item)" >预案指引</div>
@@ -355,6 +355,7 @@ export default {
         //console.log("ggg"+item.eventGrade, this.eventGradeOptions[item.eventGrade-1].dictLabel)
          item.eventGradeName = this.eventGradeOptions[item.eventGrade-1].dictLabel;
          item.eventTypeName = this.eventTypeOptions[item.eventType-1].dictLabel;
+         console.log(item)
       });
         //this.total = response.total;
       //console.log(this.receiveList)
@@ -365,7 +366,9 @@ export default {
       this.loading = true;
       listHandle(this.queryParams2).then(response => {
         this.handleList = response.rows;
-        this.form = this.handleList[this.handleList.length-1]
+        if(this.handleList.length>0){
+          this.form = this.handleList[this.handleList.length-1]
+        }
         this.total = response.total;
         this.loading = false;
       //document.getElementsByClassName("num-div")[this.handleList.length].setAttribute("class","num-div2")
@@ -551,12 +554,12 @@ export default {
       that.queryParams2.pageSize=100;
           await listHandle(that.queryParams2).then(response => {
               this.handleList = response.rows;
-              if(response.total==0){
-                this.msgSuccess("暂无详情");
-              }else{
+              // if(response.total==0){
+              //   this.msgSuccess("暂无详情");
+              // }else{
                 document.getElementById("detail").style.display="";
                 that.updateRead(id);
-              }
+              //}
         });
     },
     closeDetail(id,event){
@@ -658,8 +661,8 @@ export default {
   .content-div{
     color: #000000;
     font-size: 30;
-    height: 40px;
-    line-height: 50px;
+    height: 30px;
+    line-height: 30px;
     margin-left: 10px;
   }
 .el-form-div{
@@ -690,8 +693,9 @@ export default {
     border-bottom: 2px solid #1c84c6;
     border-top: 1px solid #1c84c6;
     height: 30px;
-    color: #000;
+    color: #ffffff;
     line-height: 30px;
+    background: #74BCFF;
   }
 .test-5::-webkit-scrollbar {
   /*滚动条整体样式*/

gassafetyprogress-web/src/permission.js

@@ -14,12 +14,14 @@ router.beforeEach((to, from, next) => {
   NProgress.start();
   // 如果cookie里有token
   if (getToken()) {
+
     /* has token*/
     // 如果要去login，就直接去默认页面
     if (to.path === "/login") {
       next({ path: "/" });
       NProgress.done();
     } else {
+      console.log("有");
       // 如果没有获得当前用户的所有信息
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息

gassafetyprogress-web/src/utils/mapClass/yjmap.js

@@ -735,7 +735,7 @@ export class EditorMap {
     }
   }
   setZoomAndCenter(longitude,latitude){
-    this.map.setZoomAndCenter(14, [longitude*1+0.02,latitude]);
+    this.map.setZoomAndCenter(14.5, [longitude*1+0.02,latitude]);
   }
   // 普通调用方法
   // 设备报警

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/TopCard.vue

 <!--
  * @Author: your name
  * @Date: 2022-03-25 13:46:23
- * @LastEditTime: 2022-03-25 17:18:05
+ * @LastEditTime: 2022-04-09 10:38:14
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData.vue
@@ -30,15 +30,27 @@
 
         <div class="middle flex">
           <div class="first">正常</div>
-          <div>高爆</div>
-          <div>低爆</div>
+          <!-- 2是探测器，探测器只有报警，没有高低报 -->
+          <template v-if="index != 2">
+            <div>高报</div>
+            <div>低报</div>
+          </template>
+          <template v-else>
+            <div>报警</div>
+          </template>
           <div class="last">离线数</div>
         </div>
 
         <div class="bottom flex">
           <div class="first">1234</div>
-          <div>1234</div>
-          <div>1231</div>
+          <!-- 2是探测器，探测器只有报警，没有高低报 -->
+          <template v-if="index != 2">
+            <div>123321</div>
+            <div>12321</div>
+          </template>
+          <template v-else>
+            <div>12312</div>
+          </template>
           <div class="last">534534</div>
         </div>
       </div>
@@ -49,10 +61,10 @@
 <script>
 export default {
   name: "charsData",
-  props:{
-    cardList:{
-      type:Array,
-    }
+  props: {
+    cardList: {
+      type: Array,
+    },
   },
   data() {
     return {
@@ -63,9 +75,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .top-card {
-  margin-bottom:22px;
+  margin-bottom: 22px;
   & > div {
     flex: 1;
     margin-right: 20px;
@@ -141,6 +152,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-
-
 </style>
\ No newline at end of file