From 18c60ace50725ec8b430cb737368f9af996fda28 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 17 六月 2024 22:39:01 +0800
Subject: [PATCH] update
---
src/views/mdc/components/Shift.vue | 7 +++
src/views/mdc/components/Time.vue | 47 +++++------------------
src/views/mdc/configuration.vue | 6 +-
src/views/mdc/efficiency-analysis.vue | 16 ++++---
4 files changed, 29 insertions(+), 47 deletions(-)
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 62f0181..4c842b1 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-06-17 21:55:33
+ * @LastEditTime: 2024-06-17 22:24:22
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -147,6 +147,11 @@
queryType: 0,
statisticalMethod: this.statisticalMethod
}
+ try {
+ this.option2.dataset.source = []
+ } catch (error) {
+
+ }
return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
this.chartsData = res.data.items.records
let option2 = {
diff --git a/src/views/mdc/components/Time.vue b/src/views/mdc/components/Time.vue
index acb1f5c..b552b66 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-06-17 22:02:38
+ * @LastEditTime: 2024-06-17 22:37:51
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
@@ -89,7 +89,7 @@
],
cols: [],
chartsData: [],
- option2: null,
+ option2: {},
}
},
watch: {
@@ -140,45 +140,19 @@
queryType: 0,
statisticalMethod: this.statisticalMethod
}
+ // console.log(this.option2.series, '>>>>>>>>>>???')
+ try {
+ this.option2.dataset.source = []
+ this.option2.series = []
+ } catch (error) {
+
+ }
return this.$HTTP.post(this.url, dataSend, { params }).then(res => {
this.chartsData = res.data.items.records
let option2 = {
- // legend: {
- // type: 'plain',
- // },
- title: {
- text: '缁熻鍥捐〃',
- subtext: '',
- },
- grid: {
- top: '80px'
- },
- tooltip: {
- trigger: 'axis'
- },
- xAxis: {
- type: 'category',
- axisLabel: {
- interval: 'auto',
- }
- },
- yAxis: {
- type: 'value',
- axisLabel: {
- formatter: (value) => {
- return value + '%'
- }
- },
- },
- dataZoom: [
- { type: 'slider' }
- ],
- dataset: {
- source: []
- },
- series: [],
...this.options
}
+ option2.series = []
let source1 = ['product']
let row = res.data.items.records[0]
Object.values(row.nameData).forEach(v => {
@@ -187,6 +161,7 @@
})
source1.push(v)
})
+
option2.dataset.source = [source1]
res.data.items.records.forEach(v => {
let current = [v.id]
diff --git a/src/views/mdc/configuration.vue b/src/views/mdc/configuration.vue
index 5b434ec..bb21642 100644
--- a/src/views/mdc/configuration.vue
+++ b/src/views/mdc/configuration.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: Sneed
- * @LastEditTime: 2024-06-17 22:16:39
+ * @LastEditTime: 2024-06-17 22:25:23
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configuration.vue
* 搴旂敤璁剧疆
-->
@@ -42,13 +42,13 @@
<span v-else>{{ scope.row.dataTypeDesc }}</span>
</template>
</el-table-column>
- <!-- <el-table-column label="鑴夊啿璁℃暟鍊嶇巼" prop="value">
+ <el-table-column label="鑴夊啿璁℃暟鍊嶇巼" prop="value">
<template #default="scope">
<el-input-number v-if="scope.row.isEdit && scope.row.collectType == 9" :min="1"
:max="10" />
<span>{{ scope?.row?.parameter?.value }}</span>
</template>
- </el-table-column> -->
+ </el-table-column>
<el-table-column label="鎿嶄綔" prop="state">
<template #default="scope">
<el-button v-show="!scope.row.id || scope.row.isEdit"
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 268f2c4..341b68d 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-06-17 21:53:34
+ * @LastEditTime: 2024-06-17 22:29:44
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -156,12 +156,14 @@
['product', '鐝1', '鐝2'],
]
},
- series: [{
- type: 'bar',
- },
- {
- type: 'bar',
- }]
+ series: [
+ {
+ type: 'bar',
+ },
+ {
+ type: 'bar',
+ }
+ ]
},
options: [
{
--
Gitblit v1.9.3