Merge branch 'lang_dev' of http://8.136.199.33:3000/eta_front/eta_front into lang_dev

src/components/chart/chartListWrap.vue

@@ -43,7 +43,7 @@
       </el-col>
     </div>
     <div v-if="!total" class="nodata">
-      <tableNoData text="暂无图表"/>
+      <tableNoData :text="$t('Common.no_chart_msg')"/>
     </div>
   </div>
 </template>

src/lang/modules/SandboxManage/SandList.js

@@ -23,6 +23,7 @@ export const SandListEn = {
     delete_attention_msg2:'Are you sure to delete current category?',
     add_diagram_msg01:"Please fill in the logic diagram's name",
     select_categories_msg:'Please select category',
+    save_as_success:'Save As successful.',
   };
   
   /* 中文 */
@@ -46,6 +47,7 @@ export const SandListEn = {
     delete_attention_msg2:'确定删除当前分类吗?',
     add_diagram_msg01:'请填写逻辑图名称',
     select_categories_msg:'请选择所属分类',
+    save_as_success:'另存为成功',
 
   };
   

src/lang/modules/StatisticAnalysis/ChartRelevance.js

@@ -31,7 +31,9 @@ export const ChartRelevanceEn = {
     update_edb:'Update indicator',
     save_other:'Indicator Save as',
     save_edb:'Save indicator',
-    update_edb:'update'
+    update_edb:'update',
+    update_success:'Update success',
+    chart_save_as:'Save Chart As',
 };
   
 /* 中文 */
@@ -63,8 +65,9 @@ export const ChartRelevanceZh = {
     update_edb:'更新指标',
     save_other:'指标另存为',
     save_edb:'保存指标',
-    update_edb:'更新'
-
+    update_edb:'更新',
+    update_success:'更新成功',
+    chart_save_as:'图表另存为',
 };
   
 /**

src/lang/modules/StatisticAnalysis/CrossVarietyChart.js

@@ -20,6 +20,7 @@ export const CrossVarietyChartEn = {
     add_date:'Add date',
     latest_date:'Latest date',
     n_day_before:'N days ago',
+    fixed_date:'fixed date'
 };
   
 /* 中文 */
@@ -40,6 +41,7 @@ export const CrossVarietyChartZh = {
     add_date:'添加日期',
     latest_date:'最新日期',
     n_day_before:'N天前',
+    fixed_date:'固定日期'
 };
   
 /**

src/lang/modules/StatisticAnalysis/StatisticFeatureChart.js

@@ -16,6 +16,8 @@ export const StatisticFeatureChartEn = {
   near_month: "Last {num} months",
   near_year: "Last {num} years",
   selecr_indicator_pld: "Please select the type of indicator",
+  data_count:'Number of data',
+  data_area:'Data interval',
 };
 
 /* 中文 */
@@ -32,6 +34,8 @@ export const StatisticFeatureChartZh = {
   near_month: "最近{num}月",
   near_year: "最近{num}年",
   selecr_indicator_pld: "请选择指标种类",
+  data_count:'数据个数',
+  data_area:'数据区间',
 };
 
 /**

src/lang/modules/SupplyAnalysis/StockPlant.js

@@ -39,6 +39,10 @@ export const StockPlantEn = {
     edit_table_btn_add_down:'Add below',
     edit_table_btn_add_other:'Add New Equipment/Production Line',
     placeholder04:'Please Select Commodity',
+    delist:'Delist',
+    placeholder05:'Please enter the factory',
+    placeholder06:'Please input device/production line',
+    placeholder07:'Please enter the annual production capacity',
 };
   
 /* 中文 */
@@ -78,6 +82,10 @@ export const StockPlantZh = {
     edit_table_btn_add_down:'向下添加',
     edit_table_btn_add_other:'添加其他装置',
     placeholder04:'请选择品种',
+    delist:'退市',
+    placeholder05:'请输入工厂',
+    placeholder06:'请输入装置/产线',
+    placeholder07:'请输入年产能',
 };
   
 /**

src/lang/modules/ToolBox/PositionAnalysis.js

@@ -25,6 +25,7 @@ export const PositionAnalysisEn = {
     hold_short_position:'Number of Short Positions Held',
     net_long_position_num:'Number of Net Long Position',
     net_short_position_num:'Number of Net Short Position',
+    held:"Held",
 };
   
 /* 中文 */
@@ -50,6 +51,7 @@ export const PositionAnalysisZh = {
     hold_short_position:'持空单量',
     net_long_position_num:'净多单量',
     net_short_position_num:'净空单量',
+    held:"持",
 };
   
 /**

src/views/chartRelevance_manage/components/chartCard.vue

@@ -260,7 +260,7 @@ export default {
       if(res.Ret !== 200) return
       
       this.setChartImage(entryType,res.Data.ChartInfoId)
-      this.$message.success('更新成功');
+      this.$message.success(this.$t('StatisticAnalysis.ChartRelevance.update_success'));
     },
 
     /* 更新指标 */
@@ -293,7 +293,7 @@ export default {
       }
 
 			if(res.Ret !== 200) return
-			this.$message.success('更新成功');
+			this.$message.success(this.$t('StatisticAnalysis.ChartRelevance.update_success'));
     }
   },
 

src/views/chartRelevance_manage/components/saveChartTobaseDia.vue

@@ -3,7 +3,7 @@
       :visible.sync="isShow"
       :close-on-click-modal="false"
       :modal-append-to-body="false"
-      :title="saveScence==='saveOther'?'图表另存为':'保存'"
+      :title="saveScence==='saveOther'?$t('StatisticAnalysis.ChartRelevance.chart_save_as'):$t('Dialog.confirm_save_btn')"
       @close="cancelHandle"
       custom-class="dialog savechart-dialog"
       center
@@ -14,19 +14,19 @@
         <el-form
           ref="diaForm"
           label-position="left"
-          label-width="80px"
+          label-width="120px"
           :model="form"
           :rules="formRules"
         >
-          <el-form-item label="图表名称" prop="name">
+          <el-form-item :label="$t('Chart.Detail.chart_name')" prop="name">
             <el-input
               v-model="form.name"
               style="width: 80%"
-              placeholder="必填项"
+              :placeholder="$t('Chart.Detail.chart_name')"
               clearable
             />
           </el-form-item>
-          <el-form-item label="图表分类" prop="classify">
+          <el-form-item :label="$t('Chart.Detail.chart_classify')" prop="classify">
             <el-cascader
               v-model="form.classify"
               :options="classifyOptions"
@@ -37,16 +37,16 @@
                 emitPath: false
               }"
               style="width: 80%"
-              placeholder="请选择所属分类"
+              :placeholder="$t('Edb.InputHolderAll.input_classify')"
             />
           </el-form-item>
         </el-form>
       </div>
       <div class="dia-bot">
         <el-button type="primary" style="margin-right: 20px" @click="saveHandle"
-          >保存</el-button
+          >{{$t('Dialog.confirm_save_btn')}}</el-button
         >
-        <el-button type="primary" plain @click="cancelHandle">取消</el-button>
+        <el-button type="primary" plain @click="cancelHandle">{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </el-dialog>
 </template>

src/views/chartRelevance_manage/components/saveEdbToBaseDia.vue

@@ -8,36 +8,36 @@
 		custom-class="dialog"
 		center
 		width="700px"
-    :title="saveScence==='saveOther' ? '指标另存为':'保存指标'"
+    :title="saveScence==='saveOther' ? $t('StatisticAnalysis.ChartRelevance.save_other'):$t('StatisticAnalysis.ChartRelevance.save_edb')"
 		v-dialogDrag>
 			<div class="dialog-main">
 				<el-form
 				ref="targetForm"
 				label-position="left"
-				label-width="80px"
+				label-width="120px"
 				hide-required-asterisk
 				:model="formData"
 				:rules="formRules">
-					<el-form-item label="指标名称" prop="edb_name">
+					<el-form-item :label="$t('Table.edb_name')" prop="edb_name">
 						<el-input
 						v-model="formData.edb_name"
 						style="width: 80%"
-						placeholder="指标名称"></el-input>
+						:placeholder="$t('Table.edb_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"
 						:props="levelProps"
 						style="width: 80%"
 						clearable
-						placeholder="请选择所属目录"/>
+						:placeholder="$t('CustomAnalysisPage.select_appropriate_category')"/>
 					</el-form-item>
-					<el-form-item label="频率" prop="frequency">
-						<span slot="label">频&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;率</span>
+					<el-form-item :label="$t('Table.frequency')" prop="frequency">
+						<span slot="label">{{$t('Table.frequency')}}</span>
 						<el-select 
 						v-model="formData.frequency" 
-						placeholder="请选择频率" 
+						:placeholder="$t('CustomAnalysisPage.select_frequency')" 
 						style="width:80%"
 						clearable>
 							<el-option
@@ -48,8 +48,8 @@
 							</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('Table.unit')" prop="unit">
+						<span slot="label">{{$t('Table.unit')}}</span>
 						<selectUnit 
 							v-model="formData.unit" 
 							style="width: 80%"
@@ -58,8 +58,8 @@
 				</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>

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

@@ -29,7 +29,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="百分位" prop="PercentType">
+      <el-form-item :label="$t('StatisticAnalysis.StatisticFeatureChart.percentile')" prop="PercentType">
         <el-select
           v-model="form.PercentType"
           style="width: 240px"
@@ -179,8 +179,27 @@ export default {
       return [
         { label: this.$t('StatisticAnalysis.CrossVarietyChart.latest_date')||'最新日期',val: 1 },
         { label: this.$t('StatisticAnalysis.CrossVarietyChart.n_day_before')||'N天前',val: 2 },
-        { label: '固定日期',val: 3 },
+        { label: this.$t('StatisticAnalysis.CrossVarietyChart.fixed_date')||'固定日期',val: 3 },
       ]
+    },
+    percentOptions(){
+      return [
+        { label: this.$t('StatisticAnalysis.StatisticFeatureChart.data_count')||'数据个数',val: 1 },
+        { label: this.$t('StatisticAnalysis.StatisticFeatureChart.data_area')||'数据区间',val: 0 },
+      ]
+    },
+    tips(){
+      if(this.$i18n.locale == 'zh'){
+        return {
+          'percent':`1、数据个数百分位算法：数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1)，(T2,S2)，T代表时间，S代表对应的值。个数百分位=（n-1）/（N-1) ，N=1时不计算， N=T1到T2时间段指标数据个数，n=小于等于S2的数据个数。<br>
+          2、数据区间百分位算法：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算`
+        }
+      }else{
+        return {
+          'percent':`1. Data Count Percentile Algorithm: The first (earlier date) and last data points (more recent date) in the data interval are (T1, S1) and (T2, S2), respectively. T represents time. S represents the corresponding value; N = the number of indicator data points from T1 to T2. n = the number of data points less than or equal to S2. Count Percentile = (n-1) / (N-1), do not calculate when N=1.<br>
+          2. Data Range Percentile Algorithm: For the selected time range, take the maximum value Max and minimum value Min, calculate Max-Min, and then percentile = (current value - Min) / (Max - Min), do not calculate when Max=Min.`
+        }
+      }
     }
   },
   data() {
@@ -210,14 +229,14 @@ export default {
       //   { label: 'N天前',val: 2 },
       // ]
 
-      percentOptions: [
-        { label: '数据个数',val: 1 },
-        { label: '数据区间',val: 0 },
-      ],
-      tips: {
-        'percent':`1、数据个数百分位算法：数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1)，(T2,S2)。T代表时间。S代表对应的值，N=T1到T2时间段指标数据个数。n=小于等于S2的数据个数。个数百分位=（n-1）/（N-1) ，N=1时不计算。<br>
-        2、数据区间百分位算法：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算`
-      }
+      // percentOptions: [
+      //   { label: '数据个数',val: 1 },
+      //   { label: '数据区间',val: 0 },
+      // ],
+      // tips: {
+      //   'percent':`1、数据个数百分位算法：数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1)，(T2,S2)。T代表时间。S代表对应的值，N=T1到T2时间段指标数据个数。n=小于等于S2的数据个数。个数百分位=（n-1）/（N-1) ，N=1时不计算。<br>
+      //   2、数据区间百分位算法：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算`
+      // }
     };
   },
   methods: {

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

@@ -41,6 +41,8 @@
             <el-popconfirm
               :title="`${$t('StatisticAnalysis.CrossVarietyChart.del_msg')}${type==='tag'?$t('StatisticAnalysis.CrossVarietyChart.label_name'):$t('StatisticAnalysis.CrossVarietyChart.variety_name')}`"
               @onConfirm="closeItemHandle(item)"
+              :confirm-button-text="$t('Dialog.confirm_btn')"
+              :cancel-button-text="$t('Dialog.cancel_btn')"
             >
               <i
                 slot="reference"
@@ -120,7 +122,7 @@ export default {
         : await crossVarietyInterface.varietyDel({ChartVarietyId:item.id})
 
       if(res.Ret !== 200) return
-      this.$message.success('删除成功')
+      this.$message.success(this.$t('MsgPrompt.delete_msg'))
       
       this.refreshData()
     },

src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -478,7 +478,7 @@ export default {
 
 			if(res.Ret !== 200) return
 
-			this.$message.success('保存成功')
+			this.$message.success(this.$t('MsgPrompt.saved_msg'))
 		},
 
 		/* 获取图表列表 */

src/views/chartRelevance_manage/relevance/relevanceChartEditor.vue

@@ -737,7 +737,7 @@ export default {
 
     /* 保存完图表 */
     saveChartBack({source,id}) {
-      this.$message.success('保存成功');
+      this.$message.success(this.$t('MsgPrompt.saved_msg'));
       this.setButtonAuth(source);
       //封面图
       this.$refs[`chartCard`+source].setChartImage(source,id)

src/views/chartRelevance_manage/statistic/statisticFeatureChartEditor.vue

@@ -109,7 +109,7 @@
             </el-tooltip> -->
           </div>
           <div class="section-item">
-            <span style="flex-shrink:0;min-width:70px">百分位:</span>
+            <span style="flex-shrink:0;min-width:70px">{{$t('StatisticAnalysis.StatisticFeatureChart.percentile')}}:</span>
             <el-select
               v-model="chartInfo.Percentile.PercentType"
               style="width: 120px"
@@ -356,6 +356,25 @@ export default {
           {label:this.$t('Edb.FreAll.day_min'),val:'天'},
       ]
     },
+    percentOptions(){
+      return [
+        { label: this.$t('StatisticAnalysis.StatisticFeatureChart.data_count')||'数据个数',val: 1 },
+        { label: this.$t('StatisticAnalysis.StatisticFeatureChart.data_area')||'数据区间',val: 0 },
+      ]
+    },
+    tips(){
+      if(this.$i18n.locale == 'zh'){
+        return {
+          'percent':`1、数据个数百分位算法：数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1)，(T2,S2)，T代表时间，S代表对应的值。个数百分位=（n-1）/（N-1) ，N=1时不计算， N=T1到T2时间段指标数据个数，n=小于等于S2的数据个数。<br>
+          2、数据区间百分位算法：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算`
+        }
+      }else{
+        return {
+          'percent':`1. Data Count Percentile Algorithm: The first (earlier date) and last data points (more recent date) in the data interval are (T1, S1) and (T2, S2), respectively. T represents time. S represents the corresponding value; N = the number of indicator data points from T1 to T2. n = the number of data points less than or equal to S2. Count Percentile = (n-1) / (N-1), do not calculate when N=1.<br>
+          2. Data Range Percentile Algorithm: For the selected time range, take the maximum value Max and minimum value Min, calculate Max-Min, and then percentile = (current value - Min) / (Max - Min), do not calculate when Max=Min.`
+        }
+      }
+    }
   },
   data() {
     return {
@@ -429,14 +448,14 @@ export default {
         FrequencyDistribution: `在所选时间范围内，取最大值和最小值，根据频段数划分多个间距相同的区间（左闭右开，最后一个区间为左闭右闭），统计数据值落在每个区间的数据个数，频率=落在某区间数据个数/所选时间段内数据总个数，累计频率为从最小值所在区间对应的频率开始累加。`
       },
 
-      percentOptions: [
-        { label: '数据个数',val: 1 },
-        { label: '数据区间',val: 0 },
-      ],
-      tips: {
-        'percent':`1、数据个数百分位算法：数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1)，(T2,S2)，T代表时间，S代表对应的值。个数百分位=（n-1）/（N-1) ，N=1时不计算， N=T1到T2时间段指标数据个数，n=小于等于S2的数据个数。<br>
-        2、数据区间百分位算法：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算`
-      },
+      // percentOptions: [
+      //   { label: '数据个数',val: 1 },
+      //   { label: '数据区间',val: 0 },
+      // ],
+      // tips: {
+      //   'percent':`1、数据个数百分位算法：数据区间第一个(较远日期)和最后一个数据点(较近日期)分别为 (T1,S1)，(T2,S2)，T代表时间，S代表对应的值。个数百分位=（n-1）/（N-1) ，N=1时不计算， N=T1到T2时间段指标数据个数，n=小于等于S2的数据个数。<br>
+      //   2、数据区间百分位算法：对所选时间范围内的数据，取最大值Max，最小值Min，计算Max-Min，百分位=(现值-Min)/(Max-Min)，Max=Min时不计算`
+      // },
 
       /* 图表入库 */
       isSaveChartToBase: false,

src/views/futures_manage/chartEditor.vue

@@ -74,7 +74,7 @@
 						<el-input
 							v-model="chartInfo.ChartName"
 							style="width: 90%"
-							placeholder="必填项"
+							:placeholder="$t('Dialog.require_vaild')"
 							clearable
 						/>
 					</el-form-item>

src/views/positionAnalysis_manage/components/chartBox.vue

@@ -31,7 +31,7 @@
     <!-- 详情弹窗 -->
     <el-dialog
       :visible.sync="showDetailDia"
-      title="详情"
+      :title="$t('AprrovalPage.details_table')"
       :width="500"
       draggable
       :close-on-click-modal="false"
@@ -42,11 +42,11 @@
         <h2 class="title">{{ showDetailData.DealShortName }}</h2>
         <div class="table-box">
           <div class="item">
-            <div>持{{ showDetailData.TypeName }}</div>
+            <div>{{$t('ToolBox.PositionAnalysis.held')}}{{ showDetailData.TypeName }}</div>
             <div>{{ showDetailData.DealValue }}</div>
           </div>
           <div class="item">
-            <div>增减</div>
+            <div>{{$t('ToolBox.PositionAnalysis.increase')}}{{$t('ToolBox.PositionAnalysis.decrease')}}</div>
             <div>{{ showDetailData.DealChange }}</div>
           </div>
           <div class="item">
@@ -58,7 +58,7 @@
             <div>{{ showDetailData.BeforeAllValue }}</div>
           </div>
           <div class="item">
-            <div>增减</div>
+            <div>{{$t('ToolBox.PositionAnalysis.increase')}}{{$t('ToolBox.PositionAnalysis.decrease')}}</div>
             <div>{{ showDetailData.BeforeAllChange }}</div>
           </div>
           <div class="item">
@@ -66,7 +66,7 @@
             <div>{{ (showDetailData.BeforeAllRate * 100).toFixed(2) }}%</div>
           </div>
         </div>
-        <div class="close-btn" @click="showDetailDia = false">知道了</div>
+        <div class="close-btn" @click="showDetailDia = false">{{$t('Dialog.known')}}</div>
       </div>
     </el-dialog>
   </div>

src/views/sandbox_manage/index_new_version.vue

@@ -988,7 +988,7 @@ import { myGraph } from './common/gragh';
                 return;
               }
               this.lockLoding.close();
-              this.$message.success("另存为成功")
+              this.$message.success(this.$t('SandboxManage.SandList.save_as_success'))
               //沙盘图详情
               this.getSandboxDetailFun(sandData.SandboxId)
 

src/views/supply_manage/components/plantTable.vue

@@ -39,7 +39,7 @@
               <el-input
                 v-model="row.FactoryName"
                 class="large-sty"
-                placeholder="请输入工厂"
+                :placeholder="$t('SupplyAnalysis.StockPlant.placeholder05')"
                 @change="saveHandle(row)"
               />
             </span>
@@ -48,7 +48,7 @@
               <el-input
                 v-model="row.PlantName"
                 class="large-sty"
-                placeholder="请输入装置/产线"
+                :placeholder="$t('SupplyAnalysis.StockPlant.placeholder06')"
                 @change="saveHandle(row)"
               />
             </span>
@@ -58,7 +58,7 @@
                 v-model="row.AnnualCapacity"
                 type="number"
                 class="large-sty"
-                placeholder="请输入年产能"
+                :placeholder="$t('SupplyAnalysis.StockPlant.placeholder07')"
                 @change="changeParams(row)"
               />
             </span>
@@ -68,7 +68,7 @@
                 v-model="row.MaintenanceDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="检修日期"
+                :placeholder="$t('SupplyAnalysis.StockPlant.edit_table_col05')"
                 @change="changeDate(row)"
                 style="width: 140px"
               />
@@ -79,11 +79,11 @@
                 v-model="row.ResumptionDate"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="复产日期"
+                :placeholder="$t('SupplyAnalysis.StockPlant.edit_table_col06')"
                 style="width: 140px"
                 @change="() => {row.IsStop=0;changeDate(row)}  "
               />
-              <el-checkbox v-model="row.IsStop" @change="changeStopStatus($event,row)" :true-label="1" :false-label="0">退市</el-checkbox>
+              <el-checkbox v-model="row.IsStop" @change="changeStopStatus($event,row)" :true-label="1" :false-label="0">{{$t('SupplyAnalysis.StockPlant.delist')}}</el-checkbox>
             </span>
             <!-- 降负系数 -->
             <span v-else-if="item.key==='Coefficient'">