From dcf9c9e0410fe1186239e3f8d6f7bdc789c08010 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 05 六月 2024 18:00:39 +0800
Subject: [PATCH] 1

---
 src/views/mdc/output-statistics.vue |   59 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index 9c04d69..0c19a39 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-04 21:23:21
  * @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,14 @@
                     <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="浜ч噺" 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,9 +74,48 @@
     data() {
         return {
             activeName: 'shift',
-            productivityType: 'OEE',
             time: [],
             treeChecked: [],
+            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: '绋煎姩鐜�',
@@ -107,7 +143,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