Sfoglia il codice sorgente

fix: 优化需求245

ldong 2 mesi fa
parent
commit
d6cbd7828d

+ 8 - 0
src/lang/modules/EtaChart/commonLang.js

@@ -183,6 +183,10 @@ export default {
 
   //操作提示文案
   OptMsg:{
+    set_chart_alias: {
+      zh:'设置图表别名,默认PPT中插入该图表时显示,若无设置,则PPT中不显示该图表名称。',
+      en:'Set chart alias, by default, when inserting this chart into the PPT, it will be displayed. If not set, the chart name will not be displayed in the PPT.'
+    },
     refresh_ing_msg: {
       zh:'刷新图表中...',
       en:'Refreshing chart...'
@@ -341,6 +345,10 @@ export default {
       zh:'图表单位',
       en:'Chart Unit',
     },
+    chart_alias: {
+      zh:'图表别名',
+      en:'Chart Alias',
+    },
     line_color: {
       zh:'线条颜色',
       en:'Line Color',

+ 4 - 4
src/views/dataEntry_manage/addChart.vue

@@ -111,19 +111,19 @@
 							:config="{ label: currentLang === 'zh' ? 'ChartClassifyName' : 'ChartClassifyNameEn',value: 'ChartClassifyId'}"
 						/>
 					</el-form-item>
-					<!-- 图表别名 英文文案还没给-->
-					<el-form-item label="图表别名" prop="ChartAlias" v-if="[1,5,6].includes(chartInfo.ChartType)">
+					<!-- 图表别名 -->
+					<el-form-item :label="$t('Chart.Detail.chart_alias')" prop="ChartAlias" v-if="[1,4,5,6,7,11,14].includes(chartInfo.ChartType)">
 						<el-input
 							v-model="chartInfo.ChartAlias"
 							style="width: 90%"
-							placeholder="请输入图表别名"
+							:placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.chart_alias')})"
 							clearable
 						/>
 						<el-tooltip effect="dark" placement="right">
 							<div
 								slot="content"
 								style="line-height: 20px;width:300px"
-								>设置图表别名,默认PPT中插入该图表时显示,若无设置,则PPT中不显示该图表名称。</div>
+								>{{$t('Chart.OptMsg.set_chart_alias')}}</div>
 							<i class="el-icon-question" style="color: #666" />
 						</el-tooltip>
 					</el-form-item>

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

@@ -131,19 +131,19 @@
 							:placeholder="$t('Chart.InputHolderAll.input_classify')"
 						/>
 					</el-form-item>
-					<!-- 图表别名 英文文案还没给-->
-					<el-form-item label="图表别名" prop="ChartAlias" v-if="[1,5,6].includes(chartInfo.ChartType)">
+					<!-- 图表别名-->
+					<el-form-item :label="$t('Chart.Detail.chart_alias')" prop="ChartAlias" v-if="[1,4,5,6,7,11,14].includes(chartInfo.ChartType)">
 						<el-input
 							v-model="chartInfo.ChartAlias"
 							style="width: 90%"
-							placeholder="请输入图表别名"
+							:placeholder="$t('Chart.InputHolderAll.input_common',{label:$t('Chart.Detail.chart_alias')})"
 							clearable
 						/>
 						<el-tooltip effect="dark" placement="right">
 							<div
 								slot="content"
 								style="line-height: 20px;width:300px"
-								>设置图表别名,默认PPT中插入该图表时显示,若无设置,则PPT中不显示该图表名称。</div>
+								>{{$t('Chart.OptMsg.set_chart_alias')}}</div>
 							<i class="el-icon-question" style="color: #666" />
 						</el-tooltip>
 					</el-form-item>

+ 1 - 1
src/views/ppt_manage/mixins/pptMixins.js

@@ -737,7 +737,7 @@ export default {
       */
      const {Source,MyChartType,ChartThemeStyle} = options
      const isShowTitle = isShowPPTTitle(Source,MyChartType)
-     const isShowOtherTitle = Source===1&&[1,5,6].includes(MyChartType)
+     const isShowOtherTitle = Source===1&&[1,4,5,6,7,11,14].includes(MyChartType)
      
     /* 主题样式*/
     const chartTheme =  ChartThemeStyle ? JSON.parse(ChartThemeStyle) : null;

+ 1 - 1
src/views/ppt_manage/newVersion/utils/untils.js

@@ -730,7 +730,7 @@ export const getContextMenuPos = (layerId) =>{
     以上图表需要显示标题
 */
 export const isShowPPTTitle = (Source,MyChartType)=>{
-    const sense_1 = Source===1&&[2,7,10].includes(MyChartType)
+    const sense_1 = Source===1&&[2,10].includes(MyChartType)
     const sense_2 = [2,3,4,5,6,7,8,9].includes(Source)
     return sense_1||sense_2
 }