应急处置修改

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

 <template>
   <ul class="timeline-wrapper">
+    <li class="timeline-item" >
+      <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 el-form-div">
+          <div style="width: 180px">{{nowItem.createTime}}</div>
+          <div >事件发布</div>
+        </div>
+        <div class="timeline-title">{{ nowItem.eventName}}</div>
+        <div class="timeline-title">地址：{{ nowItem.address}}</div>
+      </div>
+    </li>
     <li class="timeline-item" v-for="t in timelineList" :key="t.id">
       <div class="timeline-box">
         <div class="out-circle">
@@ -8,7 +24,11 @@
         <div class="long-line"></div>
       </div>
       <div class="timeline-content">
-        <div class="timeline-date">{{t.createTime}}</div>
+        <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>
         <div class="timeline-title">{{ t.management}}</div>
         <div class="timeline-desc">
             <span
@@ -36,8 +56,8 @@
         default: () => {
           return []
         }
-      }
-
+      },
+      nowItem:{}
     },
     methods: {
       checkFile(url) {
@@ -53,7 +73,12 @@
     margin: 0;
     padding: 0;
   }
-
+  .el-form-div{
+    display:flex;
+    flex-direction:row;
+    justify-content:flex-start;
+    width: 100%;
+  }
   /* 时间线 */
   .timeline-item {
     position: relative;

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

@@ -114,9 +114,9 @@
       >
         <img
           :src="item.imgurl"
-          style="margin-top: 6px;float: left; margin-right: 3px;width: 18px;height: 18px;margin-left: 10px;"
+          style="margin-top: 8px;float: left; margin-right: 3px;width: 18px;height: 18px;margin-left: 10px;"
         />
-        {{ item.name }}
+        {{ item.name }} ({{ item.num }})
       </div>
     </div>
 
@@ -365,36 +365,42 @@ export default {
       arr2: [
         {
           val: 10,
+          num:0,
           ischeck: false,
           imgurl: require("@/assets/image/yj-jydw.png"),
           name: "救援队伍",
         },
         {
           val: 11,
+          num:0,
           ischeck: false,
           imgurl: require("@/assets/image/yj-wz.png"),
           name: "救援物资",
         },
         {
           val: 12,
+          num:0,
           ischeck: false,
           imgurl: require("@/assets/image/yj-cl.png"),
           name: "救援车辆",
         },
         {
           val: 13,
+          num:0,
           ischeck: false,
           imgurl: require("@/assets/image/yj-yy.png"),
           name: "医 院",
         },
         {
           val: 15,
+          num:0,
           ischeck: false,
           imgurl: require("@/assets/image/yj-xf.png"),
           name: "消防队伍",
         },
         {
           val: 16,
+          num:0,
           ischeck: false,
           imgurl: require("@/assets/image/yj-xj.png"),
           name: "巡检人员",
@@ -536,6 +542,12 @@ export default {
         listDevice(params).then(response => {
           response.rows.forEach((item) => {
               item.iconType = item.deviceType+9;
+              if(item.deviceType<5){
+                this.arr2[item.deviceType-1].num++;
+              }else {
+                this.arr2[item.deviceType-2].num++;
+              }
+
           });
           this.deviceList = response.rows;
           //console.log(this.deviceList)
@@ -1009,7 +1021,7 @@ export default {
 .typelist-div {
   width: 450px;
   height: 50px;
-  z-index: 9999;
+  z-index: 999;
   position: fixed;
   top: 0;
   margin-top: 80px;
@@ -1017,16 +1029,17 @@ export default {
 }
 .typelist-div2{
   width: 150px;
-  height: 50px;
-  z-index: 9999;
+  height: 230px;
+  z-index: 999;
   position: fixed;
   margin-top: 80px;
   margin-left: 10px;
+  background: white;
+  margin-left: 15px;
 }
 .list {
   z-index: 9999;
   float: left;
-  margin-left: 15px;
   color: #000000;
   line-height: auto;
   background: #ffffff;