From f606a6ba8eda7bf5078fc558e41ebd9e116a9d43 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期六, 20 四月 2024 20:55:43 +0800
Subject: [PATCH] 产量统计
---
src/views/mdc/components/Shift.vue | 10 +++++++---
src/views/mdc/components/Time.vue | 10 +++++++---
src/views/mdc/output-statistics.vue | 18 ++++++------------
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index a0a6a2e..043de38 100644
--- a/src/views/mdc/components/Shift.vue
+++ b/src/views/mdc/components/Shift.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-20 19:51:13
+ * @LastEditTime: 2024-04-20 20:49:20
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -53,6 +53,10 @@
<script>
import scEcharts from '@/components/scEcharts';
export default {
+ props: {
+ url: '/api/blade-mdc/efficiency-analysis',
+ type: String,
+ },
components: {
scEcharts
},
@@ -121,7 +125,7 @@
queryType: 0,
statisticalMethod: this.statisticalMethod
}
- return this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
this.chartsData = res.data.items.records
let option2 = {
legend: {
@@ -184,7 +188,7 @@
delete dataSend.size
delete dataSend.order
delete dataSend.prop
- return await this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ return await this.$HTTP.post(this.url, dataSend, { params }).then(res => {
return {
...res,
data: res.data.items
diff --git a/src/views/mdc/components/Time.vue b/src/views/mdc/components/Time.vue
index c01ab7c..13b11da 100644
--- a/src/views/mdc/components/Time.vue
+++ b/src/views/mdc/components/Time.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-20 20:41:13
+ * @LastEditTime: 2024-04-20 20:50:02
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
@@ -40,6 +40,10 @@
<script>
import scEcharts from '@/components/scEcharts';
export default {
+ props: {
+ url: '/api/blade-mdc/efficiency-analysis',
+ type: String,
+ },
components: {
scEcharts
},
@@ -115,7 +119,7 @@
queryType: 0,
statisticalMethod: this.statisticalMethod
}
- return this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
this.chartsData = res.data.items.records
let option2 = {
// legend: {
@@ -185,7 +189,7 @@
delete dataSend.size
delete dataSend.order
delete dataSend.prop
- return await this.$HTTP.post('/api/blade-mdc/efficiency-analysis', dataSend, { params }).then(res => {
+ return await this.$HTTP.post(this.url, dataSend, { params }).then(res => {
let row = res.data.items?.records[0]?.data || {}
this.cols = Object.keys(row)
console.log(this.cols)
diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index 9c04d69..6aa3ae9 100644
--- a/src/views/mdc/output-statistics.vue
+++ b/src/views/mdc/output-statistics.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-20 20:43:33
+ * @LastEditTime: 2024-04-20 20:52:06
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/output-statistics.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -13,13 +13,6 @@
<el-container>
<el-main class="nopadding">
<el-row>
- <el-col>缁熻鏁版嵁</el-col>
- <el-col>
- <el-select style="width: 250px" v-model="productivityType">
- <el-option v-for="(item, index) in options" :key="index" :label="item.label"
- :value="item.value"></el-option>
- </el-select>
- </el-col>
<el-col style="margin-top: 14px;">鏃ユ湡</el-col>
<el-col>
<el-date-picker value-format="YYYY-MM-DD" style="width: 250px" v-model="time"
@@ -41,10 +34,13 @@
<el-main>
<el-tabs tab-position="top" v-model="activeName" type="card">
<el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
- <Shift ref="shift" v-if="activeName == 'shift'" />
+ <Shift url="/api/blade-mdc/output" ref="shift" v-if="activeName == 'shift'">
+ </Shift>
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <Time ref="time" v-if="activeName == 'time'" />
+ <Time url="/api/blade-mdc/output" ref="time" v-if="activeName == 'time'">
+
+ </Time>
</el-tab-pane>
</el-tabs>
</el-main>
@@ -77,7 +73,6 @@
data() {
return {
activeName: 'shift',
- productivityType: 'OEE',
time: [],
treeChecked: [],
options: [
@@ -107,7 +102,6 @@
this.$refs[this.activeName].init({
endDate: this.time[1],
startDate: this.time[0],
- productivityType: this.productivityType,
shiftIndexList: [1, 2],
workStationIdList: [...this.treeChecked]
})
--
Gitblit v1.9.3