From 75b68e6680ac060c408753677e952d4f4547756c Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 18:27:18 +0800
Subject: [PATCH] 1
---
src/views/mdc/station-live.vue | 517 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 355 insertions(+), 162 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index a07a20f..6aa3a6a 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,19 +2,19 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-04-23 17:08:42
+ * @LastEditTime: 2024-11-08 18:26:10
* @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
-->
<template>
<div class="aposcope-main">
<div class="aposcope-left">
- <div class="left-title">鏌ヨ鏉′欢</div>
- <el-tree :data="tableData" node-key="id" default-expand-all :expand-on-click-node="false" :props="defalutProps" @node-click="handleNodeClick" ref="treeRef" highlight-current />
+ <!-- <div class="left-title">鏌ヨ鏉′欢</div> -->
+ <MYTree v-model="treeChecked" @loaded="query"></MYTree>
</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,19 +38,20 @@
<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: rgb(127, 192, 192);">{{item.description}}</div>
- <div class="card-value" style="background-color: rgba(127, 192, 192, 0.14);"></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>
</div>
+
<el-tabs type="border-card" class="demo-tabs">
<el-tab-pane label="宸ヤ綅鏁版嵁">
<div style="text-align: right;margin-bottom: 14px;">
@@ -60,37 +61,7 @@
<div><div id="wcs-left" style="width: 100%;height:400px;"></div></div>
<div><div id="wcs-right" style="width: 100%;height:400px;"></div></div>
</div>
- <div class="bottom-panel content-panel">
- <div class="panel-title">鐝鐘舵�佽褰�</div>
- <div class="panel-content bottom-panel-chart">
- <div class="status">
- <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
- <div class="status-wrap align-left">
- <div class="collect-status">閲囬泦鐘舵��</div>
- <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" />
- <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>
- </div>
- </div>
- </div>
- <div style="padding: 8px;">
- <div id="wcs-log" style="width: 100%;height:200px;"></div>
- <el-table ref="multipleTableRef1" :data="recordData" border style="width: 100%;">
- <el-table-column prop="shiftIndexName" label="鐝"></el-table-column>
- <el-table-column prop="temdata" label="璋冭瘯"></el-table-column>
- <el-table-column prop="temdata" label="绂荤嚎"></el-table-column>
- <el-table-column prop="temdata" label="寰呮満"></el-table-column>
- <el-table-column prop="temdata" label="鎶ヨ"></el-table-column>
- <el-table-column prop="temdata" label="杩愯"></el-table-column>
- <el-table-column prop="perdata" label="绋煎姩鐜�%"></el-table-column>
- <el-table-column prop="perdata" label="鎶ヨ鐜�%"></el-table-column>
- </el-table>
- </div>
- </div>
+
</el-tab-pane>
<el-tab-pane label="鏈哄櫒灞ュ巻">
<div class="alarm-title">鎶ヨ淇℃伅灞ュ巻</div>
@@ -111,21 +82,64 @@
</el-pagination>
</el-tab-pane>
</el-tabs>
+
+ <div class="bottom-panel content-panel">
+ <div class="panel-title">鐝鐘舵�佽褰�</div>
+ <div class="panel-content bottom-panel-chart">
+ <div class="status">
+ <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
+ <div class="status-wrap align-left">
+ <div class="collect-status">閲囬泦鐘舵��</div>
+ <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="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>
+ </div>
+ </div>
+ </div>
+ <div style="padding: 8px;">
+ <div id="wcs-log" style="width: 100%;height:200px;"></div>
+ <el-table ref="multipleTableRef1" :data="recordData" border style="width: 100%;">
+ <el-table-column prop="shiftIndexName" label="鐝"></el-table-column>
+ <el-table-column prop="5" label="璋冭瘯"></el-table-column>
+ <el-table-column prop="4" label="绂荤嚎"></el-table-column>
+ <el-table-column prop="3" label="寰呮満"></el-table-column>
+ <el-table-column prop="1" label="鎶ヨ"></el-table-column>
+ <el-table-column prop="2" label="杩愯"></el-table-column>
+ <el-table-column prop="oee" label="绋煎姩鐜�%">
+ <template #default="scope">
+ <span>{{(Number(scope.row.oee) * 100).toFixed(2)}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="perdata" label="鎶ヨ鐜�%">
+ <template #default="scope">
+ <span>{{(Number(scope.row.fault) * 100).toFixed(2)}}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
</div>
</div>
- <save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
+ <save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="treeChecked.toString()" @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'
+ import saveDialog from './add-station-status';
+ import MYTree from './MYTree.vue';
export default {
name: "state-feedback",
data(){
return {
+ treeChecked: [],
achievements: [],
collectionstatus: [],
- checked1: "",
+ humanFeedback: "",
alarmtotal: 0,
alarmtableData: [],
wcsDate: "",
@@ -143,7 +157,7 @@
tooltip: {
trigger: 'item',
//formatter: '{a} <br/>{b} : {c} ({d}%)'
- formatter: '{a} 0鍒嗛挓'
+ formatter: '{a} {c}鍒嗛挓'
},
legend: {
orient: 'vertical',
@@ -240,20 +254,7 @@
type: 'category',
data: ['1', '2']
},
- series: [
- {
- name: 'wcsLog',
- type: 'bar',
- data: [],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
+ series: []
},
dmpList: [],
stationForm: {
@@ -265,7 +266,6 @@
dialog: {
save: false
},
- lastLevelId: "",
current: "1",
size: "15",
searchData: {
@@ -290,24 +290,30 @@
current: "1",
size: "15"
},
- recordData: [] // 鐝鐘舵�佽褰晅able
+ records: [],
+ recordData: [], // 鐝鐘舵�佽褰晅able
+ allwcs: []
}
},
created(){
},
+ watch: {
+ treeChecked() {
+ this.query()
+ }
+ },
mounted(){
this.newDate(); //鑾峰彇褰撳墠鏃ユ湡
- this.getTreeList(this.$route.query.code);
},
components: {
- saveDialog
+ saveDialog,MYTree
},
methods: {
table_edit(){
this.dialog.save = true
this.$nextTick(() => {
- this.$refs.saveDialog.open('edit').setData(this.lastLevelId);
+ this.$refs.saveDialog.open('edit').setData(this.treeChecked.toString());
})
},
alarmSizeChange(val) {
@@ -322,7 +328,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.treeChecked.toString()}?current=${this.alarmsearchData.current}&size=${this.alarmsearchData.size}`).then(res=> {
if(res.code == 200) {
this.alarmtableData = res.data.records;
this.alarmtotal = res.data.total;
@@ -339,32 +345,124 @@
getrecord() { //鐝鐘舵�佽褰晅able
var obj = {
date: this.wcsDate,
- humanFeedback: true,
- workstationId: this.lastLevelId
+ humanFeedback: this.humanFeedback,
+ workstationId: this.treeChecked.toString()
}
- 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) {
- res.data.forEach(item=> {
- item.temdata = "00:00:00";
- item.perdata = "0";
- })
+ var defaultValues = {
+ oee: 0,
+ fault: 0,
+ '1': "00:00:00",
+ '2': "00:00:00",
+ '3': "00:00:00",
+ '4': "00:00:00",
+ '5': "00:00:00"
+ };
+ res.data.forEach(item => {
+ Object.keys(defaultValues).forEach(key => {
+ if (!item[key]) {
+ item[key] = defaultValues[key];
+ }
+ });
+ });
this.recordData = res.data;
}
})
},
+ renderItem(params, api) {
+ var categoryIndex = api.value(0);
+ var start = api.coord([api.value(1), categoryIndex]);
+ var end = api.coord([api.value(2), categoryIndex]);
+ var height = api.size([0, 1])[1] * 0.6;
+ var rectShape = echarts.graphic.clipRectByRect(
+ {
+ x: start[0],
+ y: start[1] - height / 2,
+ width: end[0] - start[0],
+ height: height
+ },
+ {
+ x: params.coordSys.x,
+ y: params.coordSys.y,
+ width: params.coordSys.width,
+ height: params.coordSys.height
+ }
+ );
+ return (
+ rectShape && {
+ type: 'rect',
+ transition: ['shape'],
+ shape: rectShape,
+ style: api.style()
+ }
+ );
+ },
+ getColor(name) {
+ var color = '';
+ this.achievements.forEach(item=> {
+ if(item.code == name) {
+ color = item.color;
+ }
+ })
+ return color;
+ },
+ getStatus(name) {
+ var stauts = {};
+ this.allwcs.forEach(item=> {
+ if(item.code == name) {
+ stauts.name= item.name;
+ stauts.type= item.type;
+ }
+ })
+ return stauts;
+ },
getlogcart() { //鐝鐘舵�佽褰昪hart
var obj = {
date: this.wcsDate,
- humanFeedback: true,
- workstationId: this.lastLevelId
+ //date : "2024-05-15",
+ humanFeedback: this.humanFeedback,
+ workstationId: this.treeChecked.toString()
}
- 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-chart`,obj).then(res=> {
if(res.code == 200) {
- var myChart = echarts.init(document.getElementById('wcs-log'));
- res.data.forEach(item => {
- item.value = 0;
+ var yAxisData = [];
+ var newData = [];
+ this.records = res.data.reverse();
+ res.data.forEach(item=> {
+ if(item.statusRecordList == null) item.statusRecordList = [];
+ var filterRecordList = [];
+ item.statusRecordList.forEach(item1=> {
+ if(item1.endTime.startsWith(this.wcsDate)) { //鍙繑鍥炲綋鍓嶇粨鏉熸棩鏈熺殑
+ filterRecordList.push(item1)
+ }
+ })
+ item.statusRecordList = filterRecordList;
})
- this.wcsOptionLog.series[0].data = res.data;
+ res.data.forEach((item,index)=> {
+ yAxisData.push(item.shiftIndex);
+ //璁＄畻寮�濮嬫椂闂达紝鏄剧ず鏃堕棿
+ if(item.statusRecordList == null) item.statusRecordList = [];
+ item.statusRecordList.forEach(item1=> {
+ var initstart = item1.startTime.split(" ")[0]; //鏍规嵁鏃ユ湡璁＄畻宸��
+ var startTime = moment(item1.startTime).diff(moment(initstart + " 00:00:00"), 'minutes');
+ var endTime = moment(item1.endTime).diff(moment(initstart + " 00:00:00"), 'minutes');
+ var diff = moment(item1.endTime).diff(moment(item1.startTime), 'minutes') //寮�濮嬩簡澶氫箙
+ var color = this.getColor(item1.wcs);
+ item1.value = [index,startTime,endTime,diff];
+ item1.itemStyle = {"normal": {"color": color}};
+ item1.statusName = this.getStatus(item1.wcs).name;
+ item1.statusType = this.getStatus(item1.wcs).type;
+ })
+ newData.push(...item.statusRecordList);
+ })
+ //娓叉煋鍥捐〃
+ this.setCharts(yAxisData,newData);
+
+ var nowTime = moment().format("HH:mm:ss"); //11:37:54
+ var spaceTime = moment(obj.date + " " + nowTime).diff(moment(obj.date + " 00:00:00"), 'hours'); //绂诲綋澶�00:00:00杩囦簡澶氬皯灏忔椂
+ //console.log(spaceTime,obj.date + " " + nowTime,234)
+ return;
//璁＄畻鏃堕棿
var startOfDay = moment().startOf('day'); //00:00:00
var now = moment(); //褰撳墠鏃堕棿
@@ -387,19 +485,100 @@
}
})
},
+ setCharts(yAxisData,data) {
+ var option = {
+ tooltip: {
+ formatter: function (params) {
+ if(params.data.statusType == 4) {
+ var dom = `<span class="tipdesc">宸ヤ綅:</span>${params.data.name}</br>
+ <span class="tipdesc">鐘舵��:</span>${params.data.wcsDesc}</br>
+ <span class="tipdesc">鎻忚堪:</span>${params.data.feedbackDesc}</br>
+ <span class="tipdesc">鐘舵�佹椂闂�:</span>${params.data.startTime} 锝� ${params.data.endTime}</br>
+ <span class="tipdesc">鍙嶉鏃堕棿:</span>${params.data.feedbackTime}</br>
+ <span class="tipdesc">鍙嶉浜�:</span>${params.data.feedUser}</br>`
+ }else {
+ var dom = `<span class="tipstatus">${params.data.statusName}</span></br>
+ <span class="tipdesc">鏃舵:</span><span>${params.data.startTime.split(" ")[1]} 锝� ${params.data.endTime.split(" ")[1]}</span></br>`
+ }
+ return dom;
+ }
+ },
+ grid: {
+ top: 10,
+ left: 70,
+ bottom: 120
+ },
+ xAxis: {
+ min: 0,
+ max: 1440, // 鍗曚綅鍒嗛挓
+ interval: 1440/6, //姣忛殧澶氬皯鍒嗛挓鏄剧ず涓�涓埢搴�
+ axisLabel: {
+ formatter: (value)=> {
+ if(value == 0) {
+ return "00:00:00";
+ }else if(value == 240) {
+ return "04:00:00";
+ }else if(value == 480) {
+ return "08:00:00";
+ }else if(value == 720) {
+ return "12:00:00";
+ }else if(value == 960) {
+ return "16:00:00";
+ }else if(value == 1200) {
+ return "18:00:00";
+ }else if(value == 1440) {
+ return "00:00:00";
+ }
+ }
+ }
+ },
+ yAxis: {
+ type: 'category',
+ axisLabel: {
+ formatter: function (value) {
+ return value;
+ },
+ rich: {
+ a: {
+ color: '#409eff',
+ cursor: 'pointer',
+ fontSize: '12px'
+ }
+ }
+ },
+ data: yAxisData
+ },
+ series: [
+ {
+ type: 'custom',
+ renderItem: this.renderItem,
+ itemStyle: {
+ opacity: 0.8
+ },
+ encode: {
+ x: [1, 2],
+ y: 0
+ },
+ data: data
+ }
+ ]
+ };
+ var myChart = echarts.init(document.getElementById('wcs-log'));
+ myChart.setOption(option);
+ },
getwscLvalue() {
var obj = {
date: this.wcsDate,
- humanFeedback: true,
- workstationId: this.lastLevelId
+ humanFeedback: this.humanFeedback,
+ workstationId: this.treeChecked.toString()
}
- 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));
if(res.data.length == 0) {
wcsOption.forEach(item=> {
- item.value = 20;
+ item.value = 0;
})
}else {
wcsOption.forEach(item=> {
@@ -416,7 +595,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};
@@ -429,10 +608,10 @@
getwcsR() {
var obj = {
date: this.wcsDate,
- humanFeedback: true,
- workstationId: this.lastLevelId
+ humanFeedback: this.humanFeedback,
+ workstationId: this.treeChecked.toString()
}
- 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=> {
@@ -456,49 +635,88 @@
addfeedbackSuccess() {
},
- handleNodeClick(data) {
- if(data.code) {
- this.lastLevelId = data.id;
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
- if(res.code == 200) {
- this.stationForm = res.data;
- this.getdmp(this.lastLevelId,this.stationForm.machineId);
- this.newDate(); //鑾峰彇褰撳墠鏃ユ湡
- this.getwcsR();
- this.getwscLvalue(); //宸︿晶鍥捐〃
- this.alarmsearchBtn(); //鏈哄櫒灞ュ巻
- this.getrecord(); //鐝鐘舵�佽褰晅able
- this.getlogcart(); //鐝鐘舵�佽褰昪hart
- }
- })
- }
- },
- getdmp(lastLevelId,machineId) {
- this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
+ query() {
+ if (!this.treeChecked.toString()) return;
+ this.$HTTP.get(`/api/smis/workstation/get?workstationId=${this.treeChecked.toString()}`).then(res=> {
if(res.code == 200) {
- this.dmpList = res.data;
+ if(res.data.avatar == "") {
+ res.data.avatar = station;
+ }
+ this.stationForm = res.data;
+ this.getdmp(this.stationForm.machineId);
+ //this.newDate(); //鑾峰彇褰撳墠鏃ユ湡
+ this.getwcsR();
+ this.getwcsLcolor(); //宸︿晶鍥捐〃
+ this.alarmsearchBtn(); //鏈哄櫒灞ュ巻
+ this.getrecord(); //鐝鐘舵�佽褰晅able
+ this.getlogcart(); //鐝鐘舵�佽褰昪hart
}
})
},
- getLastLevelIds(tree) {
- if (tree.length === 0) return ""; // 濡傛灉娌℃湁鏍硅妭鐐癸紝杩斿洖绌�
- const lastLevelIds = [];
- const lastLevelCodes = [];
- function traverseTree(node) {
- if(!node.code) {
- lastLevelCodes.push(node.id);
- }
- if (node.children.length > 0) {
- node.children.forEach(traverseTree); // 閫掑綊閬嶅巻瀛愯妭鐐�
- } else {
- if(node.code) {
- lastLevelIds.push(node.id); // 鏈塩ode鎵嶈
+ getdmp(machineId) {
+ this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId?machineId=${machineId}&workstationId=${this.treeChecked.toString()}`).then(res=> {
+ if(res.code == 200) {
+ this.dmpList = [];
+ var that = this;
+ //鍙戦�亀ebsocket
+ var obj = {
+ type: "realTimeData",
+ workstationIdList: this.treeChecked
}
+ 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) {
+ 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鍜岃繍琛屽搴�
+ item.color = item1.color;
+ }
+ })
+ }else {
+ 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 {
+ 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 = JSONData;
+ };
}
- }
- // 鍙亶鍘嗙涓�涓牴鑺傜偣
- traverseTree(tree[0]);
- return {lastLevelCodes,lastLevelId:lastLevelIds[0]}; // 杩斿洖lastLevelCodes锛氭病鏈塩ode鐨勬暟缁勩�俵astLevelId锛氭湁code鐨勭涓�涓猧d
+ })
},
buildTree(items) {
const idMap = {};
@@ -535,38 +753,8 @@
})
return tree;
},
- getTreeList(id) {
- var obj = {
- groupCategory: 1,
- groupType: "group_workstation"
- }
- this.$HTTP.post("/api/blade-cps/group/groupWorkstation/type",obj).then(res=> {
- if(res.code == 200) {
- if (res.code == 200) {
- var treeDisabled = this.addTreeDisable(res.data);
- this.tableData = this.buildTree(treeDisabled); //浠庢墎骞冲寲鍙樹负鏍戠姸缁撴瀯
- this.$nextTick(()=> {
- if(id) {
- this.lastLevelId = id; //鎸囧畾id
- }else {
- this.lastLevelId = this.getLastLevelIds(this.tableData).lastLevelId;
- }
- this.$refs.treeRef.setCurrentKey(this.lastLevelId); //绗竴涓妭鐐圭殑绗竴涓瓙鑺傜偣鏈�鍚庝竴绾ч粯璁ら�変腑
- //浠ヤ笅鏄垵濮嬪寲鏁版嵁
- this.getlist(); //娓叉煋璇︽儏鍜�(鐘舵�乴ist)
- this.getwcsLcolor(); //宸︿晶鍥捐〃
- this.getwcsR(); //鍙充晶鍥炬爣
- this.getachievements(); //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
- this.getrecord(); //鐝鐘舵�佽褰晅able
- this.getlogcart(); //鐝鐘舵�佽褰昪hart
- })
-
- }
- }
- })
- },
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 = []; //浜哄伐鍙嶉鐘舵��
@@ -580,14 +768,7 @@
})
this.achievements = achievements;
this.collectionstatus = collectionstatus;
- }
- })
- },
- getlist() {
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
- if(res.code == 200) {
- this.stationForm = res.data;
- this.getdmp(this.lastLevelId,this.stationForm.machineId);
+ this.allwcs = res.data;
}
})
}
@@ -605,6 +786,7 @@
margin-right: 8px;
padding: 4px;
background-color: #fff;
+ padding-top:20px;
}
.aposcope-right {
flex: 1;
@@ -691,6 +873,13 @@
padding: 0 8px;
overflow: hidden;
word-break: break-all;
+ line-height: 68px;
+}
+.card-value-bg1 {
+ background-color: rgba(115, 209, 61, 0.14);
+}
+.card-value-bg2 {
+ background-color: rgba(55, 12, 13, 0.14);
}
.wcs-main {
display: flex;
@@ -757,7 +946,6 @@
}
.panel-content {
width: 100%;
- height: calc(100% - 45px);
}
.panel-content-gant, .panel-content-table {
width: 100%;
@@ -823,4 +1011,9 @@
.status-wrap /deep/ .el-checkbox.el-checkbox--large {
color: #409eff;
}
+#record /deep/ .tipstatus {
+ width: 100%;
+ display: inline-block;
+ border-bottom: 1px solid #eee;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3