Browse Source

兼容其他图表

cxmo 1 year ago
parent
commit
84489a2c66

+ 3 - 3
src/views/dataEntry_manage/addChart.vue

@@ -466,7 +466,7 @@
 							</div> -->
 							<!-- 需求:曲线图、堆积柱状图、组合图加入新指标时上下限自动调整 -->
 							<template v-if="![7,10].includes(chartInfo.ChartType)">
-								<div class="range-cont left" v-if="leftIndex != -1">
+								<div class="range-cont left">
 									<el-input
 										style="width: 60px; display: block"
 										size="mini"
@@ -484,7 +484,7 @@
 										@change="changeAxisLimit"
 									/>
 								</div>
-								<div class="range-cont right" v-if="rightIndex != -1">
+								<div class="range-cont right">
 									<el-input
 										style="width: 60px; display: block"
 										size="mini"
@@ -503,7 +503,7 @@
 									/>
 								</div>
 								<!-- 右2上下限设置 -->
-								<div class="range-cont rightTwo" v-if="rightTwoIndex != -1">
+								<div class="range-cont rightTwo">
 									<el-input
 										style="width: 60px; display: block"
 										size="mini"

+ 1 - 0
src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -959,6 +959,7 @@ export default {
 			this.leftLimitData = []
 			this.rightLimitData = []
 			this.rightTwoLimitData = []
+			//右二轴之前没存字段,需要单独处理下
 			//若右二轴的上下限均为0,则不管用户有没有修改过,都重新赋值
 			if(this.rightTwoLimitData[0]===0&&this.rightTwoLimitData[1]===0){
 				const rightTwoData = this.tableData.filter(i=>i.IsAxis===2).map(i=>[Number(i.MinData),Number(i.MaxData)])

+ 3 - 0
src/views/dataEntry_manage/mixins/chartPublic.js

@@ -1198,6 +1198,9 @@ export const chartSetMixin = {
       x轴为指标名称的柱形图 以日期作为series
     */
     setBarChart() {
+      this.leftIndex = -1;
+      this.rightIndex = -1;
+      this.rightTwoIndex = -1;
       let seriesData = [];
       const data = _.cloneDeep(this.barDateList);