From a958e950dc675c7a3e9cbbbc66e6656669d3a34b Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期一, 09 九月 2024 11:20:22 +0800
Subject: [PATCH] Merge branch 'master' of http://122.9.151.159:9090/r/smart-web
---
src/views/mdc/components/Shift.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 4f47b84..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-04 21:22:55
+ * @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>
@@ -61,6 +61,13 @@
colname: {
default: '',
type: String,
+ },
+ colnameFn: {
+ type: Function,
+ default: val => {
+ if (isNaN(val)) return '-'
+ return `${(val ? val * 100 : 0).toFixed(2)}%`
+ }
},
options: {
default() {
@@ -126,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
}
})
@@ -140,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 = {
--
Gitblit v1.9.3