comit

src/lang/modules/EtaBase/commonLang.js

@@ -198,7 +198,24 @@ export default {
     predict_val: {
       zh:'预测值',
       en:'Predictive Value'
+    },
+    add_to_edb:{
+      zh:'添加指标库',
+      en:'Add indicator library'
+    },
+    create_chart_btn:{
+      zh:'一键成图',
+      en:'Graph'
+    },
+    add_indicator_btn:{
+      zh:'添加指标',
+      en:'Add indicator'
+    },
+    select_catalogue:{
+      zh:'所属目录',
+      en:'catalogue'
     }
+
   },
 
   /* 单位 */

src/lang/modules/SupplyAnalysis/IndexEn.js

@@ -0,0 +1,10 @@
+import { StockPlantEn } from "./StockPlant";
+
+
+
+export default {
+    // 供应分析
+    SupplyAnalysis: {
+        StockPlant:StockPlantEn
+    },
+};

src/lang/modules/SupplyAnalysis/IndexZh.js

@@ -0,0 +1,9 @@
+import { StockPlantZh } from "./StockPlant";
+
+
+export default {
+    // 供应分析
+    SupplyAnalysis: {
+        StockPlant:StockPlantZh
+    },
+};

src/lang/modules/SupplyAnalysis/StockPlant.js

@@ -0,0 +1,51 @@
+/**
+ * 供应分析-装置检修
+ */
+
+/* 英文 */
+export const StockPlantEn = {
+    add_btn:'Add Commodity',
+    only_see:'View the Commodity with Permission ',
+    placeholder01:'Commodity Name/Indicator ID',
+    analysis_btn:'Analysis ',
+    no_data:'No Data',
+    table_col01:'Commodity',
+    table_col02:'Operator',
+    table_col03:'Update Time',
+    edit_commodity_btn:'Edit Commodity',
+    placeholder02:'Please Enter Commodity Name',
+    set_permission:'Set permissions',
+    placeholder03:'Please select a researcher',
+    select_user:'Selected Users',
+    download_excel:'Download Excel',
+    last_updatetime:'Last Updated',
+    year_product_day:'Days of Production/Year',
+    day_unit:'day',
+    computed_btn:'Calculate Days',
+};
+  
+/* 中文 */
+export const StockPlantZh = {
+    add_btn:'添加品种',
+    only_see:'只看可分析',
+    placeholder01:'品种名称/指标ID',
+    analysis_btn:'分析',
+    no_data:'暂无品种',
+    table_col01:'品种',
+    table_col02:'更新人',
+    table_col03:'更新时间',
+    edit_commodity_btn:'编辑品种',
+    placeholder02:'请输入品种',
+    set_permission:'设置权限',
+    placeholder03:'请选择研究员',
+    select_user:'已选用户',
+    download_excel:'下载减产量EXCEL',
+    last_updatetime:'上次更新时间',
+    year_product_day:'年生产天数',
+    day_unit:'天',
+    computed_btn:'计算',
+};
+  
+/**
+* $t('SupplyAnalysis.StockPlant.XXX')
+*/

src/views/supply_manage/analyseVariety.vue

@@ -7,30 +7,30 @@
           plain
           v-if="targetData.length"
           @click="downloadData"
-          >下载减产量EXCEL</el-button
+          >{{$t('SupplyAnalysis.StockPlant.download_excel')}}</el-button
         >
         <template v-if="varietyInfo">
-          <span style="margin: 0 40px">品种:{{ varietyInfo.VarietyName }}</span>
-          <span>上次更新时间:{{ varietyInfo.ModifyTime }}</span>
+          <span style="margin: 0 40px">{{$t('SupplyAnalysis.StockPlant.table_col01')}}:{{ varietyInfo.VarietyName }}</span>
+          <span>{{$t('SupplyAnalysis.StockPlant.last_updatetime')}}:{{ varietyInfo.ModifyTime }}</span>
         </template>
       </div>
       <div>
         <span v-if="varietyInfo">
-          年生产天数
+          {{$t('SupplyAnalysis.StockPlant.year_product_day')}}
           <el-input
             v-model="varietyInfo.ProductionDay"
             type="number"
             style="width: 70px"
             @change="setDayHandle"
             :disabled="$route.query.type === 'look'"
-          />天
+          />{{$t('SupplyAnalysis.StockPlant.day_unit')}}
         </span>
 
         <el-button
           type="primary"
           @click="calulateHandle"
           style="margin-left: 10px"
-          >计算</el-button
+          >{{$t('SupplyAnalysis.StockPlant.computed_btn')}}</el-button
         >
       </div>
     </div>

src/views/supply_manage/components/createTargetDia.vue

@@ -8,7 +8,7 @@
 		custom-class="dialog"
 		center
 		width="700px"
-    title="添加指标"
+    	:title="$t('Edb.Detail.add_indicator_btn')"
 		v-dialogDrag>
 			<div class="dialog-main">
 				<el-form
@@ -18,13 +18,13 @@
 				hide-required-asterisk
 				:model="formData"
 				:rules="formRules">
-					<el-form-item label="指标名称" prop="edb_name">
+					<el-form-item :label="$t('Edb.Detail.e_name')" prop="edb_name">
 						<el-input
 						v-model="formData.edb_name"
 						style="width: 80%"
-						placeholder="指标名称"></el-input>
+						:placeholder="$t('Edb.Detail.e_name')"></el-input>
 					</el-form-item>
-					<el-form-item label="所属目录" prop="menu">
+					<el-form-item :label="$t('Edb.Detail.select_catalogue')" prop="menu">
 						<el-cascader
 						v-model="formData.menu"
 						:options="options"
@@ -33,13 +33,12 @@
 						clearable
 						placeholder="请选择所属目录"/>
 					</el-form-item>
-					<el-form-item label="频率" prop="frequency">
-						<span slot="label">频&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;率</span>
+					<el-form-item :label="$t('Edb.Detail.e_fre')" prop="frequency">
 						<el-select 
 						v-model="formData.frequency" 
 						placeholder="请选择频率" 
 						style="width:80%"
-            disabled
+            			disabled
 						clearable>
 							<el-option
 								v-for="item in frequencyArr"
@@ -49,8 +48,7 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
-					<el-form-item label="单位" prop="unit">
-						<span slot="label">单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>
+					<el-form-item :label="$t('Edb.Detail.e_unit')" prop="unit">
 						<el-select
 						v-model="formData.unit"
 						filterable

src/views/supply_manage/components/targetTable.vue

@@ -16,12 +16,12 @@
           <span>{{row[item.key]}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="250">
+      <el-table-column :label="$t('Table.column_operations')" align="center" width="250">
         <template slot-scope="{row}">
-          <el-button type="text" @click="copyData(row)" v-if="row.Button.Copy">复制数据</el-button>
-          <el-button type="text" @click="goToDatabase(row)" v-if="row.Button.Show">查看数据</el-button>
-          <el-button type="text" @click="joinDataBase(row)" v-if="row.Button.Add">添加指标库</el-button>
-          <el-button type="text" @click="createChartHandle(row.VarietyEdbId)">一键成图</el-button>
+          <el-button type="text" @click="copyData(row)" v-if="row.Button.Copy">{{$t('Edb.detail_copydata_btn')}}</el-button>
+          <el-button type="text" @click="goToDatabase(row)" v-if="row.Button.Show">{{$t('Edb.detail_lookdata_btn')}}</el-button>
+          <el-button type="text" @click="joinDataBase(row)" v-if="row.Button.Add">{{$t('Edb.Detail.add_to_edb')}}</el-button>
+          <el-button type="text" @click="createChartHandle(row.VarietyEdbId)">{{$t('Edb.Detail.create_chart_btn')}}</el-button>
         </template>
       </el-table-column>
 
@@ -49,39 +49,73 @@ export default {
       this.tableData = nval;
     }
   },
-  data() {
-    return {
-      tableData: this.data,
-      tableColums: [
+  computed:{
+    tableColums(){
+      return [
         {
-          label: '指标名称',
+          label: this.$t('Edb.Detail.e_name'),
           key: 'EdbName'
         },
         {
-          label: '指标ID',
+          label: this.$t('Edb.Detail.e_id'),
           key: 'EdbCode'
         },
         {
-          label: '指标分类',
+          label: this.$t('Edb.Detail.e_menu'),
           key: 'ClassifyName'
         },
         {
-          label: '更新频度',
+          label: this.$t('Edb.Detail.e_fre'),
           key: 'Frequency'
         },
         {
-          label: '起始时间',
+          label: this.$t('Edb.Detail.e_start_time'),
           key: 'StartDate'
         },
         {
-          label: '最新日期',
+          label: this.$t('Edb.Detail.e_latest_date'),
           key: 'EndDate'
         },
         {
-          label: '最新值',
+          label: this.$t('Edb.Detail.e_latest_value'),
           key: 'LatestValue'
         },
-      ],
+      ]
+    }
+  },
+  data() {
+    return {
+      tableData: this.data,
+      // tableColums: [
+      //   {
+      //     label: '指标名称',
+      //     key: 'EdbName'
+      //   },
+      //   {
+      //     label: '指标ID',
+      //     key: 'EdbCode'
+      //   },
+      //   {
+      //     label: '指标分类',
+      //     key: 'ClassifyName'
+      //   },
+      //   {
+      //     label: '更新频度',
+      //     key: 'Frequency'
+      //   },
+      //   {
+      //     label: '起始时间',
+      //     key: 'StartDate'
+      //   },
+      //   {
+      //     label: '最新日期',
+      //     key: 'EndDate'
+      //   },
+      //   {
+      //     label: '最新值',
+      //     key: 'LatestValue'
+      //   },
+      // ],
 
       // 一键成图弹窗
       isCreateChart: false,

src/views/supply_manage/components/varietySetDia.vue

@@ -7,25 +7,25 @@
     custom-class="variety-set-dialog"
     top="10vh"
     v-dialogDrag
-    :title="form.VarietyId?'编辑品种':'添加品种'"
-		width="650px"
+    :title="form.VarietyId?$t('SupplyAnalysis.StockPlant.edit_commodity_btn'):$t('SupplyAnalysis.StockPlant.add_btn')"
+		width="750px"
   >
     <div class="main">
       <el-form
         ref="form"
         class="form-cont"
         label-position="left"
-        label-width="80px"
+        label-width="120px"
         :model="formData"
       >
-        <el-form-item label="品种" prop="varietyName">
+        <el-form-item :label="$t('SupplyAnalysis.StockPlant.table_col01')" prop="varietyName">
           <el-input
             v-model="formData.varietyName"
-            style="width: 340px"
-            placeholder="请输入品种"
+            style="width: 80%"
+            :placeholder="$t('SupplyAnalysis.StockPlant.placeholder02')"
           />
         </el-form-item>
-        <el-form-item label="设置权限" prop="users">
+        <el-form-item :label="$t('SupplyAnalysis.StockPlant.set_permission')" prop="users">
           <el-cascader
             ref="cascader"
             v-model="formData.users"
@@ -40,12 +40,12 @@
             :key="cascaderIdx"
             clearable
             collapse-tags
-            placeholder="请选择研究员"
+            :placeholder="$t('SupplyAnalysis.StockPlant.placeholder03')"
             @remove-tag="removeResearchersChange"
             style="width:80%"
           />
         </el-form-item>
-        <el-form-item label="已选用户">
+        <el-form-item :label="$t('SupplyAnalysis.StockPlant.select_user')">
           <ul class="choose-users">
             <li v-for="(item,index) in chooseUsers" :key="item">
               {{item}}
@@ -56,8 +56,8 @@
       </el-form>
     </div>
     <div class="dia-bot">
-			<el-button type="primary" style="margin-right: 20px" @click="saveHandle">保存</el-button>
-			<el-button type="primary" plain @click="cancelHandle('cancel')">取消</el-button>
+			<el-button type="primary" style="margin-right: 20px" @click="saveHandle">{{$t('Dialog.confirm_save_btn')}}</el-button>
+			<el-button type="primary" plain @click="cancelHandle('cancel')">{{$t('Dialog.cancel_btn')}}</el-button>
 		</div>
   </el-dialog>
 </template>

src/views/supply_manage/stockPlant.vue

@@ -2,11 +2,11 @@
   <div class="variety-list-page">
     <div class="top">
       <el-button v-permission="permissionBtn.stockPlantPermission.stockPlant_saveVariety"
-        type="primary" @click="addVarietyHandle(null)" v-if="isCanAdd">添加品种</el-button>
+        type="primary" @click="addVarietyHandle(null)" v-if="isCanAdd">{{$t('SupplyAnalysis.StockPlant.add_btn')}}</el-button>
       <div class="top-right">
-        <el-checkbox v-model="isCanAnalyse" @change="pageChangeHandle(1)" v-if="!isCanAdd">只看可分析</el-checkbox>
+        <el-checkbox v-model="isCanAnalyse" @change="pageChangeHandle(1)" v-if="!isCanAdd">{{$t('SupplyAnalysis.StockPlant.only_see')}}</el-checkbox>
         <el-input
-          placeholder="品种名称/指标ID"
+          :placeholder="$t('SupplyAnalysis.StockPlant.placeholder01')"
           v-model="searchTxt"
           style="width:350px;margin-left: 15px;"
           @keyup.enter.native="getTableList"
@@ -34,18 +34,18 @@
             <span v-else>{{row[item.key]}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center">
+        <el-table-column :label="$t('Table.column_operations')" align="center">
           <template slot-scope="{row}">
             <el-button v-permission="permissionBtn.stockPlantPermission.stockPlant_anlysisView"
-                type="text" @click="analyseVarietyHandle(row)" v-if="row.Button.Analyse">分析</el-button>
+                type="text" @click="analyseVarietyHandle(row)" v-if="row.Button.Analyse">{{$t('SupplyAnalysis.StockPlant.analysis_btn')}}</el-button>
             <el-button v-permission="permissionBtn.stockPlantPermission.stockPlant_saveVariety"
-                type="text" @click="addVarietyHandle(row)" v-if="row.Button.Edit">编辑</el-button>
+                type="text" @click="addVarietyHandle(row)" v-if="row.Button.Edit">{{$t('Table.edit_btn')}}</el-button>
             <span v-permission="permissionBtn.stockPlantPermission.stockPlant_del"
-                class="deletesty" @click="delHandle(row)" style="margin-left: 10px;" v-if="row.Button.Delete">删除</span>
+                class="deletesty" @click="delHandle(row)" style="margin-left: 10px;" v-if="row.Button.Delete">{{$t('Table.delete_btn')}}</span>
           </template>
         </el-table-column>
         <div slot="empty" style="padding: 20px 0">
-          <tableNoData text="暂无品种" size="mini"/>
+          <tableNoData :text="$t('SupplyAnalysis.StockPlant.no_data')" size="mini"/>
         </div>
       </el-table>
       <div style="height:40px;margin-top: 20px;">
@@ -73,25 +73,43 @@ import varietySetDia from './components/varietySetDia.vue'
 import mPage from '@/components/mPage.vue'
 export default {
   components: { mPage,varietySetDia },
-  data() {
-    return {
-      searchTxt: '',
-      isCanAdd: false,
-      isCanAnalyse: false,
-      tableColums: [
+  computed:{
+    tableColums(){
+      return [
         {
-          label: '品种',
+          label: this.$t('SupplyAnalysis.StockPlant.table_col01'),
           key: 'VarietyName'
         },
         {
-          label: '更新人',
+          label: this.$t('SupplyAnalysis.StockPlant.table_col02'),
           key: 'LastUpdateSysUserRealName'
         },
         {
-          label: '更新时间',
+          label: this.$t('SupplyAnalysis.StockPlant.table_col03'),
           key: 'ModifyTime'
         },
-      ],
+      ]
+    }
+  },
+  data() {
+    return {
+      searchTxt: '',
+      isCanAdd: false,
+      isCanAnalyse: false,
+      // tableColums: [
+      //   {
+      //     label: '品种',
+      //     key: 'VarietyName'
+      //   },
+      //   {
+      //     label: '更新人',
+      //     key: 'LastUpdateSysUserRealName'
+      //   },
+      //   {
+      //     label: '更新时间',
+      //     key: 'ModifyTime'
+      //   },
+      // ],
       varietyList: [],
       pageNo: 1,
       pageSize: 10,
@@ -141,7 +159,7 @@ export default {
 
     /* 删除 */
     async delHandle({VarietyId}) {
-      await this.$confirm('删除后不可恢复,确认删除吗?','提示',{ type: 'warning' });
+      await this.$confirm(this.$t('MsgPrompt.delete_info_msg'),this.$t('Confirm.prompt'),{ type: 'warning' });
       const res = await supplyApi.delVariety({VarietyId})
 
       if(res.Ret !== 200) return