Merge branch 'eta1.8.0' into lang_new

src/lang/modules/SupplyAnalysis/StockPlant.js

@@ -43,6 +43,7 @@ export const StockPlantEn = {
     placeholder05:'Please enter the factory',
     placeholder06:'Please input device/production line',
     placeholder07:'Please enter the annual production capacity',
+    select_hint:'Please Select Equipment/Production Line',
 };
   
 /* 中文 */
@@ -86,6 +87,7 @@ export const StockPlantZh = {
     placeholder05:'请输入工厂',
     placeholder06:'请输入装置/产线',
     placeholder07:'请输入年产能',
+    select_hint:'请选择要添加的装置',
 };
   
 /**

src/views/chartRelevance_manage/components/saveEdbToBaseDia.vue

@@ -97,6 +97,24 @@ export default {
 			}
 		}
 	},
+    computed:{
+        formRules(){
+            return {
+                edb_name:[
+                    { required: true, message: /* '指标名称不能为空' */this.$t('Edb.Valids.name_msg'), trigger: 'blur' },
+                ],
+                menu:[
+                    { required: true, message: /* '所属目录不能为空' */this.$t('Edb.Valids.menu_msg'), trigger: 'blur' },
+                ],
+                frequency:[
+                    { required: true, message: /* '频率不能为空' */this.$t('Edb.Valids.fre_msg'), trigger: 'blur' },
+                ],
+                unit:[
+                    { required: true, message: /* '单位不能为空' */this.$t('Edb.Valids.unit_msg'), trigger: 'blur' },
+                ],
+            }
+        }
+    },
 	data () {
 		return {
 			formData: {
@@ -105,20 +123,6 @@ export default {
 				frequency: '',
 				unit:''
 			},
-			formRules: {
-				edb_name:[
-					{ required: true, message: '指标名称不能为空', trigger: 'blur' },
-				],
-				menu:[
-					{ required: true, message: '所属目录不能为空', trigger: 'blur' },
-				],
-				frequency:[
-					{ required: true, message: '频率不能为空', trigger: 'blur' },
-				],
-				unit:[
-					{ required: true, message: '单位不能为空', trigger: 'blur' },
-				],
-			},
 			options:  [],
 			unitArr,
 			levelProps: {

src/views/chartRelevance_manage/crossVarietyAnalysis/components/edbTableSection.vue

@@ -180,10 +180,10 @@ export default {
       arr.forEach((item) => (str += `${item.DataTime}\t${item.Value}\n`));
       this.$copyText(str).then(
         (res) => {
-          this.$message.success('已成功复制!');
+          this.$message.success(/* '已成功复制!' */this.$t('MsgPrompt.copy_success_msg'));
         },
         (err) => {
-          this.$message.error('复制失败!');
+          this.$message.error(/* '复制失败!' */this.$t('MsgPrompt.copy_fail_msg'));
         }
       );
     },

src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -561,7 +561,7 @@ export default {
 			this.refreshLoading = this.$loading({
         lock: true,
         target: '.main-right',
-        text: '刷新图表中...',
+        text: /* '刷新图表中...' */this.$t('Chart.OptMsg.refresh_ing_msg'),
         spinner: 'el-icon-loading',
         background: 'rgba(255, 255, 255, 0.8)',
       });

src/views/chartRelevance_manage/fittingEquation/fittingEquationList.vue

@@ -564,7 +564,7 @@ export default {
 			this.refreshLoading = this.$loading({
         lock: true,
         target: '.main-right',
-        text: '刷新图表中...',
+        text: /* '刷新图表中...' */this.$t('Chart.OptMsg.refresh_ing_msg'),
         spinner: 'el-icon-loading',
         background: 'rgba(255, 255, 255, 0.8)',
       });

src/views/chartRelevance_manage/mixins/classifyMixin.js

@@ -448,13 +448,13 @@ export default {
       var clipboard = new this.Clipboard(".shareLink");
       clipboard.on("success", (e) => {
         console.log(e);
-        this.$message.success("复制链接成功");
+        this.$message.success(/* "复制链接成功" */this.$t('Chart.OptMsg.copy_link_success'));
         e.clearSelection(); // 释放内存
         clipboard.destroy();
       });
       // // 浏览器不支持
       clipboard.on("error", (e) => {
-        this.$message.warning("浏览器暂不支持");
+        this.$message.warning(/* "浏览器暂不支持" */this.$t('MsgPrompt.browser_not_support'));
         // 释放内存
         clipboard.destroy();
       });

src/views/chartRelevance_manage/statistic/statisticFeatureList.vue

@@ -532,7 +532,7 @@ export default {
 			this.refreshLoading = this.$loading({
         lock: true,
         target: '.main-right',
-        text: '刷新图表中...',
+        text: /* '刷新图表中...' */this.$t('Chart.OptMsg.refresh_ing_msg'),
         spinner: 'el-icon-loading',
         background: 'rgba(255, 255, 255, 0.8)',
       });

src/views/dataEntry_manage/databaseList.vue

@@ -1974,7 +1974,7 @@ export default {
 		          this.$message.success(this.$t('MsgPrompt.copy_success_msg'));
 		        },
 		        err => {
-		         this.$message.error("复制失败!");
+		         this.$message.error(/* "复制失败!" */this.$t('MsgPrompt.copy_fail_msg'));
 		        } )
 		 	}
 		},

src/views/dataSource_manage/components/DelEDBTable.vue

@@ -14,14 +14,14 @@
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
                 :column-key="col.ColumnKey"
-                :label="col.ColumnName"
+                :label="$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName"
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
                 :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
-                    <span>{{col.ColumnName}}</span>
+                    <span>{{$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName}}</span>
                     <el-tooltip 
                         effect="dark" 
                         :content="getTableHeadTips(col.ColumnKey)" 

src/views/dataSource_manage/components/DetailTable.vue

@@ -68,14 +68,14 @@
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
                 :column-key="col.ColumnKey"
-                :label="col.ColumnName"
+                :label="$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName"
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
                 :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
-                    <span>{{col.ColumnName}}</span>
+                    <span>{{$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName}}</span>
                     <el-tooltip 
                         effect="dark" 
                         :content="getTableHeadTips(col.ColumnKey)" 

src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -30,14 +30,14 @@
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
                 :column-key="col.ColumnKey"
-                :label="col.ColumnName"
+                :label="$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName"
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
                 :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
-                    <span>{{col.ColumnName}}</span>
+                    <span>{{$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName}}</span>
                     <el-tooltip 
                         effect="dark" 
                         :content="getTableHeadTips(col.ColumnKey)" 

src/views/dataSource_manage/components/SetTableCols.vue

@@ -19,7 +19,7 @@
         >
             <div class="list-item" v-for="item in list" :key="item.ColumnKey">
                 <el-checkbox v-model="item.checked" :disabled="item.IsMust===1">
-                    <span class="name" :style="{color:item.IsMust===1?'#C0C4CC':''}">{{item.ColumnName}}</span>
+                    <span class="name" :style="{color:item.IsMust===1?'#C0C4CC':''}">{{$i18nt.locale==='zh'?item.ColumnName:item.ColumnNameEn||item.ColumnName}}</span>
                 </el-checkbox>
                 <img class="drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
             </div>

src/views/dataSource_manage/components/StatisticTable.vue

@@ -13,13 +13,13 @@
                 v-for="col in tableColOpts"
                 :key="col.ColumnKey"
                 :column-key="col.ColumnKey"
-                :label="col.ColumnName"
+                :label="$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName"
                 :prop="col.ColumnKey"
                 align="center"
                 :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
-                    <span>{{col.ColumnName}}</span>
+                    <span>{{$i18nt.locale==='zh'?col.ColumnName:col.ColumnNameEn||col.ColumnName}}</span>
                     <el-tooltip 
                         effect="dark" 
                         placement="top-start"

src/views/futures_manage/commodityChartBase.vue

@@ -592,9 +592,9 @@ export default {
 				// 是否有英文表格名称
 				if(!this.chartInfo.ChartNameEn || !this.chartInfo.UnitEn) flag = false;
 				if(!flag){
-					this.$confirm('英文名称未输入完整，分享图表上可能出现空名称的情况，确定继续分享吗？', '提示', {
-							confirmButtonText: '确定',
-							cancelButtonText: '取消',
+					this.$confirm(/* '英文名称未输入完整，分享图表上可能出现空名称的情况，确定继续分享吗？' */this.$t('Chart.OptMsg.copy_noenough_en'), /* '提示' */this.$t('Dialog.warn_tit'), {
+							/* confirmButtonText: '确定',
+							cancelButtonText: '取消', */
 							type: 'warning',
 					})
 					.then(() => {
@@ -606,7 +606,7 @@ export default {
 							input.select();
 							document.execCommand('copy');
 							document.body.removeChild(input);
-							this.$message.success('复制链接成功')
+							this.$message.success(/* '复制链接成功' */this.$t('Chart.OptMsg.copy_link_success'))
 						}
 					})
 					.catch(() => {});
@@ -657,13 +657,13 @@ export default {
       var clipboard = new this.Clipboard('.shareLink')
       clipboard.on('success', e => {
         console.log(e);
-        this.$message.success('复制链接成功')
+        this.$message.success(/* '复制链接成功' */this.$t('Chart.OptMsg.copy_link_success'))
         e.clearSelection() // 释放内存
         clipboard.destroy()
       })
       // // 浏览器不支持
       clipboard.on('error', e => {
-        this.$message.warning('浏览器暂不支持')
+        this.$message.warning(/* '浏览器暂不支持' */this.$t('MsgPrompt.browser_not_support'))
         // 释放内存
         clipboard.destroy()
       })
@@ -742,7 +742,7 @@ export default {
 			this.refreshLoading = this.$loading({
         lock: true,
         target: '.main-right',
-        text: '刷新图表中...',
+        text: /* '刷新图表中...' */this.$t('Chart.OptMsg.refresh_ing_msg'),
         spinner: 'el-icon-loading',
         background: 'rgba(255, 255, 255, 0.8)',
       });

src/views/predictEdb_manage/components/edbDia.vue

@@ -194,13 +194,13 @@ export default {
       },
       formRules: {
         classify:[
-					{ required: true, message: '分类不能为空', trigger: 'blur' },
+					{ required: true, message: /* '分类不能为空' */this.$t('Edb.Valids.classify_msg'), trigger: 'blur' },
 				],
         oldEdb: [
-					{ required: true, message: '指标不能为空', trigger: 'blur' },
+					{ required: true, message: /* '指标不能为空' */this.$t('Edb.Valids.no_edb'), trigger: 'blur' },
 				],
         edbName: [
-					{ required: true, message: '指标名称不能为空', trigger: 'blur' },
+					{ required: true, message: /* '指标名称不能为空' */this.$t('Edb.Valids.name_msg'), trigger: 'blur' },
 				],
         endDate: [
 					{ required: true, message: '预测截止日期不能为空', trigger: 'blur' },

src/views/predictEdb_manage/predictEdb.vue

@@ -1290,7 +1290,7 @@ export default {
 						this.$message.success(this.$t('MsgPrompt.copy_success_msg'))
           },
           (err) => {
-            this.$message.error('复制失败!');
+            this.$message.error(/* '复制失败!' */this.$t('MsgPrompt.copy_fail_msg'));
           }
         );
 			})

src/views/report_manage/reportdtl.vue

@@ -169,13 +169,13 @@
 			copyHandle() {
 				var clipboard = new this.Clipboard('.copy')
 				clipboard.on('success', e => {
-					this.$message.success('复制链接成功')
+					this.$message.success(/* '复制链接成功' */this.$t('Chart.OptMsg.copy_link_success'))
 					e.clearSelection() // 释放内存
 					clipboard.destroy()
 				})
 				// // 浏览器不支持
 				clipboard.on('error', e => {
-					this.$message.warning('浏览器暂不支持')
+					this.$message.warning(/* '浏览器暂不支持' */this.$t('MsgPrompt.browser_not_support'))
 					// 释放内存
 					clipboard.destroy()
 				})

src/views/smartReport/reportDetail.vue

@@ -164,13 +164,13 @@ export default {
 		copyHandle() {
 				var clipboard = new this.Clipboard('.copy')
 				clipboard.on('success', e => {
-					this.$message.success('复制链接成功')
+					this.$message.success(/* '复制链接成功' */this.$t('Chart.OptMsg.copy_link_success'))
 					e.clearSelection() // 释放内存
 					clipboard.destroy()
 				})
 				// // 浏览器不支持
 				clipboard.on('error', e => {
-					this.$message.warning('浏览器暂不支持')
+					this.$message.warning(/* '浏览器暂不支持' */this.$t('MsgPrompt.browser_not_support'))
 					// 释放内存
 					clipboard.destroy()
 				})

src/views/supply_manage/components/addOtherPlantDia.vue

@@ -192,7 +192,7 @@ export default {
 
     /* 保存 */
     async saveHandle() {
-      if(!this.selectPlants.length) return this.$message.warning('请选择要添加的装置')
+      if(!this.selectPlants.length) return this.$message.warning(/* '请选择要添加的装置' */this.$t('SupplyAnalysis.StockPlant.select_hint'))
       let res = await supplyApi.copyOtherPlant({
         VarietyId: Number(this.$route.query.id),
         PrevVarietyPlantId: this.plantId,

src/views/supply_manage/components/createTargetDia.vue

@@ -31,12 +31,12 @@
 						:props="levelProps"
 						style="width: 80%"
 						clearable
-						placeholder="请选择所属目录"/>
+						:placeholder="$t('CustomAnalysisPage.select_appropriate_category')"/>
 					</el-form-item>
 					<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 						<el-select 
 						v-model="formData.frequency" 
-						placeholder="请选择频率" 
+						:placeholder="$t('EtaBasePage.select_frequency')" 
 						style="width:80%"
             			disabled
 						clearable>
@@ -54,20 +54,20 @@
 						filterable
 						allow-create
 						style="width: 80%"
-						placeholder="请输入单位">
+						:placeholder="$t('Edb.Detail.e_unit')">
 							<el-option
 								v-for="item in unitArr"
-								:key="item"
-								:label="item"
-								:value="item">
+								:key="item.label"
+								:label="item.label"
+								:value="item.value">
 							</el-option>
 						</el-select>
 					</el-form-item>
 				</el-form>
 			</div>
 			<div class="dia-bot">
-				<el-button type="primary" style="margin-right:20px" @click="addTarget">保存</el-button>
-				<el-button type="primary" plain @click="cancelHandle">取消</el-button>
+				<el-button type="primary" style="margin-right:20px" @click="addTarget">{{$t('Dialog.confirm_save_btn')}}</el-button>
+				<el-button type="primary" plain @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
 			</div>
 		</el-dialog>
 	</div>
@@ -75,7 +75,7 @@
 
 <script>
 import { dataBaseInterface } from '@/api/api.js';
-import { unitArr,frequencySelectList } from '@/utils/defaultOptions';
+import { unitSelectList,frequencySelectList } from '@/utils/defaultOptions';
 import * as supplyApi from '@/api/modules/supplyApi.js';
 export default {
 	name:'',
@@ -104,22 +104,7 @@ export default {
 	data () {
 		return {
 			formData: {},
-			formRules: {
-				edb_name:[
-					{ required: true, message: '指标名称不能为空', trigger: 'blur' },
-				],
-				menu:[
-					{ required: true, message: '所属目录不能为空', trigger: 'blur' },
-				],
-				frequency:[
-					{ required: true, message: '频率不能为空', trigger: 'blur' },
-				],
-				unit:[
-					{ required: true, message: '单位不能为空', trigger: 'blur' },
-				],
-			},
 			options:  [],
-			unitArr,
 			levelProps: {
 				label: 'ClassifyName',
 				value: 'ClassifyId',
@@ -132,6 +117,25 @@ export default {
 	computed:{
 		frequencyArr(){
 			return frequencySelectList()
+		},
+		unitArr(){
+			return unitSelectList()
+		},
+		formRules(){
+			return {
+				edb_name:[
+					{ required: true, message: /* '指标名称不能为空' */this.$t('Edb.Valids.name_msg'), trigger: 'blur' },
+				],
+				menu:[
+					{ required: true, message: /* '所属目录不能为空' */this.$t('Edb.Valids.menu_msg'), trigger: 'blur' },
+				],
+				frequency:[
+					{ required: true, message: /* '频率不能为空' */this.$t('Edb.Valids.fre_msg'), trigger: 'blur' },
+				],
+				unit:[
+					{ required: true, message: /* '单位不能为空' */this.$t('Edb.Valids.unit_msg'), trigger: 'blur' },
+				],
+			}
 		}
 	},
 	methods: {

src/views/supply_manage/components/targetTable.vue

@@ -134,10 +134,10 @@ export default {
       arr.forEach((item) => (str += `${item.DataTime}\t${item.Value}\n`));
       this.$copyText(str).then(
         (res) => {
-          this.$message.success('已成功复制!');
+          this.$message.success(/* '已成功复制!' */this.$t('MsgPrompt.copy_success_msg'));
         },
         (err) => {
-          this.$message.error('复制失败!');
+          this.$message.error(/* '复制失败!' */this.$t('MsgPrompt.copy_fail_msg'));
         }
       );
     },