瀏覽代碼

遗漏的翻译

cxmo 11 月之前
父節點
當前提交
37e45da548

+ 8 - 0
src/lang/modules/EtaChart/commonLang.js

@@ -179,6 +179,14 @@ export default {
       zh:'您选择的图表样式为季节性图表,只支持单指标画图',
       en:'The chart style you selected is a seasonal chart, which only supports single indicator drawing'
     },
+    season_add_hint:{
+        zh:'请添加系列指标',
+        en:'Please Add a series indicator'
+    },
+    season_area_hint:{
+        zh:'横坐标显示范围不能为空',
+        en:'The horizontal coordinate display range cannot be empty'
+    },
     scatter_onlytwo_msg: {
       zh:'您选择的图表样式为散点图,最多支持2个指标',
       en:'The chart style you have selected is a scatter plot, which supports a maximum of 2 indicators'

+ 18 - 11
src/views/dataEntry_manage/addChart.vue

@@ -133,9 +133,9 @@
 							:placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.chart_unit')})">
 							<el-option
 								v-for="item in UnitOptions"
-								:key="item"
-								:label="item"
-								:value="item">
+								:key="item.label"
+								:label="item.label"
+								:value="item.value">
 							</el-option>
 						</el-select>
 					</el-form-item>
@@ -741,7 +741,7 @@
 <script>
 import { dataBaseInterface } from '@/api/api.js';
 import { chartSetMixin } from './mixins/chartPublic';
-import {unitArr} from '@/utils/defaultOptions.js';
+import {unitSelectList} from '@/utils/defaultOptions.js';
 import addOrEditMixn from './mixins/addOreditMixin';
 import Chart from './components/chart';
 import DateChooseDia from './components/DateChooseDia';
@@ -810,7 +810,10 @@ export default {
 	computed: {
 		roleName() {
 			return localStorage.getItem('userName');
-		}
+		},
+        UnitOptions(){
+            return unitSelectList()
+        }
 	},
 	mixins: [chartSetMixin,addOrEditMixn],
   data() {
@@ -825,7 +828,7 @@ export default {
 			needWatch: true,
 			IsNameDefault:true,
 
-			UnitOptions:unitArr,
+			/* UnitOptions:unitArr, */
 
 			useUnit:''
 
@@ -834,20 +837,24 @@ export default {
   methods: {
 		/* 保存 */
 		saveHandle() {
-			if(!this.tableData.length) return this.$message.warning('暂未选择指标');
+			if(!this.tableData.length) 
+				return this.$message.warning(/* '暂未选择指标' */this.$t('ToolBox.CommodityPriceChart.tips_msg05'));
 			console.log(this.chartInfo)
 			this.$refs.diaForm.validate((valid) => {
 				if(valid) {
 					// 季节图只允许添加一个指标
-					if(this.chartInfo.ChartType === 2 && this.tableData.length > 1) return this.$message.warning('您选择的图表样式为季节性图表,只支持单指标画图');
+					if(this.chartInfo.ChartType === 2 && this.tableData.length > 1) 
+						return this.$message.warning(/* '您选择的图表样式为季节性图表,只支持单指标画图' */this.$t('Chart.OptMsg.season_one_msg'));
 
-					else if([7,11].includes(this.chartInfo.ChartType)  && !this.$refs.BarOptRef.dateList.length)  return this.$message.warning('请添加日期');
+					else if([7,11].includes(this.chartInfo.ChartType)  && !this.$refs.BarOptRef.dateList.length)  
+						return this.$message.warning(/*'请添加日期'*/this.$t('ToolBox.CommodityPriceChart.tips_msg06'));
 
-					else if(this.chartInfo.ChartType === 10 && !this.$refs.SectionScatterOptRef.seriesArr[0].edbs)  return this.$message.warning('请添加系列指标');
+					else if(this.chartInfo.ChartType === 10 && !this.$refs.SectionScatterOptRef.seriesArr[0].edbs)  
+						return this.$message.warning(/* '请添加系列指标' */this.$t('Chart.OptMsg.season_add_hint'));
 
 					if(this.chartInfo.ChartType === 2){
 						if(!(this.SeasonExtraConfig.XStartDate && this.SeasonExtraConfig.XEndDate)){
-							return this.$message.warning('横坐标显示范围不能为空');
+							return this.$message.warning(/* '横坐标显示范围不能为空' */this.$t('Chart.OptMsg.season_area_hint'));
 						}
 					}
 

+ 19 - 10
src/views/dataEntry_manage/editChart.vue

@@ -141,9 +141,9 @@
 							:placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.chart_unit')})">
 							<el-option
 								v-for="item in UnitOptions"
-								:key="item"
-								:label="item"
-								:value="item">
+								:key="item.label"
+								:label="item.label"
+								:value="item.value">
 							</el-option>
 						</el-select>
 					</el-form-item> 
@@ -751,7 +751,7 @@
 <script>
 import { dataBaseInterface } from '@/api/api.js';
 import { chartSetMixin } from './mixins/chartPublic';
-import {unitArr} from '@/utils/defaultOptions.js'
+import {unitSelectList} from '@/utils/defaultOptions.js'
 import addOrEditMixn from './mixins/addOreditMixin';
 import Chart from './components/chart';
 import DateChooseDia from './components/DateChooseDia';
@@ -812,6 +812,11 @@ export default {
     },
 	},
 	mixins: [chartSetMixin,addOrEditMixn],
+    computed:{
+        UnitOptions(){
+            return unitSelectList()
+        }
+    },
   data() {
     return {
 			isSlideLeft: false,
@@ -826,7 +831,7 @@ export default {
 			needWatch: false,
 			IsNameDefault:true,
 
-			UnitOptions:unitArr
+			/* UnitOptions:unitArr */
     };
   },
   methods: {
@@ -946,20 +951,24 @@ export default {
     },
 		 /* 保存 */
 		saveHandle() {
-			if(!this.tableData.length) return this.$message.warning('暂未选择指标');
+			if(!this.tableData.length) 
+			return this.$message.warning(/* '暂未选择指标' */this.$t('ToolBox.CommodityPriceChart.tips_msg05'));
 
 			this.$refs.diaForm.validate((valid) => {
 				if(valid) {
 					// 季节图只允许添加一个指标
-					if(this.chartInfo.ChartType === 2 && this.tableData.length > 1)  return this.$message.warning('您选择的图表样式为季节性图表,只支持单指标画图');
+					if(this.chartInfo.ChartType === 2 && this.tableData.length > 1)  
+						return this.$message.warning(/* '您选择的图表样式为季节性图表,只支持单指标画图' */this.$t('Chart.OptMsg.season_one_msg'));
 
-					if(this.chartInfo.ChartType === 7 && !this.$refs.BarOptRef.dateList.length)  return this.$message.warning('请添加日期');
+					if(this.chartInfo.ChartType === 7 && !this.$refs.BarOptRef.dateList.length)  
+						return this.$message.warning(/*'请添加日期'*/this.$t('ToolBox.CommodityPriceChart.tips_msg06'));
 
-					if(this.chartInfo.ChartType === 10 && !this.$refs.SectionScatterOptRef.seriesArr[0].edbs)  return this.$message.warning('请添加系列指标');
+					if(this.chartInfo.ChartType === 10 && !this.$refs.SectionScatterOptRef.seriesArr[0].edbs)  
+						return this.$message.warning(/* '请添加系列指标' */this.$t('Chart.OptMsg.season_add_hint'));
 
 					if(this.chartInfo.ChartType === 2){
 						if(!(this.SeasonExtraConfig.XStartDate && this.SeasonExtraConfig.XEndDate)){
-							return this.$message.warning('横坐标显示范围不能为空');
+							return this.$message.warning(/* '横坐标显示范围不能为空' */this.$t('Chart.OptMsg.season_area_hint'));
 						}
 					}
 					let db_arr = this.tableData.map(item => ({

+ 15 - 6
src/views/sandbox_manage/sandFlowNew/components/addLInkDia.vue

@@ -45,7 +45,7 @@
             :filterable="!search_dataBaseId"
             remote
             clearable
-            placeholder="图表名称"
+            :placeholder="$t('Chart.Detail.chart_name')"
             style="width: 240px"
             :remote-method="dataBaseSearch"
             @click.native="dataBaseInputFocus"
@@ -71,7 +71,7 @@
             </el-option>
           </el-select>
           <el-input v-else v-model="reportKeyWord" @input="searchReport"
-          placeholder="标题 / 创建人" style="width: 240px;" clearable >
+          :placeholder="$t('ReportManage.smart_title_creator_btn')" style="width: 240px;" clearable >
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
         </div>
@@ -87,10 +87,10 @@
                   <template slot-scope="scope">{{ scope.row.EdbName }}</template>
                 </el-table-column>
                 <el-table-column :label="$t('Table.frequency')" align="center" width="50">
-                  <template slot-scope="scope">{{ scope.row.Frequency }}</template>
+                  <template slot-scope="scope">{{ getFrequencyTrans(scope.row.Frequency||'null') }}</template>
                 </el-table-column>
                 <el-table-column :label="$t('Table.unit')" align="center">
-                  <template slot-scope="scope">{{ scope.row.Unit }}</template>
+                  <template slot-scope="scope">{{ getUnitTrans(scope.row.Unit) }}</template>
                 </el-table-column>
                 <el-table-column :label="$t('Table.start_time')" align="center" width="100">
                   <template slot-scope="scope">{{ scope.row.StartDate }}</template>
@@ -274,13 +274,22 @@ import * as preDictEdbInterface from '@/api/modules/predictEdbApi.js';
         }
       }
     },
+    computed:{
+        linkTypeList(){
+            return [
+                {value:1,label:this.$t('SandboxManage.SandFlow.link_type_opt1')},
+                {value:2,label:this.$t('SandboxManage.SandFlow.link_type_opt2')},
+                {value:3,label:this.$t('SandboxManage.SandFlow.link_type_opt3')}
+            ]
+        }
+    },
     data() {
       return {
-        linkTypeList:[
+        /* linkTypeList:[
           {value:1,label:this.$t('SandboxManage.SandFlow.link_type_opt1')},
           {value:2,label:this.$t('SandboxManage.SandFlow.link_type_opt2')},
           {value:3,label:this.$t('SandboxManage.SandFlow.link_type_opt3')}
-        ],
+        ], */
         addLinkSearchParams:{
           linkType:1
         },