dedsudiyu hace 2 años
padre
commit
297ccd6975

BIN
src/assets/ZDimages/bigData3_2/icon_znjc_jq_yc.png


BIN
src/assets/ZDimages/bigData3_2/icon_znjc_jq_zc.png


BIN
src/assets/ZDimages/subject/icon_syspz_jiaquan.png


+ 1 - 1
src/layout/components/AppMain.vue

@@ -234,7 +234,7 @@ export default {
           this.$set(this,'textType',true);
           this.$set(this,'textType',true);
           //没有火焰预案并且没有查看过
           //没有火焰预案并且没有查看过
           for(let i=0;i<response.data.length;i++){
           for(let i=0;i<response.data.length;i++){
-            if(response.data[i].riskAttribute != '1'&&response.data[i].ifcheck != '1'){
+            if(response.data[i].riskAttribute != '1'&&response.data[i].ifCheck != '1'){
               //如果就在应急预案页面责终止跳转
               //如果就在应急预案页面责终止跳转
               if(self.$route.path == '/emergencyManagement/evacuation/newPerformEvacuation' || self.$route.path == '/newEvacuationBigData'){
               if(self.$route.path == '/emergencyManagement/evacuation/newPerformEvacuation' || self.$route.path == '/newEvacuationBigData'){
                 return
                 return

+ 1 - 0
src/views/comprehensive/laboratoryManagement/subject/index.vue

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

+ 7 - 1
src/views/newEvacuationBigData.vue

@@ -601,7 +601,7 @@
       setRiskPlanId(id){
       setRiskPlanId(id){
         let obj = {
         let obj = {
           groupId:id,
           groupId:id,
-          ifcheck:1,
+          ifCheck:1,
         };
         };
         riskPlanId(obj).then(response => {})
         riskPlanId(obj).then(response => {})
       },
       },
@@ -2125,6 +2125,8 @@
           guangqi_yc : require('@/assets/ZDimages/bigData3_2/icon_yygb_gq_yc.png'),
           guangqi_yc : require('@/assets/ZDimages/bigData3_2/icon_yygb_gq_yc.png'),
           lvqi_zc : require('@/assets/ZDimages/bigData3_2/icon_znjc_lq.png'),
           lvqi_zc : require('@/assets/ZDimages/bigData3_2/icon_znjc_lq.png'),
           lvqi_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_lq_yc.png'),
           lvqi_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_lq_yc.png'),
+          jiaquan_zc : require('@/assets/ZDimages/bigData3_2/icon_znjc_jq_zc.png'),
+          jiaquan_yc : require('@/assets/ZDimages/bigData3_2/icon_znjc_jq_yc.png'),
           nullClass : require('@/assets/ZDimages/evacuation3_2/icon_znwl_sybz.png'),
           nullClass : require('@/assets/ZDimages/evacuation3_2/icon_znwl_sybz.png'),
           });
           });
         }
         }
@@ -2198,6 +2200,10 @@
               obj.zcImg = this.sensorIconData.lvqi_zc;
               obj.zcImg = this.sensorIconData.lvqi_zc;
               obj.ycImg = this.sensorIconData.lvqi_yc;
               obj.ycImg = this.sensorIconData.lvqi_yc;
               break;
               break;
+            case 'jiaquan':
+              obj.zcImg = this.sensorIconData.jiaquan_zc;
+              obj.ycImg = this.sensorIconData.jiaquan_yc;
+              break;
             default:
             default:
               obj.zcImg = this.sensorIconData.nullClass;
               obj.zcImg = this.sensorIconData.nullClass;
               obj.ycImg = this.sensorIconData.nullClass;
               obj.ycImg = this.sensorIconData.nullClass;