From 1233a8055749d03f5afc1b78529b8da1655cf692 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期六, 27 四月 2024 17:59:57 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 63 +++++++++++++++++++++++++++----
src/views/mdc/components/recordChartsByWorkstation.vue | 35 ++++++++---------
2 files changed, 71 insertions(+), 27 deletions(-)
diff --git a/src/views/mdc/components/recordChartsByWorkstation.vue b/src/views/mdc/components/recordChartsByWorkstation.vue
index 55c94a6..12753cc 100644
--- a/src/views/mdc/components/recordChartsByWorkstation.vue
+++ b/src/views/mdc/components/recordChartsByWorkstation.vue
@@ -1,6 +1,6 @@
<template>
- <div>
- <div id="recordwork" style="width: 1000px;height:500px;"></div>
+ <div id="recordworkParse">
+ <div id="recordwork" style="height:500px;"></div>
<div class="paginationwork">
<el-pagination layout="prev, pager, next" @current-change="recordChange" :total="total" :default-page-size="6"/>
</div>
@@ -11,13 +11,13 @@
import moment from 'moment';
import * as echarts from 'echarts';
export default {
- props: ['collectionstatus','date','workstationInfoList'],
+ props: ['setWork','collectionstatus',"select"],
watch: {
- date(val) {
+ setWork(val) {
this.current = "1";
this.getCharts();
},
- workstationInfoList(val) {
+ select(val) {
this.current = "1";
this.getCharts();
}
@@ -75,20 +75,15 @@
return color;
},
getCharts() {
- var obj = {
- date: this.date,
- humanFeedback: true,
- machineFeedback: true,
- workstationInfoList: this.workstationInfoList
- }
- this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-date?current=${this.current}&size=${this.size}`,obj).then(res => {
+ if(!this.setWork) return;
+ this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => {
if (res.code === 200) {
var yAxisData = [];
var newData = [];
this.records = res.data.records;
res.data.records.reverse();
res.data.records.forEach((item,index)=> {
- yAxisData.push(item.workstationInfo.name);
+ yAxisData.push(item.date);
//璁＄畻寮�濮嬫椂闂达紝鏄剧ず鏃堕棿
item.statusRecordList.forEach(item1=> {
var initstart = item1.startTime.split(" ")[0]; //鏍规嵁鏃ユ湡璁＄畻宸��
@@ -98,9 +93,9 @@
var color = this.getColor(item1.wcsDesc);
item1.value = [index,startTime,endTime,diff];
item1.itemStyle = {"normal": {"color": color}};
- item1.code = item.workstationInfo.code;
- item1.name = item.workstationInfo.name;
- item1.id = item.workstationInfo.id;
+ item1.code = item.date;
+ item1.name = item.date;
+ item1.id = item.date;
})
newData.push(...item.statusRecordList);
})
@@ -125,9 +120,9 @@
},
grid: {
top: 10,
- left: 70,
+ left: 100,
bottom: 130,
- right: 0
+ right: 30
},
xAxis: {
min: 0,
@@ -173,7 +168,11 @@
]
};
var recordDom = document.getElementById('recordwork');
+ var recordworkParse = document.getElementById('recordworkParse');
var myChart = echarts.init(recordDom);
+ myChart.resize({
+ width: document.documentElement.clientWidth - 340 + "px"
+ });
myChart.setOption(option);
},
recordChange(current) {
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index 6b6a62d..c86ba48 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -46,7 +46,7 @@
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
<div class="fact-analysis-realtim">
- <div class="wimi-empty" style="background-color: rgb(255, 255, 255);" v-show="isshowempty">
+ <div class="wimi-empty" v-if="isshowempty" style="background-color: rgb(255, 255, 255);">
<div class="wimi-empty-img" style="width: 150px; height: 150px;">
<img src="./quesheng.bd026700.png" style="height: auto; width: 100%;">
</div>
@@ -54,12 +54,13 @@
<div>鏆傛棤鏁版嵁</div>
</div>
</div>
- <div v-show="!isshowempty">
+ <div>
<el-button-group>
<el-button @click="changeTabGongwei(item)" :type="btnGongweiListActive == item.id ? 'primary' : ''" v-for="item in btnGongweiList" :key="item.id" size="small">{{item.name }}</el-button>
</el-button-group>
<div class="status">
<div class="status-wrap align-left">
+ <div class="feed-button" @click="table_edit">鐘舵�佸弽棣�</div>
<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>
@@ -70,12 +71,11 @@
</div>
</div>
</div>
- <!-- collectionstatus 鍙嶉鐘舵��
- date 鏃ユ湡
- workstationInfoList 宸ヤ綅list -->
- <record-charts-by-workstation :collectionstatus="collectionstatus" :date="date" :workstationInfoList="workstationInfoList" v-if="collectionstatus.length != 0"></record-charts-by-workstation>
+ <!-- setWork 鍏ュ弬 -->
+ <record-charts-by-workstation :setWork="setWork" :select="select" :collectionstatus="collectionstatus" v-if="!isshowempty"></record-charts-by-workstation>
</div>
</div>
+ <save-dialog v-if="dialog.save" ref="saveDialog" @success="addfeedbackSuccess" :workstationId="lastLevelId" @closed="dialog.save=false"></save-dialog>
</el-tab-pane>
</el-tabs>
</div>
@@ -83,6 +83,7 @@
</template>
<script>
+import saveDialog from './add-station-status'
import moment from 'moment';
import MYTree from './MYTree.vue';
import recordChartsByDate from './components/recordChartsByDate.vue';
@@ -92,7 +93,8 @@
time: "",
MYTree,
recordChartsByDate,
- recordChartsByWorkstation
+ recordChartsByWorkstation,
+ saveDialog
},
watch: {
treeChecked(select) {
@@ -105,6 +107,9 @@
},
data() {
return {
+ dialog: {
+ save: false
+ },
isshowempty: true,
select: [],
workstationInfoList: [],
@@ -148,7 +153,9 @@
time: [],
treeChecked: [],
achievements: [],
- collectionstatus: []
+ collectionstatus: [],
+ workstationId: "",
+ setWork: {}
}
},
created() {
@@ -159,6 +166,21 @@
this.init();
},
methods: {
+ addfeedbackSuccess() {
+ this.setWork = {
+ endDate: this.time[1],
+ startDate: this.time[0],
+ humanFeedback: true,
+ machineFeedback: true,
+ workstationId: this.lastLevelId
+ }
+ },
+ table_edit(){
+ this.dialog.save = true
+ this.$nextTick(() => {
+ this.$refs.saveDialog.open('edit').setData(this.lastLevelId);
+ })
+ },
tabChange(val) {
if(val == "time") { //鎸夊伐浣嶆煡鐪�
@@ -183,7 +205,15 @@
this.date = item.id;
},
changeTabGongwei(item) { //鎸夊伐浣嶆煡璇�
-
+ this.btnGongweiListActive = item.id;
+ this.lastLevelId = this.btnGongweiListActive;
+ this.setWork = {
+ endDate: this.time[1],
+ startDate: this.time[0],
+ humanFeedback: true,
+ machineFeedback: true,
+ workstationId: item.id
+ }
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
@@ -237,6 +267,14 @@
if(this.select.length != 0) { //閫変簡鍊兼樉绀哄伐浣�
this.btnGongweiList = this.select;
this.btnGongweiListActive = this.btnGongweiList[0].id;
+ this.lastLevelId = this.btnGongweiListActive;
+ this.setWork = {
+ endDate: this.time[1],
+ startDate: this.time[0],
+ humanFeedback: true,
+ machineFeedback: true,
+ workstationId: this.select[0].id
+ }
this.isshowempty = false;
}
}
@@ -374,4 +412,11 @@
margin-top: -16px;
line-height: 28px;
}
+ .feed-button {
+ position: absolute;
+ right: 10px;
+ top: -2px;
+ color: #3b8e8e;
+ cursor: pointer;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3