Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress

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/leftBar.vue

@@ -63,8 +63,8 @@
     <div class="pietwo">
       <div id="myChartpietwo" :style="{width: '225px', height: '250px'}"></div>
       <div class="titleTex">
-       <span :style="{color: '#00ffff'}"> ● 已完成:{{allNum.typeOne}}</span>
-       <span :style="{color: '#0099ff'}"> ● 未完成:{{allNum.typeTwo}}</span>
+       <span :style="{color: '#00ffff'}"> ● 已完成:0</span>
+       <span :style="{color: '#0099ff'}"> ● 未完成:0</span>
       </div>
     </div>
 

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;
+        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/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/system/info/index.vue

@@ -125,20 +125,20 @@
           <span v-if="scope.row.hiddenTroubleDealStatus == 3" style="color: #30B46B">已完成</span>
         </template>
       </el-table-column>
-      <el-table-column label="隐患处理情况" align="center" prop="hiddenTroubleDealCondition" >
-        <span slot-scope="scope" v-if="scope.row.hiddenTroubleDealCondition">{{scope.row.hiddenTroubleDealCondition}}</span>
-        <span v-else>-</span>
-      </el-table-column>
-      <el-table-column label="隐患处理完成时间" align="center" prop="hiddenTroubleDealFinishTime" width="180">
-        <template slot-scope="scope">
-          <span v-if="scope.row.hiddenTroubleDealFinishTime">{{ parseTime(scope.row.hiddenTroubleDealFinishTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" >
-        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>
-        <span v-else>-</span>
-      </el-table-column>
+<!--      <el-table-column label="隐患处理情况" align="center" prop="hiddenTroubleDealCondition" >-->
+<!--        <span slot-scope="scope" v-if="scope.row.hiddenTroubleDealCondition">{{scope.row.hiddenTroubleDealCondition}}</span>-->
+<!--        <span v-else>-</span>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="隐患处理完成时间" align="center" prop="hiddenTroubleDealFinishTime" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.hiddenTroubleDealFinishTime">{{ parseTime(scope.row.hiddenTroubleDealFinishTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>-->
+<!--          <span v-else>-</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="备注" align="center" prop="remarks" >-->
+<!--        <span slot-scope="scope" v-if="scope.row.remarks">{{scope.row.remarks}}</span>-->
+<!--        <span v-else>-</span>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -309,33 +309,33 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="11">
-            <el-form-item label="隐患处理完成时间" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealFinishTime">
-              <el-date-picker clearable size="small"
-                              v-model="form.hiddenTroubleDealFinishTime"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="选择隐患处理完成时间">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="11">-->
+<!--            <el-form-item label="隐患处理完成时间" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealFinishTime">-->
+<!--              <el-date-picker clearable size="small"-->
+<!--                              v-model="form.hiddenTroubleDealFinishTime"-->
+<!--                              type="datetime"-->
+<!--                              value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                              placeholder="选择隐患处理完成时间">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
 
-        <el-row>
-          <el-col :span="22">
-            <el-form-item label="隐患处理情况" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealCondition">
-              <el-input v-model="form.hiddenTroubleDealCondition" type="textarea" placeholder="请输入隐患处理情况" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="22">-->
+<!--            <el-form-item label="隐患处理情况" v-if="form.hiddenTroubleDealStatus==3" prop="hiddenTroubleDealCondition">-->
+<!--              <el-input v-model="form.hiddenTroubleDealCondition" type="textarea" placeholder="请输入隐患处理情况" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
-        <el-row>
-          <el-col :span="22">
-            <el-form-item label="备注" prop="remarks">
-              <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="22">-->
+<!--            <el-form-item label="备注" prop="remarks">-->
+<!--              <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
 
       </el-form>