From 7243d05010bde40a8c82b7cbbf904eeb35168cdd Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 23 四月 2024 23:09:57 +0800
Subject: [PATCH] update
---
src/views/mdc/status-record.vue | 110 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 19 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index ae523e8..9635dfc 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -3,13 +3,13 @@
<div class="aposcope-left">
<div class="left-title">鏌ヨ鏉′欢</div>
<div class="left-title-col">鏃ユ湡</div>
- <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;"/>
+ <el-date-picker v-model="time" type="daterange" :shortcuts="shortcuts" range-separator="-" size="small" style="width: 100%;" value-format="YYYY-MM-DD"/>
<div class="left-title-col">宸ヤ綅</div>
<div class="MYTree">
<MYTree v-model="treeChecked" show-checkbox class="MYTree-content"></MYTree>
</div>
<div class="footer">
- <el-button @click="query">鏌ヨ</el-button>
+ <el-button @click="query" type="primary">鏌ヨ</el-button>
<el-button>瀵煎嚭</el-button>
</div>
</div>
@@ -20,7 +20,6 @@
<el-button @click="btnListActive = item.id" :type="btnListActive == item.id ? 'primary' : ''" v-for="item in btnList" :key="item.id" size="small">{{item.title }}</el-button>
</el-button-group>
<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>
@@ -31,6 +30,12 @@
<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 id="record" style="width: 100%;height:280px;"></div>
+ </div>
+ <div class="pagination">
+ <el-pagination layout="prev, pager, next" :total="total" :default-page-size="6"/>
</div>
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
@@ -46,7 +51,7 @@
import MYTree from './MYTree.vue'
import Shift from './components/Shift.vue'
import Time from './components/Time.vue'
-
+import * as echarts from 'echarts';
export default {
components: {
time: "",
@@ -75,6 +80,7 @@
},
data() {
return {
+ workstationInfoList: [],
checked1: true,
btnListActive: '',
btnList: [],
@@ -113,13 +119,49 @@
treeChecked: [],
achievements: [],
collectionstatus: [],
+ current: "1",
+ size: "6",
+ total: 0,
+ recordOptionLog:{
+ grid: {
+ top: '0%'
+ },
+ tooltip: {
+ //trigger: 'axis' // 瑙﹀彂绫诲瀷锛岄粯璁ゆ暟鎹Е鍙戯紝鍙�変负锛�'item'銆�'axis'
+ },
+ xAxis: {
+ boundaryGap: false,
+ type: 'category',
+ data: ['00:00:00', '04:00:00', '08:00:00', '12:00:00', '16:00:00', '20:00:00', '00:00:00'],
+ },
+ yAxis: {
+ type: 'category',
+ axisLabel: {
+ formatter: '{value}'
+ },
+ data: []
+ },
+ series: [
+ {
+ name: 'wcsLog',
+ type: 'bar',
+ data: [],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)'
+ }
+ }
+ }
+ ]
+ },
}
},
created() {
},
mounted() {
- this.query();
this.init();
},
methods: {
@@ -146,8 +188,41 @@
...data
}).then(res => {
if (res.code === 200) {
- this.btnList = res.data
+ var today = moment().format('YYYY-MM-DD');
+ var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
+ res.data.forEach(item=> {
+ if(item.title == today) {
+ item.title = "浠婂ぉ";
+ }
+ if(item.title == yesterday) {
+ item.title = "鏄ㄥぉ";
+ }
+ })
+ this.btnList = res.data.reverse();
this.btnListActive = res?.data?.[0]?.id
+ }
+ })
+ },
+ getCharts() {
+ var obj = {
+ //date: this.time[1],
+ date: "2024-04-16",
+ 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 (res.code === 200) {
+ console.log(res.data)
+ var myChart = echarts.init(document.getElementById('record'));
+ this.recordOptionLog.series[0].data = res.data.records.statusRecordList;
+ // var yAxis = [];
+ res.data.records.forEach(item=> {
+ item.value = item.workstationInfo.name;
+ })
+ this.recordOptionLog.yAxis.data = res.data.records;
+ myChart.setOption(this.recordOptionLog);
+ this.total = res.data.total;
}
})
},
@@ -155,17 +230,15 @@
this.time = [moment().subtract(2, 'days').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')];
this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'}); //鏃ユ湡sort
this.getachievements(); //閲囬泦鐘舵�乷r浜哄伐鍙嶉鐘舵��
+ this.getCharts();
},
timeBtnChange() {
},
query() {
- // this.$refs[this.activeName].init({
- // endDate: this.time[1],
- // startDate: this.time[0],
- // shiftIndexList: [1, 2],
- // workStationIdList: [...this.treeChecked]
- // })
+ this.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'});
+ //this.getCharts();
+ console.log(this.treeChecked,2)
}
}
}
@@ -176,6 +249,7 @@
display: flex;
min-height: 100%;
height: 100%;
+ overflow: hidden;
margin: 8px;
}
.aposcope-left {
@@ -241,13 +315,6 @@
font-size: 16px;
cursor: pointer;
}
-.feed-button {
- position: absolute;
- right: 10px;
- top: -2px;
- color: #3b8e8e;
- cursor: pointer;
-}
.status-wrap.align-left, .status-wrap:first-child {
padding-left: 24px;
}
@@ -281,4 +348,9 @@
.status-wrap /deep/ .el-checkbox.el-checkbox--large {
color: #3b8e8e;
}
+.pagination {
+ text-align: right;
+ display: flex;
+ justify-content: end;
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3