浏览代码

数据转换与原先表格数据分离

cxmo 1 年之前
父节点
当前提交
9b01f5d4d3
共有 2 个文件被更改,包括 21 次插入13 次删除
  1. 7 12
      src/views/dataEntry_manage/addChart.vue
  2. 14 1
      src/views/dataEntry_manage/mixins/addOreditMixin.js

+ 7 - 12
src/views/dataEntry_manage/addChart.vue

@@ -566,26 +566,26 @@
 						border
 					>
 						<el-table-column type="expand">
-							<template slot-scope="{row}">
+							<template slot-scope="{row,$index}">
 								<div class="expand-wrap">
 									<div class="data-change">
-										<el-checkbox v-model="row.isChange" @change="checkTableChange">数据转换</el-checkbox>
-										<el-select v-model="row.changeType">
+										<el-checkbox v-model="updateData[$index].isChange">数据转换</el-checkbox>
+										<el-select v-model="updateData[$index].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" v-model="row.changeNum"></el-input>
+									<el-input type="number" v-model="updateData[$index].changeNum"></el-input>
 									</div>
 									<div class="unit-change">
 										<label>单位</label>
-										<el-input v-model="row.changeUnit"></el-input>
+										<el-input v-model="updateData[$index].changeUnit"></el-input>
 										<label>英文单位</label>
-										<el-input v-model="row.changeUnitEn"></el-input>
+										<el-input v-model="updateData[$index].changeUnitEn"></el-input>
 									</div>
 									<!--柱形图-->
 									<div class="use-change" v-if="chartInfo.ChartType===7">
-										<el-radio v-model="useUnit">设置为图表单位</el-radio>
+										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
 									</div>
 									<div class="confirm-btn">
 										<el-button type="text">保存</el-button>
@@ -713,11 +713,6 @@ 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();

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

@@ -81,7 +81,7 @@ export default {
 			sourceEditForm: {
 
 			},
-			isEdbDataChange:false
+			updateData:[]
 		}
 	},
 	computed: {
@@ -160,6 +160,16 @@ export default {
 	},
 
 	methods: {
+        formatUpdateData(data){
+            return {
+                ...data,
+                isChange:data.isChange||false,
+                changeType:data.changeType||1,
+                changeNum:data.changeNum||100,
+                changeUnit:data.Unit||'',
+                changeUnitEn:data.UnitEn||''
+            }
+        },
 		checkTableChange(type){
 			console.log('change')
 			this.isEdbDataChange = true
@@ -228,6 +238,8 @@ export default {
 							this.tableData.push(tableItem);
 							this.isSetExtremeValue = true;
 							// console.log(this.tableData)
+							const tempItem = this.formatUpdateData(tableItem)
+							this.updateData.push(tempItem)
 							
 							//默认拼接来源
 							if(!this.chartInfo.SourcesFrom) {
@@ -522,6 +534,7 @@ export default {
 		delTarget(item) {
 			let index = this.tableData.findIndex(obj => obj.EdbInfoId === item.EdbInfoId);
 			this.tableData.splice(index, 1);
+			this.updateData.splice(index, 1)
 			this.$message.success('删除成功')
 
 			//添加图表时重置默认样式