Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

src/views/oneKeyOutfire/planExecuteRecord/planExecuteRecordDetail.vue

@@ -35,7 +35,7 @@
             <li v-for="(item,index3) in msgsPush" :key="index3">
               <i>{{item.createTimeStr}}</i>
               <i>{{item.pushType.code==0?'语音播报':'短信推送'}}</i>
-              <i>{{item.showInfo}}</i></li>
+              <i>{{item.recipientName}}</i></li>
           </div>
         </div>
       </div>
@@ -47,7 +47,9 @@
               <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 !='风险解除'"> {{item.riskPlanName}} ({{item.riskPlanLevelName}})</p>
+                <p v-if="(item.riskStatus==1||item.riskStatus==2) && item.riskPlanName =='风险解除'"> {{item.riskPlanName}}</p>
+
                 <p v-if="(item.riskStatus!=1&& item.riskStatus!=2)">{{item.riskPlanName}}</p>
                 <p class="sensor_val">{{item.sensorJsonName}}：<i class="color: #FF3131;">{{item.sensorJsonValue}}</i></p>
                 <p class="sensor_timer">时间：<i>{{item.createTime}}</i></p>