Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap

src/views/PaintShopView/components/verticalNum.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \gitscreenFront\src\views\PaintShopView\components\verticalNum.vue
+ * @FilePath: \screenFront\src\views\PaintShopView\components\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -180,12 +180,14 @@ defineExpose({
   /* position: relative; */
   /* top: -15px; */
 }
+
 .icon-grey {
   color: rgb(167, 166, 189);
   font-size: 100px;
   /* position: relative; */
   /* top: -15px; */
 }
+
 .iconsmall-size {
   font-size: 20px;
 }

src/views/electronicControlAmbient/top.vue

@@ -27,11 +27,7 @@
               </template>
             </border3>
           </div>
-          <chart
+          <chart :title="ductOption.title" :option="ductOption.option" ref="ductref"></chart>
-            :title="ductOption.title"
-            :option="ductOption.option"
-            ref="ductref"
-          ></chart>
         </div>
       </el-col>
     </el-row>
@@ -285,7 +281,7 @@ let temp_humi_index = 0
   let type = []
   let valueduct = []
   for (let key in val.water_pressure) {
-      if(key=='精加车间水暖管道压力43（进水）'){
+    if (key == '电控水暖管道压力(进水)24') {
       // type.push('进水')
       ductOption.option.series[0].data[0].value = val.water_pressure[key]
     } else {

src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront-branches\src\views\realtimeSecurity\content\chart\verticalNum.vue
+ * @FilePath: \screenFront\src\views\realtimeSecurityJixiefenchang\content\chart\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -13,7 +13,7 @@
       <template v-slot>
         <div class="box" ref="classBox1">
           <div class="icontip">
-            <div v-for="items in value.data" style="margin: auto 5px;" v-show="+items.val > +value.quota">
+            <div v-for="items in value.data" style="margin: auto 5px;" v-show="(+items.val > +value.quota)&&item.status">
               <el-popover placement="bottom" :width="250" trigger="hover" effect="dark"
                 :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
                 <ul class="icontipBox">
@@ -49,11 +49,8 @@
           </div>
           <!-- <h2>{{ `${t(item.i18n[0])}${t(item.i18n[1])}`}}</h2> -->
           <h2>{{ item.name}}</h2>
-            <i :class="+item.val > +value.quota
+            <i :class="['iconfont', 'iconbig-size', value.iconname, iconcolor]"></i>
-                ? 'iconfont ' + value.iconname + ' icon-red iconbig-size'
+            <p class="unit" v-if="value.unit&&item.status">
-                : 'iconfont ' + value.iconname + ' icon-blue iconbig-size'
-              "></i>
-            <p class="unit" v-if="value.unit">
               <p class="num">{{item.val}}</p>
               <span>{{ value.unit }}</span>
             </p>
@@ -78,7 +75,17 @@ let props = defineProps<{
 let i =ref(0)
 let item = computed(() => {
   
-  return value.data[i.value]||{"name":"","val":"0","type":"","field":"","ts":0};
+  return value.data[i.value]||{"name":"","val":"0","type":"","field":"","ts":0,"status":false};
+});
+let iconcolor = computed(() => {
+  console.log(value.data[i.value]);
+  //开始进入渲染是没有获取到该数据则需要判断 如果没有则返回空
+  if (value.data[i.value]) {
+    return value.data[i.value].status ? +value.data[i.value].val > +value.quota ? "icon-red" : "icon-blue" : "icon-grey";
+  } else {
+    return "icon-grey"
+  }
+
 });
 let keynum = ref(0);
 const value = reactive<any>({
@@ -169,6 +176,12 @@ p {
   /* position: relative; */
   /* top: -15px; */
 }
+.icon-grey {
+  color: rgb(167, 166, 189);
+  font-size: 140px;
+  /* position: relative; */
+  /* top: -15px; */
+}
 .icon-blue {
   font-size: 140px;
   color: #20AEC5;