瀏覽代碼

eta图库页面,添加图表页面

Karsa 1 年之前
父節點
當前提交
49c90322ef

+ 17 - 1
src/components/selectUnit.vue

@@ -15,7 +15,23 @@
 </template>
 
 <script>
-import { unitArr } from '@/utils/defaultOptions';
+// import { unitArr } from '@/utils/defaultOptions';
+const unitArr = [
+	'无',
+	'万吨',
+	'亿元',
+	'元',
+	'元/吨',
+	'元/湿吨',
+	'千克',
+	'吨',
+	'短吨',
+	'美元/吨',
+	'万平方米',
+	'美元/桶',
+	'美分/加仑',
+	'手'
+]
 export default {
     name:"selectUnit",
     props:{

+ 29 - 1
src/lang/commonLang.js

@@ -39,6 +39,10 @@ export default {
     warn_tit: {
       en: 'Notice',
       zh: '提示'
+    },
+    known: {
+      en: 'Understood',
+      zh: '知道了'
     }
   },
   Table: {
@@ -47,7 +51,7 @@ export default {
       zh: "添加",
     },
     edit_btn: {
-      en: "Edit",
+      en: "Edit ",
       zh: "编辑",
     },
     delete_btn: {
@@ -142,6 +146,10 @@ export default {
       en: "Added successfully.",
       zh: "新增成功",
     },
+    add_msg2: {
+      en: "Added successfully.",
+      zh: "添加成功",
+    },
     publish_msg: {
       en: "Publish successfully.",
       zh: "发布成功",
@@ -158,6 +166,10 @@ export default {
       en: "Copy sucessfully",
       zh: "复制成功",
     },
+    copy_fail_msg: {
+      en: "Copy sucessfully",
+      zh: "复制失败,稍后再试",
+    },
     saveing_msg: {
       en: "Saving",
       zh: "保存中",
@@ -205,6 +217,10 @@ export default {
     refresh_ing_msg: {
       en: 'Updating data...',
       zh: '刷新数据中...'
+    },
+    refresh_success_msg: {
+      en: 'Refresh successful',
+      zh: '刷新成功'
     }
   },
   Common: {
@@ -236,6 +252,14 @@ export default {
       en: ' To ',
       zh:'至'
     },
+    ph_time_start: {
+      en: 'Start Date',
+      zh: '开始日期'
+    },
+    ph_time_end: {
+      en: 'End Date',
+      zh: '结束日期'
+    },
     no_classify_msg: {
       en: 'No Category',
       zh: '暂无分类'
@@ -243,6 +267,10 @@ export default {
     no_info_msg: {
       en: 'No Information',
       zh: '暂无信息'
+    },
+    no_chart_msg: {
+      en: 'No Charts',
+      zh: '暂无图表'
     }
   },
   Edb,

+ 52 - 2
src/lang/modules/EtaChart/En.js

@@ -1,6 +1,56 @@
-/* eta图库模块 */
+/* eta图库模块 
+  $t('EtaChartPage.xxx')
+*/
 export default {
+  /* eta图库页面 */
   EtaChartPage: {
-    
+    tab_classify: 'Catalogue',
+    tab_series: 'Axis',
+    add_classify_btn: 'Add Chart Category',
+    label_tag_serie:'Label, Series Name',
+
+    //分类弹窗
+    one_level_menu: 'First-level Directory',
+    two_level_menu: 'Secondary Directory ',
+  },
+  
+  /* 添加编辑图库页面 */
+  EtaChartAddPage: {
+    label_lead: 'Leading',
+    label_chart_type: 'The Catagory of Chart Generated',
+    label_chart_theme: 'Chart Theme',
+    label_xserie_range: 'X-axis Display Range',
+    xserie_range_tip: `
+      Configure the time scale displayed on the X-axis</br>
+      1、If the start date is earlier than the end date, the default is not to cross the year, and you can check the check box to cross the year.</br>
+      2、If the start date is later than or equal to the end date, it will cross the year and the check is not allowed.
+    `,
+    label_cross_year:'Cross the year',
+    label_legend_set:'Legend Name Settings',
+    no_set_msg: 'No configuration available',
+    add_date_btn: 'Add date',
+    label_sort_rule: 'Sorting Rule',
+    option_sort_config: 'Default',
+    option_sort_up: 'Ascending',
+    option_sort_low: 'Descending',
+    label_date_way: 'Create Method',
+    label_day_num: 'Days',
+    label_date_choose: 'Select date',
+
+    //标示线区弹窗
+    add_plotline_btn: 'Add Marker Line',
+    add_plotarea_btn: 'Add Marker Area',
+    edit_plotline_btn: 'Edit Marker Line',
+    edit_plotarea_btn: 'Edit Marker Area',
+    add_intro_btn: 'Add Chart Description',
+    label_select_serie:'Select axis',
+    label_line_scale:'Marker line position',
+    label_area_scale:'Marker area range',
+    label_line_sty:'Line Type',
+    label_line_intru:'Mark Line Description',
+    label_area_intru:'Mark Area Description',
+    label_text_pos:'Text Position',
+    label_text_color:'Text Color',
+    label_text_size:'Text Size',
   }
 }

+ 52 - 2
src/lang/modules/EtaChart/Zh.js

@@ -1,6 +1,56 @@
-/* eta图库模块 */
+/* eta图库模块 
+  $t('EtaChartPage.xxx')
+*/
 export default {
+  /* eta图库页面 */
   EtaChartPage: {
-    
+    tab_classify: '目录',
+    tab_series: '坐标轴',
+    add_classify_btn: '添加图表分类',
+    label_tag_serie:'标签,系列名称',
+
+    //分类弹窗
+    one_level_menu: '一级目录',
+    two_level_menu: '二级目录',
+  },
+
+  /* 添加编辑图库页面 */
+  EtaChartAddPage: {
+    label_lead: '领先',
+    label_chart_type: '生成图表类型',
+    label_chart_theme: '图表主题',
+    label_xserie_range: '横坐标显示范围',
+    xserie_range_tip: `
+      配置横坐标显示的时间刻度</br>
+      1、若开始日期小于结束日期,则默认不跨年,允许勾选跨年</br>
+      2、若开始日期大于等于结束日期,则跨年,不允许取消勾选
+    `,
+    label_cross_year:'跨年',
+    label_legend_set:'图例名称设置',
+    no_set_msg: '暂无配置',
+    add_date_btn: '添加日期',
+    label_sort_rule: '排序规则',
+    option_sort_config: '默认',
+    option_sort_up: '升序',
+    option_sort_low: '降序',
+    label_date_way: '添加方式',
+    label_day_num: '天数',
+    label_date_choose: '选择日期',
+
+    //标示线区弹窗
+    add_plotline_btn: '添加标识线',
+    add_plotarea_btn: '添加标识区',
+    edit_plotline_btn: '编辑标识线',
+    edit_plotarea_btn: '编辑标识区',
+    add_intro_btn: '添加图表说明',
+    label_select_serie:'选择坐标轴',
+    label_line_scale:'标识线所在刻度',
+    label_area_scale:'标识区所在范围',
+    label_line_sty:'线型',
+    label_line_intru:'标记线说明',
+    label_area_intru:'标记区说明',
+    label_text_pos:'文本位置',
+    label_text_color:'文本颜色',
+    label_text_size:'文本字号',
   }
 }

+ 303 - 2
src/lang/modules/EtaChart/commonLang.js

@@ -112,9 +112,41 @@ export default {
     zh:'只看我的',
     en:'Just look at mine'
   },
+  label_create_sty: {
+    zh:'生成样式',
+    en:'Generate style'
+  },
+  up_limit: {
+    zh:'上限',
+    en:'Upper limit'
+  },
+  low_limit: {
+    zh:'下限',
+    en:'Lower limit'
+  },
+  option_date_type_new: {
+    zh:'最新日期',
+    en:'Latest Date'
+  },
+  option_date_type_before: {
+    zh:'N天前',
+    en:'N days ago'
+  },
+  option_date_type_fix: {
+    zh:'固定日期',
+    en:'Fixed Date'
+  },
 
   //操作提示文案
   OptMsg:{
+    refresh_ing_msg: {
+      zh:'刷新图表中...',
+      en:'Refreshing chart...'
+    },
+    copy_link_success: {
+      zh:'复制链接成功',
+      en:'Link copied successfully'
+    },
     del_fail_tag:{
       zh:'删除失败',
       en:'Deletion failure'
@@ -127,18 +159,63 @@ export default {
       zh:'确定删除当前分类吗?',
       en:'Are you sure to delete the current category?'
     },
+    classify_delall_confirm:{
+      zh:'确认删除当前分类及包含的子分类吗?',
+      en:'Are you sure you want to delete the current category and its subcategories?'
+    },
     chart_del_confirm:{
       zh:'删除后该图表将不能再引用,确认删除吗?',
       en:'After deletion, this chart will no longer be referenced. Are you sure to delete it?'
     },
+    season_one_msg:{
+      zh:'您选择的图表样式为季节性图表,只支持单指标画图',
+      en:'The chart style you selected is a seasonal chart, which only supports single indicator drawing'
+    },
+    scatter_onlytwo_msg: {
+      zh:'您选择的图表样式为散点图,最多支持2个指标',
+      en:'The chart style you have selected is a scatter plot, which supports a maximum of 2 indicators'
+    },
+    edb_haved_msg: {
+      zh:'录入指标已存在',
+      en:'The entered indicator already exists'
+    }
 
 
   },
 
+  /* 图表类型 */
   ChartType:{
-    graph_name:{
+    spline_name:{
       zh:'曲线图',
-      en:'graph'
+      en:'Line Chart'
+    },
+    season_name:{
+      zh:'季节性图',
+      en:'Seasonal Chart'
+    },
+    stack_column_name:{
+      zh:'堆积柱状图',
+      en:'Stacked Histogram'
+    },
+    scatter_name:{
+      zh:'散点图',
+      en:'Scatter Plot'
+    },
+    combo_name:{
+      zh:'组合图',
+      en:'Combo Chart'
+    },
+    bar_name:{
+      zh:'柱形图',
+      en:'Bar Chart'
+    },
+    cross_scatter_name:{
+      zh:'截面散点图',
+      en:'Cross-sectional Scatter Plot'
+    },
+    radar_name:{
+      zh:'雷达图',
+      en:'Radar Chart'
     },
     correlation_name:{
       zh:'相关性',
@@ -148,5 +225,229 @@ export default {
       zh:'滚动相关性',
       en:'Rolling correlation'
     }
+  },
+
+  /* 详情属性 */
+  Detail: {
+    chart_name: {
+      zh:'图表名称',
+      en:'Chart Name',
+    },
+    chart_en_name: {
+      zh:'英文图表名称',
+      en:'English Chart Name',
+    },
+    good_name: {
+      zh:'期货名称',
+      en:'Futures Name',
+    },
+    good_en_name: {
+      zh:'英文期货名称',
+      en:'English Futures Name',
+    },
+    profit_name: {
+      zh:'盘面利润',
+      en:'Plate Profit Name',
+    },
+    profit_en_name: {
+      zh:'英文盘面利润名称',
+      en:'English Plate Profit Name',
+    },
+    chart_classify: {
+      zh:'图表分类',
+      en:'Chart Catagory',
+    },
+    chart_unit: {
+      zh:'图表单位',
+      en:'Chart Unit',
+    },
+    line_color: {
+      zh:'线条颜色',
+      en:'Line Color',
+    },
+    scatter_color: {
+      zh:'散点颜色',
+      en:'Dot Color',
+    },
+    color: {
+      zh:'颜色',
+      en:'Color',
+    },
+    size: {
+      zh:'粗细',
+      en:'Size',
+    },
+    predict_color: {
+      zh:'预测值颜色',
+      en:'Predicted value color',
+    },
+    line_size: {
+      zh:'线条粗细',
+      en:'Line Size',
+    },
+    re_order: {
+      zh:'逆序',
+      en:'Reverse order',
+    },
+    l_axis: {
+      zh:'左轴',
+      en:'Left Axis',
+    },
+    r_axis: {
+      zh:'右轴',
+      en:'Right Axis',
+    },
+    rtwo_axis: {
+      zh:'右2轴',
+      en:'Secondary Right Axis',
+    },
+    h_axis: {
+      zh:'横轴',
+      en:'Horizontal Axis',
+    },
+    stand_lead: {
+      zh:'标准指标',
+      en:'Standard Indicator',
+    },
+    leading_lead: {
+      zh:'领先指标',
+      en:'Leading Indicator',
+    },
+    author: {
+      zh:'作者',
+      en:'Author'
+    },
+    source: {
+      zh:'来源',
+      en:'Source'
+    },
+    x_name: {
+      zh:'X轴名称',
+      en:'X-axis Name '
+    },
+    x_en_name: {
+      zh:'英文X轴名称',
+      en:'English X-axis Name '
+    },
+    y_name: {
+      zh:'Y轴名称',
+      en:'Y-axis Name '
+    },
+    y_en_name: {
+      zh:'英文Y轴名称',
+      en:'English Y-axis Name '
+    },
+    x_unit: {
+      zh:'X轴单位',
+      en:'X-axis Unit '
+    },
+    y_unit: {
+      zh:'Y轴单位',
+      en:'Y-axis Unit '
+    },
+    variety_name: {
+      zh:'品种名称',
+      en:'Variety Name '
+    },
+    variety_en_name: {
+      zh:'英文品种名称',
+      en:'English Variety Name'
+    },
+    tag_name: {
+      zh:'标签',
+      en:'Tag'
+    },
+    serie_name: {
+      zh:'系列',
+      en:'Series'
+    },
+    date_alias: {
+      zh:'日期别名',
+      en:'Date Alias'
+    },
+    plot_line: {
+      zh:'标识线',
+      en:'Mark Line'
+    },
+    plot_area: {
+      zh:'标识区',
+      en:'Mark Area'
+    },
+    chart_intru: {
+      zh:'图表说明',
+      en:'Chart Description'
+    },
+    text_size: {
+      zh:'字号',
+      en:'Size'
+    }
+  },
+
+  /* form校验 */
+  Vailds: {
+    name_msg: {
+      zh: '图表名称不能为空',
+      en: 'Chart name can not be empty'
+    },
+    style_msg: {
+      zh: '生成样式不能为空',
+      en: 'Generate style can not be empty'
+    },
+    classify_msg: {
+      zh: '图表分类不能为空',
+      en: 'Chart category can not be empty'
+    },
+    unit_msg: {
+      zh: '图表单位不能为空',
+      en: 'Chart unit can not be empty'
+    },
+    intro_msg: {
+      zh: '图表说明不能为空',
+      en: 'Chart Description can not be empty'
+    },
+    plotline_msg: {
+      zh: '标识线所在刻度不能为空',
+      en: 'The marker line can not be empty'
+    },
+    plotarea_msg: {
+      zh: '标识区所在范围不能为空',
+      en: 'The marker area ranges can not be empty'
+    },
+    plotarea_same_msg: {
+      zh: '标识区所在范围不能相同',
+      en: 'The marker area ranges can not be identical'
+    },
+  },
+
+  /* 相关placeholder */
+  InputHolderAll: {
+    input_classify: {
+      zh: '请选择图表分类',
+      en: 'Please select the chart category'
+    },
+    input_en_name: {
+      zh: '请输入英文图表名称',
+      en: 'Please input the English chart name chart'
+    },
+    input_en_unit: {
+      zh: '请输入英文单位',
+      en: 'Please input the English unit'
+    },
+    input_en_label: {
+      zh: '请输入英文名称',
+      en: 'Please input the English name'
+    },
+    input_date: {
+      zh: '请选择日期',
+      en: 'Please select Date'
+    },
+    input_common: {
+      zh: '请输入{label}',
+      en: 'Please input {label}'
+    },
+    input_content: {
+      zh: '请输入内容',
+      en: 'Please input content'
+    },
   }
 }

+ 1 - 1
src/views/chartRelevance_manage/relevance/relevanceChartEditor.vue

@@ -42,7 +42,7 @@
         </el-form>
 
         <div class="section">
-          <div>{{$t('Chart.ChartType.graph_name')}}</div>
+          <div>{{$t('Chart.ChartType.spline_name')}}</div>
           <div class="section-item">
             <span style="flex-shrink:0;min-width:50px;">{{$t('StatisticAnalysis.ChartRelevance.time')}}:</span>
             <el-select

+ 1 - 1
src/views/chartRelevance_manage/statistic/statisticFeatureChartEditor.vue

@@ -27,7 +27,7 @@
 				</div>
 
         <div class="section">
-          <div>{{$t('Chart.ChartType.graph_name')}}</div>
+          <div>{{$t('Chart.ChartType.spline_name')}}</div>
           <div class="section-item">
             <span style="flex-shrink:0;min-width:50px;">{{$t('StatisticAnalysis.ChartRelevance.time')}}:</span>
             <el-select

+ 53 - 49
src/views/dataEntry_manage/addChart.vue

@@ -13,8 +13,8 @@
 					type="primary" 
 					@click="saveHandle"
 					:disabled="chartInfo.ChartType === 5 && tableData.length !== 2"
-				>保存</el-button>
-        <el-button type="primary" plain @click="$router.back()">取消</el-button>
+				><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
+        <el-button type="primary" plain @click="$router.back()"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
 			<div class="left-min">
 
@@ -25,7 +25,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="请选择生成样式"
@@ -41,7 +41,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="请选择图表主题"
@@ -61,10 +61,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
@@ -74,7 +74,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"
@@ -95,24 +95,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
@@ -120,7 +120,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"
@@ -134,12 +134,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>
@@ -150,7 +148,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>
@@ -160,15 +158,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>
@@ -177,7 +180,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"
@@ -185,7 +188,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>
 					
 					<!-- 配置区  柱形 截面 雷达不需要-->
@@ -200,12 +203,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 
@@ -214,7 +217,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>
@@ -223,7 +226,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
@@ -231,10 +234,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"
@@ -264,7 +267,7 @@
                 </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"
@@ -273,7 +276,7 @@
                     ></el-color-picker>
                   </div>
 									<div style="display: flex;margin-top: 12px" v-if="item.EdbInfoCategoryType === 1">
-                    <span style="margin-right: 3px">预测值颜色:</span>
+                    <span style="margin-right: 3px"><!-- 预测值颜色 -->{{$t('Chart.Detail.predict_color')}}:</span>
                     <el-color-picker
                       v-model="item.PredictChartColor"
                       size="mini"
@@ -286,7 +289,7 @@
 										v-if="chartInfo.ChartType === 1 
 										|| (chartInfo.ChartType === 6 &&item.ChartStyle==='spline')"
 									>
-                    线条粗细:
+                    <!-- 线条粗细 -->{{$t('Chart.Detail.line_size')}}
                     <el-input
                       style="width: 60px"
                       size="mini"
@@ -298,7 +301,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="请选择生成样式"
@@ -316,7 +319,7 @@
                   </div>
                 </li>
               </ul>
-							<div style="margin: 10px;text-align: center;color: #999;" v-else>暂无配置</div>
+							<div style="margin: 10px;text-align: center;color: #999;" v-else><!-- 暂无配置 -->{{$t('EtaChartAddPage.no_set_msg')}}</div>
             </el-collapse-item>
           </el-collapse>
 
@@ -511,7 +514,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}}
+								><!-- 来源 -->{{$t('Chart.Detail.source')}}:{{ JSON.parse(chartInfo.SourcesFrom).text}}
 								</span>
 
 								<el-switch
@@ -522,7 +525,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>
 
 							<!-- 公历农历切换 只用于季节性图 -->
@@ -532,8 +535,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>
 
 							<!-- 图表说明 -->
@@ -550,7 +553,7 @@
 
 
 						<span class="chart-author"
-							>作者:{{ chartInfo.SysUserRealName || roleName }}</span
+							><!-- 作者 -->{{$t('Chart.Detail.author')}}:{{ chartInfo.SysUserRealName || roleName }}</span
 						>
 					</div>
 					<el-table
@@ -581,31 +584,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>
 
@@ -820,7 +823,8 @@ export default {
         ImageUrl: Data.ResourceUrl,
       });
 
-			this.$message.success('添加成功');
+			// this.$message.success('添加成功');
+			this.$message.success(this.$t('MsgPrompt.add_msg2'));
 			this.$router.replace({
 				path: '/chartsetting',
 				query: {

+ 125 - 123
src/views/dataEntry_manage/chartSetting.vue

@@ -22,19 +22,27 @@
       <div class="main-left left" id="left" v-show="!isSlideLeft">
         
         <div class="add-chart-cont">
-          <el-button v-permission="permissionBtn.chartLibPermission.chartLib_add"
-            @click="$router.push({path: '/addchart'})" type="primary">添加图表</el-button>
-          <change-lang v-permission="permissionBtn.chartLibPermission.chartLib_switchEn"
-            :lang="currentLang" @changeLang="changeLanguage" style="margin-left: 10px;"/>
+          <el-button 
+            v-permission="permissionBtn.chartLibPermission.chartLib_add"
+            @click="$router.push({path: '/addchart'})" type="primary"
+          ><!-- 添加图表 -->{{$t('Chart.add_chart_btn')}}</el-button>
+
+          <!-- <change-lang v-permission="permissionBtn.chartLibPermission.chartLib_switchEn"
+            :lang="currentLang" @changeLang="changeLanguage" style="margin-left: 10px;"/> -->
 
         </div>
         
         <ul class="left-tab">
-          <li :class="['tab',{'act': leftShowLabel===tab}]" v-for="tab in ['目录','坐标轴']" :key="tab" @click="leftShowLabel=tab">{{tab}}</li>
+          <li 
+            :class="['tab',{'act': leftShowLabel===tab.val}]" 
+            v-for="tab in leftTabs" 
+            :key="tab.val" 
+            @click="leftShowLabel=tab.val"
+          >{{tab.label}}</li>
           <li >
             <el-checkbox v-model="isOnlyMe" 
                 v-permission="permissionBtn.chartLibPermission.chartLib_isOnlyMine"
-                @change="onlyMeHandler">只看我的</el-checkbox>
+                @change="onlyMeHandler"><!-- 只看我的 -->{{$t('Chart.only_see_mine')}}</el-checkbox>
           </li>
         </ul>
 
@@ -47,7 +55,7 @@
               :filterable="!search_txt"
               remote
               clearable
-              placeholder="请输入图表名称"
+              :placeholder="$t('Chart.search_chart_placeholder')"
               style="width: 100%; margin-top: 20px"
               :remote-method="searchHandle"
               @click.native="inputFocusHandle"
@@ -76,7 +84,7 @@
               draggable
               :expand-on-click-node="false"
               check-strictly
-              empty-text="暂无分类"
+              :empty-text="$t('Common.no_classify_msg')"
               lazy
 						  :load="getLazyTreeData"
               @node-expand="handleNodeExpand"
@@ -156,7 +164,7 @@
                 alt=""
                 style="width: 16px; height: 16px; margin-right: 10px"
               />
-              <span>添加图表分类</span>
+              <span><!-- 添加图表分类 -->{{$t('EtaChartPage.add_classify_btn')}}</span>
             </div>
           </div>
         </template>
@@ -165,7 +173,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.line_color')}}:</span>
 							<el-color-picker
 								v-model="tableData[0].ChartColor"
 								size="mini"
@@ -173,7 +181,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">
@@ -185,12 +193,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)"
@@ -198,7 +206,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>
@@ -207,18 +215,16 @@
                     v-model="item.EdbInfoType"
                     :label="1"
                     @change="getPreviewChartInfo"
-                    >标准指标</el-radio
-                  >
+                  ><!-- 标准指标 -->{{$t('Chart.Detail.stand_lead')}}</el-radio>
                   <div style="margin-top: 15px">
                     <el-radio
                       v-model="item.EdbInfoType"
                       :label="0"
                       style="margin-right: 10px"
                       @change="getPreviewChartInfo"
-                      >领先指标</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"
@@ -248,7 +254,7 @@
                 </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"
@@ -257,7 +263,7 @@
                     ></el-color-picker>
                   </div>
                   <div style="display: flex;margin-top: 12px" v-if="item.EdbInfoCategoryType === 1">
-                    <span style="margin-right: 3px">预测值颜色:</span>
+                    <span style="margin-right: 3px"><!-- 预测值颜色 -->{{$t('Chart.Detail.predict_color')}}:</span>
                     <el-color-picker
                       v-model="item.PredictChartColor"
                       size="mini"
@@ -271,7 +277,7 @@
                     v-if="chartInfo.ChartType === 1 
 										|| (chartInfo.ChartType === 6 && item.ChartStyle==='spline')"
                   >
-                    线条粗细:
+                    <!-- 线条粗细 -->{{$t('Chart.Detail.line_size')}}
                     <el-input
                       style="width: 60px"
                       size="mini"
@@ -284,7 +290,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="请选择生成样式"
@@ -305,7 +311,7 @@
             </el-collapse-item>
           </el-collapse>
           <div v-else class="nodata">
-            <tableNoData text="暂无信息"/>
+            <tableNoData :text="$t('Common.no_info_msg')"/>
           </div>
         </div>
         
@@ -387,7 +393,7 @@
                         style="width: 60px; display: block"
                         size="mini"
                         type="number"
-                        placeholder="上限"
+                        :placeholder="$t('Chart.up_limit')"
                         :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[leftIndex].MaxData"
                       />
@@ -395,7 +401,7 @@
                         class="min-data-input"
                         size="mini"
                         type="number"
-                        placeholder="下限"
+                        :placeholder="$t('Chart.low_limit')"
                         :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[leftIndex].MinData"
                       />
@@ -408,7 +414,7 @@
                         style="width: 60px; display: block"
                         size="mini"
                         type="number"
-                        placeholder="上限"
+                        :placeholder="$t('Chart.up_limit')"
                         :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightIndex].MaxData"
                       />
@@ -416,7 +422,7 @@
                         class="min-data-input"
                         size="mini"
                         type="number"
-                        placeholder="下限"
+                        :placeholder="$t('Chart.low_limit')"
                         :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightIndex].MinData"
                       />
@@ -428,7 +434,7 @@
                         style="width: 60px; display: block"
                         size="mini"
                         type="number"
-                        placeholder="上限"
+                        :placeholder="$t('Chart.up_limit')"
                         :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightTwoIndex].MaxData"
                       />
@@ -436,7 +442,7 @@
                         class="min-data-input"
                         size="mini"
                         type="number"
-                        placeholder="下限"
+                        :placeholder="$t('Chart.low_limit')"
                         :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                         v-model="tableData[rightTwoIndex].MinData"
                       />
@@ -449,7 +455,7 @@
                           style="width: 60px; display: block"
                           size="mini"
                           type="number"
-                          placeholder="上限"
+                          :placeholder="$t('Chart.up_limit')"
                           :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.max"
                           @change="changeLimit"
@@ -458,7 +464,7 @@
                           class="min-data-input"
                           size="mini"
                           type="number"
-                          placeholder="下限"
+                          :placeholder="$t('Chart.low_limit')"
                           :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.min"
                           @change="changeLimit"
@@ -470,7 +476,7 @@
                           class="left"
                           size="mini"
                           type="number"
-                          placeholder="下限"
+                          :placeholder="$t('Chart.low_limit')"
                           :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.x_min"
                           @change="changeLimit"
@@ -479,7 +485,7 @@
                           class="left"
                           size="mini"
                           type="number"
-                          placeholder="上限"
+                          :placeholder="$t('Chart.up_limit')"
                           :disabled="!permissionBtn.isShowBtn('chartLibPermission','chartLib_editLimit')"
                           v-model="chartLimit.x_max"
                           @change="changeLimit"
@@ -488,7 +494,7 @@
                     </template>
                   </div>
                   <span class="chart-author"
-                    >作者:{{ chartInfo.SysUserRealName || '' }}</span
+                    ><!-- 作者 -->{{$t('Chart.Detail.author')}}:{{ chartInfo.SysUserRealName || '' }}</span
                   >
 
                   <div class="chart-bottom-insruction-info">
@@ -500,7 +506,7 @@
                           color: ${JSON.parse(chartInfo.SourcesFrom).color};
                           fontSize: ${ JSON.parse(chartInfo.SourcesFrom).fontSize }px;
                         `"
-                        >来源:{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
+                        ><!-- 来源 -->{{$t('Chart.Detail.source')}}:{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
                     </div>
 
                     <!-- 公历农历切换 只用于季节性图 -->
@@ -510,8 +516,8 @@
                       v-if="chartInfo.ChartType === 2"
                       @change="getPreviewChartInfo"
                     >
-                      <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>
 
                     <!-- 图表说明 -->
@@ -533,7 +539,7 @@
               </el-col>
               <el-col :span="3" style="position: absolute;height: 100%;right: 0;min-width: 115px;">
                 <ul class="right-actions">
-                    <li>操作</li>
+                    <li><!-- 操作 -->{{$t('Table.column_operations')}}</li>
                     <li
                       v-permission="permissionBtn.chartLibPermission.chartLib_share"
                       class="span-item shareLink"
@@ -541,7 +547,8 @@
                       :data-clipboard-text="linkUrl"
                       v-if="!chartInfo.Disabled"
                     >
-                      <i class="el-icon-share"/>&nbsp;分享
+                      <i class="el-icon-share"/>&nbsp;<!-- 分享 -->
+                      {{$t('Chart.chart_share_btn')}}
                     </li>
                     <li
                       v-permission="permissionBtn.chartLibPermission.chartLib_addMy"
@@ -552,27 +559,35 @@
                         :src="$icons.chart_join_ico"
                         alt=""
                         style="width: 13px; height: 12px; vertical-align: middle"
-                      />加入我的图库
+                      /><!-- 加入我的图库 -->{{$t('Chart.chart_addmy_btn')}}
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_refresh"
-                        class="span-item" @click="refreshHandle">
-                      <span><i class="el-icon-refresh" style="margin-left:0"/>&nbsp;刷新 </span>
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_refresh"
+                      class="span-item" 
+                      @click="refreshHandle"
+                    >
+                      <span>
+                        <i class="el-icon-refresh" style="margin-left:0"/>&nbsp;<!-- 刷新 -->{{$t('Edb.detail_refresh_btn')}} 
+                      </span>
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_save"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_save"
                       class="span-item"
                     >
                       <span @click="saveChartHandle('')">
-                        <i class="el-icon-collection" />&nbsp;保存
+                        <i class="el-icon-collection" />&nbsp;<!-- 保存 -->{{$t('Chart.chart_save_btn')}}
                       </span>
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_otherSave"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_otherSave"
                       class="span-item"
                     >
                       <span @click="saveChartOtherHandle">
-                        <i class="el-icon-document-add" />&nbsp;另存为
+                        <i class="el-icon-document-add" />&nbsp;<!-- 另存为 -->{{$t('Chart.chart_copy_btn')}}
                       </span>
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_edit"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_edit"
                       class="span-item"
                       v-if="chartInfo.IsEdit"
                       @click="editChartHandle"
@@ -581,35 +596,39 @@
                         src="~@/assets/img/set_m/edit.png"
                         alt=""
                         style="width: 13px; height: 12px;"
-                      />&nbsp;编辑
+                      />&nbsp;<!-- 编辑 -->{{$t('Chart.chart_edit_btn')}}
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_copyOffice"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_copyOffice"
                       class="span-item copy"
                       @click="copyChartConfirm('office')"
                       v-if="!chartInfo.Disabled"
                     >
-                      <i class="el-icon-document-copy" />&nbsp;复制至office
+                      <i class="el-icon-document-copy" />&nbsp;<!-- 复制至office -->{{$t('Chart.chart_copyoffice')}}
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_copyWechat"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_copyWechat"
                       class="span-item copy"
                       @click="copyChartConfirm('微信')"
                       v-if="!chartInfo.Disabled"
                     >
-                      <img style="width: 13px; height: 12px;vertical-align: middle" src="~@/assets/img/chart_m/WeChat.jpg" />&nbsp;复制至微信
+                      <img style="width: 13px; height: 12px;vertical-align: middle" src="~@/assets/img/chart_m/WeChat.jpg" />&nbsp;<!-- 复制至微信 -->{{$t('Chart.chart_copywx')}}
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_enNameSetting"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_enNameSetting"
                       class="span-item copy"
                       @click="openEnNameDia"
                     >
-                      <img style="width: 16px;vertical-align: middle" :src="$icons.to_en" />&nbsp;设置英文名称
+                      <img style="width: 16px;vertical-align: middle" :src="$icons.to_en" />&nbsp;<!-- 设置英文名称 -->{{$t('Edb.detail_en_btn')}}
                     </li>
-                    <li v-permission="permissionBtn.chartLibPermission.chartLib_del"
+                    <li 
+                      v-permission="permissionBtn.chartLibPermission.chartLib_del"
                       class="span-item"
                       style="color: #ff4040"
                       @click="delChartHandle"
                       v-if="chartInfo.IsEdit"
                     >
-                      <i class="el-icon-delete" style="color: #ff4040" />&nbsp;删除
+                      <i class="el-icon-delete" style="color: #ff4040" />&nbsp;<!-- 删除 -->{{$t('Chart.chart_del_btn')}}
                     </li>
                 </ul>
               </el-col>
@@ -642,31 +661,36 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="操作"
+                :label="$t('Table.column_operations')"
                 key="Copy"
                 align="center"
                 width="110"
               >
                 <template slot-scope="scope">
-                  <span v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
-                    class="editsty" @click="copyCode(scope.row)">
-                    <i class="el-icon-document-copy" />&nbsp;复制数据</span
+                  <span 
+                    v-permission="permissionBtn.chartLibPermission.chartLib_copyData"
+                    class="editsty" @click="copyCode(scope.row)"
                   >
-                  <span v-permission="permissionBtn.chartLibPermission.chartLib_viewData"
+                    <i class="el-icon-document-copy" />&nbsp;<!-- 复制数据 -->{{$t('Edb.detail_copydata_btn')}}
+                  </span>
+                  <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="chart-public-cont" v-else>
-          <span>共{{ public_total }}张图表</span>
+          <span>{{$t('Chart.total_chart_show',{limit:public_total})}}</span>
           <div
             class="chart-public-list"
             ref="listChartPage"
@@ -681,7 +705,7 @@
                     <div class="chart-item-img" @click="detailShowHandle(chart)"
                     :style="chart.ChartImage?{background: `no-repeat top/cover url('${chart.ChartImage}')`}:{}"></div>
                     <div class="chart-item-bottom">
-                        <span>创建时间: {{ chart.CreateTime.slice(0,10) }}</span>
+                        <span><!-- 创建时间 -->{{$t('Chart.list_chart_time')}}: {{ chart.CreateTime.slice(0,10) }}</span>
                         <span v-permission="permissionBtn.chartLibPermission.chartLib_addMy"
                             class="join_txt"
                             @click="addMychartHandle(chart)"
@@ -691,48 +715,14 @@
                             alt=""
                             style="width: 13px; height: 12px; vertical-align: middle"
                             />
-                            加入我的图库
+                            <!-- 加入我的图库 -->{{$t('Chart.chart_addmy_btn')}}
                         </span>
                     </div>
                 </div>
             </div>
-            
-            <!-- <el-col
-              :span="6"
-              style="margin-bottom: 20px; padding-right: 20px"
-              v-for="chart in chartPublicList"
-              :key="chart.ChartInfoId"
-            >
-              <el-card class="public-chart-item">
-                <div slot="header" class="item-top" style="position: relative;">
-                  <div class="chartEn-mark" v-show="chart.IsEnChart" style="top: -10px;left:-10px;">En</div>
-                  <span class="text_oneLine" :style="{'padding-left':chart.IsEnChart?'24px':''}">{{ currentLang === 'en' ? (chart.ChartNameEn||chart.ChartName) : chart.ChartName }}</span>
-                </div>
-                <img
-                  :src="chart.ChartImage"
-                  alt=""
-                  class="chart-img"
-                  @click="detailShowHandle(chart)"
-                />
-                <div class="item-bottom">
-                  <span>创建时间: {{ chart.CreateTime.slice(0,10) }}</span>
-                  <span v-permission="permissionBtn.chartLibPermission.chartLib_addMy"
-                    class="join_txt"
-                    @click="addMychartHandle(chart)"
-                  >
-                    <img
-                      :src="$icons.chart_join_ico"
-                      alt=""
-                      style="width: 13px; height: 12px; vertical-align: middle"
-                    />
-                    加入我的图库
-                  </span>
-                </div>
-              </el-card>
-            </el-col> -->
           </div>
           <div v-if="!public_total" class="nodata">
-            <tableNoData text="暂无图表"/>
+            <tableNoData :text="$t('Common.no_chart_msg')"/>
           </div>
         </div>
       </div>
@@ -1012,6 +1002,13 @@ export default {
     linkUrl() {
       const LINK_CHART_URL = this.$setting.dynamicOutLinks.ChartViewUrl+'/chartshow';
       return `${LINK_CHART_URL}?code=${this.chartInfo.UniqueCode}&fromType=share&lang=${this.currentLang}`
+    },
+
+    leftTabs() {
+      return [
+        {label: this.$t('EtaChartPage.tab_classify'),val:'目录'},
+        {label: this.$t('EtaChartPage.tab_series'),val:'坐标轴'}
+      ]
     }
   },
   methods: {
@@ -1232,27 +1229,27 @@ export default {
              * 2 有子目录无图表
              */
             const deleteLabelMap = {
-              1: '该分类下关联图表不可删除',
-              2: '确认删除当前分类及包含的子分类吗?',
+              1: /* '该分类下关联图表不可删除' */this.$t('Chart.OptMsg.classify_del_fail'),
+              2: /* '确认删除当前分类及包含的子分类吗?' */this.$t('Chart.OptMsg.classify_delall_confirm'),
               4: res.Data.TipsMsg
             }
 
             if([1,4].includes(res.Data.DeleteStatus)) this.$confirm(
                 deleteLabelMap[res.Data.DeleteStatus],
-                '删除失败',
+                /* '删除失败' */this.$t('Chart.OptMsg.del_fail_tag'),
                 {
-                confirmButtonText: '知道了',
+                confirmButtonText: /* '知道了' */this.$t('Dialog.known'),
                 showCancelButton:false,
                 type: 'error'
               })
             else if([0,2].includes(res.Data.DeleteStatus)) this.$confirm(
                 res.Data.DeleteStatus === 2 
                 ? deleteLabelMap[res.Data.DeleteStatus]
-                : data.ChartInfoId?'删除后该图表将不能再引用,确认删除吗?':'确定删除当前分类吗?', 
-                '提示',
+                : data.ChartInfoId?this.$t('Chart.OptMsg.chart_del_confirm'):this.$t('Chart.OptMsg.classify_del_confirm'), 
+                this.$t('Dialog.warn_tit'),
                 {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+                confirmButtonText: /* '确定' */this.$t('Dialog.confirm_btn'),
+                cancelButtonText: /* '取消' */this.$t('Dialog.cancel_btn'),
                 type: 'warning'
               }).then(() => {
                 res.Data.DeleteStatus === 0 && data.ChartInfoId 
@@ -1664,7 +1661,7 @@ export default {
           ? `${this.chartInfo.StartDate}~至今`
           : this.chartInfo.DateType === 20
           ?`最近${this.chartInfo.StartYear}年`
-          :'请选择时间段';
+          :/* '请选择时间段' */this.$t('Chart.choose_time');
 
     },
     // 设置默认预览配置项
@@ -1851,7 +1848,8 @@ export default {
 
         dataBaseInterface.chartSave(params).then((res) => {
           if (res.Ret === 200) {
-            this.$message.success('保存成功');
+            // this.$message.success('保存成功');
+            this.$message.success(this.$t('MsgPrompt.saved_msg'));
             sessionStorage.removeItem('beforeOptions');
             sessionStorage.setItem(
               'defaultArr',
@@ -1896,7 +1894,8 @@ export default {
                 input.select();
                 document.execCommand('copy');
                 document.body.removeChild(input);
-                this.$message.success('复制链接成功')
+                // this.$message.success('复制链接成功')
+                this.$message.success(this.$t('Chart.OptMsg.copy_link_success'))
               }else{
                 this.copyChartHandle(type)
               }
@@ -1974,9 +1973,9 @@ export default {
     },
     /* 点击删除图表 */
     delChartHandle() {
-      this.$confirm('删除后该图表将不能再引用,确认删除吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(/* '删除后该图表将不能再引用,确认删除吗?' */this.$t('Chart.OptMsg.chart_del_confirm'), this.$t('Dialog.warn_tit'), {
+        confirmButtonText: /* '确定' */this.$t('Dialog.confirm_btn'),
+        cancelButtonText: /* '取消' */this.$t('Dialog.cancel_btn'),
         type: 'warning',
       })
         .then(() => {
@@ -2020,7 +2019,7 @@ export default {
     changeYear(item) {
       this.year_select = item.value;
       this.select_date = '';
-      this.dateTip = '请选择时间段';
+      this.dateTip = /* '请选择时间段' */this.$t('Chart.choose_time');
       // 图表已存在
       this.selected_chartid && this.getPreviewChartInfo();
     },
@@ -2197,7 +2196,7 @@ export default {
       this.refreshLoading = this.$loading({
         lock: true,
         target: '.main-right',
-        text: '刷新图表中...',
+        text: /* '刷新图表中...' */this.$t('Chart.OptMsg.refresh_ing_msg'),
         spinner: 'el-icon-loading',
         background: 'rgba(255, 255, 255, 0.8)',
       });
@@ -2209,7 +2208,8 @@ export default {
           this.refreshLoading.close();
           if (res.Ret === 200) {
             [7,10,11].includes(this.chartInfo.ChartType) ? this.getChartDetail() : this.getPreviewChartInfo();
-            this.$message.success(res.Msg);
+            // this.$message.success('刷新成功');
+            this.$message.success(this.$t('MsgPrompt.refresh_success_msg'));
           }
         });
     },
@@ -2257,13 +2257,15 @@ export default {
       var clipboard = new this.Clipboard('.shareLink')
       clipboard.on('success', e => {
         console.log(e);
-        this.$message.success('复制链接成功')
+        // this.$message.success('复制链接成功')
+        this.$message.success(this.$t('Chart.OptMsg.copy_link_success'))
         e.clearSelection() // 释放内存
         clipboard.destroy()
       })
       // // 浏览器不支持
       clipboard.on('error', e => {
-        this.$message.warning('浏览器暂不支持')
+        // this.$message.warning('浏览器暂不支持')
+        this.$message.warning(this.$t('MsgPrompt.browser_not_support'))
         // 释放内存
         clipboard.destroy()
       })

+ 1 - 1
src/views/dataEntry_manage/components/DateChooseDia.vue

@@ -26,7 +26,7 @@
 							type="date"
 							value-type="format"
 							value-format="yyyy-MM-dd"
-							placeholder="选择日期"
+							:placeholder="$t('Chart.InputHolderAll.input_date')"
 							:picker-options="pickerOptions"
 						></el-date-picker>
 						<el-date-picker

+ 12 - 11
src/views/dataEntry_manage/components/SaveChartOther.vue

@@ -8,24 +8,24 @@
 		center
 		width="560px"
 		v-dialogDrag
-    title="另存为"
+    :title="$t('Chart.chart_copy_btn')"
   >
     <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('Dialog.require_vaild')"
           clearable
         />
       </el-form-item>
-      <el-form-item label="图表分类" prop="classify" v-if="![10,'cross_variety'].includes(this.source)">
+      <el-form-item :label="$t('Chart.Detail.chart_classify')" prop="classify" v-if="![10,'cross_variety'].includes(this.source)">
         <el-cascader
           v-model="form.classify"
           :options="classifyOptions"
@@ -36,15 +36,15 @@
             emitPath: false
           }"
           style="width: 80%"
-          placeholder="请选择所属分类"
+          :placeholder="$t('Chart.InputHolderAll.input_classify')"
         />
       </el-form-item>
     </el-form>
     <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>
@@ -83,10 +83,10 @@ export default {
       },
       formRules: {
 				name:[
-					{ required: true, message: '图表名称不能为空', trigger: 'blur' },
+					{ required: true, message: /* '图表名称不能为空' */this.$t('Chart.Vailds.name_msg'), trigger: 'blur' },
 				],
 				classify:[
-					{ required: true, message: '图表分类不能为空', trigger: 'blur' },
+					{ required: true, message: /* '图表分类不能为空' */this.$t('Chart.Vailds.classify_msg'), trigger: 'blur' },
 				],
 			},
       classifyOptions:[]
@@ -175,7 +175,8 @@ export default {
 
       if(res.Ret !== 200) return
 
-      this.$message.success('保存成功');
+      // this.$message.success('保存成功');
+      this.$message.success(this.$t('MsgPrompt.saved_msg'));
       this.cancelHandle();
       this.fromType === 'chartsetting' && this.$emit('ensure',{ code: res.Data.UniqueCode, id: res.Data.ChartInfoId })
     }

+ 31 - 31
src/views/dataEntry_manage/components/addMarkerDialog.vue

@@ -19,20 +19,20 @@
         :model="markerForm"
         hide-required-asterisk
       >
-          <el-form-item label="选择坐标轴" prop="axis">
+          <el-form-item :label="$t('EtaChartAddPage.label_select_serie')" prop="axis">
             <el-select 
               v-model="markerForm.axis"
               placeholder="请选择日期坐标轴"
               style="width:200px;"
               @change="markerForm.axisName=axisLabelMap[markerForm.axis]"
             >
-              <el-option label="左轴" :value="1" v-if="canSelectLeftYaxis"/>
-              <el-option label="横轴" :value="3" v-if="canSelectXaxis"/>
-              <el-option label="右轴" :value="0" v-if="canSelectRightYaxis"/>
-              <el-option label="右2轴" :value="2" v-if="canSelectRightTwoYaxis"/>
+              <el-option :label="$t('Chart.Detail.l_axis')" :value="1" v-if="canSelectLeftYaxis"/>
+              <el-option :label="$t('Chart.Detail.h_axis')" :value="3" v-if="canSelectXaxis"/>
+              <el-option :label="$t('Chart.Detail.r_axis')" :value="0" v-if="canSelectRightYaxis"/>
+              <el-option :label="$t('Chart.Detail.rtwo_axis')" :value="2" v-if="canSelectRightTwoYaxis"/>
             </el-select>
           </el-form-item>
-          <el-form-item :label="form.markerType==='line'?`标记线所在刻度`:`标识区所在范围`" prop="value">
+          <el-form-item :label="form.markerType==='line'?$t('EtaChartAddPage.label_line_scale'):$t('EtaChartAddPage.label_area_scale')" prop="value">
             <!-- 标识线 -->
             <template v-if="form.markerType==='line'">
               <!-- 时间轴1,2,4,6的y轴数字 x轴日期  -->
@@ -43,7 +43,7 @@
                   :popper-class="{'month-day-picker':chartInfo.ChartType===2}"
                   type="date"
                   style="width: 200px;"
-                  placeholder="选择日期"
+                  :placeholder="$t('EtaChartAddPage.label_date_choose')"
                   :clearable="false"
                   :format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
                   :value-format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
@@ -55,7 +55,7 @@
                   class="number-input"
                   style="width: 200px;"
                   type="number"
-                  placeholder="输入数字"
+                  :placeholder="$t('Edb.InputHolderAll.input_number')"
                 />
 
               </template>
@@ -67,7 +67,7 @@
                   style="width: 200px;"
                   type="number"
                   class="number-input"
-                  placeholder="输入数字"
+                  :placeholder="$t('Edb.InputHolderAll.input_number')"
                   clearable
                 />
               </template>
@@ -84,18 +84,18 @@
                     :popper-class="{'month-day-picker':chartInfo.ChartType===2}"
                     type="date"
                     style="width: 150px;"
-                    placeholder="选择日期"
+                    :placeholder="$t('EtaChartAddPage.label_date_choose')"
                     :clearable="false"
                     :format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
                     :value-format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
                   ></el-date-picker>
-                  至
+                  <!--  -->{{$t('Common.to')}}
                   <el-date-picker
                     v-model="markerForm.toValue"
                     :popper-class="{'month-day-picker':chartInfo.ChartType===2}"
                     type="date"
                     style="width: 150px;"
-                    placeholder="选择日期"
+                    :placeholder="$t('EtaChartAddPage.label_date_choose')"
                     :clearable="false"
                     :format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
                     :value-format="chartInfo.ChartType===2?'MM-dd':'yyyy-MM-dd'"
@@ -108,15 +108,15 @@
                     class="number-input"
                     style="width: 90px;"
                     type="number"
-                    placeholder="输入数字"
+                    :placeholder="$t('Edb.InputHolderAll.input_number')"
                   />
-                  至
+                  <!--  -->{{$t('Common.to')}}
                   <el-input
                     v-model="markerForm.toValue"
                     class="number-input"
                     style="width: 90px;"
                     type="number"
-                    placeholder="输入数字"
+                    :placeholder="$t('Edb.InputHolderAll.input_number')"
                   />
 
                 </div>
@@ -129,22 +129,22 @@
                   class="number-input"
                   style="width: 90px;"
                   type="number"
-                  placeholder="输入数字"
+                  :placeholder="$t('Edb.InputHolderAll.input_number')"
                 />
-                至
+                <!--  -->{{$t('Common.to')}}
                 <el-input
                   v-model="markerForm.toValue"
                   class="number-input"
                   style="width: 90px;"
                   type="number"
-                  placeholder="输入数字"
+                  :placeholder="$t('Edb.InputHolderAll.input_number')"
                 />
 
               </div>
             </template>
             
           </el-form-item>
-          <el-form-item label="线型" prop="dashStyle" v-if="form.markerType==='line'">
+          <el-form-item :label="$t('EtaChartAddPage.label_line_sty')" prop="dashStyle" v-if="form.markerType==='line'">
             <el-select 
               v-model="markerForm.dashStyle"
               style="width:200px;"
@@ -159,7 +159,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="颜色" prop="color" style="margin-bottom:8px;">
+          <el-form-item :label="$t('Chart.Detail.color')" prop="color" style="margin-bottom:8px;">
             <el-color-picker
               v-model="markerForm.color"
               :predefine="predefineColors"
@@ -167,7 +167,7 @@
               style="width: 90px"
             />
           </el-form-item>
-          <el-form-item label="粗细" prop="lineWidth" v-if="form.markerType==='line'">
+          <el-form-item :label="$t('Chart.Detail.size')" prop="lineWidth" v-if="form.markerType==='line'">
             <el-input
               v-model="markerForm.lineWidth"
               style="width: 90px"
@@ -175,14 +175,14 @@
               :min="1"
             />
           </el-form-item>
-          <el-form-item :label="`标记${form.markerType==='line'?'线':'区'}说明`" prop="text">
+          <el-form-item :label="form.markerType==='line'?$t('EtaChartAddPage.label_line_intru'):$t('EtaChartAddPage.label_area_intru')" prop="text">
             <el-input
               v-model="markerForm.text"
               style="width: 200px"
-              placeholder="请输入内容"
+              :placeholder="$t('Chart.InputHolderAll.input_content')"
             />
           </el-form-item>
-          <el-form-item label="文本位置" prop="textPosition">
+          <el-form-item :label="$t('EtaChartAddPage.label_text_pos')" prop="textPosition">
             <el-select 
               v-model="markerForm.textPosition"
               style="width:200px;"
@@ -195,7 +195,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="文本颜色" prop="textColor" style="margin-bottom:8px;">
+          <el-form-item :label="$t('EtaChartAddPage.label_text_color')" prop="textColor" style="margin-bottom:8px;">
             <el-color-picker
               v-model="markerForm.textColor"
               show-alpha
@@ -203,7 +203,7 @@
               style="width: 90px"
             />
           </el-form-item>
-          <el-form-item label="文本字号" prop="textFontSize">
+          <el-form-item :label="$t('EtaChartAddPage.label_text_size')" prop="textFontSize">
             <el-input
               v-model="markerForm.textFontSize"
               class="number-input"
@@ -216,8 +216,8 @@
     </div>
 
     <div class="bottom">
-      <el-button @click="saveMarker" type="primary" style="margin-right:5%">保存</el-button>
-      <el-button @click="cancelHandle">取消</el-button>
+      <el-button @click="saveMarker" type="primary" style="margin-right:5%"><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
+      <el-button @click="cancelHandle"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
     </div>
 
   </el-dialog>
@@ -343,11 +343,11 @@ export default {
 
     async saveMarker() {
 
-      if(this.form.markerType==='line'&&!this.markerForm.value) return this.$message.warning('标识线所在刻度不能为空')
+      if(this.form.markerType==='line'&&!this.markerForm.value) return this.$message.warning(/* '标识线所在刻度不能为空' */this.$t('Chart.Vailds.plotline_msg'))
 
-      else if(this.form.markerType==='area'&&(!this.markerForm.fromValue||!this.markerForm.toValue)) return this.$message.warning('标识区所在范围不能为空')
+      else if(this.form.markerType==='area'&&(!this.markerForm.fromValue||!this.markerForm.toValue)) return this.$message.warning(/* '标识区所在范围不能为空' */this.$t('Chart.Vailds.plotarea_msg'))
       
-      else if(this.form.markerType==='area'&&this.markerForm.fromValue===this.markerForm.toValue) return this.$message.warning('标识区所在范围不能相同')
+      else if(this.form.markerType==='area'&&this.markerForm.fromValue===this.markerForm.toValue) return this.$message.warning(/* '标识区所在范围不能相同' */this.$t('Chart.Vailds.plotarea_same_msg'))
 
       
       let item = _.cloneDeep(this.markerForm)

+ 20 - 20
src/views/dataEntry_manage/components/barOptionSection.vue

@@ -4,7 +4,7 @@
       <!-- 排序规则 -->
       <div v-if="isBaseBarShow&&chartInfo.ChartType===7">
         <div>
-          <label style="margin-right: 5px;">排序规则</label> 
+          <label style="margin-right: 5px;"><!-- 排序规则 -->{{$t('EtaChartAddPage.label_sort_rule')}}</label> 
           <el-radio-group v-model="sortObj.sort" @change="() => { sortObj.sortIndex= '';changeSort()}">
             <el-radio v-for="item in sortRules" :key="item.key" :label="item.key">{{item.name}}</el-radio>
           </el-radio-group> 
@@ -13,7 +13,7 @@
           v-model="sortObj.sortIndex"
           v-if="sortObj.sort!==0"
           clearable
-          placeholder="请选择日期"
+          :placeholder="$t('Chart.InputHolderAll.input_date')"
           class="sort-date"
           style="width: 100%; margin-top: 20px"
           @change="changeSort"
@@ -41,13 +41,13 @@
               <el-input
                 v-model="item.Name"
                 style="width: 90%"
-                placeholder="日期别名"
+                :placeholder="$t('Chart.Detail.date_alias')"
                 @change="changeOptions"
               />
             </li>
             <li>
               <div style="display: flex">
-                <span style="margin-right: 3px">颜色:</span>
+                <span style="margin-right: 3px"><!-- 颜色 -->{{$t('Chart.Detail.color')}}:</span>
                 <el-color-picker
                   v-model="item.Color"
                   size="mini"
@@ -72,11 +72,11 @@
         alt=""
         style="width: 16px; height: 16px; margin-right: 10px"
       />
-      <span>添加日期</span>
+      <span><!-- 添加日期 -->{{$t('EtaChartAddPage.add_date_btn')}}</span>
     </div>
 
     <m-dialog
-      title="添加日期" 
+      :title="$t('EtaChartAddPage.add_date_btn')" 
       :show.sync="dialogForm.show" 
       width="650px"
     >
@@ -86,8 +86,8 @@
           ref="formRef" 
           label-position="left"
           hide-required-asterisk
-          label-width="80px">
-          <el-form-item prop="Type" label="添加方式">
+          label-width="110px">
+          <el-form-item prop="Type" :label="$t('EtaChartAddPage.label_date_way')">
             <el-select 
               v-model="dialogForm.Type"
               placeholder="请选择添加方式"
@@ -96,20 +96,20 @@
               <el-option v-for="item in dateOptions" :key="item.key" :label="item.label" :value="item.key"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="天数" prop="Value" v-if="dialogForm.Type === 2">
+          <el-form-item :label="$t('EtaChartAddPage.label_day_num')" prop="Value" v-if="dialogForm.Type === 2">
             <el-input 
               type="number" 
               v-model="dialogForm.Value"
-              placeholder="请输入数字"
+              :placeholder="$t('Edb.InputHolderAll.input_number')"
               style="width:350px;"
             />
           </el-form-item>
-          <el-form-item prop="Type" label="选择日期" v-if="dialogForm.Type === 3">
+          <el-form-item prop="Type" :label="$t('EtaChartAddPage.label_date_choose')" v-if="dialogForm.Type === 3">
             <el-date-picker
               v-model="dialogForm.Date"
               value-format="yyyy-MM-dd"
               type="date"
-              placeholder="选择日期"
+              :placeholder="$t('EtaChartAddPage.label_date_choose')"
               style="width: 350px"
             />
           </el-form-item>
@@ -119,12 +119,12 @@
         <el-button
         @click="cancelDialog"
         style="width: 132px; height: 40px"
-        >取消</el-button>
+        ><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
         <el-button
           @click="saveDate"
           type="primary"
           style="width: 132px; height: 40px"
-          >保存</el-button>
+          ><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
       </div>
     </m-dialog>
   </div>
@@ -176,9 +176,9 @@ export default {
       },
       dateList: [],
       sortRules: [
-        { key:0,name:'默认' },
-        { key:2,name:'升序' },
-        { key:1,name:'降序' },
+        { key:0,name:/* '默认' */this.$t('EtaChartAddPage.option_sort_config') },
+        { key:2,name:/* '升序' */this.$t('EtaChartAddPage.option_sort_up') },
+        { key:1,name:/* '降序' */this.$t('EtaChartAddPage.option_sort_low') },
       ],
 
       dateMapLabel: {
@@ -187,9 +187,9 @@ export default {
         3: '固定日期'
       },
       dateOptions: [
-        { key: 1,label:'最新日期' },
-        { key: 2,label:'N天前' },
-        { key: 3,label:'固定日期' },
+        { key: 1,label:/* '最新日期't */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') },
       ],
 
       dialogForm: {

+ 14 - 14
src/views/dataEntry_manage/components/chartDialog.vue

@@ -7,66 +7,66 @@
 		@close="cancelHandle"
 		custom-class="dialog"
 		center
-		width="560px"
+		width="650px"
 		v-dialogDrag>
 			<div slot="title" style="display:flex;alignItems:center;">
 				<img :src="title=='添加'?$icons.add:title=='编辑'?$icons.edit:''" style="color:#fff;width:16px;height:16px;marginRight:5px;">
-				<span style="fontSize:16px;">{{title}}</span>
+				<span style="fontSize:16px;">{{title==='添加'?$t('Table.add_btn'):$t('Table.edit_btn')}}</span>
 			</div>
 			<div class="dialog-main">
 				<el-form
 				ref="diaForm"
 				label-position="left"
 				hide-required-asterisk
-				label-width="80px"
+				label-width="120px"
 				:model="formData"
 				:rules="formRules">
 					<!-- 添加/编辑1级目录 -->
 					<template 
 					v-if="(title=='添加'&&formData.level === 0)
 					|| (title=='编辑'&&formData.level === 1)">
-						<el-form-item label="分类名称" prop="level_1">
+						<el-form-item :label="$t('Chart.classify_name_label')" prop="level_1">
 							<el-input
 							v-model="formData.level_1"
 							style="width: 80%"
-							placeholder="必填项"></el-input>
+							:placeholder="$t('Dialog.require_vaild')"></el-input>
 						</el-form-item>
 					</template>
 					<!-- 添加/编辑2级目录 -->
 					<template 
 					v-else-if="(title=='添加'&&formData.level === 1)
 					|| (title=='编辑'&&formData.level === 2)">
-						<el-form-item label="一级目录" prop="level_1">
+						<el-form-item :label="$t('EtaChartPage.one_level_menu')" prop="level_1">
 							<span>{{formData.level_1}}</span>
 						</el-form-item>
-						<el-form-item label="分类名称" prop="level_2">
+						<el-form-item :label="$t('Chart.classify_name_label')"  prop="level_2">
 							<el-input
 							v-model="formData.level_2"
 							style="width: 80%"
-							placeholder="必填项"></el-input>
+							:placeholder="$t('Dialog.require_vaild')"></el-input>
 						</el-form-item>
 					</template>
 					<!-- 添加/编辑三级目录 -->
 					<template v-else-if="(title=='添加'&&formData.level === 2)
 					|| (title=='编辑'&&formData.level === 3)">
-						<el-form-item label="一级目录" prop="level_1">
+						<el-form-item :label="$t('EtaChartPage.one_level_menu')" prop="level_1">
 							<span>{{formData.level_1}}</span>
 						</el-form-item>
-						<el-form-item label="二级目录" prop="level_2">
+						<el-form-item :label="$t('EtaChartPage.two_level_menu')" prop="level_2">
 							<span>{{formData.level_2}}</span>
 						</el-form-item>
-						<el-form-item label="分类名称" prop="level_3">
+						<el-form-item :label="$t('Chart.classify_name_label')"  prop="level_3">
 							<el-input
 							v-model="formData.level_3"
 							style="width: 80%"
-							placeholder="必填项"></el-input>
+							:placeholder="$t('Dialog.require_vaild')"></el-input>
 						</el-form-item>
 					</template>
 				</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">取消</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>
 		</el-dialog>
 	</div>

+ 8 - 8
src/views/dataEntry_manage/components/chartSourceEditDialog.vue

@@ -9,28 +9,28 @@
 		width="650px"
 		v-dialogDrag
     top="8vh"
-    title="编辑数据来源"
+    :title="`${$t('Table.edit_btn')}${$t('Edb.Detail.source')}`"
   >
     <div style="padding-left: 20%">
       <el-form
         :model="chartSourceForm"
-        label-width="80px"
+        label-width="110px"
         label-position="left"
       >
-        <el-form-item label="数据来源">
+        <el-form-item :label="$t('Edb.Detail.source')">
           <el-input
             v-model="chartSourceForm.text"
-            placeholder="请输入内容"
+            :placeholder="$t('Chart.Detail.input_content')"
           />
         </el-form-item>
-        <el-form-item label="颜色" style="margin-bottom:8px;">
+        <el-form-item :label="$t('Chart.Detail.color')" style="margin-bottom:8px;">
           <el-color-picker
             v-model="chartSourceForm.color"
             show-alpha
             style="width:90px"
           />
         </el-form-item>
-        <el-form-item label="字号">
+        <el-form-item :label="$t('Chart.Detail.text_size')">
           <el-input
             v-model="chartSourceForm.fontSize"
             style="width: 90px"
@@ -41,8 +41,8 @@
       </el-form>
     </div>
     <div slot="footer" style="margin-top: 20px;">
-      <el-button @click="saveSource" type="primary">保存</el-button>
-      <el-button @click="cancelHandle">取消</el-button>
+      <el-button @click="saveSource" type="primary"><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
+      <el-button @click="cancelHandle"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
     </div>
   </el-dialog>
 </template>

+ 14 - 14
src/views/dataEntry_manage/components/markersSection.vue

@@ -24,7 +24,7 @@
             alt=""
             style="width: 16px; height: 16px; margin-right: 10px"
           />
-          <span>添加标识线</span>
+          <span><!-- 添加标识线 -->{{$t('EtaChartAddPage.add_plotline_btn')}}</span>
         </div>
 
       </div>
@@ -50,7 +50,7 @@
             alt=""
             style="width: 16px; height: 16px; margin-right: 10px"
           />
-          <span>添加标识区</span>
+          <span><!-- 添加标识区 -->{{$t('EtaChartAddPage.add_plotarea_btn')}}</span>
         </div>
 
       </div>
@@ -77,7 +77,7 @@
           alt=""
           style="width: 16px; height: 16px; margin-right: 10px"
         />
-        <span>添加图表说明</span>
+        <span><!-- 添加图表说明 -->{{$t('EtaChartAddPage.add_intro_btn')}}</span>
       </div>
 
     </div>
@@ -99,7 +99,7 @@
 
     <!-- 图表说明弹窗 -->
     <m-dialog
-      :title="'添加图表说明'"
+      :title="$t('EtaChartAddPage.add_intro_btn')"
       class="marker-edit-dialog"
       :show.sync="chartInductionDiaForm.show" 
       width="650px"
@@ -107,23 +107,23 @@
       <div style="padding-left: 20%">
         <el-form
           :model="chartInductionDiaForm"
-          label-width="80px"
+          label-width="110px"
           label-position="left"
         >
-          <el-form-item label="图表说明">
+          <el-form-item :label="$t('Chart.Detail.chart_intru')">
             <el-input
               v-model="chartInductionDiaForm.text"
-              placeholder="请输入内容"
+              :placeholder="$t('Chart.InputHolderAll.input_content')"
             />
           </el-form-item>
-          <el-form-item label="颜色" style="margin-bottom:8px;">
+          <el-form-item :label="$t('Chart.Detail.color')" style="margin-bottom:8px;">
             <el-color-picker
               v-model="chartInductionDiaForm.color"
               show-alpha
               style="width:90px"
             />
           </el-form-item>
-          <el-form-item label="字号">
+          <el-form-item :label="$t('Chart.Detail.text_size')">
             <el-input
               v-model="chartInductionDiaForm.fontSize"
               style="width: 90px"
@@ -134,8 +134,8 @@
         </el-form>
       </div>
       <div slot="footer" style="margin-top: 20px;">
-        <el-button @click="saveInductionDiaForm" type="primary">保存</el-button>
-        <el-button @click="chartInductionDiaForm.show=false">取消</el-button>
+        <el-button @click="saveInductionDiaForm" type="primary"><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
+        <el-button @click="chartInductionDiaForm.show=false"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
     </m-dialog>
 
@@ -186,13 +186,13 @@ export default {
         this.markerForm = {
           markerType,
           editIndex: index,
-          title: `编辑标识${markerType==='line'?'线':'区'}`,
+          title: `${markerType==='line'?this.$t('EtaChartAddPage.edit_plotline_btn'):this.$t('EtaChartAddPage.edit_plotarea_btn')}`,
           data: editItem
         }
       }else {
         this.markerForm = {
           markerType,
-          title: `添加标识${markerType==='line'?'线':'区'}`
+          title: `${markerType==='line'?this.$t('EtaChartAddPage.add_plotline_btn'):this.$t('EtaChartAddPage.add_plotarea_btn')}`
         }
         
       }
@@ -227,7 +227,7 @@ export default {
     },
 
     saveInductionDiaForm() {
-      if(!this.chartInductionDiaForm.text) return this.$message.warning('图表说明不能为空')
+      if(!this.chartInductionDiaForm.text) return this.$message.warning(/* '图表说明不能为空' */this.$t('Chart.Vailds.intro_msg'))
       const { text,color,fontSize } = this.chartInductionDiaForm;
       this.chartInstruction = {
         text,

+ 19 - 19
src/views/dataEntry_manage/components/setEnNameDia.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog 
-    title="英文名称" 
+    :title="this.$t('Chart.chart_en_btn')" 
     :visible.sync="isOpenDialog" 
     :close-on-click-modal="false" 
     :modal-append-to-body='false'
@@ -13,54 +13,54 @@
         <!-- 截面散点图 -->
         <div class="set-en-name-box" v-if="chartType===10">
           <el-collapse v-model="activeNames" class="sectionScatter-collapse">
-            <el-collapse-item title="图表名称" :name="0" >
+            <el-collapse-item :title="$t('Chart.Detail.chart_name')" :name="0" >
               <ul class="section-ul">
                 <li v-if="copyFormData.chartInfo.length">
-                  <div class="ch-name">图表名称:{{copyFormData.chartInfo[0].value}}</div>
-                  <el-input v-model="copyFormData.chartInfo[1].value" placeholder="请输入英文名称" style="width: 600px;"/>
+                  <div class="ch-name">{{$t('Chart.Detail.chart_name')}}:{{copyFormData.chartInfo[0].value}}</div>
+                  <el-input v-model="copyFormData.chartInfo[1].value" :placeholder="$t('Chart.InputHolderAll.input_en_name')" style="width: 600px;"/>
                 </li>
                 <li>
-                  <div class="ch-name">X轴名称:{{updateInfo.XName}}</div>
-                  <el-input v-model="updateInfo.XNameEn" placeholder="请输入英文名称" ></el-input>
+                  <div class="ch-name"><!-- X轴名称: -->{{$t('Chart.Detail.x_name')}}:{{updateInfo.XName}}</div>
+                  <el-input v-model="updateInfo.XNameEn" :placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.x_en_name')})" ></el-input>
                 </li>
                 <li>
-                  <div class="ch-name">X轴单位:{{updateInfo.XUnitName}}</div>
-                  <el-input v-model="updateInfo.XUnitNameEn" placeholder="请输入英文单位" ></el-input>
+                  <div class="ch-name"><!-- X轴单位 -->{{$t('Chart.Detail.x_unit')}}:{{updateInfo.XUnitName}}</div>
+                  <el-input v-model="updateInfo.XUnitNameEn" :placeholder="$t('Chart.InputHolderAll.input_en_unit')" ></el-input>
                 </li>
                 <li>
-                  <div class="ch-name">Y轴名称:{{updateInfo.YName}}</div>
-                  <el-input v-model="updateInfo.YNameEn" placeholder="请输入英文名称" ></el-input>
+                  <div class="ch-name"><!-- Y轴名称: -->{{$t('Chart.Detail.y_name')}}:{{updateInfo.YName}}</div>
+                  <el-input v-model="updateInfo.YNameEn" :placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.y_en_name')})" ></el-input>
                 </li>
                 <li>
-                  <div class="ch-name">Y轴单位:{{updateInfo.YUnitName}}</div>
-                  <el-input v-model="updateInfo.YUnitNameEn" placeholder="请输入英文单位" ></el-input>
+                  <div class="ch-name"><!-- Y轴单位 -->{{$t('Chart.Detail.y_unit')}}:{{updateInfo.YUnitName}}</div>
+                  <el-input v-model="updateInfo.YUnitNameEn" :placeholder="$t('Chart.InputHolderAll.input_en_unit')" ></el-input>
                 </li>
 
               </ul>
             </el-collapse-item>
             
             <!-- 系列标签 -->
-            <el-collapse-item title="标签,系列名称" :name="1" v-if="updateInfo.SeriesList">
+            <el-collapse-item :title="$t('EtaChartPage.label_tag_serie')" :name="1" v-if="updateInfo.SeriesList">
               <ul class="section-ul">
                 <li v-for="(item,index) in updateInfo.SeriesList" :key="index">
-                  <div class="ch-name">系列{{index+1}}:{{item.Name}}</div>
-                  <el-input v-model="item.NameEn" placeholder="请输入英文名称" ></el-input>
+                  <div class="ch-name">{{$t('Chart.Detail.serie_name')}}{{index+1}}:{{item.Name}}</div>
+                  <el-input v-model="item.NameEn" :placeholder="$t('Chart.InputHolderAll.input_en_label')" ></el-input>
                 </li>
               </ul>  
               <ul class="section-ul">
                 <li v-for="(tag,index) in updateInfo.SeriesList[0].EdbInfoList" :key="index">
-                  <div class="ch-name">标签{{index+1}}:{{tag.Name}}</div>
-                  <el-input v-model="tag.NameEn" placeholder="请输入英文名称" ></el-input>
+                  <div class="ch-name">{{$t('Chart.Detail.tag_name')}}{{index+1}}:{{tag.Name}}</div>
+                  <el-input v-model="tag.NameEn" :placeholder="$t('Chart.InputHolderAll.input_en_label')" ></el-input>
                 </li>
               </ul>
             </el-collapse-item>
 
             <!-- 指标英文 -->
-            <el-collapse-item title="指标名称" :name="2">
+            <el-collapse-item :title="$t('Edb.Detail.e_name')" :name="2">
               <ul class="section-ul">
                 <li v-for="(item,index) in fromEdbList" :key="index">
                   <div class="ch-name text_oneLine">{{item.EdbName}}</div>
-                  <el-input v-model="item.EdbNameEn" placeholder="请输入英文名称" ></el-input>
+                  <el-input v-model="item.EdbNameEn" :placeholder="$t('Chart.InputHolderAll.input_en_label')" ></el-input>
                 </li>
               </ul>  
             </el-collapse-item>  

+ 2 - 2
src/views/dataEntry_manage/editChart.vue

@@ -13,7 +13,7 @@
 					type="primary" 
 					@click="saveHandle"
 					:disabled="chartInfo.ChartType === 5 && tableData.length !== 2"
-					>保存</el-button>
+				><!-- 保存 -->{{$t('Dialog.confirm_save_btn')}}</el-button>
 				<el-button v-permission="permissionBtn.chartLibPermission.chartLib_otherSave"
 					type="primary" @click="saveChartOtherHandle">另存为</el-button>
         <el-button type="primary" plain @click="$router.replace({
@@ -22,7 +22,7 @@
 						code: chartInfo.UniqueCode,
 						id: chartInfo.ChartInfoId
 					}
-				})">取消</el-button>
+				})"><!-- 取消 -->{{$t('Dialog.cancel_btn')}}</el-button>
       </div>
 			<div class="left-min">
 				<el-form

+ 23 - 21
src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -24,16 +24,16 @@ export default {
 			},
 			chartRules: {
 				ChartType:[
-					{ required: true, message: '生成样式不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('Chart.Vailds.style_msg')/* '生成样式不能为空' */, trigger: 'blur' },
 				],
 				ChartName:[
-					{ required: true, message: '图表名称不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('Chart.Vailds.name_msg')/* '图表名称不能为空' */, trigger: 'blur' },
 				],
 				classify:[
-					{ required: true, message: '图表分类不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('Chart.Vailds.classify_msg')/* '图表分类不能为空' */, trigger: 'blur' },
 				],
 				Unit:[
-					{ required: true, message: '图表单位不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('Chart.Vailds.unit_msg')/* '图表单位不能为空' */, trigger: 'blur' },
 				],
 			},
 
@@ -45,15 +45,15 @@ export default {
       },
 
 			styleArr: [
-				{ label: '曲线图', key: 1 },
-        { label: '季节性图', key: 2 },
+				{ label: /* '曲线图' */this.$t('Chart.ChartType.spline_name'), key: 1 },
+        { label: /* '季节性图' */this.$t('Chart.ChartType.season_name'), key: 2 },
         // { label: '堆积面积图', key: 3 },
-        { label: '堆积柱状图', key: 4 },
-        { label: '散点图', key: 5 },
-        { label: '组合图', key: 6 },
-				{ label: '柱形图',key: 7 },
-				{ label: '截面散点图',key: 10 },
-				{ label: '雷达图',key: 11 },
+        { label: /* '堆积柱状图' */this.$t('Chart.ChartType.stack_column_name'), key: 4 },
+        { label: /* '散点图' */this.$t('Chart.ChartType.scatter_name'), key: 5 },
+        { label: /* '组合图' */this.$t('Chart.ChartType.combo_name'), key: 6 },
+				{ label: /* '柱形图' */this.$t('Chart.ChartType.bar_name'),key: 7 },
+				{ label: /* '截面散点图' */this.$t('Chart.ChartType.cross_scatter_name'),key: 10 },
+				{ label: /* '雷达图' */this.$t('Chart.ChartType.radar_name'),key: 11 },
       ], //图表样式
 
 
@@ -102,10 +102,10 @@ export default {
 
 				if(newval === 2 && this.tableData.length > 1) {
 					this.chartInfo.ChartType = oldval;
-					return this.$message.warning('您选择的图表样式为季节性图表,只支持单指标画图');
+					return this.$message.warning(/* '您选择的图表样式为季节性图表,只支持单指标画图' */this.$t('Chart.OptMsg.season_one_msg'));
 				} else if(newval === 5 && this.tableData.length > 2) {
 					this.chartInfo.ChartType = oldval;
-					return this.$message.warning('您选择的图表样式为散点图,最多支持2个指标');
+					return this.$message.warning(/* '您选择的图表样式为散点图,最多支持2个指标' */this.$t('Chart.OptMsg.scatter_onlytwo_msg'));
 				}else if(newval===10&&this.tableData.length) {
 					this.$nextTick(() => {
 						console.log(this.$refs.SectionScatterOptRef)
@@ -202,8 +202,8 @@ export default {
 	
 						if(have_bol) {
 							this.search_txt = '';
-							if(this.chartInfo.ChartType === 2 && this.tableData.length >= 1) return this.$message.warning('您选择的图表样式为季节性图表,只支持单指标画图')
-							else if(this.chartInfo.ChartType === 5 && this.tableData.length >= 2) return this.$message.warning('您选择的图表样式为散点图,最多支持2个指标')
+							if(this.chartInfo.ChartType === 2 && this.tableData.length >= 1) return this.$message.warning(/* '您选择的图表样式为季节性图表,只支持单指标画图' */this.$t('Chart.OptMsg.season_one_msg'))
+							else if(this.chartInfo.ChartType === 5 && this.tableData.length >= 2) return this.$message.warning(/* '您选择的图表样式为散点图,最多支持2个指标' */this.$t('Chart.OptMsg.scatter_onlytwo_msg'))
 							this.tableData.push(tableItem);
 							this.isSetExtremeValue = true;
 							// console.log(this.tableData)
@@ -233,7 +233,8 @@ export default {
 							})
 
 						}else {
-							this.$message.warning('录入指标已存在');
+							// this.$message.warning('录入指标已存在');
+							this.$message.warning(this.$t('Chart.OptMsg.edb_haved_msg'));
 						}
 				})
 
@@ -245,7 +246,7 @@ export default {
 
 			//新增属性用作别名
 			this.$set(edb,'EdbAliasName',edb.EdbName)
-			if(have_bol) return this.$message.warning('录入指标已存在');
+			if(have_bol) return this.$message.warning(/* '录入指标已存在' */this.$t('Chart.OptMsg.edb_haved_msg'));
 			this.search_txt = '';
 			this.chartInfo.Unit = this.chartInfo.Unit||edb.Unit
 			this.tableData.push(edb)
@@ -407,7 +408,7 @@ export default {
 		changeYear(item) {
 			this.year_select = item.value;
 			this.select_date = '';
-			this.dateTip = '请选择时间段';
+			this.dateTip =/* '请选择时间段' */ this.$t('Chart.choose_time');
 
 			this.getPreviewSplineInfo();
 		},
@@ -473,7 +474,7 @@ export default {
 			this.calendar_type = '公历';
 			this.season_year = '';
 			this.dateForm = {};
-			this.dateTip = '请选择时间段';
+			this.dateTip = /* '请选择时间段' */ this.$t('Chart.choose_time');
 			this.barDateList = [];
       this.chartLimit = {};
       this.sectionScatterData = {};
@@ -557,7 +558,8 @@ export default {
 		delTarget(item) {
 			let index = this.tableData.findIndex(obj => obj.EdbInfoId === item.EdbInfoId);
 			this.tableData.splice(index, 1);
-			this.$message.success('删除成功')
+			// this.$message.success('删除成功')
+			this.$message.success(this.$t('MsgPrompt.delete_msg'))
 
 			//添加图表时重置默认样式
 			this.$route.path==='/addchart' && this.resetChartEdbDefault();

+ 40 - 34
src/views/dataEntry_manage/mixins/chartPublic.js

@@ -60,14 +60,14 @@ export const chartSetMixin = {
        */
 			year_select: yearSelector[0].value,
       sameOptionType:[1,3,4,5,6],// 头部一样 配置一样的图表类型 曲线 散点 柱状 面积 组合
-      yearSelector, //年份按钮组
+      // yearSelector, //年份按钮组
       select_date: '', //自定义时间段
       count_year: 0, //最近年数
       isDateDia: false, // 时间段弹窗
       earliestDate:'', // 最早的日期 - 起始日期
       latestDate:'', //最晚日期 - 最新日期
       dateForm: {},
-      dateTip: '请选择时间段',
+      dateTip: /* '请选择时间段' */ this.$t('Chart.choose_time'),
       predefineColors: defaultOpts.colors.slice(0, 2), //定义颜色蓝,红 默认颜色
       fre_options: ['年', '季', '月', '周', '天'], //领先指标频度配置
       //领先频度对应英文
@@ -248,6 +248,9 @@ export const chartSetMixin = {
           key: 'SourceName',
         },
       ]
+    },
+    yearSelector() {
+      return yearSelector
     }
   },
   watch: {
@@ -301,7 +304,7 @@ export const chartSetMixin = {
       this.formItemArray.chartInfo=[]
       this.formItemArray.chartsList=[]
       this.formItemArray.chartInfo.push({
-        label:'图表名称',
+        label:/* '图表名称' */this.$t('Chart.Detail.chart_name'),
         value:this.chartInfo.ChartName,
         key:'ChartName',
         id:this.chartInfo.ChartInfoId,
@@ -309,11 +312,11 @@ export const chartSetMixin = {
         notEdit:true
       },
       {
-        label:'英文图表名称',
+        label:/* '英文图表名称' */this.$t('Chart.Detail.chart_name'),
         value:this.chartInfo.ChartNameEn,
         key:'ChartNameEn',
         id:this.chartInfo.ChartInfoId,
-        placeholder:'请输入英文图表名称'
+        placeholder:/* '请输入英文图表名称' */this.$t('Chart.InputHolderAll.input_en_name')
       })
 
       if([1,2,5].includes(this.chartInfo.Source)){ //需要设置指标的
@@ -321,49 +324,49 @@ export const chartSetMixin = {
           if(item.Unit){
             this.formItemArray.chartsList.push([
               {
-                label:'指标名称',
+                label:/* '指标名称' */this.$t('Edb.Detail.e_name'),
                 value:item.EdbName,
                 key:'EdbName',
                 id:item.EdbInfoId,
                 notEdit:true
               },
               {
-                label:'单位',
+                label:/* '单位' */this.$t('Edb.Detail.e_unit'),
                 value:item.Unit,
                 key:'Unit',
                 id:item.EdbInfoId,
                 notEdit:true
               },
               {
-                label:'英文指标名称',
+                label:/* '英文指标名称' */this.$t('Edb.Detail.e_en_name'),
                 value:item.EdbNameEn,
                 key:'EdbNameEn',
                 id:item.EdbInfoId,
-                placeholder:'请输入英文指标名称'
+                placeholder:/* '请输入英文指标名称' */ this.$t('Edb.InputHolderAll.input_common',{label: this.$t('Edb.Detail.e_en_name')})
               },
               {
-                label:'英文单位',
+                label:/* '英文单位' */this.$t('Edb.Detail.e_en_unit'),
                 value:item.UnitEn,
                 key:'UnitEn',
                 id:item.EdbInfoId,
-                placeholder:'请输入英文单位'
+                placeholder:/* '请输入英文单位' */this.$t('Edb.InputHolderAll.input_common',{label: this.$t('Edb.Detail.e_en_unit')})
               }
             ])
           }else{
             this.formItemArray.chartsList.push([
               {
-                label:'指标名称',
+                label:/* '指标名称' */this.$t('Edb.Detail.e_name'),
                 value:item.EdbName,
                 key:'EdbName',
                 id:item.EdbInfoId,
                 notEdit:true
               },
               {
-                label:'英文指标名称',
+                label:/* '英文指标名称' */this.$t('Edb.Detail.e_en_name'),
                 value:item.EdbNameEn,
                 key:'EdbNameEn',
                 id:item.EdbInfoId,
-                placeholder:'请输入英文指标名称'
+                placeholder:this.$t('Edb.InputHolderAll.input_common',{label: this.$t('Edb.Detail.e_en_name')})
               }
             ])
           }
@@ -373,36 +376,36 @@ export const chartSetMixin = {
       //价格曲线
       if(this.chartInfo.Source===2) {
         this.formItemArray.chartInfo.push({
-          label:'期货名称',
+          label:/* '期货名称' */this.$t('Chart.Detail.good_name'),
           value:this.commodityEdbList[1].EdbName,
           key:'FutureGoodName',
           id:this.chartInfo.ChartInfoId,
           notEdit:true
         },
         {
-          label:'英文期货名称',
+          label:/* '英文期货名称' */this.$t('Chart.Detail.good_en_name'),
           value:this.commodityEdbList[1].EdbNameEn,
           key:'FutureGoodNameEn',
           id:this.chartInfo.ChartInfoId,
-          placeholder:'请输入英文期货名称'
+          placeholder:/* '请输入英文期货名称' */this.$t('Chart.InputHolderAll.input_common',{label:this.$t('Chart.Detail.good_en_name')})
         })
       }
 
       //利润曲线
       else if(this.chartInfo.Source===5) {
         this.formItemArray.chartInfo.push({
-          label:'盘面利润名称',
+          label:/* '盘面利润名称' */this.$t('Chart.Detail.profit_name'),
           value:this.chartInfo.ProfitName,
           key:'ProfitName',
           id:this.chartInfo.ChartInfoId,
           notEdit:true
         },
         {
-          label:'英文盘面利润名称',
+          label:/* '英文盘面利润名称' */this.$t('Chart.Detail.profit_en_name'),
           value:this.chartInfo.ProfitNameEn,
           key:'ProfitNameEn',
           id:this.chartInfo.ChartInfoId,
-          placeholder:'请输入英文盘面利润名称'
+          placeholder:/* '请输入英文盘面利润名称' */this.$t('Chart.InputHolderAll.input_common',{label:this.$t('Chart.Detail.profit_en_name')})
         })
       }
 
@@ -413,48 +416,48 @@ export const chartSetMixin = {
         const { TagList,VarietyList } = Data;
 
         this.formItemArray.chartInfo.push({
-          label:'X轴名称',
+          label:/* 'X轴名称' */this.$t('Chart.Detail.x_name'),
           value:this.crossVarietyChartData.XName,
           key:'XName',
           id:TagList[0].ChartTagId,
           notEdit:true
         },
         {
-          label:'英文X轴名称',
+          label:/* '英文X轴名称' */this.$t('Chart.Detail.x_en_name'),
           value:this.crossVarietyChartData.XNameEn,
           key:'XNameEn',
           id:TagList[0].ChartTagId,
-          placeholder:'请输入英文X轴名称'
+          placeholder:/* '请输入英文X轴名称' */this.$t('Chart.InputHolderAll.input_common',{label:this.$t('Chart.Detail.x_en_name')})
         },{
-          label:'Y轴名称',
+          label:/* 'Y轴名称' */this.$t('Chart.Detail.y_name'),
           value:this.crossVarietyChartData.YName,
           key:'YName',
           id:TagList[1].ChartTagId,
           notEdit:true
         },
         {
-          label:'英文Y轴名称',
+          label:/* '英文Y轴名称' */this.$t('Chart.Detail.y_en_name'),
           value:this.crossVarietyChartData.YNameEn,
           key:'YNameEn',
           id:TagList[1].ChartTagId,
-          placeholder:'请输入英文Y轴名称'
+          placeholder:/* '请输入英文Y轴名称' */this.$t('Chart.InputHolderAll.input_common',{label:this.$t('Chart.Detail.y_en_name')})
         })
 
         VarietyList.forEach(item => {
           this.formItemArray.chartsList.push([
             {
-              label:'品种名称',
+              label:/* '品种名称' */this.$t('Chart.Detail.variety_name'),
               value:item.ChartVarietyName,
               key:'ChartVarietyName',
               id:item.ChartVarietyId,
               notEdit:true
             },
             {
-              label:'英文品种名称',
+              label:/* '英文品种名称' */this.$t('Chart.Detail.variety_en_name'),
               value:item.ChartVarietyNameEn,
               key:'ChartVarietyNameEn',
               id:item.ChartVarietyId,
-              placeholder:'请输入英文品种名称'
+              placeholder:/* '请输入英文品种名称' */this.$t('Chart.InputHolderAll.input_common',{label:this.$t('Chart.Detail.variety_en_name')})
             }
           ])
         })
@@ -2305,10 +2308,10 @@ export const chartSetMixin = {
       arr.forEach((item) => (str += `${item.DataTime}\t${item.Value}\n`));
       this.$copyText(str).then(
         (res) => {
-          this.$message.success('已成功复制!');
+          this.$message.success(/* '已成功复制!' */this.$t('MsgPrompt.copy_success_msg'));
         },
         (err) => {
-          this.$message.error('复制失败!');
+          this.$message.error(/* '复制失败!' */this.$t('MsgPrompt.copy_fail_msg'));
         }
       );
     },
@@ -2371,16 +2374,19 @@ export const chartSetMixin = {
             const data = [new ClipboardItem({ [blob.type]: blob })]; 
             await navigator.clipboard.write(data).then(
               () => {
-               this.$message.success('复制成功!')
+              //  this.$message.success('复制成功!')
+               this.$message.success(this.$t('MsgPrompt.copy_success_msg'))
               },
               (error) => {
                 console.log('复制失败,稍后再试',error);
-                this.$message.warning('复制失败,稍后再试')
+                // this.$message.warning('复制失败,稍后再试')
+                this.$message.warning(this.$t('MsgPrompt.copy_fail_msg'))
               }
             );
           });
         }else {
-          this.$message.warning('当前协议暂不支持,仅支持https协议')
+          // this.$message.warning('当前协议暂不支持,仅支持https协议')
+          this.$message.warning(this.$t('MsgPrompt.http_not_support'))
         }
       };
     },