统计分析-跨品种分析

src/lang/modules/EtaChart/commonLang.js

@@ -130,10 +130,6 @@ export default {
       zh:'删除后该图表将不能再引用，确认删除吗？',
       en:'After deletion, this chart will no longer be referenced. Are you sure to delete it?'
     },
-    graph_name:{
-      zh:'曲线图',
-      en:'graph'
-    },
 
 
   },

src/lang/modules/StatisticAnalysis/CrossVarietyChart.js

@@ -0,0 +1,47 @@
+/**
+ * 统计分析-跨品种分析
+ */
+
+/* 英文 */
+export const CrossVarietyChartEn = {
+    select_variety:'Select variety',
+    variety_management:'Variety management',
+    placeholder01:'Please enter name',
+    label_config:'Label configuration',
+    label_manage:'Label management',
+    del_msg:'Are you sure to delete this',
+    label_name:'Label',
+    variety_name:'Variety',
+    time_length:'Length of time',
+    x_axis:'X-axis coordinate',
+    y_axis:'Y-axis coordinate',
+    chart_name:'Chart name',
+    selec_date:'Select date',
+    add_date:'Add date',
+    latest_date:'Latest date',
+    n_day_before:'N days ago',
+};
+  
+/* 中文 */
+export const CrossVarietyChartZh = {
+    select_variety:'选择品种',
+    variety_management:'品种管理',
+    placeholder01:'请输入名称',
+    label_config:'标签配置',
+    label_manage:'标签管理',
+    del_msg:'是否确认删除该',
+    label_name:'标签',
+    variety_name:'品种',
+    time_length:'时间长度',
+    x_axis:'X轴坐标',
+    y_axis:'Y轴坐标',
+    chart_name:'图表名称',
+    selec_date:'选择日期',
+    add_date:'添加日期',
+    latest_date:'最新日期',
+    n_day_before:'N天前',
+};
+  
+/**
+* $t('StatisticAnalysis.CrossVarietyChart.XXX')
+*/

src/lang/modules/StatisticAnalysis/IndexEn.js

@@ -1,5 +1,6 @@
 
 import { ChartRelevanceEn } from "./ChartRelevance";
+import { CrossVarietyChartEn } from "./CrossVarietyChart";
 import { FittingEquationChartEn } from "./FittingEquationChart";
 import { StatisticFeatureChartEn } from "./statisticFeatureChart";
 
@@ -9,6 +10,7 @@ export default {
   StatisticAnalysis: {
     ChartRelevance:ChartRelevanceEn,
     FittingEquationChart:FittingEquationChartEn,
-    StatisticFeatureChart:StatisticFeatureChartEn
+    StatisticFeatureChart:StatisticFeatureChartEn,
+    CrossVarietyChart:CrossVarietyChartEn
   },
 };

src/lang/modules/StatisticAnalysis/IndexZh.js

@@ -1,4 +1,5 @@
 import { ChartRelevanceZh } from "./ChartRelevance";
+import { CrossVarietyChartZh } from "./CrossVarietyChart";
 import { FittingEquationChartZh } from "./FittingEquationChart";
 import { StatisticFeatureChartZh } from "./statisticFeatureChart";
 
@@ -8,6 +9,7 @@ export default {
     StatisticAnalysis: {
       ChartRelevance:ChartRelevanceZh,
       FittingEquationChart:FittingEquationChartZh,
-      StatisticFeatureChart:StatisticFeatureChartZh
+      StatisticFeatureChart:StatisticFeatureChartZh,
+      CrossVarietyChart:CrossVarietyChartZh
     },
   };

src/views/chartRelevance_manage/components/explainText.js

@@ -94,4 +94,27 @@ export const crossVarietyAnalisisTextArr = [
     <p>（4）Y轴坐标：选择标签；</p>
     <p>（5）图表名称：X轴坐标和Y轴坐标的拼接。</p>`
 
+]
+
+export const crossVarietyAnalisisTextArrEn = [
+    `<p style="font-weight:bold;">I. Processing Logic</p>
+    <p>1. Percentile Calculation Formula: For the selected time range, determine the maximum value (Max) and minimum value (Min), calculate Max-Min, and compute the percentile as (Current Value - Min) / (Max - Min). If Max = Min, do not calculate.</p>
+    <p>2. Value Retrieval Method:</p>
+    <p>(1) Using "Select Date" and "Time Span," set the time range from the "Select Date" to the date that goes back by the chosen "Time Span." Within this period, find the maximum and minimum values of the indicator for percentile calculation.</p>
+    <p>(2) If no values are found within the time frame mentioned in (1), continue to look further back in time until values are found.</p>
+    <p>3. Chart Description:</p>
+    <p>(1) A particular commodity will have multiple coordinate points (the number of points depends on the number of dates set).</p>
+    <p>(2) The X and Y values of coordinate points correspond to actual dates and values.</p>`,
+
+    `<p style="font-weight:bold;">II. Related Configuration</p>
+    <p>1. Basic Configuration:</p>
+    <p>(1) Administrators manage commodities and tags.</p>
+    <p>(2) Users associate commodities with indicators based on tags.</p>
+    <p>2. Calculation Configuration:</p>
+    <p>(1) Time Span: The default display is 6 months.</p>
+    <p>(2) Select Date: Supports selecting up to 5 dates.</p>
+    <p>(3) X-axis Coordinate: Choose a tag.</p>
+    <p>(4) Y-axis Coordinate: Choose a tag.</p>
+    <p>(5) Chart Name: Concatenation of X-axis and Y-axis coordinates tags.</p>`
+
 ]

src/views/chartRelevance_manage/crossVarietyAnalysis/chartEditor.vue

@@ -10,25 +10,25 @@
     <div class="left-cont" v-show="!isSlideLeft" id="left">
       <div class="left-top">
         <div>
-          <el-button type="primary" @click="saveChartHandle">保存</el-button>
-          <el-button type="primary" plain @click="$router.back()">取消</el-button>
+          <el-button type="primary" @click="saveChartHandle">{{$t('Dialog.confirm_save_btn')}}</el-button>
+          <el-button type="primary" plain @click="$router.back()">{{$t('Dialog.cancel_btn')}}</el-button>
 
         </div>
         <div style="color:#409EFF;font-size: 16px;cursor: pointer;" @click="showExplain = true">
             <i class="el-icon-document" style="font-size:22px;"></i>
-            操作说明
+            {{$t('StatisticAnalysis.ChartRelevance.opt_tip_btn')}}
         </div>
       </div>
 
       <div class="left-min">
         <section class="section-item">
           <div class="top">
-            <label>选择品种</label>
+            <label>{{$t('StatisticAnalysis.CrossVarietyChart.select_variety')}}</label>
             <el-button
               v-permission="permissionBtn.statisticPermission.crossVariety_variety_edit"
               type="text" 
               @click="setDialogOpen('variety')"
-            >品种管理</el-button>
+            >{{$t('StatisticAnalysis.CrossVarietyChart.variety_management')}}</el-button>
           </div>
           <div class="list" v-if="varietyOptions.length">
             <el-tag 
@@ -47,12 +47,12 @@
 
         <section class="section-item">
           <div class="top">
-            <label>标签配置</label>
+            <label>{{$t('StatisticAnalysis.CrossVarietyChart.label_config')}}</label>
             <el-button
               v-permission="permissionBtn.statisticPermission.crossVariety_tag_edit"
               type="text" 
               @click="setDialogOpen('tag')"
-            >标签管理</el-button>
+            >{{$t('StatisticAnalysis.CrossVarietyChart.label_manage')}}</el-button>
           </div>
           <div class="list" v-if="tagOptions.length">
             <el-tag 
@@ -97,7 +97,7 @@
                 height="450px"
                 ref="chartRef"
               />
-              <span class="chart-author">作者:{{ chartInfo.SysUserRealName || accountName}}</span>
+              <span class="chart-author">{{$t('MsgPrompt.author')}}:{{ chartInfo.SysUserRealName || accountName}}</span>
 
               <!-- 上下限 -->
               <template>	
@@ -501,8 +501,8 @@ export default {
     }
   }
   .left-cont {
-    width: 380px;
-    min-width: 380px;
+    width: 400px;
+    min-width: 400px;
     background: #fff;
     margin-right: 20px;
     border: 1px solid #ececec;

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

@@ -3,11 +3,11 @@
     <el-form
       ref="diaForm"
       label-position="left"
-      label-width="80px"
+      label-width="125px"
       :model="form"
       :rules="formRules"
     >
-      <el-form-item label="时间长度" prop="CalculateValue">
+      <el-form-item :label="$t('StatisticAnalysis.CrossVarietyChart.time_length')" prop="CalculateValue">
         <el-input
           v-model="form.CalculateValue"
           style="width: 140px"
@@ -29,7 +29,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="X轴坐标" prop="TagX">
+      <el-form-item :label="$t('StatisticAnalysis.CrossVarietyChart.x_axis')" prop="TagX">
         <el-select
           v-model="form.TagX"
           style="width: 240px"
@@ -44,7 +44,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="Y轴坐标" prop="TagY">
+      <el-form-item :label="$t('StatisticAnalysis.CrossVarietyChart.y_axis')" prop="TagY">
         <el-select
           v-model="form.TagY"
           placeholder="请选择"
@@ -59,7 +59,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="图表名称" prop="ChartName">
+      <el-form-item :label="$t('StatisticAnalysis.CrossVarietyChart.chart_name')" prop="ChartName">
         <el-input
           v-model="form.ChartName"
           style="width: 240px"
@@ -70,7 +70,7 @@
     </el-form>
 
     <div class="date-section">
-      <label class="el-form-item__label">选择日期</label>
+      <label class="el-form-item__label">{{$t('StatisticAnalysis.CrossVarietyChart.selec_date')}}</label>
       <ul>
         <li class="date-li" v-for="(item,index) in form.DateConfigList" :key="index">
           <el-select
@@ -100,7 +100,7 @@
             <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 -2 16 16" fill="none">
               <path d="M5.23966 8.48046H7.51966V10.7605C7.51966 10.8265 7.57366 10.8805 7.63966 10.8805H8.35966C8.42566 10.8805 8.47966 10.8265 8.47966 10.7605V8.48046H10.7597C10.8257 8.48046 10.8797 8.42646 10.8797 8.36046V7.64046C10.8797 7.57446 10.8257 7.52046 10.7597 7.52046H8.47966V5.24046C8.47966 5.17446 8.42566 5.12046 8.35966 5.12046H7.63966C7.57366 5.12046 7.51966 5.17446 7.51966 5.24046V7.52046H5.23966C5.17366 7.52046 5.11966 7.57446 5.11966 7.64046V8.36046C5.11966 8.42646 5.17366 8.48046 5.23966 8.48046Z" fill="#0052D9"/>
               <path d="M13.52 2H2.48C2.2145 2 2 2.2145 2 2.48V13.52C2 13.7855 2.2145 14 2.48 14H13.52C13.7855 14 14 13.7855 14 13.52V2.48C14 2.2145 13.7855 2 13.52 2ZM12.92 12.92H3.08V3.08H12.92V12.92Z" fill="#0052D9"/>
-            </svg>添加日期
+            </svg>{{$t('StatisticAnalysis.CrossVarietyChart.add_date')}}
           </el-button>
 
           <i 
@@ -125,6 +125,23 @@ export default {
       type: Object
     }
   },
+  computed:{
+    unitOpt(){
+      return [
+          {label:this.$t('Edb.FreAll.year_min'),val:'年'},
+          {label:this.$t('Edb.FreAll.quarter_min'),val:'季'},
+          {label:this.$t('Edb.FreAll.month_min'),val:'月'},
+          {label:this.$t('Edb.FreAll.week_min'),val:'周'},
+          {label:this.$t('Edb.FreAll.day_min'),val:'天'},
+      ]
+    },
+    dateOptions(){
+      return [
+        { label: this.$t('StatisticAnalysis.CrossVarietyChart.latest_date')||'最新日期',val: 1 },
+        { label: this.$t('StatisticAnalysis.CrossVarietyChart.n_day_before')||'N天前',val: 2 },
+      ]
+    }
+  },
   data() {
     return {
       form: {
@@ -138,18 +155,18 @@ export default {
           { DateType: 1,Num: 0 },
         ],
       },
-      unitOpt: [
-        { label: "年", val: "年" },
-        { label: "季", val: "季" },
-        { label: "月", val: "月" },
-        { label: "周", val: "周" },
-        { label: "天", val: "天" },
-      ],
+      // unitOpt: [
+      //   { label: "年", val: "年" },
+      //   { label: "季", val: "季" },
+      //   { label: "月", val: "月" },
+      //   { label: "周", val: "周" },
+      //   { label: "天", val: "天" },
+      // ],
 
-      dateOptions: [
-        { label: '最新日期',val: 1 },
-        { label: 'N天前',val: 2 },
-      ]
+      // dateOptions: [
+      //   { label: '最新日期',val: 1 },
+      //   { label: 'N天前',val: 2 },
+      // ]
     };
   },
   methods: {

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

@@ -26,16 +26,16 @@
           <span v-else>{{ scope.row[item.key] }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" key="Copy" align="center" width="140">
+      <el-table-column :label="$t('Table.column_operations')" key="Copy" align="center" width="140">
         <template slot-scope="scope">
           <span class="editsty" @click="copyCode(scope.row)">
-          <i class="el-icon-document-copy" />&nbsp;复制数据</span
+          <i class="el-icon-document-copy" />&nbsp;{{$t('Edb.detail_copydata_btn')}}</span
         ><br />
-        <span class="editsty" @click="viewTarget(scope.row)">查看数据</span>
+        <span class="editsty" @click="viewTarget(scope.row)">{{$t('Edb.detail_lookdata_btn')/* 查看数据 */}}</span>
       </template>
     </el-table-column>
     <div slot="empty">
-      <tableNoData text="暂无指标" size="mini"/>
+      <tableNoData :text="$t('Table.no_edb_msg')" size="mini"/>
     </div>
   </el-table>
 </template>
@@ -49,59 +49,114 @@ export default {
       default: () => []
     }
   },
-  data() {
-    return {
-      tableColums: [
+  computed:{
+    tableColums(){
+      return [
         {
-          label: '指标名称',
+          label: this.$t('Edb.Detail.e_name')||'指标名称',
           key: 'EdbName',
           enKey:'EdbNameEn',
 					inputTip:'点击输入英文指标名称',
           minwidthsty: '150px',
         },
         {
-          label: '指标ID',
+          label: this.$t('Edb.Detail.e_id')||'指标ID',
           key: 'EdbCode',
           widthsty: '120px',
         },
         {
-          label: '更新频度',
+          label: this.$t('Edb.Detail.e_fre')||'更新频度',
           key: 'Frequency',
           enKey:'FrequencyEn',
           minwidthsty: '60px',
         },
         {
-          label: '单位',
+          label: this.$t('Edb.Detail.e_unit')||'单位',
           key: 'Unit',
           enKey:'UnitEn',
 					inputTip:'英文单位',
           minwidthsty: '50px',
         },
         {
-          label: '起始时间',
+          label: this.$t('Edb.Detail.e_start_time')||'起始时间',
           key: 'StartDate',
           minwidthsty: '100px',
         },
         {
-          label: '最新日期',
+          label: this.$t('Edb.Detail.e_latest_date')||'最新日期',
           key: 'LatestDate',
           minwidthsty: '90px',
         },
         {
-          label: '最新值',
+          label: this.$t('Edb.Detail.e_latest_value')||'最新值',
           key: 'LatestValue',
           minwidthsty: '90px',
         },
         {
-          label: '最近更新',
+          label: this.$t('Edb.Detail.e_recent_time')||'最近更新',
           key: 'ModifyTime',
           minwidthsty: '100px',
         },
         {
-          label: '数据来源',
+          label: this.$t('Edb.Detail.source')||'数据来源',
           key: 'SourceName',
         },
-      ],//表格列
+      ]
+    }
+  },
+  data() {
+    return {
+      // tableColums: [
+      //   {
+      //     label: '指标名称',
+      //     key: 'EdbName',
+      //     enKey:'EdbNameEn',
+			// 		inputTip:'点击输入英文指标名称',
+      //     minwidthsty: '150px',
+      //   },
+      //   {
+      //     label: '指标ID',
+      //     key: 'EdbCode',
+      //     widthsty: '120px',
+      //   },
+      //   {
+      //     label: '更新频度',
+      //     key: 'Frequency',
+      //     enKey:'FrequencyEn',
+      //     minwidthsty: '60px',
+      //   },
+      //   {
+      //     label: '单位',
+      //     key: 'Unit',
+      //     enKey:'UnitEn',
+			// 		inputTip:'英文单位',
+      //     minwidthsty: '50px',
+      //   },
+      //   {
+      //     label: '起始时间',
+      //     key: 'StartDate',
+      //     minwidthsty: '100px',
+      //   },
+      //   {
+      //     label: '最新日期',
+      //     key: 'LatestDate',
+      //     minwidthsty: '90px',
+      //   },
+      //   {
+      //     label: '最新值',
+      //     key: 'LatestValue',
+      //     minwidthsty: '90px',
+      //   },
+      //   {
+      //     label: '最近更新',
+      //     key: 'ModifyTime',
+      //     minwidthsty: '100px',
+      //   },
+      //   {
+      //     label: '数据来源',
+      //     key: 'SourceName',
+      //   },
+      // ],//表格列
     }
   },
   methods:{

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

@@ -3,7 +3,7 @@
     :visible.sync="isShow"
     :close-on-click-modal="false"
     :modal-append-to-body="false"
-    :title="type==='tag'?'标签管理':'品种管理'"
+    :title="type==='tag'?$t('StatisticAnalysis.CrossVarietyChart.label_manage'):$t('StatisticAnalysis.CrossVarietyChart.variety_management')"
     @close="cancelHandle"
     custom-class="dialog"
     center
@@ -13,7 +13,7 @@
     <div class="dialog-min">
       <el-input
         v-model="searchTxt"
-        placeholder="请输入名称"
+        :placeholder="$t('StatisticAnalysis.CrossVarietyChart.placeholder01')"
         prefix-icon="el-icon-search"
         size="medium"
         clearable 
@@ -39,7 +39,7 @@
           <span v-else>
             {{ item.label }}
             <el-popconfirm
-              :title="`是否确认删除该${type==='tag'?'标签':'品种'}`"
+              :title="`${$t('StatisticAnalysis.CrossVarietyChart.del_msg')}${type==='tag'?$t('StatisticAnalysis.CrossVarietyChart.label_name'):$t('StatisticAnalysis.CrossVarietyChart.variety_name')}`"
               @onConfirm="closeItemHandle(item)"
             >
               <i
@@ -60,7 +60,7 @@
           @blur="addNewTagHandle"
         >
         </el-input>
-        <el-button v-else size="small" @click="addNewItem">+ {{type==='tag'?'标签':'品种'}}</el-button>
+        <el-button v-else size="small" @click="addNewItem">+ {{type==='tag'?$t('StatisticAnalysis.CrossVarietyChart.label_name'):$t('StatisticAnalysis.CrossVarietyChart.variety_name')}}</el-button>
 
       </div>
     </div>

src/views/chartRelevance_manage/crossVarietyAnalysis/list.vue

@@ -12,20 +12,20 @@
       <div class="main-left left" id="left" v-show="!isSlideLeft">
 				<div class="datasheet_top">
 						<el-button v-permission="permissionBtn.statisticPermission.crossVariety_addChart"
-							 type="primary" @click="goAddChart">添加图表</el-button>
+							 type="primary" @click="goAddChart">{{$t('StatisticAnalysis.ChartRelevance.chart_add_btn')}}</el-button>
 				</div>
 
 				<div class="search-cont">
 					<el-checkbox v-model="isShowMe"  
 						v-permission="permissionBtn.statisticPermission.crossVariety_onlyMine"
-						@change="() => { getTreeData();getPublicList() }">只看我的</el-checkbox>
+						@change="() => { getTreeData();getPublicList() }">{{$t('StatisticAnalysis.ChartRelevance.only_see_mine')}}</el-checkbox>
 					<el-select
 						v-model="search_txt"
 						v-loadMore="searchLoad"
 						:filterable="!search_txt"
 						remote
 						clearable
-						placeholder="请输入图表名称"
+						:placeholder="$t('Chart.search_chart_placeholder')"
 						style="width: 100%; margin-top: 20px"
 						:remote-method="searchHandle"
 						@click.native="inputFocusHandle"
@@ -144,7 +144,7 @@
 											ref="chartRef"
 										/>
                   </div>
-                  <span class="chart-author">作者:{{ chartInfo.SysUserRealName}}</span>
+                  <span class="chart-author">{{$t('MsgPrompt.author')}}:{{ chartInfo.SysUserRealName}}</span>
                 </div>
 
                 <!-- 异常显示 -->
@@ -370,7 +370,7 @@ export default {
     /* 编辑节点 */
     editNode(node, { ChartClassifyName,ChartClassifyId }) {
 
-      this.dialog_title = '编辑图表分类';
+      this.dialog_title = this.$t('StatisticAnalysis.ChartRelevance.edit_chart_classify')||'编辑图表分类';
       /* 编辑目录 */
       this.classifyForm = {
         classify_name: ChartClassifyName,
@@ -467,9 +467,9 @@ export default {
 		/* 删除图表 */
 		delChartHandle() {
 			const { ChartClassifyId,ChartInfoId } = this.chartInfo;
-			this.$confirm('删除后该图表将不能再引用，确认删除吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+			this.$confirm(this.$t('Chart.OptMsg.chart_del_confirm'), this.$t('Confirm.prompt'), {
+        // confirmButtonText: '确定',
+        // cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {