应急处置消息，应急处置预案、处置信息修改

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

@@ -24,6 +24,9 @@ public class TEventHandle extends BaseEntity
     @Excel(name = "事件id")
     private Long eventId;
 
+    @Excel(name = "类型")
+    private Integer eventType;
+
     /** 企业id */
     @Excel(name = "企业id")
     private Long enterpriseId;
@@ -56,9 +59,27 @@ public class TEventHandle extends BaseEntity
     @Excel(name = "指导时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date guidanceTime;
 
+
+    private Integer readStatus;
     /** 0未删除 1已删除 */
     private Integer isDel;
 
+    public Integer getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(Integer eventType) {
+        this.eventType = eventType;
+    }
+
+    public Integer getReadStatus() {
+        return readStatus;
+    }
+
+    public void setReadStatus(Integer readStatus) {
+        this.readStatus = readStatus;
+    }
+
     public String getPlanTitle() {
         return planTitle;
     }

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

@@ -70,11 +70,30 @@ public class TEventReceive extends BaseEntity
     /** 备注 */
     private String remarks;
 
+    private Integer companyRead;
+
+    private Integer  governmentRead;
     /** 0未删除 1已删除 */
     private Integer isDel;
     @Excel(name = "状态")
     private Integer status;
 
+    public Integer getCompanyRead() {
+        return companyRead;
+    }
+
+    public void setCompanyRead(Integer companyRead) {
+        this.companyRead = companyRead;
+    }
+
+    public Integer getGovernmentRead() {
+        return governmentRead;
+    }
+
+    public void setGovernmentRead(Integer governmentRead) {
+        this.governmentRead = governmentRead;
+    }
+
     public void setId(Integer id)
     {
         this.id = id;

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TEventHandle" id="TEventHandleResult">
         <result property="handleId"    column="handle_id"    />
         <result property="eventId"    column="event_id"    />
+        <result property="eventType"    column="event_type"    />
         <result property="enterpriseId"    column="enterprise_id"    />
         <result property="enterpriseName"    column="enterprise_name"    />
         <result property="management"    column="management"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTEventHandleVo">
-        select handle_id, event_id, enterprise_id, enterprise_name, management,management_event, plan_id,plan_title,plan_url, guidance_opinion, guidance_time, is_del, create_time from t_event_handle
+        select handle_id, event_id,event_type, enterprise_id, enterprise_name, management,management_event, plan_id,plan_title,plan_url, guidance_opinion, guidance_time, is_del, create_time from t_event_handle
     </sql>
 
     <select id="selectTEventHandleList" parameterType="TEventHandle" resultMap="TEventHandleResult">
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_event_handle
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="eventId != null">event_id,</if>
+            <if test="eventType != null">event_type,</if>
             <if test="enterpriseId != null">enterprise_id,</if>
             <if test="enterpriseName != null">enterprise_name,</if>
             <if test="management != null">management,</if>
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="eventId != null">#{eventId},</if>
+            <if test="eventType != null">#{eventType},</if>
             <if test="enterpriseId != null">#{enterpriseId},</if>
             <if test="enterpriseName != null">#{enterpriseName},</if>
             <if test="management != null">#{management},</if>
@@ -72,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_event_handle
         <trim prefix="SET" suffixOverrides=",">
             <if test="eventId != null">event_id = #{eventId},</if>
+            <if test="eventType != null">event_type = #{eventType},</if>
             <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
             <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
             <if test="management != null">management = #{management},</if>

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

@@ -20,12 +20,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enterpriseId"    column="enterprise_id"    />
         <result property="enterpriseName"    column="enterprise_name"    />
         <result property="remarks"    column="remarks"    />
+        <result property="companyRead"    column="company_read"    />
+        <result property="governmentRead"    column="government_read"    />
         <result property="isDel"    column="is_del"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectTEventReceiveVo">
-        select id, event_name, event_type, event_grade, address, longitude, latitude, informant, infor_time, informant_phone, `describe`, `status`,enterprise_id, enterprise_name, remarks, is_del, create_time from t_event_receive
+        select id, event_name, event_type, event_grade, address, longitude, latitude,
+         company_read,government_read,informant, infor_time, informant_phone, `describe`, `status`,enterprise_id, enterprise_name, remarks, is_del, create_time from t_event_receive
     </sql>
 
     <select id="selectTEventReceiveList" parameterType="TEventReceive" resultMap="TEventReceiveResult">
@@ -36,6 +39,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="eventGrade != null "> and event_grade = #{eventGrade}</if>
             <if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
             <if test="status != null and status!=5"> and status = #{status}</if>
+            <if test="companyRead != null"> and company_read = #{companyRead}</if>
+            <if test="governmentRead != null"> and government_read = #{governmentRead}</if>
             <if test="status ==5"> and status !=4 </if>
             and is_del = 0
         </where>
@@ -65,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null">enterprise_id,</if>
             <if test="enterpriseName != null">enterprise_name,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="companyRead != null">company_read,</if>
+            <if test="governmentRead != null">government_read,</if>
             <if test="isDel != null">is_del,</if>
             <if test="createTime != null">create_time,</if>
          </trim>
@@ -84,6 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null">#{enterpriseId},</if>
             <if test="enterpriseName != null">#{enterpriseName},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="companyRead != null">#{companyRead},</if>
+            <if test="governmentRead != null">#{governmentRead},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="createTime != null">#{createTime},</if>
          </trim>
@@ -106,6 +115,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
             <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="companyRead != null">company_read = #{companyRead},</if>
+            <if test="governmentRead != null">government_read = #{governmentRead},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
         </trim>

gassafetyprogress-web/src/components/FileUpload/index.vue

@@ -5,6 +5,7 @@
       :before-upload="handleBeforeUpload"
       :file-list="fileArr"
       :limit="1"
+      :fileType="fileType"
       :list-type="listType"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"

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

+<template>
+  <ul class="timeline-wrapper">
+    <li class="timeline-item" v-for="t in timelineList" :key="t.id">
+      <div class="timeline-box">
+        <div class="out-circle">
+          <div class="in-circle"></div>
+        </div>
+        <div class="long-line"></div>
+      </div>
+      <div class="timeline-content">
+        <div class="timeline-date">{{t.createTime}}</div>
+        <div class="timeline-title">{{ t.management}}</div>
+        <div class="timeline-desc">
+            <span
+              class="dbtn"
+              @click="checkFile(t.managementEvent)"
+              v-if="t.managementEvent != null && t.managementEvent!=''"
+            >
+              <i class="el-icon el-icon-view"></i>查看/下载
+            </span>
+            <span v-else>-</span>
+        </div>
+      </div>
+    </li>
+  </ul>
+
+</template>
+
+<script type="text/babel">
+  import Vue from 'vue'
+  export default Vue.component('Timeline',{
+    name: "Timeline",
+    props: {
+      timelineList: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      }
+
+    },
+    methods: {
+      checkFile(url) {
+        window.open(url,'_blank');
+      },
+    }
+  })
+</script>
+
+<style scoped lang="scss">
+  ul.timeline-wrapper {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  /* 时间线 */
+  .timeline-item {
+    position: relative;
+
+    .timeline-box {
+      text-align: center;
+      position: absolute;
+
+      .out-circle {
+        width: 16px;
+        height: 16px;
+        background: rgba(14, 116, 218, 0.1);
+        box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
+        /*opacity: 0.1;*/
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+
+        .in-circle {
+          width: 12px;
+          height: 12px;
+          margin: 0 auto;
+          background: rgba(14, 116, 218, 1);
+          border-radius: 50%;
+          box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
+        }
+      }
+
+      .long-line {
+        width: 2px;
+        height: 98px;
+        background: #ffffff;
+        box-shadow: 0px 4px 12px 0px rgba(0, 0, 0, 0.1);
+        opacity: 0.5;
+        margin-left: 8px;
+      }
+    }
+
+    .timeline-content {
+      box-sizing: border-box;
+      margin-left: 20px;
+      height: 86px;
+      padding: 0 0 0 20px;
+      text-align: left;
+      margin-bottom: 30px;
+
+      .timeline-title {
+        font-size: 14px;
+        word-break: break-all;
+        margin-bottom: 16px;
+        color: #d9d9d9;
+        font-weight: 500;
+        /*display: inline;*/
+      }
+
+      .timeline-date {
+        font-size: 16px;
+        color: #dfe4ed;
+        font-weight: 500;
+        margin-bottom: 16px;
+      }
+      .timeline-desc {
+        font-size: 14px;
+        color: #30b46b;
+      }
+    }
+
+  }
+
+  .dbtn {
+    display: inline-block;
+    line-height: normal;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: pointer;
+    border-radius: 3px;
+    border-style: solid;
+    border-width: 0;
+    color: rgb(48, 180, 107);
+  }
+  .timeline-item:last-of-type .timeline-content {
+    margin-bottom: 0;
+  }
+</style>

gassafetyprogress-web/src/layout/components/Navbar.vue

@@ -7,6 +7,9 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+        <div class="right-menu-item" v-if="total>0" @click="$router.push('/emergency/emergency')">
+          <img src="@/assets/xiaoxi.png" :hidden="xiaohidden" style="height: 40px;width: 40px;margin-top: 5px;cursor: pointer;">
+        </div>
         <search id="header-search" class="right-menu-item" />
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -46,7 +49,8 @@ import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
-
+import { getUserProfile } from "@/api/system/user";
+import { listReceive } from "@/api/system/receive";
 export default {
   components: {
     Breadcrumb,
@@ -56,6 +60,13 @@ export default {
     SizeSelect,
     Search
   },
+  data() {
+    return {
+      userType:-2,
+      total:0,
+      xiaohidden:false,
+    }
+  },
   computed: {
     ...mapGetters([
       'sidebar',
@@ -79,6 +90,37 @@ export default {
       }
     }
   },
+mounted(){
+      getUserProfile().then(response => {
+        this.userType = response.data.deptId;
+      });
+    //定时检测新消息
+    setInterval(() => {
+            var params = {
+                  pageNum: 1,
+                    pageSize: 100,
+                    status:5,
+                    enterpriseId:this.userType
+                };
+          if(this.userType==-2){
+            params.governmentRead=0
+          }else {
+            params.companyRead=0
+          }
+          listReceive(params).then(response => {
+              //console.log("total==",response.total);
+              this.total= response.total;
+          });
+      }, 5000);
+      setInterval(() => {
+        if(this.xiaohidden){
+          this.xiaohidden = false
+        }else{
+          this.xiaohidden = true
+        }
+
+      },500);
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
@@ -137,7 +179,6 @@ export default {
     float: right;
     height: 100%;
     line-height: 50px;
-
     &:focus {
       outline: none;
     }

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

@@ -32,10 +32,12 @@ export const svgUrl = {
   7: require("@/assets/image/zrxk.svg"),
   8: require("@/assets/image/zcrq.svg"),
   9: require("@/assets/image/car.png"),
-  10: require("@/assets/mapImages/mark02.png"),
-  11: require("@/assets/mapImages/mark03.png"),
-  12: require("@/assets/mapImages/mark04.png"),
-  13: require("@/assets/mapImages/mark01.png"),
+  10: require("@/assets/image/yj-jydw.png"),
+  11: require("@/assets/image/yj-wz.png"),
+  12: require("@/assets/image/yj-cl.png"),
+  13: require("@/assets/image/yj-yy.png"),
+  14: require("@/assets/image/yj-xf.png"),
+  15: require("@/assets/image/yj-xj.png"),
 };
 export const svgAlarm = {
   2: require("@/assets/mapImages/tyxAlarm.svg"),

gassafetyprogress-web/src/views/emergency/index.vue

@@ -333,27 +333,39 @@ export default {
         {
           val: 10,
           ischeck: false,
-          imgurl: require("@/assets/image/tyxsub.svg"),
+          imgurl: require("@/assets/image/yj-jydw.png"),
           name: "救援队伍",
         },
         {
           val: 11,
           ischeck: false,
-          imgurl: require("@/assets/image/fmjsub.svg"),
+          imgurl: require("@/assets/image/yj-wz.png"),
           name: "救援物资",
         },
         {
           val: 12,
           ischeck: false,
-          imgurl: require("@/assets/image/czsub.svg"),
+          imgurl: require("@/assets/image/yj-cl.png"),
           name: "救援车辆",
         },
         {
           val: 13,
           ischeck: false,
-          imgurl: require("@/assets/image/usersub.svg"),
+          imgurl: require("@/assets/image/yj-yy.png"),
           name: "医 院",
         },
+        {
+          val: 14,
+          ischeck: false,
+          imgurl: require("@/assets/image/yj-xf.png"),
+          name: "消防队伍",
+        },
+        {
+          val: 15,
+          ischeck: false,
+          imgurl: require("@/assets/image/yj-xj.png"),
+          name: "巡检人员",
+        },
       ],
       selarr1: [],
       // 用户的center数据