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

src/views/InPlantProducts/index.vue

@@ -88,7 +88,7 @@ function getWebsocket(val) {
   } catch (err) {}
 }
 function errWebsocket(val) {
-  headerref.value.HeadererrWebsocket(val)
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
   // console.log(val);
 }
 

src/views/Mechanics/index.vue

@@ -99,7 +99,7 @@ function getWebsocket(val){
 
   }
   function errWebsocket(val){
-    headerref.value.HeadererrWebsocket(val)
+    headerref.value?headerref.value.HeadererrWebsocket(val):''
     // console.log(val);
 }
 async function gatcountsOfMachineryFactoryInStatusTimefun() {

src/views/MicrofactoryDev/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\MicrofactoryDev\index.vue
+ * @FilePath: \gitscreenFront\src\views\MicrofactoryDev\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-03-10 09:15:58
@@ -114,7 +114,7 @@ function getWebsocket(val) {
   } catch (err) {}
 }
 function errWebsocket(val) {
-  headerref.value.HeadererrWebsocket(val)
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
   // console.log(val);
 }
 //获取设备列表数据

src/views/Offsite/index.vue

@@ -123,7 +123,8 @@ let {t} = useI18n();
 
   }
   function errWebsocket(val){
-    headerref.value.HeadererrWebsocket(val)
+    headerref.value?headerref.value.HeadererrWebsocket(val):''
+    // headerref.value.HeadererrWebsocket(val)
     // console.log(val);
 }
   onMounted(() => {

src/views/PaintShopView/View1/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\PaintShopView\View1\index.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\View1\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-11 13:50:05
@@ -11,8 +11,8 @@
   <div class="container">
     <div class="header">
       <div class="title">
-        <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="t('messages.JingShi_generalEnvironment')"
+        <header2 ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.JingShi_generalEnvironment')"
-          :titleTip="[]" :typeFun="['time']" :alarmType="[]"></header2>
+          :titleTip="titleTip" :typeFun="['time']" :alarmType="[]"></header2>
       </div>
     </div>
     <div class="content" ref="Acontent">
@@ -49,6 +49,20 @@ let size = reactive({
   oWidth: 0,
   oHeight: 0
 });
+let titleTip = [
+  {
+    color: "#E43961",
+    name: t('messages.abnormal'),
+  },
+  {
+    color: "#20AEC5",
+    name: t('messages.NoAbnormal'),
+  },
+  {
+    color: "#A7A6BD",
+    name: t('messages.disconnection'),
+  },
+];
 function WH(div: HTMLElement) {
   let a = calcWH(div.offsetHeight, div.offsetWidth, 3, 24, 0)
   size.oWidth = a.oWidth
@@ -138,7 +152,7 @@ onUnmounted(() => {
 
 .content {
   width: 100%;
-  --header: 100px;
+  --header: 150px;
   height: calc(1080px - var(--header))
 }
 </style>

src/views/PaintShopView/finishView/index.vue

@@ -14,9 +14,9 @@
         <header2
           ref="headerref"
           :width="'100%'"
-          :height="'100px'"
+          :height="'150px'"
           :title="t('messages.JingJia_generalEnvironment')"
-          :titleTip="[]"
+          :titleTip="titleTip"
           :typeFun="['time']"
           :alarmType="[]"
         ></header2>
@@ -79,6 +79,20 @@ let size = reactive({
   oWidth: 0,
   oHeight: 0,
 });
+let titleTip = [
+  {
+    color: "#E43961",
+    name: t('messages.abnormal'),
+  },
+  {
+    color: "#20AEC5",
+    name: t('messages.NoAbnormal'),
+  },
+  {
+    color: "#A7A6BD",
+    name: t('messages.disconnection'),
+  },
+];
 function WH(div: HTMLElement) {
   let a = calcWH(div.offsetHeight, div.offsetWidth, 3, 24, 0);
   size.oWidth = a.oWidth;
@@ -164,7 +178,7 @@ onUnmounted(() => {
 .content {
   display: flex;
   width: 100%;
-  --header: 100px;
+  --header: 150px;
   height: calc(1080px - var(--header));
 }
 </style>

src/views/PaintShopView/machiningView/index.vue

@@ -14,9 +14,9 @@
         <header2
           ref="headerref"
           :width="'100%'"
-          :height="'100px'"
+          :height="'150px'"
           :title="t('messages.JiJia_generalEnvironment')"
-          :titleTip="[]"
+          :titleTip="titleTip"
           :typeFun="['time']"
           :alarmType="[]"
         ></header2>
@@ -79,6 +79,20 @@ let size = reactive({
   oWidth: 0,
   oHeight: 0,
 });
+let titleTip = [
+  {
+    color: "#E43961",
+    name: t('messages.abnormal'),
+  },
+  {
+    color: "#20AEC5",
+    name: t('messages.NoAbnormal'),
+  },
+  {
+    color: "#A7A6BD",
+    name: t('messages.disconnection'),
+  },
+];
 function WH(div: HTMLElement) {
   let a = calcWH(div.offsetHeight, div.offsetWidth, 3, 24, 0);
   size.oWidth = a.oWidth;
@@ -164,7 +178,7 @@ onUnmounted(() => {
 .content {
   display: flex;
   width: 100%;
-  --header: 100px;
+  --header: 150px;
   height: calc(1080px - var(--header));
 }
 </style>

src/views/PaintShopView/stuffView/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\PaintShopView\stuffView\index.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\stuffView\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-11 13:50:05
@@ -11,7 +11,7 @@
     <div class="container">
      <div class="header">
            <div class="title">
-             <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="t('messages.DaJian_generalEnvironment')" :titleTip="[]" :typeFun="['time']" :alarmType="[]"></header2>
+             <header2 ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.DaJian_generalEnvironment')" :titleTip="titleTip" :typeFun="['time']" :alarmType="[]"></header2>
            </div>
          </div>
          <div class="content" ref="Acontent">
@@ -55,6 +55,20 @@ let {t} = useI18n();
        oWidth:0,
        oHeight:0
      });
+     let titleTip = [
+  {
+    color: "#E43961",
+    name: t('messages.abnormal'),
+  },
+  {
+    color: "#20AEC5",
+    name: t('messages.NoAbnormal'),
+  },
+  {
+    color: "#A7A6BD",
+    name: t('messages.disconnection'),
+  },
+];
      function WH(div:HTMLElement){
        let a=calcWH(div.offsetHeight,div.offsetWidth,3,24,0)
      size.oWidth=a.oWidth
@@ -140,7 +154,7 @@ function errWebsocket(val) {
      .content{
       display: flex;
          width:100%;
-         --header:100px;
+         --header:150px;
          height:calc(1080px - var(--header))
      }
    </style>

src/views/PaintShopView/weldView/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\PaintShopView\weldView\index.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\weldView\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-11 13:50:05
@@ -11,7 +11,7 @@
     <div class="container">
      <div class="header">
            <div class="title">
-             <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="t('messages.HanJie_generalEnvironment')" :titleTip="[]" :typeFun="['time']" :alarmType="[]"></header2>
+             <header2 ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.HanJie_generalEnvironment')" :titleTip="titleTip" :typeFun="['time']" :alarmType="[]"></header2>
            </div>
          </div>
          <div class="content" ref="Acontent">
@@ -48,6 +48,20 @@ let {t} = useI18n();
        oWidth:0,
        oHeight:0
      });
+     let titleTip = [
+  {
+    color: "#E43961",
+    name: t('messages.abnormal'),
+  },
+  {
+    color: "#20AEC5",
+    name: t('messages.NoAbnormal'),
+  },
+  {
+    color: "#A7A6BD",
+    name: t('messages.disconnection'),
+  },
+];
      function WH(div:HTMLElement){
        let a=calcWH(div.offsetHeight,div.offsetWidth,3,24,0)
      size.oWidth=a.oWidth
@@ -130,7 +144,7 @@ function errWebsocket(val) {
      }
      .content{
          width:100%;
-         --header:100px;
+         --header:150px;
          height:calc(1080px - var(--header))
      }
    </style>

src/views/electronicControlAmbient/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\electronicControlAmbient\index.vue
+ * @FilePath: \gitscreenFront\src\views\electronicControlAmbient\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-04-11 13:50:05
@@ -14,9 +14,9 @@
         <header2
           ref="headerref"
           :width="'100%'"
-          :height="'100px'"
+          :height="'150px'"
           :title="t('messages.DianKongDetection')"
-          :titleTip="[]"
+          :titleTip="titleTip"
           :typeFun="['time']"
           :alarmType="[]"
         ></header2>
@@ -79,6 +79,20 @@ let size = reactive({
   oWidth: 0,
   oHeight: 0,
 });
+let titleTip = [
+  {
+    color: "#E43961",
+    name: t('messages.abnormal'),
+  },
+  {
+    color: "#20AEC5",
+    name: t('messages.NoAbnormal'),
+  },
+  {
+    color: "#A7A6BD",
+    name: t('messages.disconnection'),
+  },
+];
 function WH(div: HTMLElement) {
   let a = calcWH(div.offsetHeight, div.offsetWidth, 3, 24, 0);
   size.oWidth = a.oWidth;
@@ -165,7 +179,7 @@ onUnmounted(() => {
 .content {
   display: flex;
   width: 100%;
-  --header: 100px;
+  --header: 150px;
   height: calc(1080px - var(--header));
 }
 </style>

src/views/generalEnvironment/index.vue

@@ -81,7 +81,7 @@ function getWebsocket(val) {
   } catch (err) { }
 }
 function errWebsocket(val) {
-  headerref.value.HeadererrWebsocket(val)
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
   // console.log(val);
 }
 

src/views/generalEnvironmentjixiefenchang/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\generalEnvironmentjixiefenchang\index.vue
+ * @FilePath: \gitscreenFront\src\views\generalEnvironmentjixiefenchang\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-10 11:45:17
@@ -94,7 +94,7 @@ function getWebsocket(val) {
   } catch (err) {}
 }
 function errWebsocket(val) {
-  headerref.value.HeadererrWebsocket(val)
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
   // console.log(val);
 }
 

src/views/realtimeSecurity/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\realtimeSecurity\index.vue
+ * @FilePath: \gitscreenFront\src\views\realtimeSecurity\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-10 11:45:17
@@ -140,7 +140,7 @@ function getWebsocket(val) {
   // }
 }
 function errWebsocket(val) {
-  headerref.value.HeadererrWebsocket(val)
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
   // console.log(val);
 }
 onMounted(() => {

src/views/realtimeSecurityJixiefenchang/index.vue

@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\realtimeSecurityJixiefenchang\index.vue
+ * @FilePath: \gitscreenFront\src\views\realtimeSecurityJixiefenchang\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-10 11:45:17
@@ -141,7 +141,7 @@ function getWebsocket(val) {
   }
 }
 function errWebsocket(val) {
-  headerref.value.HeadererrWebsocket(val)
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
   // console.log(val);
 }
 onMounted(() => {