hanzhengzheng/screenFront
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改电控分厂 军团大屏显示

Browse Source
This commit is contained in:
hzz 2023-05-18 14:57:42 +08:00
parent 7998e246dc
commit de630866c8
10 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/electronicControl/index.ts
View File

@ -1,3 +1,13 @@
/*
* @Author: hzz hzz
* @Date: 2023-05-12 16:37:42
* @LastEditors: hzz hzz
* @LastEditTime: 2023-05-18 09:08:30
* @FilePath: \screenFront\src\http\electronicControl\index.ts
* @Description:
*
* Copyright (c) 2023 by ${git_name_email}, All Rights Reserved.
*/
import {get,post} from "@/utils/http"
//获取电控分厂数据
@ -6,7 +16,7 @@ export function getElectronDevice(){
}
//通过depId 获取设备状态
export function getElectronDeviceStatus(deptId:string){
return get('/alarm/getAlarmListByDeptId',{deptId})
export function getElectronDeviceStatus(deptId:string,alarmType:string = 'offline'){
return get('/alarm/getAlarmListByDeptId',{deptId,alarmType})
}

4
src/views/Offsite/child/childContent/chart/devTip.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\chart\devTip.vue
* @FilePath: \screenFront\src\views\Offsite\child\childContent\chart\devTip.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-04-12 10:21:10
@ -33,7 +33,7 @@
<p>时间:<span>{{ res.ts }}</span></p>
</div>
<div class="item-text">
<p><span :style="{ color: JSON.parse(res.status) ? 'green' : 'red' }">{{ JSON.parse(res.status) ? t('messages.onLine') : t('messages.offline') }}</span></p>
<p><span :style="{ color: JSON.parse(res.status) ? '#20aec5' : 'rgb(228, 57, 97)' }">{{ JSON.parse(res.status) ? t('messages.onLine') : t('messages.offline') }}</span></p>
<p>{{t('messages.DevName')}}:<span>{{ res.name }}</span></p>
</div>
</div>

4
src/views/electronicControl/childContent/center.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \wwwd:\code\screenFront\src\views\electronicControl\childContent\center.vue
* @FilePath: \screenFront\src\views\electronicControl\childContent\center.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-04-12 08:46:57
@ -103,7 +103,7 @@ function setDataList(val: any) {
//设置页面数据
topTitleRef.value.setData({ title: t('messages.OnlineNum'), num: tipdata.ison });
topTitleRef2.value.setData({ title: t('messages.TOTAL'), num: tipdata.isall });
topTitleRef3.value.setData({ title: t('messages.OffNum'), num: tipdata.isoff });
topTitleRef3.value.setData({ title: t('messages.OffNum'), num: tipdata.isoff ,color:'rgb(228, 57, 97)'});
let electronicControl1 = require("@/assets/img/electronicControl1.jpg");
let electronicControl2 = require("@/assets/img/electronicControl2.png");

4
src/views/electronicControl/childContent/chart/devTip.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \wwwd:\code\screenFront\src\views\electronicControl\childContent\chart\devTip.vue
* @FilePath: \screenFront\src\views\electronicControl\childContent\chart\devTip.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-04-12 10:21:10
@ -31,7 +31,7 @@
<p>时间:<span>{{ res.time }}</span></p>
</div>
<div class="item-text">
<p><span :style="{ color: res.status ? 'green' : 'red' }">{{ res.status ? t('messages.onLine') : t('messages.offline') }}</span></p>
<p><span :style="{ color: res.status ? '#20aec5' : 'rgb(228, 57, 97)' }">{{ res.status ? t('messages.onLine') : t('messages.offline') }}</span></p>
<p>{{t('messages.DevName')}}:<span>{{ res.name }}</span></p>
</div>
</div>

5
src/views/electronicControl/childContent/chart/topTitle.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \wwwd:\code\screenFront\src\views\electronicControl\childContent\chart\topTitle.vue
* @FilePath: \screenFront\src\views\electronicControl\childContent\chart\topTitle.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-04-12 13:03:15
@ -13,7 +13,7 @@
<template v-slot>
<div class="box" :key="keynum" :style="{ width: boxWH.width, height: boxWH.height }">
<p>{{ data.num }}<span>{{t('messages.units')}}</span></p>
<p :style="{color:data.color?data.color:''}">{{ data.num }}<span>{{t('messages.units')}}</span></p>
<h2>{{ data.title }}</h2>
</div>
</template>
@ -39,6 +39,7 @@ let keynum = ref(0);
let data = reactive({
title: "",
num: 0,
color:''
});
let refborder6 = ref();
let marginbox = ref();

8
src/views/electronicControl/childContent/right.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \wwwd:\code\screenFront\src\views\electronicControl\childContent\right.vue
* @FilePath: \screenFront\src\views\electronicControl\childContent\right.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-04-13 09:09:03
@ -119,12 +119,10 @@ function setDataList(val:any){
val.typenum.forEach(res=>{
echartdata.push({name:res.name,value:res.counts})
})
console.log(echartdata, "item.data");
DevType.option.series[0].data=echartdata
chartref.value.changeData(DevType.option)
data2.push(...data2)//val.alarmList
devTipRef.value.setData(data2);
let devTipList = val.alarmList.length>0?val.alarmList:data2
devTipRef.value.setData(devTipList);
}
onMounted(() => {

4
src/views/legionProducts/chart/devStatus.vue
View File

@ -1,5 +1,5 @@
<!--
* @FilePath: \wwwd:\code\screenFront\src\views\legionProducts\chart\devStatus.vue
* @FilePath: \screenFront\src\views\legionProducts\chart\devStatus.vue
* @Author: 王路平
* @文件版本: V1.0.0
* @Date: 2023-04-28 14:29:11
@ -20,7 +20,7 @@
<h3>{{t('messages.OnlineNum')}}</h3>
</div>
<div class="card">
<div><b>{{ prop.data.offLine}}</b>{{t('messages.units')}}</div>
<div style="color:rgb(228, 57, 97)"><b>{{ prop.data.offLine}}</b>{{t('messages.units')}}</div>
<h3>{{t('messages.OffNum')}}</h3>
</div>
</div>

2
src/views/legionProducts/chart/scrollBoard.vue
View File

@ -40,7 +40,7 @@ let triggerRef = ref(null)
const dvMouseover = (value) => {
if (value.toElement && value.toElement.innerHTML&&value.toElement.className == 'ceil') {
triggerRef.value = value.toElement
tipcontent.value = value.toElement.innerHTML
tipcontent.value = value.toElement.innerText
visible.value = true
}

3
src/views/legionProducts/index.vue
View File

@ -99,7 +99,8 @@ const getList = (deptId) => {
getDeviceInPlantList({ deptId }).then((res: any) => {
if (res.code == 200) {
res.data.forEach((item: any, index: number) => {
let temp = [index + 1, item.name, t('messages.model'), t('messages.RackNum'), t('messages.type'), t('messages.InstallPhase'), t('messages.DevStatus'), t('messages.AssemblyGroup'), t('messages.electronicGroup'), t('messages.inspector'), item.deliveryDate]
let status = JSON.parse(item.deviceStatus) == true ? '在线' : '离线'
let temp = [index + 1, item.name, t('messages.model'), item.label, t('messages.type'), t('messages.InstallPhase'), status, t('messages.AssemblyGroup'), t('messages.electronicGroup'), t('messages.inspector'), item.deliveryDate]
scrollBoardConfig.data.push(temp)
item.index = index+1
severdata.push(item)

2
src/views/realtimeSecurity/content/content.vue
View File

@ -123,7 +123,7 @@ async function getSafeWarningDatafun(){
if (element.val>item.limit) {
element.date = gettime(element.ts),
element.time = element.ts||datetime
element.continuous = clacendTime(datetime,element.ts)
element.continuous = clacendTime(datetime,element.ts||datetime)
} else {
element.date = null
element.time = null