From b1ac0c149564d4873a8b6ef075029fcaa7c83960 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 21 六月 2024 01:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/efficiency-analysis.vue | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 90 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 56beb57..b489b88 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-20 19:41:25
+ * @LastEditTime: 2024-06-20 23:53:51
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -32,8 +32,8 @@
<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>
</el-footer>
</el-container>
</el-aside>
@@ -41,10 +41,10 @@
<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" colname="鏁堢巼" ref="shift" v-if="activeName == 'shift'" />
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <Time ref="time" v-if="activeName == 'time'" />
+ <Time :options="chartOption1" ref="time" v-if="activeName == 'time'" />
</el-tab-pane>
</el-tabs>
</el-main>
@@ -80,6 +80,91 @@
productivityType: 'OEE',
time: [],
treeChecked: [],
+ chartOption1: {
+ title: {
+ text: '缁熻鍥捐〃',
+ subtext: '',
+ },
+ grid: {
+ top: '80px'
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ tooltip: {
+ trigger: 'axis',
+ valueFormatter: (params) => {
+ return params.toFixed(2) + '%'
+ }
+ },
+ 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',
+ valueFormatter: (params) => {
+ console.log(params, '>>>>>>>>.113213')
+ return params.toFixed(2) + '%'
+ }
+ },
+ 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: '绋煎姩鐜�',
--
Gitblit v1.9.3