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/components/Shift.vue | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 326fbaf..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-05-20 21:05:43
+ * @LastEditTime: 2024-06-17 22:24:22
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -32,7 +32,7 @@
</el-table-column>
<el-table-column prop="" :label="colname">
<template #default="scope">
- <span>{{ scope.row.data['1'] }}</span>
+ <span>{{ colnameFn(scope.row.data['1']) }}</span>
</template>
</el-table-column>
<el-table-column prop="" label="鐝2">
@@ -42,7 +42,7 @@
</el-table-column>
<el-table-column prop="" :label="colname">
<template #default="scope">
- <span>{{ scope.row.data['2'] }}</span>
+ <span>{{ colnameFn(scope.row.data['2']) }}</span>
</template>
</el-table-column>
</scTable>
@@ -62,10 +62,21 @@
default: '',
type: String,
},
+ colnameFn: {
+ type: Function,
+ default: val => {
+ if (isNaN(val)) return '-'
+ return `${(val ? val * 100 : 0).toFixed(2)}%`
+ }
+ },
options: {
default() {
return {}
},
+ },
+ datasetNum: {
+ type: Number,
+ default: 100
}
},
components: {
@@ -122,7 +133,7 @@
...data
}).then(res => {
if (res.code === 200) {
- this.btnList = res.data
+ this.btnList = res.data.reverse()
this.btnListActive = res?.data?.[0]?.id
}
})
@@ -136,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 = {
@@ -143,7 +159,7 @@
}
option2.dataset.source = [['product', '鐝1', '鐝2']]
res.data.items.records.forEach(v => {
- option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * 100, v.data[2] === '-' ? 0 : v.data[2] * 100])
+ option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * this.datasetNum, v.data[2] === '-' ? 0 : v.data[2] * this.datasetNum])
});
this.option2 = option2
console.log(option2)
--
Gitblit v1.9.3