1.处理机械分厂一级大屏打开15秒后出现的报错
2.处理厂内二级设备页面打开后产生的报错
This commit is contained in:
parent
a61aaa8481
commit
439854ccb0
@ -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
|
||||
|
@ -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)
|
||||
|
@ -22,7 +22,6 @@
|
||||
<dv-scroll-board
|
||||
ref="devList"
|
||||
:config="value"
|
||||
:key="detailslistSize.width"
|
||||
@click="dvClick"
|
||||
@mouseover="dvMouseover"
|
||||
@mouseend="dvmouseleave"
|
||||
|
@ -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()
|
||||
|
@ -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,
|
||||
|
@ -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
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user