Эх сурвалжийг харах

小优化 英文翻译补充

cxmo 10 сар өмнө
parent
commit
18e709166c

+ 3 - 0
src/lang/modules/EtaChart/En.js

@@ -96,6 +96,9 @@ export default {
     limit_range:'Range of Limits',
     limit_range:'Range of Limits',
     average_range:'Range of Average',
     average_range:'Range of Average',
     std_range:'Range of STDEV',
     std_range:'Range of STDEV',
+    year_placeholder:'Please enter year',
+    linewidth_placeholder:'Please enter line width',
+    multiple_placeholder:'Please enter the multiple',
 
 
     //截面散点图区域
     //截面散点图区域
     label_serie_set:'Series {index} Configuration',
     label_serie_set:'Series {index} Configuration',

+ 3 - 0
src/lang/modules/EtaChart/Zh.js

@@ -97,6 +97,9 @@ export default {
     limit_range:'上下限取数范围',
     limit_range:'上下限取数范围',
     average_range:'均线取数范围',
     average_range:'均线取数范围',
     std_range:'取数范围',
     std_range:'取数范围',
+    year_placeholder:'请输入年份',
+    linewidth_placeholder:'请输入线宽',
+    multiple_placeholder:'请输入倍数',
 
 
     //截面散点图区域
     //截面散点图区域
     label_serie_set:'系列{index}配置',
     label_serie_set:'系列{index}配置',

+ 4 - 4
src/views/dataEntry_manage/components/addAverageDialog.vue

@@ -115,10 +115,10 @@ export default {
         },
         },
         formRules(){ //方便英文翻译
         formRules(){ //方便英文翻译
             return {
             return {
-                Legend:[{required:true,message:'请输入图例名称'}],
-                Year:[{required:true,message:'请输入年份'}],
-                LineWidth:[{required:true,message:'请选择线宽'}],
-                Multiple:[{required:true,message:'请选择倍数'}],
+                Legend:[{required:true,message:/* '请输入图例名称' */this.$t('EtaChartAddPage.legend_placeholder')}],
+                Year:[{required:true,message:/* '请输入年份' */this.$t('EtaChartAddPage.year_placeholder')}],
+                LineWidth:[{required:true,message:/* '请选择线宽' */this.$t('EtaChartAddPage.linewidth_placeholder')}],
+                Multiple:[{required:true,message:/* '请选择倍数' */this.$t('EtaChartAddPage.multiple_placeholder')}],
             }
             }
         }
         }
     },
     },

+ 4 - 1
src/views/dataEntry_manage/components/addRightEdbDialog.vue

@@ -292,7 +292,10 @@ export default {
         confirmPerson(){
         confirmPerson(){
             //校验
             //校验
             if(this.rightEdbForm.IndicatorType!==1&&!this.search_txt){
             if(this.rightEdbForm.IndicatorType!==1&&!this.search_txt){
-                return this.$message.warning('请选择指标!')
+                return this.$message.warning(/* '请选择指标!' */this.$t('Edb.InputHolderAll.input_select_edb'))
+            }
+            if(!this.rightEdbForm.Legend){
+                return this.$message.warning(/* '请输入图例名称' */this.$t('EtaChartAddPage.legend_placeholder'))
             }
             }
             this.$emit('modify',{form:this.rightEdbForm,data:this.rightEdbData})
             this.$emit('modify',{form:this.rightEdbForm,data:this.rightEdbData})
         }
         }

+ 2 - 1
src/views/dataEntry_manage/components/markersSection.vue

@@ -267,7 +267,7 @@ const baseRightForm = {
     Shape:'circle',//标记点形状
     Shape:'circle',//标记点形状
     ChartColor:'#075EEE',//颜色
     ChartColor:'#075EEE',//颜色
     Size:3,//标记点大小
     Size:3,//标记点大小
-    Legend:'同比(右轴)',//图例名称
+    Legend:'',//图例名称
     NumFormat:1,//数值格式 1百分比 2小数
     NumFormat:1,//数值格式 1百分比 2小数
     IsConnected:0,//连线 0无 1有
     IsConnected:0,//连线 0无 1有
     LineColor:'#075EEE',//线条颜色
     LineColor:'#075EEE',//线条颜色
@@ -467,6 +467,7 @@ export default {
         this.rightEdbForm.IsShow = false
         this.rightEdbForm.IsShow = false
         this.$emit('previewSeasonRight',{rightConfig:this.rightEdbForm,tableData:this.rightEdbInfo})
         this.$emit('previewSeasonRight',{rightConfig:this.rightEdbForm,tableData:this.rightEdbInfo})
         this.rightEdbForm = {}
         this.rightEdbForm = {}
+        Object.assign(this.rightEdbForm,baseRightForm)
     },
     },
     //更新季节性图 同期/右轴
     //更新季节性图 同期/右轴
     //预览图表
     //预览图表

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

@@ -1184,9 +1184,11 @@ export default {
 					this.updateData = this.tableData.map(item=>{
 					this.updateData = this.tableData.map(item=>{
 						return this.formatUpdateData(item)
 						return this.formatUpdateData(item)
 					})
 					})
-					
 					//弹窗回显
 					//弹窗回显
 					this.$refs.markerSectionRef.rightEdbInfo =RightAxis.IndicatorType!==1? _.cloneDeep(EdbInfoList[1]):{}
 					this.$refs.markerSectionRef.rightEdbInfo =RightAxis.IndicatorType!==1? _.cloneDeep(EdbInfoList[1]):{}
+				}else{
+					//右轴为指标时有修改tableData的行为 会重绘图表 而右轴为同比时不会 这里手动重绘一次
+					this.reLoadChartOption()
 				}
 				}
 				
 				
 			})
 			})