From eef1ef0be935d4a3d8fc691b2666f41796b2d4a5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 04 十一月 2024 19:57:08 +0800
Subject: [PATCH] 增加列表显示
---
src/views/mdc/station-live.vue | 110 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 43 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 8da8d3c..e13026e 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-15 16:25:52
+ * @LastEditTime: 2024-10-23 10:34:29
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -14,7 +14,7 @@
</div>
<div class="aposcope-right">
<div class="content-machine-box">
- <div class="content-machine-img"><img src="./station.png" alt=""></div>
+ <div class="content-machine-img"><img :src="stationForm.avatar" alt=""></div>
<div class="content-machine-detail">
<div class="content-machine-name">{{stationForm.machineName}}</div>
<el-form :model="stationForm" ref="dialogForm" label-width="80px" label-position="center" style="width: 100%;">
@@ -38,15 +38,15 @@
<div class="collect-info-panel">
<div class="fact-analysis-realtim">
<div class="wimi-empty" style="background-color: rgb(255, 255, 255);" v-if="dmpList.length == 0">
- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
+ <!-- <div class="wimi-empty-img" style="width: 150px; height: 150px;">
<img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
- </div>
+ </div> -->
<div class="empty-description">
<div>鏆傛棤鏁版嵁</div>
</div>
</div>
<div class="fact-analysis-card" v-for="item in dmpList" v-if="dmpList.length != 0">
- <div class="card-name" :style="{'background-color': item.color}">{{item.description}}</div>
+ <div class="card-name" :style="{'background-color': item.color}">{{item.dpLabel}}</div>
<div :class="{'card-value': true,'card-value-bg1':item.name != 'Alarm','card-value-bg2':item.name == 'Alarm'}">{{item.codeName}}</div>
</div>
</div>
@@ -70,7 +70,7 @@
<div class="status-box" v-for="item in achievements"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
<div class="status-wrap">
- <el-checkbox v-model="checked1" label="浜哄伐鍙嶉鐘舵��" size="large" />
+ <el-checkbox v-model="humanFeedback" label="浜哄伐鍙嶉鐘舵��" size="large" />
<div class="status-con">
<div class="status-box" v-for="item in collectionstatus"><div class="status-color" :style="{'background-color': item.color}"></div>{{ item.name }}</div>
</div>
@@ -124,6 +124,7 @@
<save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
</template>
<script>
+ import station from "./station.png";
import moment from 'moment'
import * as echarts from 'echarts';
import saveDialog from './add-station-status'
@@ -133,7 +134,7 @@
return {
achievements: [],
collectionstatus: [],
- checked1: "",
+ humanFeedback: "",
alarmtotal: 0,
alarmtableData: [],
wcsDate: "",
@@ -319,7 +320,7 @@
this.alarmsearchBtn();
},
alarmsearchBtn() {
- this.$HTTP.get(`/api/blade-mdc/work-station-analysis/alarm/${this.lastLevelId}?current=${this.alarmsearchData.current}&size=${this.alarmsearchData.size}`).then(res=> {
+ this.$HTTP.get(`/api/mdc/work-station-analysis/alarm/${this.lastLevelId}?current=${this.alarmsearchData.current}&size=${this.alarmsearchData.size}`).then(res=> {
if(res.code == 200) {
this.alarmtableData = res.data.records;
this.alarmtotal = res.data.total;
@@ -336,10 +337,10 @@
getrecord() { //鐝鐘舵�佽褰晅able
var obj = {
date: this.wcsDate,
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/shift-index-status-record-table`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/shift-index-status-record-table`,obj).then(res=> {
if(res.code == 200) {
var defaultValues = {
oee: 0,
@@ -412,10 +413,10 @@
var obj = {
date: this.wcsDate,
//date : "2024-05-15",
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/shift-index-status-record-chart`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/shift-index-status-record-chart`,obj).then(res=> {
if(res.code == 200) {
var yAxisData = [];
var newData = [];
@@ -560,10 +561,10 @@
getwscLvalue() {
var obj = {
date: this.wcsDate,
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/time-distribution`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/time-distribution`,obj).then(res=> {
if(res.code == 200) {
var myChart = echarts.init(document.getElementById('wcs-left'));
var wcsOption = JSON.parse(JSON.stringify(this.wcsBeginOption));
@@ -586,7 +587,7 @@
})
},
getwcsLcolor() {
- this.$HTTP.get(`/api/blade-cps/global_wcs/list?code=&name=`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/list?code=&name=`).then(res=> {
if(res.code == 200) {
res.data.forEach(item=> {
item.itemStyle = {color: item.color};
@@ -599,10 +600,10 @@
getwcsR() {
var obj = {
date: this.wcsDate,
- humanFeedback: true,
+ humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/equipment-efficiency`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/equipment-efficiency`,obj).then(res=> {
if(res.code == 200) {
var myChart = echarts.init(document.getElementById('wcs-right'));
res.data.forEach(item=> {
@@ -629,8 +630,11 @@
handleNodeClick(data) {
if(data.code) {
this.lastLevelId = data.id;
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
+ this.$HTTP.get(`/api/smis/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
if(res.code == 200) {
+ if(res.data.avatar == "") {
+ res.data.avatar = station;
+ }
this.stationForm = res.data;
this.getdmp(this.lastLevelId,this.stationForm.machineId);
//this.newDate(); //鑾峰彇褰撳墠鏃ユ湡
@@ -644,8 +648,7 @@
}
},
getdmp(lastLevelId,machineId) {
- console.log(lastLevelId,machineId)
- this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
+ this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
this.dmpList = [];
var that = this;
@@ -654,39 +657,57 @@
type: "realTimeData",
workstationIdList: [lastLevelId]
}
+ if(res.data.dpConfig == null || res.data.dpConfig.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
if(this.$TOOL.socket.websocket == null) { //娌℃湁寤虹珛鍏堝缓绔�
this.$TOOL.socket.connectToWebSocket(this.$TOOL.cookie.get("TOKEN"));
}
this.$TOOL.socket.sendDataToWebSocket(obj); //鍙戦��
this.$TOOL.socket.websocket.onmessage = function(event) {
- if(res.data.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
- res.data.forEach(item=> { //绗竴姝ユ妸v鏀惧埌code閲�
- var eventData = JSON.parse(event.data);
- if(item.name == "DeviceStatus") { //鏈哄櫒鐘舵��
- item.code = eventData.data[item.name].v;
- that.allwcs.forEach(item1=> {
+ var JSONData = JSON.parse(res.data.dpConfig);
+ var eventData = JSON.parse(event.data);
+ if(Object.keys(eventData.data).length == 0) return;
+ JSONData.forEach((item,index)=> { //绗竴姝ユ妸v鏀惧埌code閲�
+ if(item.dpName == "DeviceStatus") { //鏈哄櫒鐘舵��
+ if(eventData.data[item.dpName]) {
+ item.code = eventData.data[item.dpName].v;
+ }
+ that.allwcs.forEach((item1)=> {
if(item.code == item1.code) {
item.codeName = item1.name; //绗簩姝ユ妸v鐨刢ode鍜岃繍琛屽搴�
- if(item.code == "2") {
- item.color = "#73D13D";
- }else {
- item.color = "#75C0C0";
- }
+ item.color = item1.color;
}
})
}else {
- if(item.name == 'Alarm') { //鎶ヨ
- var v = JSON.parse(eventData.data[item.name].v);
- item.description = v.code;
- item.codeName = v.msg;
- item.color = "#370C0D";
+ if(item.dpName == 'Alarm') { //鎶ヨ
+ if(eventData.data[item.dpName]) {
+ var v = JSON.parse(eventData.data[item.dpName].v);
+ if(Array.isArray(v)) { //濡傛灉鏄暟缁勶紝涓嶈祴鍊�
+ if(v.length == 0) {
+ JSONData.splice(index,1);
+ }else {
+ item.codeName = v[0].msg;
+ }
+ }else {
+ item.codeName = v.msg;
+ }
+ }
}else {
- item.codeName = eventData.data[item.name].v;
- item.color = "#75C0C0";
+ if(eventData.data[item.dpName]) {
+ item.codeName = eventData.data[item.dpName].v;
+ }else {
+ item.codeName = "";
+ }
}
+ that.allwcs.forEach((item1)=> {
+ if(item.code == item1.code) {
+ item.color = item1.color;
+ }else {
+ item.color = "#7FC0C0";
+ }
+ })
}
});
- that.dmpList = res.data;
+ that.dmpList = JSONData;
};
}
})
@@ -751,7 +772,7 @@
groupCategory: 1,
groupType: "group_workstation"
}
- this.$HTTP.post("/api/blade-cps/group/groupWorkstation/type",obj).then(res=> {
+ this.$HTTP.post("/api/smis/group/groupWorkstation/type",obj).then(res=> {
if(res.code == 200) {
if (res.code == 200) {
var treeDisabled = this.addTreeDisable(res.data);
@@ -777,7 +798,7 @@
})
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
- this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/wcs-achievements`).then(res=> {
if(res.code == 200) {
var achievements = [];//閲囬泦鐘舵��
var collectionstatus = []; //浜哄伐鍙嶉鐘舵��
@@ -796,8 +817,11 @@
})
},
getlist() {
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
- if(res.code == 200) {
+ this.$HTTP.get(`/api/smis/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
+ if(res.code == 200) {
+ if(res.data.avatar == "") {
+ res.data.avatar = station;
+ }
this.stationForm = res.data;
this.getdmp(this.lastLevelId,this.stationForm.machineId);
}
--
Gitblit v1.9.3