bugfix

src/views/dataEntry_manage/addChart.vue

@@ -112,14 +112,7 @@
 							placeholder="请选择所属分类"
 						/>
 					</el-form-item>
-					<el-form-item label="图表单位" prop="Unit" v-if="chartInfo.ChartType===7">
-						<!-- <el-input
-							v-model="chartInfo.Unit"
-							style="width: 90%"
-							placeholder="请输入图表单位"
-							clearable
-							@change="changeUnit"
-						/> -->
+					<!-- <el-form-item label="图表单位" prop="Unit" v-if="chartInfo.ChartType===7">
 						<el-select
 							v-model="chartInfo.Unit"
 							filterable
@@ -135,7 +128,7 @@
 								:value="item">
 							</el-option>
 						</el-select>
-					</el-form-item>
+					</el-form-item> -->
 				</el-form>
 
 				<div class="xaxis-range-cont" v-if="chartInfo.ChartType===2 && tableData && tableData.length>0">
@@ -801,7 +794,8 @@ export default {
 							return {
 								...item,
 								IsConvert:Number(IsConvert),
-								ConvertType,ConvertValue,
+								ConvertType,
+								ConvertValue:Number(ConvertValue),
 								ConvertUnit:IsConvert?ConvertUnit:'',
 								ConvertEnUnit:IsConvert?ConvertEnUnit:''
 							}

src/views/dataEntry_manage/editChart.vue

@@ -120,7 +120,7 @@
 							placeholder="请选择所属分类"
 						/>
 					</el-form-item>
-					<el-form-item label="图表单位" prop="Unit" v-if="chartInfo.ChartType===7">
+					<!-- <el-form-item label="图表单位" prop="Unit" v-if="chartInfo.ChartType===7">
 						<el-select
 							v-model="chartInfo.Unit"
 							filterable
@@ -136,7 +136,7 @@
 								:value="item">
 							</el-option>
 						</el-select>
-					</el-form-item>
+					</el-form-item> -->
 				</el-form>
 
 				<div class="xaxis-range-cont" v-if="chartInfo.ChartType===2 && tableData && tableData.length>0">
@@ -890,7 +890,8 @@ export default {
 							return {
 								...item,
 								IsConvert:Number(IsConvert),
-								ConvertType,ConvertValue,
+								ConvertType,
+								ConvertValue:Number(ConvertValue),
 								ConvertUnit:IsConvert?ConvertUnit:'',
 								ConvertEnUnit:IsConvert?ConvertEnUnit:''
 							}

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -32,9 +32,9 @@ export default {
 				classify:[
 					{ required: true, message: '图表分类不能为空', trigger: 'blur' },
 				],
-				Unit:[
+				/* Unit:[
 					{ required: true, message: '图表单位不能为空', trigger: 'blur' },
-				],
+				], */
 			},
 
 			classifyOptions: [],//分类option
@@ -228,6 +228,7 @@ export default {
 		checkConver(type,value){
 			//对数：value>1
 			//乘除：value!=0
+			if(!value) return false
 			if(type===3){
 				return value>1
 			}else{