Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap
This commit is contained in:
hzz
commit
3a387ebd6a
@ -123,7 +123,7 @@ const changeData = (val: any) => {
|
||||
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;
|
||||
}
|
||||
};
|
||||
|
||||
@ -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: \screenFront\src\components\headerBox\header2.vue
|
||||
* @Author: 王路平
|
||||
* @文件版本: V1.0.0
|
||||
* @Date: 2023-02-16 11:04:06
|
||||
@ -45,7 +45,7 @@
|
||||
<ul class="popoverBOX" ref="popoverliDom" v-click-outside="noClickAbnormalDataFun">
|
||||
<li v-for="item in powerlist" :key="item.deviceId" >{{item.context}}</li>
|
||||
<li class="lookdown" v-show="onloadlist">
|
||||
<span @click="clickNextPageAlarmList">加载更多</span>
|
||||
<span @click="clickNextPageAlarmList">{{ t('messages.加载更多') }}</span>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -59,10 +59,12 @@ import { ClickOutside as vClickOutside } from 'element-plus'
|
||||
import { useRoute,useRouter } from "vue-router";
|
||||
import { devListType } from "@/type/InPlantProducts";
|
||||
import { getAlarmListData} from "@/http/index";
|
||||
import { onMounted, onUnmounted, reactive, ref ,unref, watch } from "vue";
|
||||
import { onMounted, onUnmounted, reactive, ref ,unref, watch,computed } from "vue";
|
||||
import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
|
||||
import { useHeaderStore } from "@/store/components/header";
|
||||
import { getStoredLanguage } from "@/utils/languageStorage"
|
||||
import { useI18n } from 'vue-i18n'
|
||||
let {t} = useI18n();
|
||||
const storeheader = useHeaderStore();
|
||||
let { timeHtml } = useNowTime();
|
||||
const router=useRouter()
|
||||
@ -77,7 +79,9 @@ let popoverliDom=ref()
|
||||
//历史报警数据弹窗显示
|
||||
let Abnormalpopovervisible=ref(false)
|
||||
let AbnormalpopovervisibleCtrl=ref(false)//解决点击历史报警数据弹窗外部关闭再打开问题
|
||||
let onloadlist=ref(true)
|
||||
let onloadlist= computed(()=>{
|
||||
return storeheader.num>powerlist.length
|
||||
})
|
||||
const listdata = reactive<devListType>({data: [],
|
||||
rowNum:2,
|
||||
oddRowBGC:'#100C2A',
|
||||
@ -184,16 +188,17 @@ async function getAlarmListDatafun(){
|
||||
|
||||
if (result.code == 200) {
|
||||
storeheader.setDataList(result);
|
||||
|
||||
}
|
||||
}
|
||||
//单机显示更多历史报警数据
|
||||
function clickNextPageAlarmList(){
|
||||
|
||||
|
||||
if(storeheader.num<=powerlist.length){
|
||||
onloadlist.value=false
|
||||
return
|
||||
}
|
||||
// if(storeheader.num<=powerlist.length){
|
||||
// onloadlist.value=false
|
||||
// return
|
||||
// }
|
||||
AbnormalType.pageNum++
|
||||
getAlarmListDatafun()
|
||||
}
|
||||
@ -237,9 +242,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 +255,16 @@ function setAlarmscrollBoardList(){
|
||||
if(storeheader.AlarmscrollBoardList.length==0){
|
||||
return
|
||||
}
|
||||
if(storeheader.AlarmscrollBoardList.length-1<end){
|
||||
// console.log('进入了1');
|
||||
|
||||
if(storeheader.AlarmscrollBoardList.length-1<end){
|
||||
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)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* @FilePath: \gitscreenFront\src\locales\lang\en.ts
|
||||
* @FilePath: \screenFront\src\locales\lang\en.ts
|
||||
* @Author: 王路平
|
||||
* @文件版本: V1.0.0
|
||||
* @Date: 2023-05-04 16:36:13
|
||||
@ -263,6 +263,7 @@ export default {
|
||||
'AlarmTime':'Alarm Time',
|
||||
'duration':'duration',
|
||||
'IoT_System':'IoT Management System',
|
||||
'environment_dust':'Environment-Dust Real-time Monitoring System'
|
||||
'environment_dust':'Environment-Dust Real-time Monitoring System',
|
||||
'加载更多':'Load More',
|
||||
}
|
||||
}
|
||||
@ -263,6 +263,7 @@ export default {
|
||||
'AlarmTime':'报警时间',
|
||||
'duration':'持续时间',
|
||||
'IoT_System':'物联管理系统',
|
||||
'environment_dust':'环境-粉尘 实时监测系统'
|
||||
'environment_dust':'环境-粉尘 实时监测系统',
|
||||
'加载更多':'加载更多',
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* @FilePath: \daping\src\main.ts
|
||||
* @FilePath: \screenFront\src\main.ts
|
||||
* @Author: 王路平
|
||||
* @文件版本: V1.0.0
|
||||
* @Date: 2023-01-29 15:16:36
|
||||
@ -20,7 +20,6 @@ import dataV from '@jiaminghi/data-view'
|
||||
import './registerServiceWorker'
|
||||
import router from './router'
|
||||
import i18n from './locales'
|
||||
console.log(i18n,'i18n');
|
||||
|
||||
let app = createApp(App)
|
||||
const store = createPinia()
|
||||
|
||||
@ -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\axle.vue
|
||||
* @FilePath: \screenFront\src\views\InPlantProducts\child\component\axle.vue
|
||||
* @Author: 王路平
|
||||
* @文件版本: V1.0.0
|
||||
* @Date: 2023-02-16 11:51:32
|
||||
@ -11,7 +11,13 @@
|
||||
<div :style="{width:itemSize.width,height:itemSize.height}">
|
||||
<border1 ref="refborder1" :title="t('messages.DevMotor')">
|
||||
<template v-slot>
|
||||
<div class="box" :key="keynum" :style="{width:boxSize.width,height:boxSize.height}">
|
||||
<div class="box" :key="keynum" :style="{width:boxSize.width,height:boxSize.height,position:'relative'}">
|
||||
<div class="type">
|
||||
<ul>
|
||||
<li class="on">已调试</li>
|
||||
<li class="off">未调试</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div v-for="(res,index) in data" :style="{width:'120px',height:'120px'}" >
|
||||
<span>
|
||||
<i :class="res.value=='1'?'iconfont icon-dianji green':'iconfont icon-dianji red'"></i>
|
||||
@ -93,4 +99,42 @@ p{
|
||||
font-size:30px;
|
||||
}
|
||||
|
||||
.type {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
font-size: 20px;
|
||||
color: #fff;
|
||||
}
|
||||
.type ul {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100%;
|
||||
}
|
||||
.type ul li {
|
||||
position: relative;
|
||||
margin: 0 20px;
|
||||
}
|
||||
.type ul .on::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
background-color: green;
|
||||
top: 05px;
|
||||
left: -30px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 100%;
|
||||
}
|
||||
.type ul .off::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
background-color: #aaa;
|
||||
top: 05px;
|
||||
left: -30px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -8,61 +8,68 @@
|
||||
* 版权信息 : 2023 by ${再登软件}, All Rights Reserved.
|
||||
-->
|
||||
<template>
|
||||
<div :style="{width:itemSize.width,height:itemSize.height}">
|
||||
<border1 ref="refborder1" :title="t('messages.DevSensors')">
|
||||
<template v-slot>
|
||||
<div class="box" :key="keynum" :style="{width:boxSize.width,height:boxSize.height}">
|
||||
<div v-for="(res,index) in data" :style="{width:'130px',height:'130px'}" >
|
||||
<span>
|
||||
<i :class="res.value=='1'?'iconfont icon-jingshideng green':'iconfont icon-jingshideng red'"></i>
|
||||
</span>
|
||||
<p>{{res.name}}</p>
|
||||
</div>
|
||||
<div :style="{ width: itemSize.width, height: itemSize.height }">
|
||||
<border1 ref="refborder1" :title="t('messages.DevSensors')">
|
||||
<template v-slot>
|
||||
<div class="box" :key="keynum" :style="{ width: boxSize.width, height: boxSize.height, position: 'relative' }">
|
||||
<div class="type">
|
||||
<ul>
|
||||
<li class="on">已调试</li>
|
||||
<li class="off">未调试</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div v-for="(res, index) in data" :style="{ width: '130px', height: '130px' }">
|
||||
<span>
|
||||
<i
|
||||
:class="res.value == '1' ? 'iconfont icon-jingshideng green' : 'iconfont icon-jingshideng red'"></i>
|
||||
</span>
|
||||
<p>{{ res.name }}</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
</border1>
|
||||
</div>
|
||||
</template>
|
||||
</border1>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {getCurrentInstance, onMounted, reactive, ref} from "vue"
|
||||
import { getCurrentInstance, onMounted, reactive, ref } from "vue"
|
||||
import border1 from "@/components/borderBox/border1.vue"
|
||||
import { useI18n } from 'vue-i18n'
|
||||
let {t} = useI18n();
|
||||
let refborder1=ref()
|
||||
let data=reactive([])
|
||||
let keynum=ref(0)
|
||||
const itemSize=reactive({
|
||||
height:'0px',
|
||||
width:'0px'
|
||||
})
|
||||
const boxSize=reactive({
|
||||
height:'0px',
|
||||
width:'0px'
|
||||
})
|
||||
onMounted(() => {
|
||||
// setData()
|
||||
})
|
||||
let { t } = useI18n();
|
||||
let refborder1 = ref()
|
||||
let data = reactive([])
|
||||
let keynum = ref(0)
|
||||
const itemSize = reactive({
|
||||
height: '0px',
|
||||
width: '0px'
|
||||
})
|
||||
const boxSize = reactive({
|
||||
height: '0px',
|
||||
width: '0px'
|
||||
})
|
||||
onMounted(() => {
|
||||
// setData()
|
||||
})
|
||||
|
||||
function setchartWH(width:any,height:any){
|
||||
itemSize.height=height-20+'px'
|
||||
itemSize.width=width-80+'px'
|
||||
boxSize.height=height-80+'px'
|
||||
boxSize.width=width-30+'px'
|
||||
function setchartWH(width: any, height: any) {
|
||||
itemSize.height = height - 20 + 'px'
|
||||
itemSize.width = width - 80 + 'px'
|
||||
boxSize.height = height - 80 + 'px'
|
||||
boxSize.width = width - 30 + 'px'
|
||||
refborder1.value.resetWH()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const setData=(value:any)=>{
|
||||
data=value
|
||||
//更新key用来更新组件数据
|
||||
keynum.value++
|
||||
refborder1.value.resetWH()
|
||||
}
|
||||
const setData = (value: any) => {
|
||||
data = value
|
||||
//更新key用来更新组件数据
|
||||
keynum.value++
|
||||
refborder1.value.resetWH()
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
defineExpose({
|
||||
setchartWH,
|
||||
setData
|
||||
})
|
||||
@ -70,14 +77,16 @@ let {t} = useI18n();
|
||||
|
||||
<style scoped>
|
||||
@import '@/assets/css/iconfont.css';
|
||||
p{
|
||||
|
||||
p {
|
||||
margin: 0 5px 0 5px;
|
||||
color: #fff;
|
||||
font-size: 18px;
|
||||
}
|
||||
.box{
|
||||
width:100%;
|
||||
height:80%;
|
||||
|
||||
.box {
|
||||
width: 100%;
|
||||
height: 80%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
/* justify-content:center; */
|
||||
@ -85,13 +94,53 @@ p{
|
||||
/* align-content: flex-start; */
|
||||
overflow: auto;
|
||||
}
|
||||
.green{
|
||||
|
||||
.green {
|
||||
color: green;
|
||||
font-size: 30px;
|
||||
}
|
||||
.red{
|
||||
color:#aaa;
|
||||
font-size:30px;
|
||||
|
||||
.red {
|
||||
color: #aaa;
|
||||
font-size: 30px;
|
||||
}
|
||||
|
||||
.type {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
font-size: 20px;
|
||||
color: #fff;
|
||||
}
|
||||
.type ul {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
height: 100%;
|
||||
}
|
||||
.type ul li {
|
||||
position: relative;
|
||||
margin: 0 20px;
|
||||
}
|
||||
.type ul .on::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
background-color: green;
|
||||
top: 05px;
|
||||
left: -30px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 100%;
|
||||
}
|
||||
.type ul .off::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
background-color: #aaa;
|
||||
top: 05px;
|
||||
left: -30px;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border-radius: 100%;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<!--
|
||||
* @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\right.vue
|
||||
* @FilePath: \screenFront\src\views\Offsite\child\childContent\right.vue
|
||||
* @Author: 王路平
|
||||
* @文件版本: V1.0.0
|
||||
* @Date: 2023-04-13 09:09:03
|
||||
@ -107,98 +107,98 @@ let DevType = reactive({
|
||||
],
|
||||
},
|
||||
});
|
||||
let data2 = [
|
||||
{
|
||||
"name": "全自动铺布机",
|
||||
"label": "50945",
|
||||
"ts": "2023-05-12 08:36:37",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动铺布机，时间：2023-05-11 17:36:37",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "电脑绣花机",
|
||||
"label": "0201112",
|
||||
"ts": "2023-05-12 08:36:37",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡电脑绣花机，时间：2023-05-11 17:36:37",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动双头垫板式冲孔机",
|
||||
"label": "1170824#",
|
||||
"ts": "2023-05-12 08:36:47",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动双头垫板式冲孔机，时间：2023-05-11 17:36:47",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "三合一裁床",
|
||||
"label": "040720",
|
||||
"ts": "2023-05-12 08:37:05",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:三合一裁床，时间：2023-05-11 17:37:05",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动任意转单针缝纫机",
|
||||
"label": "RHUL-01",
|
||||
"ts": "2023-05-12 08:37:05",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动任意转单针缝纫机，时间：2023-05-11 17:37:05",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "特种缝纫机",
|
||||
"label": "RPS-1108-165",
|
||||
"ts": "2023-05-12 08:37:05",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡特种缝纫机，时间：2023-05-11 17:37:05",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动缝纫机(零等待)",
|
||||
"label": "170321NS064",
|
||||
"ts": "2023-05-12 08:37:06",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动缝纫机(零等待)，时间：2023-05-11 17:37:06",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "激光雕刻切割机",
|
||||
"label": "170322798",
|
||||
"ts": "2023-05-12 08:37:06",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡激光雕刻切割机，时间：2023-05-11 17:37:06",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "电脑绣花机(三合一)",
|
||||
"label": "1885",
|
||||
"ts": "2023-05-12 08:37:25",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡电脑绣花机(三合一)，时间：2023-05-11 17:37:25",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动电脑裁床",
|
||||
"label": "50231",
|
||||
"ts": "2023-05-12 08:37:25",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动电脑裁床，时间：2023-05-11 17:37:25",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
}
|
||||
]
|
||||
// let data2 = [
|
||||
// {
|
||||
// "name": "全自动铺布机",
|
||||
// "label": "50945",
|
||||
// "ts": "2023-05-12 08:36:37",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动铺布机，时间：2023-05-11 17:36:37",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "电脑绣花机",
|
||||
// "label": "0201112",
|
||||
// "ts": "2023-05-12 08:36:37",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡电脑绣花机，时间：2023-05-11 17:36:37",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动双头垫板式冲孔机",
|
||||
// "label": "1170824#",
|
||||
// "ts": "2023-05-12 08:36:47",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动双头垫板式冲孔机，时间：2023-05-11 17:36:47",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "三合一裁床",
|
||||
// "label": "040720",
|
||||
// "ts": "2023-05-12 08:37:05",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:三合一裁床，时间：2023-05-11 17:37:05",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动任意转单针缝纫机",
|
||||
// "label": "RHUL-01",
|
||||
// "ts": "2023-05-12 08:37:05",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动任意转单针缝纫机，时间：2023-05-11 17:37:05",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "特种缝纫机",
|
||||
// "label": "RPS-1108-165",
|
||||
// "ts": "2023-05-12 08:37:05",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡特种缝纫机，时间：2023-05-11 17:37:05",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动缝纫机(零等待)",
|
||||
// "label": "170321NS064",
|
||||
// "ts": "2023-05-12 08:37:06",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动缝纫机(零等待)，时间：2023-05-11 17:37:06",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "激光雕刻切割机",
|
||||
// "label": "170322798",
|
||||
// "ts": "2023-05-12 08:37:06",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡激光雕刻切割机，时间：2023-05-11 17:37:06",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "电脑绣花机(三合一)",
|
||||
// "label": "1885",
|
||||
// "ts": "2023-05-12 08:37:25",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡电脑绣花机(三合一)，时间：2023-05-11 17:37:25",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动电脑裁床",
|
||||
// "label": "50231",
|
||||
// "ts": "2023-05-12 08:37:25",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动电脑裁床，时间：2023-05-11 17:37:25",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// }
|
||||
// ]
|
||||
function setDataList(val:any){
|
||||
let echartdata=[]
|
||||
val.typenum.forEach(res=>{
|
||||
@ -207,8 +207,7 @@ val.typenum.forEach(res=>{
|
||||
DevType.option.series[0].data=echartdata
|
||||
chartref.value.changeData(DevType.option)
|
||||
|
||||
data2.push(...data2)
|
||||
devTipRef.value.setData(data2);
|
||||
devTipRef.value.setData(val.data2);
|
||||
}
|
||||
onMounted(() => {
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -107,98 +107,98 @@ let DevType = reactive({
|
||||
],
|
||||
},
|
||||
});
|
||||
let data2 = [
|
||||
{
|
||||
"name": "全自动铺布机",
|
||||
"label": "50945",
|
||||
"ts": "2023-05-12 08:36:37",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动铺布机，时间：2023-05-11 17:36:37",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "电脑绣花机",
|
||||
"label": "0201112",
|
||||
"ts": "2023-05-12 08:36:37",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡电脑绣花机，时间：2023-05-11 17:36:37",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动双头垫板式冲孔机",
|
||||
"label": "1170824#",
|
||||
"ts": "2023-05-12 08:36:47",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动双头垫板式冲孔机，时间：2023-05-11 17:36:47",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "三合一裁床",
|
||||
"label": "040720",
|
||||
"ts": "2023-05-12 08:37:05",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:三合一裁床，时间：2023-05-11 17:37:05",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动任意转单针缝纫机",
|
||||
"label": "RHUL-01",
|
||||
"ts": "2023-05-12 08:37:05",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动任意转单针缝纫机，时间：2023-05-11 17:37:05",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "特种缝纫机",
|
||||
"label": "RPS-1108-165",
|
||||
"ts": "2023-05-12 08:37:05",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡特种缝纫机，时间：2023-05-11 17:37:05",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动缝纫机(零等待)",
|
||||
"label": "170321NS064",
|
||||
"ts": "2023-05-12 08:37:06",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动缝纫机(零等待)，时间：2023-05-11 17:37:06",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "激光雕刻切割机",
|
||||
"label": "170322798",
|
||||
"ts": "2023-05-12 08:37:06",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡激光雕刻切割机，时间：2023-05-11 17:37:06",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "电脑绣花机(三合一)",
|
||||
"label": "1885",
|
||||
"ts": "2023-05-12 08:37:25",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡电脑绣花机(三合一)，时间：2023-05-11 17:37:25",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
},
|
||||
{
|
||||
"name": "全自动电脑裁床",
|
||||
"label": "50231",
|
||||
"ts": "2023-05-12 08:37:25",
|
||||
"status": "false",
|
||||
"deptId": null,
|
||||
"context": "设备离线提醒:富怡全自动电脑裁床，时间：2023-05-11 17:37:25",
|
||||
"remark": "常规警报数据-设备离线"
|
||||
}
|
||||
]
|
||||
// let data2 = [
|
||||
// {
|
||||
// "name": "全自动铺布机",
|
||||
// "label": "50945",
|
||||
// "ts": "2023-05-12 08:36:37",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动铺布机，时间：2023-05-11 17:36:37",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "电脑绣花机",
|
||||
// "label": "0201112",
|
||||
// "ts": "2023-05-12 08:36:37",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡电脑绣花机，时间：2023-05-11 17:36:37",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动双头垫板式冲孔机",
|
||||
// "label": "1170824#",
|
||||
// "ts": "2023-05-12 08:36:47",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动双头垫板式冲孔机，时间：2023-05-11 17:36:47",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "三合一裁床",
|
||||
// "label": "040720",
|
||||
// "ts": "2023-05-12 08:37:05",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:三合一裁床，时间：2023-05-11 17:37:05",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动任意转单针缝纫机",
|
||||
// "label": "RHUL-01",
|
||||
// "ts": "2023-05-12 08:37:05",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动任意转单针缝纫机，时间：2023-05-11 17:37:05",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "特种缝纫机",
|
||||
// "label": "RPS-1108-165",
|
||||
// "ts": "2023-05-12 08:37:05",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡特种缝纫机，时间：2023-05-11 17:37:05",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动缝纫机(零等待)",
|
||||
// "label": "170321NS064",
|
||||
// "ts": "2023-05-12 08:37:06",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动缝纫机(零等待)，时间：2023-05-11 17:37:06",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "激光雕刻切割机",
|
||||
// "label": "170322798",
|
||||
// "ts": "2023-05-12 08:37:06",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡激光雕刻切割机，时间：2023-05-11 17:37:06",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "电脑绣花机(三合一)",
|
||||
// "label": "1885",
|
||||
// "ts": "2023-05-12 08:37:25",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡电脑绣花机(三合一)，时间：2023-05-11 17:37:25",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// },
|
||||
// {
|
||||
// "name": "全自动电脑裁床",
|
||||
// "label": "50231",
|
||||
// "ts": "2023-05-12 08:37:25",
|
||||
// "status": "false",
|
||||
// "deptId": null,
|
||||
// "context": "设备离线提醒:富怡全自动电脑裁床，时间：2023-05-11 17:37:25",
|
||||
// "remark": "常规警报数据-设备离线"
|
||||
// }
|
||||
// ]
|
||||
function setDataList(val:any){
|
||||
let echartdata=[]
|
||||
val.typenum.forEach(res=>{
|
||||
@ -207,7 +207,7 @@ val.typenum.forEach(res=>{
|
||||
DevType.option.series[0].data=echartdata
|
||||
chartref.value.changeData(DevType.option)
|
||||
|
||||
devTipRef.value.setData(data2);
|
||||
devTipRef.value.setData(val.data2);
|
||||
}
|
||||
onMounted(() => {
|
||||
|
||||
|
||||
@ -38,6 +38,7 @@ import header2 from '@/components/headerBox/header2.vue'
|
||||
import { calcWH } from '@/components/ts/selfAdaption'
|
||||
import { Offsite } from "@/store/module/offsite";
|
||||
import { deviceCountsSecondaryOfOutPlantData, deviceTypeCountsSecondaryOfOutPlantData, deviceStatusCountsSecondaryOfOutPlantData, secondaryOutPlantData } from "@/http/offsite";
|
||||
import {getElectronDeviceStatus} from "@/http/electronicControl";
|
||||
import left from "./childContent/left.vue"
|
||||
import center from "./childContent/center.vue"
|
||||
import right from "./childContent/right.vue"
|
||||
@ -48,8 +49,11 @@ const route = useRoute();
|
||||
const store = Offsite()
|
||||
let Acontent = ref()
|
||||
let time = ref(null)
|
||||
let routeCity = route.params.city
|
||||
|
||||
let routeCity:any = '广东省'
|
||||
let deptId_list = {
|
||||
'广东省': '16',
|
||||
'浙江省': '17'
|
||||
}
|
||||
let leftRef = ref()
|
||||
let centerRef = ref()
|
||||
let rightRef = ref()
|
||||
@ -98,20 +102,31 @@ async function secondaryOutPlantDatafun() {
|
||||
}
|
||||
}
|
||||
function getdata() {
|
||||
Promise.all([deviceCountsSecondaryOfOutPlantData(), deviceTypeCountsSecondaryOfOutPlantData(), deviceStatusCountsSecondaryOfOutPlantData(), secondaryOutPlantData()]).then((res: any) => {
|
||||
let data = { devnum: null, typenum: null, statusnum: null, citylist: null, }
|
||||
res.forEach((ele, i) => {
|
||||
for (let key in ele.data) {
|
||||
if (key == "广东省") {
|
||||
i == 0 ? data.devnum = ele.data[key] : i == 1 ? data.typenum = ele.data[key] : i == 2 ? data.statusnum = ele.data[key] : i == 3 ? data.citylist = ele.data[key] : ''
|
||||
}
|
||||
}
|
||||
})
|
||||
Promise.all([
|
||||
deviceCountsSecondaryOfOutPlantData(),
|
||||
deviceTypeCountsSecondaryOfOutPlantData(),
|
||||
deviceStatusCountsSecondaryOfOutPlantData(),
|
||||
secondaryOutPlantData(),
|
||||
getElectronDeviceStatus(deptId_list[routeCity])]).then((res: any) => {
|
||||
let data = { devnum: null, typenum: null, statusnum: null, citylist: null, data2:null}
|
||||
data.devnum = res[0].data[routeCity]
|
||||
data.typenum = res[1].data[routeCity]
|
||||
data.statusnum = res[2].data[routeCity]
|
||||
data.citylist = res[3].data[routeCity]
|
||||
data.data2 = res[4].data
|
||||
|
||||
leftRef.value.setDataList(data)
|
||||
centerRef.value.setDataList(data)
|
||||
rightRef.value.setDataList(data)
|
||||
})
|
||||
// res.forEach((ele, i) => {
|
||||
// for (let key in ele.data) {
|
||||
// if (key == route.params.city) {
|
||||
// i == 0 ? data.devnum = ele.data[key] : i == 1 ? data.typenum = ele.data[key] : i == 2 ? data.statusnum = ele.data[key] : i == 3 ? data.citylist = ele.data[key] : ''
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
|
||||
leftRef.value.setDataList(data)
|
||||
centerRef.value.setDataList(data)
|
||||
rightRef.value.setDataList(data)
|
||||
})
|
||||
}
|
||||
onMounted(() => {
|
||||
// deviceCountsSecondaryOfOutPlantDatafun()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user