cxmo 1 년 전
부모
커밋
b3853ec2f8
2개의 변경된 파일16개의 추가작업 그리고 6개의 파일을 삭제
  1. 10 5
      src/views/dataEntry_manage/addChart.vue
  2. 6 1
      src/views/dataEntry_manage/mixins/addOreditMixin.js

+ 10 - 5
src/views/dataEntry_manage/addChart.vue

@@ -569,19 +569,19 @@
 							<template slot-scope="{row}">
 								<div class="expand-wrap">
 									<div class="data-change">
-										<el-checkbox>数据转换</el-checkbox>
-										<el-select>
+										<el-checkbox v-model="row.isChange" @change="checkTableChange">数据转换</el-checkbox>
+										<el-select v-model="row.changeType">
 											<el-option label="乘以" :value="1"></el-option>
 											<el-option label="除以" :value="2"></el-option>
 											<el-option label="对数" :value="3"></el-option>
 										</el-select>
-										<el-input type="number"></el-input>
+										<el-input type="number" v-model="row.changeNum"></el-input>
 									</div>
 									<div class="unit-change">
 										<label>单位</label>
-										<el-input></el-input>
+										<el-input v-model="row.changeUnit"></el-input>
 										<label>英文单位</label>
-										<el-input></el-input>
+										<el-input v-model="row.changeUnitEn"></el-input>
 									</div>
 									<!--柱形图-->
 									<div class="use-change" v-if="chartInfo.ChartType===7">
@@ -713,6 +713,11 @@ export default {
 		tableData: {
       handler(newval, oldval) {
 				if(newval.length) {
+					//如果是数据转换引起的变更,直接return
+					if(this.isEdbDataChange){
+						this.isEdbDataChange = false
+						return 
+					}
 					if([7,10].includes(this.chartInfo.ChartType)) {
 						// 奇怪柱形图
 						this.chartInfo.ChartType === 7 && this.barDateList.length && this.$refs.BarOptRef.getBarData();

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

@@ -80,7 +80,8 @@ export default {
 			isShowSourceDialog: false,
 			sourceEditForm: {
 
-			}
+			},
+			isEdbDataChange:false
 		}
 	},
 	computed: {
@@ -159,6 +160,10 @@ export default {
 	},
 
 	methods: {
+		checkTableChange(type){
+			console.log('change')
+			this.isEdbDataChange = true
+		},
 		/* 选择指标 获取指标详情并push到表格中*/
 		selectTarget(item,type='') {
 			if(!item) return