指标库over

src/lang/modules/EtaChart/En.js

@@ -52,5 +52,23 @@ export default {
     label_text_pos:'Text Position',
     label_text_color:'Text Color',
     label_text_size:'Text Size',
+
+    //截面散点图区域
+    label_serie_set:'Series {index} Configuration',
+    label_trend_line:'Trendline',
+    label_fitting:'Fitting Equation',
+    label_show_all:'Show all',
+    label_more_serie: 'More series',
+    label_x_serie:'X-axis',
+    label_y_serie:'Y-axis',
+    label_serie_name: 'Series Name',
+    label_serie_color:'Series Color',
+    tag_tip: 'The label defaults to the X-axis indicator name, which can be modified',
+    label_x_edb: 'X-axis Indicator',
+    label_y_edb: 'Y-axis Indicator',
+    label_edb_num: 'items',
+    label_replace_edb: '指标替换',
+    label_replace_to:'替换为',
+    label_add_moreserie:'More series configurations'
   }
 }

src/lang/modules/EtaChart/Zh.js

@@ -52,5 +52,23 @@ export default {
     label_text_pos:'文本位置',
     label_text_color:'文本颜色',
     label_text_size:'文本字号',
+
+    //截面散点图区域
+    label_serie_set:'系列{index}配置',
+    label_trend_line:'趋势线',
+    label_fitting:'拟合方程',
+    label_show_all:'全部显示',
+    label_more_serie: '更多系列',
+    label_x_serie:'X轴',
+    label_y_serie:'Y轴',
+    label_serie_name: '系列名称',
+    label_serie_color:'系列颜色',
+    tag_tip: '标签默认取X轴指标名称，可修改',
+    label_x_edb: 'X轴指标',
+    label_y_edb: 'Y轴指标',
+    label_edb_num: '项',
+    label_replace_edb: '指标替换',
+    label_replace_to:'替换为',
+    label_add_moreserie:'更多系列配置'
   }
 }

src/lang/modules/EtaChart/commonLang.js

@@ -417,6 +417,26 @@ export default {
       zh: '标识区所在范围不能相同',
       en: 'The marker area ranges can not be identical'
     },
+    x_name_msg: {
+      zh: 'X轴名称不能为空',
+      en: 'X-axis name can not be empty'
+    },
+    x_unit_msg: {
+      zh: 'X轴单位不能为空',
+      en: 'X-axis unit can not be empty'
+    },
+    y_name_msg: {
+      zh: 'Y轴名称不能为空',
+      en: 'Y-axis name can not be empty'
+    },
+    y_unit_msg: {
+      zh: 'Y轴单位不能为空',
+      en: 'Y-axis unit can not be empty'
+    },
+    serie_name_msg: {
+      zh: '系列名称不能为空',
+      en: 'Series Name can not be empty'
+    },
   },
 
   /* 相关placeholder */

src/views/dataEntry_manage/addChart.vue

@@ -536,7 +536,7 @@
 								@change="getPreviewSplineInfo"
 							>
 								<el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
-							<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
+								<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
 							</el-radio-group>
 
 							<!-- 图表说明 -->

src/views/dataEntry_manage/components/satterSeriesDia.vue

@@ -10,15 +10,16 @@
 		width="1200px"
 		v-dialogDrag
     top="8vh"
-    title="系列1配置"
+    :title="$t('EtaChartAddPage.label_serie_set',{index:1})"
   >
 
     <div class="target-wrapper">
       <div class="tags-cont">
-        <div class="tag-title">标签</div>
+        <div class="tag-title"><!-- 标签 -->{{$t('Chart.Detail.tag_name')}}</div>
         <div class="tip">
           <i class="el-icon-s-opportunity"/>
-          标签默认取X轴指标名称，可修改
+          <!-- 标签默认取X轴指标名称，可修改 -->
+          {{$t('EtaChartAddPage.tag_tip')}}
         </div>
         <ul class="tag-ul">
           <li class="tag-item" v-for="(item,index) in targetInfo.xEdbs" :key="index">
@@ -36,12 +37,12 @@
       <div class="x-target-cont">
         <div class="tag-title">
           <div>
-            X轴指标 
-            <span style="color:#999">{{targetInfo.xEdbs.length}}项</span> 
+            <!-- X轴指标 -->{{$t('EtaChartAddPage.label_x_edb')}} 
+            <span style="color:#999">{{targetInfo.xEdbs.length}}{{$t('EtaChartAddPage.label_edb_num')}}</span> 
           </div>
           <el-radio-group v-model="selectObj.xEdbFromType">
-            <el-radio :label="0" style="margin-right: 15px">ETA指标</el-radio>
-            <el-radio :label="1">ETA预测指标</el-radio>
+            <el-radio :label="0" style="margin-right: 15px"><!-- ETA指标 -->{{$t('Edb.eta_name')}}</el-radio>
+            <el-radio :label="1"><!-- ETA预测指标 -->{{$t('Edb.eta_predictor_name')}}</el-radio>
           </el-radio-group>
         </div>
         <div class="targets-cont">
@@ -52,7 +53,7 @@
             :filterable="!search_txt"
             remote
             clearable
-            placeholder="指标ID/指标名称"
+            :placeholder="$t('Edb.InputHolderAll.input_name_orid')"
             style="width:90%;display:block;margin:0 auto;"
             :remote-method="searchHandle"
             @click.native="inputFocusHandle('x',$event)"
@@ -95,12 +96,12 @@
       <div class="x-target-cont">
          <div class="tag-title">
           <div>
-            Y轴指标 
-            <span style="color:#999">{{targetInfo.yEdbs.length}}项</span> 
+            <!-- Y轴指标 -->{{$t('EtaChartAddPage.label_y_edb')}}  
+            <span style="color:#999">{{targetInfo.yEdbs.length}}{{$t('EtaChartAddPage.label_edb_num')}}</span> 
           </div>
           <el-radio-group v-model="selectObj.yEdbFromType">
-            <el-radio :label="0" style="margin-right: 15px">ETA指标</el-radio>
-            <el-radio :label="1">ETA预测指标</el-radio>
+            <el-radio :label="0" style="margin-right: 15px"><!-- ETA指标 -->{{$t('Edb.eta_name')}}</el-radio>
+            <el-radio :label="1"><!-- ETA预测指标 -->{{$t('Edb.eta_predictor_name')}}</el-radio>
           </el-radio-group>
         </div>
         <div class="targets-cont">
@@ -111,7 +112,7 @@
             :filterable="!search_txt"
             remote
             clearable
-            placeholder="指标ID/指标名称"
+            :placeholder="$t('Edb.InputHolderAll.input_name_orid')"
             style="width:90%;display:block;margin:0 auto;"
             :remote-method="searchHandle"
             @click.native="inputFocusHandle('y',$event)"
@@ -161,11 +162,11 @@
       :model="form"
       :rules="formRules"
     >
-      <el-form-item label="X轴" prop="x_title" style="margin-bottom: 20px;">
+      <el-form-item :label="$t('EtaChartAddPage.label_x_serie')" prop="x_title" style="margin-bottom: 20px;">
         <el-input
           v-model="form.x_title"
           style="width: 350px;"
-          placeholder="请输入x轴名称"
+          :placeholder="$t('Chart.InputHolderAll.input_common',{label: $t('EtaChartAddPage.label_x_serie')})"
           clearable
         />
       </el-form-item>
@@ -173,7 +174,6 @@
         <selectUnit 
           v-model="form.x_unit" 
           style="width: 150px"
-          placeholder="请输入单位"
           clearable
         />
       </el-form-item>
@@ -199,15 +199,15 @@
           v-model="form.x_date"
           value-format="yyyy-MM-dd"
           type="date"
-          placeholder="选择日期"
+          :placeholder="$t('Edb.InputHolderAll.input_date')"
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="Y轴" prop="y_title" style="margin-bottom: 20px;">
+      <el-form-item :label="$t('EtaChartAddPage.label_y_serie')" prop="y_title" style="margin-bottom: 20px;">
         <el-input
           v-model="form.y_title"
           style="width: 350px;"
-          placeholder="请输入y轴名称"
+          :placeholder="$t('Chart.InputHolderAll.input_common',{label: $t('EtaChartAddPage.label_y_serie')})"
           clearable
         />
       </el-form-item>
@@ -215,7 +215,6 @@
         <selectUnit 
           v-model="form.y_unit" 
           style="width: 150px"
-          placeholder="请输入单位"
           clearable
         />
       </el-form-item>
@@ -241,19 +240,19 @@
           v-model="form.y_date"
           value-format="yyyy-MM-dd"
           type="date"
-          placeholder="选择日期"
+          :placeholder="$t('Edb.InputHolderAll.input_date')"
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="系列名称" prop="series_name" style="margin-right: 40px">
+      <el-form-item :label="$t('EtaChartAddPage.label_serie_name')" prop="series_name" style="margin-right: 40px">
         <el-input
           v-model="form.series_name"
           style="width: 350px"
-          placeholder="请输入系列名称"
+          :placeholder="$t('Chart.InputHolderAll.input_common',{label: $t('EtaChartAddPage.label_serie_name')})"
           clearable
         />
       </el-form-item>
-      <el-form-item label="系列颜色" prop="color">
+      <el-form-item :label="$t('EtaChartAddPage.label_serie_color')"  prop="color">
         <el-color-picker
           v-model="form.color"
           size="mini"
@@ -264,8 +263,8 @@
       </el-form-item>
     </el-form>
     <div class="dia-bot">
-      <el-button type="primary" style="margin-right: 20px" @click="saveHandle">保存</el-button>
-      <el-button type="primary" plain @click="cancelHandle">取消</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"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
     </div>
 
 
@@ -279,16 +278,16 @@
       <div>
         <el-form
 					label-position="left"
-					label-width="80px"
+					label-width="120px"
 					:model="replaceForm"
 				>
-					<el-form-item label="指标名称" prop="name">
+					<el-form-item :label="$t('Edb.Detail.e_name')" prop="name">
 						<span>{{replaceForm.oldEdbName}}</span>
 					</el-form-item>
-          <el-form-item label="替换为">
+          <el-form-item :label="$t('EtaChartAddPage.label_replace_to')">
             <el-radio-group v-model="edbFromType">
-							<el-radio :label="0" style="margin-right: 15px">ETA指标</el-radio>
-							<el-radio :label="1">ETA预测指标</el-radio>
+							<el-radio :label="0" style="margin-right: 15px"><!-- ETA指标 -->{{$t('Edb.eta_name')}}</el-radio>
+							<el-radio :label="1"><!-- ETA预测指标 -->{{$t('Edb.eta_predictor_name')}}</el-radio>
 						</el-radio-group>
             <el-select
               v-model="replaceForm.searchTxt"
@@ -297,7 +296,7 @@
               :filterable="!replaceForm.searchTxt"
               remote
               clearable
-              placeholder="指标ID/指标名称"
+              :placeholder="$t('Edb.InputHolderAll.input_name_orid')"
               style="width:90%;margin-top: 10px;display: block;"
               :remote-method="searchHandle"
               @click.native="inputFocusHandle('',$event)"
@@ -327,10 +326,10 @@
             type="primary"
             style="margin-right: 60px"
             @click="saveReplace"
-            >保存</el-button
+            ><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button
           >
           <el-button type="primary" plain @click="cancelReplace"
-            >取消</el-button
+            ><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button
           >
         </div>
       </div>
@@ -446,19 +445,19 @@ export default {
 
       formRules: {
         x_title:[
-					{ required: true, message: 'X轴名称不能为空', trigger: 'blur' },
+					{ required: true, message: /* 'X轴名称不能为空' */this.$t('Chart.Vailds.x_name_msg'), trigger: 'blur' },
 				],
 				x_unit:[
-					{ required: true, message: 'X轴单位不能为空', trigger: 'blur' },
+					{ required: true, message: /* 'X轴单位不能为空' */this.$t('Chart.Vailds.x_unit_msg'), trigger: 'blur' },
 				],
         y_title:[
-					{ required: true, message: 'Y轴名称不能为空', trigger: 'blur' },
+					{ required: true, message: /* 'Y轴名称不能为空' */this.$t('Chart.Vailds.y_name_msg'), trigger: 'blur' },
 				],
 				y_unit:[
-					{ required: true, message: 'Y轴单位不能为空', trigger: 'blur' },
+					{ required: true, message: /* 'Y轴单位不能为空' */this.$t('Chart.Vailds.y_unit_msg'), trigger: 'blur' },
 				],
         series_name: [
-          { required: true, message: '系列名称不能为空', trigger: 'blur' },
+          { required: true, message: /* '系列名称不能为空' */this.$t('Chart.Vailds.serie_name_msg'), trigger: 'blur' },
         ]
       },
 

src/views/dataEntry_manage/components/sectionalScatterOption.vue

@@ -9,22 +9,29 @@
           :disabled="!item.edbs"
         >
           <template slot="title">
-            <el-button type="text" size="small" @click.stop="openSetDialog(item,index)" style="font-size: 15px;">系列{{index+1}}配置</el-button>
+            <el-button 
+              type="text" 
+              size="small" 
+              @click.stop="openSetDialog(item,index)" 
+            style="font-size: 15px;"
+            ><!-- 系列{{index+1}}配置 -->
+              {{$t('EtaChartAddPage.label_serie_set',{index: index+1})}}
+            </el-button>
             <i class="el-icon-delete del-icon" v-if="index>0" @click.stop="removeSeries(index)"></i>
           </template>
           <div class="setting-wrapper" v-if="item.edbs">
             <div class="set-header">
-              <el-checkbox v-model="item.showTrendLine" @change="changeSeriesOption(item,index)">趋势线</el-checkbox>
+              <el-checkbox v-model="item.showTrendLine" @change="changeSeriesOption(item,index)"><!-- 趋势线 -->{{$t('EtaChartAddPage.label_trend_line')}}</el-checkbox>
               <template v-if="item.showTrendLine">
-                <el-checkbox v-model="item.showFitEquation" @change="changeSeriesOption(item,index)">拟合方程</el-checkbox>
+                <el-checkbox v-model="item.showFitEquation" @change="changeSeriesOption(item,index)"><!-- 拟合方程 -->{{$t('EtaChartAddPage.label_fitting')}}</el-checkbox>
                 <el-checkbox v-model="item.showRSquare" @change="changeSeriesOption(item,index)">R²</el-checkbox>
               </template>
             </div>
 
             <ul class="setting-cont" v-if="item.edbs">
               <li id="tag-item">
-                <span>标签</span>
-                <el-checkbox v-model="item.tagsAllShow" @change="changeTagShow(item,null,index)">全部显示</el-checkbox>
+                <span><!-- 标签 -->{{$t('Chart.Detail.tag_name')}}</span>
+                <el-checkbox v-model="item.tagsAllShow" @change="changeTagShow(item,null,index)"><!-- 全部显示 -->{{$t('EtaChartAddPage.label_show_all')}}</el-checkbox>
               </li>
               <li 
                 id="tag-item"
@@ -46,7 +53,7 @@
         alt=""
         style="width: 16px; height: 16px; margin-right: 10px"
       />
-      <span>更多系列</span>
+      <span><!-- 更多系列 -->{{$t('EtaChartAddPage.label_more_serie')}}</span>
     </div>
 
 
@@ -62,7 +69,7 @@
 
     <!-- 添加其他系列 -->
     <m-dialog
-      :title="dialogForm.index ? `系列${dialogForm.index+1}配置`:'更多系列配置'" 
+      :title="dialogForm.index ? $t('EtaChartAddPage.label_serie_set',{index: dialogForm.index+1}) : $t('EtaChartAddPage.label_add_moreserie')" 
       :show.sync="dialogForm.show" 
       width="650px"
     >
@@ -73,8 +80,8 @@
           ref="formRef" 
           label-position="left"
           hide-required-asterisk
-          label-width="80px">
-          <el-form-item prop="x_date_type" label="X轴">
+          label-width="120px">
+          <el-form-item prop="x_date_type" :label="$t('EtaChartAddPage.label_x_serie')">
             <el-select 
               v-model="dialogForm.x_date_type"
               placeholder="请选择日期添加方式"
@@ -96,11 +103,11 @@
               v-model="dialogForm.x_date"
               value-format="yyyy-MM-dd"
               type="date"
-              placeholder="选择日期"
+              :placeholder="$t('Edb.InputHolderAll.input_date')"
               style="width: 140px"
             />
           </el-form-item>
-          <el-form-item prop="y_date_value" label="Y轴">
+          <el-form-item prop="y_date_value" :label="$t('EtaChartAddPage.label_y_serie')">
             <el-select 
               v-model="dialogForm.y_date_type"
               placeholder="请选择日期添加方式"
@@ -113,7 +120,7 @@
               <el-input
                 type="number" 
                 v-model="dialogForm.y_date_value"
-                placeholder="请输入数字"
+                :placeholder="$t('Edb.InputHolderAll.input_number')"
                 style="width:100px;"
               />
               天
@@ -123,19 +130,19 @@
               v-model="dialogForm.y_date"
               value-format="yyyy-MM-dd"
               type="date"
-              placeholder="选择日期"
+              :placeholder="$t('Edb.InputHolderAll.input_date')"
               style="width: 140px"
             />
           </el-form-item>
-          <el-form-item prop="series_name" label="系列名称">
+          <el-form-item prop="series_name" :label="$t('EtaChartAddPage.label_serie_name')">
             <el-input
               v-model="dialogForm.series_name"
               style="width: 300px"
-              placeholder="请输入系列名称"
+              :placeholder="$t('Chart.InputHolderAll.input_common',{label: $t('EtaChartAddPage.label_serie_name')})"
               clearable
             />
           </el-form-item>
-          <el-form-item label="系列颜色" prop="color">
+          <el-form-item :label="$t('EtaChartAddPage.label_serie_color')" prop="color">
             <el-color-picker
               v-model="dialogForm.color"
               show-alpha
@@ -150,11 +157,11 @@
           @click="saveSeries"
           type="primary"
           style="width: 132px; height: 40px"
-          >保存</el-button>
+          ><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
         <el-button
         @click="cancelDialog"
         style="width: 132px; height: 40px"
-        >取消</el-button>
+        ><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </m-dialog>
   </div>
@@ -214,13 +221,13 @@ export default {
         },
         formRules: {
           series_name: [
-            { required: true, message: '系列名称不能为空', trigger: 'blur' },
+            { required: true, message: /* '系列名称不能为空' */this.$t('Chart.Vailds.serie_name_msg'), trigger: 'blur' },
           ]
         },
         dateOptions: [
-          { key: 1,label:'最新日期' },
-          { key: 2,label:'N天前' },
-          { key: 3,label:'固定日期' },
+          { key: 1,label:/* '最新日期' */this.$t('Chart.option_date_type_new') },
+          { key: 2,label:/* 'N天前' */this.$t('Chart.option_date_type_before') },
+          { key: 3,label:/* '固定日期' */this.$t('Chart.option_date_type_fix') },
         ],
     }
   },

src/views/dataEntry_manage/editChart.vue

@@ -15,7 +15,7 @@
 					:disabled="chartInfo.ChartType === 5 && tableData.length !== 2"
 				><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
 				<el-button v-permission="permissionBtn.chartLibPermission.chartLib_otherSave"
-					type="primary" @click="saveChartOtherHandle">另存为</el-button>
+					type="primary" @click="saveChartOtherHandle"><!-- 另存为 -->{{$t('Table.save_as')}}</el-button>
         <el-button type="primary" plain @click="$router.replace({
 					path: '/chartsetting',
 					query: {
@@ -32,7 +32,7 @@
 					:model="chartInfo"
 					:rules="chartRules"
 				>
-					<el-form-item label="生成图表类型" prop="ChartType">
+					<el-form-item :label="$t('EtaChartAddPage.label_chart_type')" prop="ChartType">
 						<el-select
 							v-model="chartInfo.ChartType"
 							placeholder="请选择生成样式"
@@ -49,7 +49,7 @@
 						</el-select>
 					</el-form-item>
 
-					<el-form-item label="图表主题" prop="Theme">
+					<el-form-item :label="$t('EtaChartAddPage.label_chart_theme')" prop="Theme">
 						<el-select
 							v-model="chartInfo.ChartThemeId"
 							placeholder="请选择图表主题"
@@ -69,10 +69,10 @@
 					<el-form-item label="">
 						<div class="search-cont" v-if="chartInfo.ChartType!==10">
 							<div>
-								<label>选择指标：</label>
+								<label><!-- 选择指标 -->{{$t('Edb.choose_edb')}}：</label>
 								<el-radio-group v-model="edbFromType">
-									<el-radio :label="0" style="margin-right: 15px">ETA指标</el-radio>
-									<el-radio :label="1">ETA预测指标</el-radio>
+									<el-radio :label="0" style="margin-right: 15px"><!-- ETA指标 -->{{$t('Edb.eta_name')}}</el-radio>
+									<el-radio :label="1"><!-- ETA预测指标 -->{{$t('Edb.eta_predictor_name')}}</el-radio>
 								</el-radio-group>
 							</div>
 							<el-select
@@ -82,7 +82,7 @@
 								:filterable="!search_txt"
 								remote
 								clearable
-								placeholder="指标ID/指标名称"
+								:placeholder="$t('Edb.InputHolderAll.input_name_orid')"
 								style="width:90%;margin-top: 10px;display: block;"
 								:remote-method="searchHandle"
 								@click.native="inputFocusHandle"
@@ -103,24 +103,24 @@
 						</div>
 					</el-form-item>
 
-					<el-form-item label="图表名称" prop="ChartName">
+					<el-form-item :label="$t('Chart.Detail.chart_name')" prop="ChartName">
 						<el-input
 							v-model="chartInfo.ChartName"
 							style="width: 90%"
-							placeholder="必填项"
+							:placeholder="$t('Dialog.require_vaild')"
 							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="chartInfo.classify"
 							:options="classifyOptions"
 							:props="levelProps"
 							style="width: 90%"
-							placeholder="请选择所属分类"
+							:placeholder="$t('Chart.InputHolderAll.input_classify')"
 						/>
 					</el-form-item>
-					<el-form-item label="图表单位" prop="Unit" v-if="[7,11].includes(chartInfo.ChartType)">
+					<el-form-item :label="$t('Chart.Detail.chart_unit')" prop="Unit" v-if="[7,11].includes(chartInfo.ChartType)">
 						<el-select
 							v-model="chartInfo.Unit"
 							filterable
@@ -128,7 +128,7 @@
 							default-first-option
 							clearable
 							@change="changeUnit"
-							placeholder="请输入图表单位">
+							:placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.chart_unit')})">
 							<el-option
 								v-for="item in UnitOptions"
 								:key="item"
@@ -142,12 +142,10 @@
 				<div class="xaxis-range-cont" v-if="chartInfo.ChartType===2 && tableData && tableData.length>0">
 					<!-- 仅用于季节性图配置 -->
 					<div style="margin-bottom: 12px;" class="xaxis-range-tip">
-						横坐标显示范围 
+						{{$t('EtaChartAddPage.label_xserie_range')}}<!-- 横坐标显示范围 -->  
 						<el-tooltip>
 							<div slot="content">
-								<p class="hint-message">配置横坐标显示的时间刻度</p>
-								<p class="hint-message">1、若开始日期小于结束日期，则默认不跨年，允许勾选跨年</p>
-								<p class="hint-message">2、若开始日期大于等于结束日期，则跨年，不允许取消勾选</p>
+								{{$t('EtaChartAddPage.xserie_range_tip')}}
 							</div>
 							<img src="~@/assets/img/icons/question_mark_black.png" style="height: 16px;cursor: pointer;margin-left: 6px;" />
 						</el-tooltip>
@@ -158,7 +156,7 @@
 						value-format="MM-dd"
 						popper-class="x-range-picker-date"
 						format="MM-dd"
-						placeholder="开始日期"
+						:placeholder="$t('Common.ph_time_start')"
 						@change="xAxisChange"
 						:clearable="false"
 					></el-date-picker>
@@ -168,15 +166,20 @@
 						value-format="MM-dd"
 						popper-class="x-range-picker-date"
 						format="MM-dd"
-						placeholder="结束日期"
+						:placeholder="$t('Common.ph_time_end')"
 						@change="xAxisChange"
 						:clearable="false"
 					></el-date-picker>
-					<el-checkbox label="跨年" v-model="isSpanYear" :disabled="isSpanYearDisable"
-					style="margin-top: 12px;" @change="changeIsSpanYear"></el-checkbox>
+					<el-checkbox 
+						:label="$t('EtaChartAddPage.label_cross_year')" 
+						v-model="isSpanYear" 
+						:disabled="isSpanYearDisable"
+						style="margin-top: 12px;" 
+						@change="changeIsSpanYear"
+					></el-checkbox>
 					<br />
 					<div class="legend-set-text" @click="openLegendEditDia">
-						<span>图例名称设置</span>
+						<span>{{$t('EtaChartAddPage.label_legend_set')}}<!-- 图例名称设置 --></span>
 						<img src="~@/assets/img/icons/edit-blue.png" />
 					</div>
 				</div>
@@ -185,7 +188,7 @@
 						<!-- 仅用于散点图配置提出 -->
 					<div class="scatter-setting" v-if="chartInfo.ChartType === 5 && tableData.length">
 						<div style="display: flex;margin-right: 15px;">
-							<span style="margin-right: 3px">散点颜色：</span>
+							<span style="margin-right: 3px"><!-- 散点颜色： -->{{$t('Chart.Detail.scatter_color')}}：</span>
 							<el-color-picker
 								v-model="tableData[0].ChartColor"
 								size="mini"
@@ -193,7 +196,7 @@
 								:predefine="predefineColors"
 							></el-color-picker>
 						</div>
-						<el-checkbox v-model="tableData[0].IsOrder">逆序</el-checkbox>
+						<el-checkbox v-model="tableData[0].IsOrder"><!-- 逆序 -->{{$t('Chart.Detail.re_order')}}</el-checkbox>
 					</div>
 
           <el-collapse v-model="activeNames" class="target-list" v-if="tableData.length&&![7,10,11].includes(chartInfo.ChartType)">
@@ -206,12 +209,12 @@
 								<!-- 堆叠图 或组合图中的堆叠类型 非第一项隐藏配置 -->
 								<template v-if="showYOptionsHandle(item,index)">
 									<li>
-										<el-checkbox v-model="item.IsOrder">逆序</el-checkbox>
+										<el-checkbox v-model="item.IsOrder"><!-- 逆序 -->{{$t('Chart.Detail.re_order')}}</el-checkbox>
 									</li>
 									<li>
 										<el-radio-group v-model="item.IsAxis" size="mini">
-											<el-radio-button :label="1">左轴</el-radio-button>
-											<el-radio-button :label="0">右轴</el-radio-button>
+											<el-radio-button :label="1"><!-- 左轴 -->{{$t('Chart.Detail.l_axis')}}</el-radio-button>
+											<el-radio-button :label="0"><!-- 右轴 -->{{$t('Chart.Detail.r_axis')}}</el-radio-button>
 											<!-- 指标有右轴时才可以选右2轴 不然没有右2这个概念的意义 -->
 											<el-radio-button 
 												v-if="[1,6].includes(chartInfo.ChartType)"
@@ -219,7 +222,7 @@
 												:disabled="(tableData.findIndex(_ => _.IsAxis===0) === -1) 
 												|| (tableData.findIndex(_ => _.IsAxis===0) === index 
 														&& tableData.filter(_ => _.IsAxis===0).length === 1)"
-											>右2轴</el-radio-button>
+											><!-- 右2轴 -->{{$t('Chart.Detail.rtwo_axis')}}</el-radio-button>
 										</el-radio-group>
 									</li>
 								</template>	
@@ -228,7 +231,7 @@
                     v-model="item.EdbInfoType"
                     :label="1"
                     @change="getPreviewSplineInfo"
-                    >标准指标</el-radio
+                    ><!-- 标准指标 -->{{$t('Chart.Detail.stand_lead')}}</el-radio
                   >
                   <div style="margin-top: 15px">
                     <el-radio
@@ -236,10 +239,10 @@
                       :label="0"
                       style="margin-right: 10px"
                       @change="getPreviewSplineInfo"
-                      >领先指标</el-radio
+                      ><!-- 领先指标 -->{{$t('Chart.Detail.leading_lead')}}</el-radio
                     >
                     <template v-if="item.EdbInfoType === 0">
-                      领先
+                      <!-- 领先 -->{{$t('EtaChartAddPage.label_lead')}}
                       <el-input
                         style="width: 60px"
                         size="mini"
@@ -269,20 +272,29 @@
                 </li>
                 <li>
                   <div style="display: flex">
-                    <span style="margin-right: 3px">线条颜色：</span>
+                    <span style="margin-right: 3px"><!-- 线条颜色 -->{{$t('Chart.Detail.line_color')}}：</span>
                     <el-color-picker
                       v-model="item.ChartColor"
                       size="mini"
 											show-alpha
                       :predefine="predefineColors"
                     ></el-color-picker>
+                  </div>
+									<div style="display: flex;margin-top: 12px" v-if="item.EdbInfoCategoryType === 1">
+                    <span style="margin-right: 3px"><!-- 预测值颜色 -->{{$t('Chart.Detail.predict_color')}}：</span>
+                    <el-color-picker
+                      v-model="item.PredictChartColor"
+                      size="mini"
+											show-alpha
+                      :predefine="predefineColors"
+                    ></el-color-picker>
                   </div>
                   <div 
 										style="margin-top: 12px"
 										v-if="chartInfo.ChartType === 1 
 										|| (chartInfo.ChartType === 6 &&item.ChartStyle==='spline')"
 									>
-                    线条粗细：
+                    <!-- 线条粗细 -->{{$t('Chart.Detail.line_size')}}：
                     <el-input
                       style="width: 60px"
                       size="mini"
@@ -294,7 +306,7 @@
                 </li>
 								<li v-if="chartInfo.ChartType === 6">
                   <div style="display: flex">
-                    <span style="margin-right: 3px">生成样式：</span>
+                    <span style="margin-right: 3px"><!-- 生成样式 -->{{$t('Chart.label_create_sty')}}：</span>
                     <el-select
 											v-model="item.ChartStyle"
 											placeholder="请选择生成样式"
@@ -508,7 +520,7 @@
 										color: ${JSON.parse(chartInfo.SourcesFrom).isShow ? JSON.parse(chartInfo.SourcesFrom).color : '#999'};
 										fontSize: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
 									`"
-									>来源:{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
+									><!-- 来源 -->{{$t('Chart.Detail.source')}}:{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
 								<el-switch
 									v-if="chartInfo.SourcesFrom"
 									v-model="chartInfo.SourcesFromVisable"
@@ -517,7 +529,7 @@
 									style="margin:0 15px;"
 									@change="changeSourceVisable"
 								/>
-								<span class="editsty" @click="isShowSourceDialog=true">编辑</span>
+								<span class="editsty" @click="isShowSourceDialog=true"><!-- 编辑 -->{{$t('Chart.chart_edit_btn')}}</span>
 							</div>
 
 							<!-- 公历农历切换 只用于季节性图 -->
@@ -527,8 +539,8 @@
 								v-if="chartInfo.ChartType === 2"
 								@change="getPreviewSplineInfo"
 							>
-								<el-radio-button label="公历" />
-								<el-radio-button label="农历" />
+								<el-radio-button label="公历">{{$t('Chart.calendar_gre')}}</el-radio-button>
+								<el-radio-button label="农历">{{$t('Chart.calendar_lunar')}}</el-radio-button>
 							</el-radio-group>
 
 							<!-- 图表说明 -->
@@ -543,7 +555,7 @@
 							></div>
 						</div>
 
-						<span class="chart-author">作者:{{ chartInfo.SysUserRealName }}</span>
+						<span class="chart-author"><!-- 作者 -->{{$t('Chart.Detail.author')}}:{{ chartInfo.SysUserRealName }}</span>
 					</div>	
 
 					<!-- 异常显示 -->
@@ -576,31 +588,31 @@
 							</template>
 						</el-table-column>
 						<el-table-column
-							label="操作"
+							:label="$t('Table.column_operations')"
 							key="Copy"
 							align="center"
 							width="140"
 						>
 							<template slot-scope="scope">
-								<span @click="delTarget(scope.row)" class="deletesty">删除&nbsp;</span>
+								<span @click="delTarget(scope.row)" class="deletesty"><!-- 删除 -->{{$t('Table.delete_btn')}}&nbsp;</span>
 								<span v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
 									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 v-permission="permissionBtn.chartLibPermission.chartLib_viewData"
 									class="editsty"
 									@click="viewTarget(scope.row)"
-								>查看数据</span>
+								><!-- 查看数据 -->{{$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>
 				</div>
       </div>
 			<div class="nodata" v-else>
-				<tableNoData text="暂无信息"/>
+				<tableNoData :text="$t('Common.no_info_msg')"/>
 			</div>
 		</div>