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/efficiency-analysis.vue | 73 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 2776c22..f42fd8b 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-18 21:48:13
+ * @LastEditTime: 2024-04-20 21:04:13
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -22,8 +22,8 @@
</el-col>
<el-col style="margin-top: 14px;">鏃ユ湡</el-col>
<el-col>
- <el-date-picker style="width: 250px" v-model="time" type="daterange"
- range-separator="-" start-placeholder="" end-placeholder="" />
+ <el-date-picker value-format="YYYY-MM-DD" style="width: 250px" v-model="time"
+ type="daterange" range-separator="-" start-placeholder="" end-placeholder="" />
</el-col>
</el-row>
<el-row style="margin-top: 14px;">
@@ -32,20 +32,22 @@
<MYTree v-model="treeChecked" show-checkbox></MYTree>
</el-main>
<el-footer>
- <el-button>鏌ヨ</el-button>
+ <el-button @click="query">鏌ヨ</el-button>
<el-button>瀵煎嚭</el-button>
</el-footer>
</el-container>
</el-aside>
<el-container>
- <el-tabs tab-position="top" v-model="activeName">
- <el-tab-pane label="鎸夌彮娆＄粺璁�" name="ban">
-
- </el-tab-pane>
- <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
-
- </el-tab-pane>
- </el-tabs>
+ <el-main>
+ <el-tabs tab-position="top" v-model="activeName" type="card">
+ <el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
+ <Shift colname="鏁堢巼" ref="shift" v-if="activeName == 'shift'" />
+ </el-tab-pane>
+ <el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
+ <Time ref="time" v-if="activeName == 'time'" />
+ </el-tab-pane>
+ </el-tabs>
+ </el-main>
</el-container>
</el-container>
</el-card>
@@ -53,21 +55,31 @@
</template>
<script>
+import moment from 'moment';
import MYTree from './MYTree.vue'
+import Shift from './components/Shift.vue'
+import Time from './components/Time.vue'
+
export default {
components: {
MYTree,
+ Shift,
+ Time
},
watch: {
- treeChecked(value) {
- this.query(value)
+ activeName() {
+ this.$nextTick(() => {
+ this.query()
+ })
+
}
},
data() {
return {
- activeName: '',
- productivityType: '',
+ activeName: 'shift',
+ productivityType: 'OEE',
time: [],
+ treeChecked: [],
options: [
{
label: '绋煎姩鐜�',
@@ -84,21 +96,28 @@
]
}
},
+ created() {
+ this.time = [moment().format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')]
+ },
+ mounted() {
+ this.query()
+ },
methods: {
- query(vals) {
- console.log([...vals])
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
- endDate: this.time[0],
- startDate: this.time[1],
- statisticalMethod: 'SHIFT'
+ query() {
+ this.$refs[this.activeName].init({
+ endDate: this.time[1],
+ startDate: this.time[0],
+ productivityType: this.productivityType,
+ shiftIndexList: [1, 2],
+ workStationIdList: [...this.treeChecked]
})
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis?size=-1', {
+ // this.$HTTP.post('/api/blade-mdc/efficiency-analysis?size=-1', {
- })
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis?current=1&size=15', {
+ // })
+ // this.$HTTP.post('/api/blade-mdc/efficiency-analysis?current=1&size=15', {
- })
- this.$HTTP.post('/api/blade-cps/workstation-wcs-feedback/feedback-status', [...vals])
+ // })
+ // this.$HTTP.post('/api/blade-cps/workstation-wcs-feedback/feedback-status', [...vals])
}
}
}
--
Gitblit v1.9.3