From 3e091224ab26252d8624b42b461ba773ee8bee0f Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期日, 03 十一月 2024 19:16:31 +0800
Subject: [PATCH] update
---
src/views/mdc/output-statistics.vue | 126 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 110 insertions(+), 16 deletions(-)
diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index 9c04d69..e8a9856 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-06-22 18:35:47
* @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"
@@ -32,8 +25,9 @@
<MYTree v-model="treeChecked" show-checkbox></MYTree>
</el-main>
<el-footer>
- <el-button @click="query">鏌ヨ</el-button>
- <el-button>瀵煎嚭</el-button>
+ <el-button type="primary" @click="query">鏌ヨ</el-button>
+ <!-- <el-button @click="exportExcel">瀵煎嚭</el-button> -->
+ <exportDialog @export="exportExcel"></exportDialog>
</el-footer>
</el-container>
</el-aside>
@@ -41,10 +35,16 @@
<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 :options="chartOption" :datasetNum="1" colname="浜ч噺"
+ :colnameFn="val => { return val }" url="/api/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 :resFn="val => val" :options="chartOption1" :colnameFn="val => { return val }"
+ url="/api/mdc/output" ref="time" v-if="activeName == 'time'">
+
+ </Time>
</el-tab-pane>
</el-tabs>
</el-main>
@@ -59,12 +59,13 @@
import MYTree from './MYTree.vue'
import Shift from './components/Shift.vue'
import Time from './components/Time.vue'
-
+import exportDialog from '@/layout/components/exportDialog.vue'
export default {
components: {
MYTree,
Shift,
- Time
+ Time,
+ exportDialog
},
watch: {
activeName() {
@@ -77,9 +78,87 @@
data() {
return {
activeName: 'shift',
- productivityType: 'OEE',
time: [],
treeChecked: [],
+ chartOption1: {
+ title: {
+ text: '缁熻鍥捐〃',
+ subtext: '',
+ },
+ grid: {
+ top: '80px'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ tooltip: {
+ trigger: 'axis',
+ valueFormatter: (params) => {
+ return params
+ }
+ },
+ xAxis: {
+ type: 'category',
+ axisLabel: {
+ interval: 'auto',
+ }
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value
+ }
+ },
+ },
+ dataZoom: [
+ { type: 'slider' }
+ ],
+ dataset: {
+ source: []
+ },
+ series: []
+ },
+ chartOption: {
+ legend: {
+ type: 'plain',
+ },
+ title: {
+ text: '缁熻鍥捐〃',
+ subtext: '',
+ },
+ grid: {
+ top: '80px'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ xAxis: {
+ type: 'category',
+ },
+ yAxis: {
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value
+ }
+ },
+ },
+ dataZoom: [
+ { type: 'slider' }
+ ],
+ dataset: {
+ source: [
+ ['product', '鐝1', '鐝2'],
+ ]
+ },
+ series: [{
+ type: 'bar',
+ },
+ {
+ type: 'bar',
+ }]
+ },
options: [
{
label: '绋煎姩鐜�',
@@ -103,11 +182,26 @@
this.query()
},
methods: {
+ exportExcel(statisticalMethod) {
+ this.$HTTP.post(`/api/mdc/output/export`, {
+ startDate: this.time[0],
+ endDate: this.time[1],
+ statisticalMethod,
+ queryType: 1,
+ shiftIndexList: [1, 2],
+ workStationIdList: this.treeChecked
+ }).then(res => {
+ if (res.success) {
+ window.open(res.data.link)
+ } else {
+ this.$message.error(res.msg)
+ }
+ })
+ },
query() {
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