Merge branch 'web-v2' into web-v2-pro

src/api/laboratory/subject.js

@@ -393,7 +393,7 @@ export function abnormalLogOrderByList(query) {
 //消息推送记录
 export function viewWarnMessage(query) {
   return request({
-    url: '/laboratory/bigview/'+query+'/warn/message',
+    url: '/laboratory/bigview/'+query+'/warn/getRiskLog',
     method: 'get',
   })
 }

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -118,6 +118,7 @@
                     <img src="@/assets/ZDimages/subject/guangqi.png" v-if="item.funNum == 'guangqi'">
                     <img src="@/assets/ZDimages/subject/lvqi.png" v-if="item.funNum == 'lvqi'">
                     <img src="@/assets/ZDimages/subject/icon_syspz_jiaquan.png" v-if="item.funNum == 'jiaquan'">
+                    <img src="@/assets/ZDimages/subject/icon_syspz_hwcw.png" v-if="item.funNum == 'hwcwy'">
                     <div>
                       <el-tooltip class="item" effect="dark" :content="item.describe" placement="bottom">
                         <p>{{item.describe|ellipsis}}</p>

src/views/newEvacuationBigData.vue

@@ -2205,6 +2205,8 @@
           jiaquan_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_jq_yc.png'),
           huoyan_zc : require('@/assets/ZDimages/bigData3_2/icon_zdmh_hyjc_zc.png'),
           huoyan_yc : require('@/assets/ZDimages/bigData3_2/icon_zdmh_hyjc_yc.png'),
+          hwcw_zc : require('@/assets/ZDimages/bigData3_2/icon_znjc_hwcw.png'),
+          hwcw_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_hwcw_yc.png'),
           nullClass : require('@/assets/ZDimages/evacuation3_2/icon_znwl_sybz.png'),
           });
         }
@@ -2287,6 +2289,10 @@
               obj.zcImg = this.sensorIconData.huoyan_zc;
               obj.ycImg = this.sensorIconData.huoyan_yc;
               break;
+            case 'hwcwy':
+              obj.zcImg = this.sensorIconData.hwcw_zc;
+              obj.ycImg = this.sensorIconData.hwcw_yc;
+              break;
             default:
               obj.zcImg = this.sensorIconData.nullClass;
               obj.ycImg = this.sensorIconData.nullClass;

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -33,7 +33,7 @@
           <div class="small_title">消息推送记录</div>
           <div class="addPage_b_t_r_b" v-if="msgsPush.length>0">
             <li v-for="(item,index3) in msgsPush" :key="index3">
-              <i>{{item.createTime}}</i>
+              <i>{{item.createTimeStr}}</i>
               <i>{{item.pushType.code==0?'语音播报':'短信推送'}}</i>
               <i>{{item.showInfo}}</i></li>
           </div>
@@ -44,10 +44,15 @@
         <div class="addPage_b_b_b">
           <div class="time-box">
             <ul>
-              <li :class="item.riskStatus==1||item.riskStatus==2?'risk_trend':'hardware'" v-for="(item,index2) in planAxis" :key="index2">
-                <p>发生风险：{{item.riskPlanName}}</p>
+              <li :class="(item.riskStatus==1||item.riskStatus==2)?'risk_trend':'hardware'" v-for="(item,index2) in planAxis" :key="index2">
+                <p v-if="(index2 !=0 && index2 !=planAxis.length-1)" :class="(item.riskStatus==1||item.riskStatus==2)?'dot':'dot_tow'"></p>
+
+                <p v-if="(item.riskStatus==1||item.riskStatus==2)">{{item.riskPlanLevelName}}: {{item.riskPlanName}}</p>
+                <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.riskPlanName}}</p>
                 <p>{{item.sensorJsonName}}：<i>{{item.sensorJsonValue}}</i></p>
                 <p>时间：<i>{{item.createTime}}</i></p>
+
+                <p v-if="index2 !=planAxis.length-1" :class="(item.riskStatus==1||item.riskStatus==2)?'ledgement':'ledgement_tow'"></p>
               </li>
             </ul>
           </div>
@@ -252,9 +257,9 @@ export default {
               font-family: Source Han Sans CN-Regular, Source Han Sans CN;
               font-weight: 400;
               color: #666666;
-              line-height: 14px;
-
+              line-height: 18px;
               display: inline-block;
+              vertical-align: top;
             }
             >i:nth-of-type(1){
               width: 148px;
@@ -276,7 +281,7 @@ export default {
         overflow-y: auto;
         >ul{
           position: relative;
-          height:255px;
+          height:355px;
           white-space: nowrap;
           display: inline-flex;
           >li{
@@ -309,10 +314,28 @@ export default {
               }
             }
           }
+          /*横线*/
+          .ledgement{
+            width:250px;
+            background: #d2d2d2;
+            height: 1px;
+            position: absolute;
+            left:0;
+            bottom:-48%;
+          }
+          .ledgement_tow{
+            width:250px;
+            background: #d2d2d2;
+            height: 1px;
+            position: absolute;
+            left:0;
+            top:-48%;
+          }
           >li:nth-child(2n){
             margin-top:160px;
           }
-          >li:before{
+          /*点*/
+          .dot{
             content: "";
             width: 56px;
             height: 56px;
@@ -322,13 +345,40 @@ export default {
             left:20%;
             margin-left:-64px;
             bottom: 0;
-            bottom:-60px;
+            bottom:-74px;
             z-index: 1;
             border: 20px solid #fff;
           }
-          >li:nth-child(2n):before{
-            bottom: auto;top:-60px;
+          .dot_tow{
+            content: "";
+            width: 56px;
+            height: 56px;
+            border-radius: 28px;
+            background: #0183FA;
+            position: absolute;
+            left:20%;
+            margin-left:-64px;
+            top:-74px;
+            z-index: 1;
+            border: 20px solid #fff;
           }
+          //>li:before{
+          //  content: "";
+          //  width: 56px;
+          //  height: 56px;
+          //  border-radius: 28px;
+          //  background: #0183FA;
+          //  position: absolute;
+          //  left:20%;
+          //  margin-left:-64px;
+          //  bottom: 0;
+          //  bottom:-60px;
+          //  z-index: 1;
+          //  border: 20px solid #fff;
+          //}
+          //>li:nth-child(2n):before{
+          //  bottom: auto;top:-60px;
+          //}
           /*风险趋势*/
           .risk_trend{
 
@@ -337,15 +387,15 @@ export default {
           .hardware{
             margin-top:160px;
           }
-          >li:after{
-            content: "";  display: block; background: #d2d2d2;height: 1px;width: 100%;position: absolute;left:0;bottom:-32%;;
-          }
-          >li:nth-child(2n):after{
-            top:-32%;
-          }
-          >li:last-child:after{
-            content: "";  display: block; background: none;height: 1px;width: 100%;position: absolute;left:0;bottom:-32%;;
-          }
+          //>li:after{
+          //  content: "";  display: block; background: #d2d2d2;height: 1px;width: 100%;position: absolute;left:0;bottom:-32%;
+          //}
+          //>li:nth-child(2n):after{
+          //  top:-32%;
+          //}
+          //>li:last-child:after{
+          //  content: "";  display: block; background: none;height: 1px;width: 100%;position: absolute;left:0;bottom:-32%;
+          //}
           >li:first-child:before{
             content: "";
             width: 26px;