From c2e36c45578e63ad17c5e258c92d62d9ae03dadb Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 30 五月 2025 11:55:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue
---
src/views/historymode/component/TrendAnalysis.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/views/historymode/component/TrendAnalysis.vue b/src/views/historymode/component/TrendAnalysis.vue
index 06be06b..665305f 100644
--- a/src/views/historymode/component/TrendAnalysis.vue
+++ b/src/views/historymode/component/TrendAnalysis.vue
@@ -1,17 +1,17 @@
<template>
<el-row class="wrap">
<Transition name="">
- <el-col v-show="show" span="10">
+ <el-col v-show="show" span="10" class="wrap-left">
<FactorCheckbox
v-model="selectFactorType"
:device-type="deviceType"
></FactorCheckbox>
- <LineChart
+ <ProgressLineChart
:locate-index="locateIndex"
@chart-click="handleChartClick"
:factor-datas="factorDatas"
:select-factor-type="selectFactorType"
- ></LineChart>
+ ></ProgressLineChart>
</el-col>
</Transition>
<el-col span="2">
@@ -28,11 +28,14 @@
* 鐩戞祴瑕佺礌瓒嬪娍鍒嗘瀽
*/
import { FactorDatas } from '@/model/FactorDatas';
+import { defaultFactorTypes } from '@/constant/checkbox-options';
+import { TYPE0 } from '@/constant/device-type';
export default {
props: {
deviceType: {
- type: String
+ type: String,
+ default: TYPE0
},
factorDatas: FactorDatas,
// 褰撳墠閫変腑楂樹寒鐨勬暟鎹偣绱㈠紩
@@ -40,11 +43,18 @@
},
data() {
return {
- selectFactorType: ['1'],
+ selectFactorType: defaultFactorTypes(this.deviceType, 1),
show: true
};
},
emits: ['chartClick'],
+ watch: {
+ deviceType(nV, oV) {
+ if (nV != oV) {
+ this.selectFactorType = defaultFactorTypes(nV, 1);
+ }
+ }
+ },
methods: {
handleChartClick(index) {
this.$emit('chartClick', index);
@@ -59,6 +69,11 @@
/* background-color: aliceblue; */
}
+.wrap-left {
+ /* background-color: aliceblue; */
+ min-width: 600px;
+}
+
.slide-fade-enter-active {
transition: all 0.3s ease-out;
}
--
Gitblit v1.9.3