Merge branch 'lang_dev' into lang_db

src/lang/modules/StatisticAnalysis/ChartRelevance.js

@@ -7,8 +7,8 @@ export const ChartRelevanceEn = {
     chart_add_btn:'Add chart',
     catagory:'Catagory',
     only_see_mine:'Just look at mine',
-    tab_type01:'correlation',
-    tab_type02:'Rolling correlation',
+    tab_type01:'Correl',
+    tab_type02:'Roll Correl',
     add_chart_classify:'Add chart category',
     edit_chart_classify:'Edit chart category',
     classify_name_tips:"The category name cannot be empty",

src/lang/modules/SupplyAnalysis/StockPlant.js

@@ -33,8 +33,8 @@ export const StockPlantEn = {
     edit_table_col08:'Production Decreased per Day/ton',
     edit_table_col09:'Duration',
     edit_table_col10:'Total Cuts',
-    edit_table_col_tip01:'默认检修结束日期为复产日期',
-    edit_table_col_tip02:'1表示停产,0.1表示降负10%',
+    edit_table_col_tip01:'Default maintenance end date is the resumption of production date',
+    edit_table_col_tip02:'1 indicates shutdown, 0.1 indicates a 10% load reduction',
     edit_table_btn_add_up:'Add above',
     edit_table_btn_add_down:'Add below',
     edit_table_btn_add_other:'Add New Equipment/Production Line',

src/lang/modules/ToolBox/CommodityPriceChart.js

@@ -4,8 +4,8 @@
 
 /* 英文 */
 export const CommodityPriceChartEn = {
-    add_price_line_btn:'Add a price curve',
-    add_price_profit_btn:'Adding Profit Curves',
+    add_price_line_btn:'Price Curve',
+    add_price_profit_btn:'Profit Curve',
     select_spot_price:'Select spot price indicators',
     plate_profit_set:'Plate Profit Settings',
     select_future:'select futures',

src/lang/modules/systemManage/OperateAuth.js

@@ -10,7 +10,7 @@ export const OperateAuthEn = {
     tab04:'ETA Predictive Indicators',
     tab05:'Image Library',
 
-    placeholder01:'请输入图表名称',
+    placeholder01:'Please Enter Chart Name',
     placeholder02:'Enter Indicator ID/Indicator Name',
     placeholder03:'Select Category',
     placeholder04:'Select User',
@@ -18,8 +18,8 @@ export const OperateAuthEn = {
     btn_text01:'Batch Edit',
     btn_text02:'Permission Settings',
 
-    table_col_name01:'图表名称',
-    table_col_name02:'图分类',
+    table_col_name01:'Chart Name',
+    table_col_name02:'Chart category',
     table_col_name03:'Creator',
     table_col_name04:'Indicator ID',
     table_col_name05:'Indicator Name',

src/lang/modules/systemManage/OutLinkConfig.js

@@ -9,9 +9,11 @@ export const OutLinkConfigEn = {
     tale_col01:'Menu Name',
     tale_col02:'Page Link',
     tale_col03:'Creation Time',
-    placeholder01:'请输入菜单名称',
-    placeholder02:'请输入URL',
-    del_success_msg:'Delete menu successfully'
+    placeholder01:'Enter menu name',
+    placeholder02:'Enter URL',
+    del_success_msg:'Delete menu successfully',
+    tips_msg01:'Menu name cannot be empty',
+    tips_msg02:'URL cannot be empty',
 };
   
 /* 中文 */
@@ -21,9 +23,11 @@ export const OutLinkConfigZh = {
     tale_col01:'菜单名称',
     tale_col02:'页面链接',
     tale_col03:'创建时间',
-    placeholder01:'Please enter menu name',
-    placeholder02:'Please enter URL',
-    del_success_msg:'删除菜单成功'
+    placeholder01:'请输入菜单名称',
+    placeholder02:'请输入URL',
+    del_success_msg:'删除菜单成功',
+    tips_msg01:'菜单名称不能为空',
+    tips_msg02:'URL不能为空',
 };
   
 /**

src/views/system_manage/departManage.vue

@@ -432,7 +432,7 @@ export default {
 			},//部门表单
 			departRule:{
 				name:[
-					{ required: true, message: '请输入部门名称', trigger: 'blur' },
+					{ required: true, message: this.$t('SystemManage.DepartManage.depart_name_placeholder'), trigger: 'blur' },
 				]
 			},//部门校验
 			isAddGroup:false,//添加分组

src/views/system_manage/operateAuthManage.vue

@@ -88,8 +88,8 @@
           <template slot-scope="{row}">
             <template v-if="item.key==='handle'">
               <span class="editsty" @click="edbAuthSetHandle(row)" v-if="[3,4].includes(default_tab
-        )&&authBtn('auth')">权限设置</span>
-              <span class="editsty" @click="editAuthHandle(row)" v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">编辑</span>
+        )&&authBtn('auth')">{{$t('SystemManage.OperateAuth.btn_text02')}}</span>
+              <span class="editsty" @click="editAuthHandle(row)" v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">{{$t('Dialog.title_prefix_edit')}}</span>
             </template>
 
             <span v-else>{{ row[item.key] }}</span>

src/views/system_manage/outlinkListConfig.vue

@@ -51,10 +51,10 @@
         :model="outlinkForm"
         ref="outlinkFormRef"
         label-width="100px">
-          <el-form-item prop="Title" :label="$t('SystemManage.OutLinkConfig.tale_col01')" :rules="{required:true,message:'菜单名称不能为空',trigger:'blur'}">
+          <el-form-item prop="Title" :label="$t('SystemManage.OutLinkConfig.tale_col01')" :rules="{required:true,message:$t('SystemManage.OutLinkConfig.tips_msg01'),trigger:'blur'}">
               <el-input v-model="outlinkForm.Title" :placeholder="$t('SystemManage.OutLinkConfig.placeholder01')" style="width: 295px;"></el-input>
           </el-form-item>
-          <el-form-item prop="Url" :label="$t('SystemManage.OutLinkConfig.tale_col02')" :rules="{required:true,message:'URL不能为空',trigger:'blur'}">
+          <el-form-item prop="Url" :label="$t('SystemManage.OutLinkConfig.tale_col02')" :rules="{required:true,message:$t('SystemManage.OutLinkConfig.tips_msg02'),trigger:'blur'}">
               <el-input v-model="outlinkForm.Url" :placeholder="$t('SystemManage.OutLinkConfig.placeholder02')" style="width: 295px;"></el-input>
           </el-form-item>
           <div class="form-box-buttons-zone">