From 439854ccb08365cf2e9015231bd8d69d1b390127 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Wed, 17 May 2023 15:53:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=84=E7=90=86=E6=9C=BA=E6=A2=B0=E5=88=86?=
 =?UTF-8?q?=E5=8E=82=E4=B8=80=E7=BA=A7=E5=A4=A7=E5=B1=8F=E6=89=93=E5=BC=80?=
 =?UTF-8?q?15=E7=A7=92=E5=90=8E=E5=87=BA=E7=8E=B0=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=202.=E5=A4=84=E7=90=86=E5=8E=82=E5=86=85=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E8=AE=BE=E5=A4=87=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E5=90=8E=E4=BA=A7=E7=94=9F=E7=9A=84=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/borderBox/border1.vue                  |  2 +-
 src/components/headerBox/header2.vue                  | 11 ++++++++---
 src/views/InPlantProducts/child/component/Details.vue |  1 -
 src/views/InPlantProducts/child/component/header1.vue | 11 +++++------
 src/views/InPlantProducts/child/component/origin.vue  |  3 +--
 src/views/InPlantProducts/child/component/toptip.vue  |  2 +-
 src/views/InPlantProducts/child/index.vue             |  6 +++---
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/components/borderBox/border1.vue b/src/components/borderBox/border1.vue
index c0f5549..c55ab92 100644
--- a/src/components/borderBox/border1.vue
+++ b/src/components/borderBox/border1.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wang-vue-worke:\demo\daping\src\components\borderBox\border1.vue
+ * @FilePath: \gitscreenFront\src\components\borderBox\border1.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-01-30 13:47:15
diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue
index c5c80f5..8346909 100644
--- a/src/components/headerBox/header2.vue
+++ b/src/components/headerBox/header2.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\components\headerBox\header2.vue
+ * @FilePath: \gitscreenFront\src\components\headerBox\header2.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 11:04:06
@@ -184,6 +184,7 @@ async function getAlarmListDatafun(){
 
 if (result.code == 200) {
   storeheader.setDataList(result);
+  
 }
 }
 //单机显示更多历史报警数据
@@ -237,9 +238,12 @@ function setAlarmscrollBoardList(){
 
     end = end + 5
     start = i >= 5 ? 5 : storeheader.AlarmscrollBoardList.length - 1
+    start<=0?start=0:''
   }, 1000)
 
   AlarmscrollTime=setInterval(()=>{
+    
+    
     if (i==0) {
       listdata.data=[]
     }
@@ -247,15 +251,16 @@ function setAlarmscrollBoardList(){
     if(storeheader.AlarmscrollBoardList.length==0){
       return
     }
+    
     if(storeheader.AlarmscrollBoardList.length-1<end){
-      // console.log('进入了1');
-      
       end=storeheader.AlarmscrollBoardList.length-1
     }
     for(start;start<=end;start++){
       // console.log(storeheader.AlarmscrollBoardList[start],start,end);
       // console.log(storeheader.AlarmscrollBoardList.length-1);
      let listcontent = storeheader.AlarmscrollBoardList[start]?.context.split('，')
+     
+     
      listdata.data.push(...[[listcontent[0]],[listcontent[1]]])
     }
     changeAbnormalData(listdata)
diff --git a/src/views/InPlantProducts/child/component/Details.vue b/src/views/InPlantProducts/child/component/Details.vue
index c8783c2..cacdc97 100644
--- a/src/views/InPlantProducts/child/component/Details.vue
+++ b/src/views/InPlantProducts/child/component/Details.vue
@@ -22,7 +22,6 @@
           <dv-scroll-board
             ref="devList"
             :config="value"
-            :key="detailslistSize.width"
             @click="dvClick"
             @mouseover="dvMouseover"
             @mouseend="dvmouseleave"
diff --git a/src/views/InPlantProducts/child/component/header1.vue b/src/views/InPlantProducts/child/component/header1.vue
index e741bb1..5be9e88 100644
--- a/src/views/InPlantProducts/child/component/header1.vue
+++ b/src/views/InPlantProducts/child/component/header1.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\component\header1.vue
+ * @FilePath: \gitscreenFront\src\views\InPlantProducts\child\component\header1.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-17 11:05:00
@@ -8,15 +8,14 @@
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
 -->
 <template>
-  <div class="header1" :style="{ width: props.width, height: props.height }">
+  <div class="header1" :style="{ width: props.width + 'px', height: props.height + 'px' }">
     <div>
       <h2>{{t('messages.DebugProgress')}}</h2>
     </div>
     <dv-percent-pond
       ref="progress"
       :config="config"
-      :key="props.width"
-      :style="{ width: '100%', height: '40%' }"
+      :style="{ width: props.width + 'px', height: props.height/10*4 + 'px' }"
     />
     <div class="comeBack" @click="comeBackFun">
       <i class="iconfont icon-back"></i>
@@ -33,8 +32,8 @@ let {t} = useI18n();
 const store = useInPlantProductsStore();
 const router=useRouter()
 let props = defineProps<{
-  width: string;
-  height: string;
+  width: number;
+  height: number;
   title: String;
 }>();
 let progress=ref()
diff --git a/src/views/InPlantProducts/child/component/origin.vue b/src/views/InPlantProducts/child/component/origin.vue
index 88af242..64c8dfd 100644
--- a/src/views/InPlantProducts/child/component/origin.vue
+++ b/src/views/InPlantProducts/child/component/origin.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\component\origin.vue
+ * @FilePath: \gitscreenFront\src\views\InPlantProducts\child\component\origin.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 11:51:32
@@ -19,7 +19,6 @@
           <dv-scroll-board
             ref="devList"
             :config="value"
-            :key="originlistSize.width"
             :style="{
               width: originlistSize.width,
               height: originlistSize.height,
diff --git a/src/views/InPlantProducts/child/component/toptip.vue b/src/views/InPlantProducts/child/component/toptip.vue
index 04ef3f2..b6445b4 100644
--- a/src/views/InPlantProducts/child/component/toptip.vue
+++ b/src/views/InPlantProducts/child/component/toptip.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\component\toptip.vue
+ * @FilePath: \gitscreenFront\src\views\InPlantProducts\child\component\toptip.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 11:51:32
diff --git a/src/views/InPlantProducts/child/index.vue b/src/views/InPlantProducts/child/index.vue
index 512fe16..4032af3 100644
--- a/src/views/InPlantProducts/child/index.vue
+++ b/src/views/InPlantProducts/child/index.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\index.vue
+ * @FilePath: \gitscreenFront\src\views\InPlantProducts\child\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-17 15:04:50
@@ -12,8 +12,8 @@
     <div class="header">
       <div class="title">
         <header1
-          :width="size.oWidth*3 + 'px'"
-          :height="'100px'"
+          :width="size.oWidth*3"
+          :height="100"
           :title="'67'"
         ></header1>
       </div>