From d1bd10ed59634f7c24692867ee4418640a2cef6b Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期二, 23 四月 2024 18:25:49 +0800
Subject: [PATCH] 1
---
src/views/mdc/status-record.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index ae523e8..0c4a9ac 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>
@@ -32,6 +32,7 @@
</div>
</div>
</div>
+ <el-pagination layout="prev, pager, next" :total="total" :page-count="size" :default-page-size="size"/>
</el-tab-pane>
<el-tab-pane label="鎸夊伐浣嶆煡鐪�" name="time">
鎸夊伐浣嶆煡鐪�
@@ -46,7 +47,6 @@
import MYTree from './MYTree.vue'
import Shift from './components/Shift.vue'
import Time from './components/Time.vue'
-
export default {
components: {
time: "",
@@ -113,13 +113,15 @@
treeChecked: [],
achievements: [],
collectionstatus: [],
+ current: "1",
+ size: "6",
+ total: 0
}
},
created() {
},
mounted() {
- this.query();
this.init();
},
methods: {
@@ -151,15 +153,31 @@
}
})
},
+ getCharts() {
+ var obj = {
+ date: this.time[0],
+ humanFeedback: true,
+ machineFeedback: true,
+ 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.records)
+ this.total = res.data.total;
+ }
+ })
+ },
init() {
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.getTime({endDate: this.time[1],startDate: this.time[0],statisticalMethod: 'SHIFT'})
// this.$refs[this.activeName].init({
// endDate: this.time[1],
// startDate: this.time[0],
--
Gitblit v1.9.3