合一下ETA1.5.8

src/api/modules/chartApi.js

@@ -943,6 +943,22 @@ const dataBaseInterface = {
 	 */
 	getRadarPreviewData: params => {
 		return http.post('/datamanage/chart_info/preview/radar',params)
+    },
+	  /**
+		 * 获取数据转换后Edb数据
+		 * @param {Object} params 
+		 * @param {Number} params.IsConvert 是否数据转换
+		 * @param {Number} params.ConvertType 数据转换类型 1乘 2除 3对数
+		 * @param {Number} params.ConvertValue 数据转换值
+		 * @param {String} params.ConvertUnit 数据转换单位
+		 * @param {String} params.ConvertEnUnit 数据转换单位英文
+		 * @param {*} params.SeasonStartDate
+		 * @param {*} params.SeasonEndDate
+		 * @param {*} params.EdbInfoId
+		 * @returns 
+		 */
+	getChangeEdbData:params=>{
+		return http.get('/datamanage/chart_info/convert/detail',params)
 	}
 	
 }

src/views/dataEntry_manage/addChart.vue

@@ -112,7 +112,7 @@
 							placeholder="请选择所属分类"
 						/>
 					</el-form-item>
-					<el-form-item label="图表单位" prop="Unit" v-if="[7,11].includes(chartInfo.ChartType)">
+					<el-form-item label="图表单位" prop="Unit" v-if="[11].includes(chartInfo.ChartType)">
 						<el-select
 							v-model="chartInfo.Unit"
 							filterable
@@ -616,6 +616,34 @@
 						highlight-current-row
 						border
 					>
+						<el-table-column type="expand" v-if="![10,11].includes(chartInfo.ChartType)">
+							<template slot-scope="{row,$index}">
+								<div class="expand-wrap">
+									<div class="data-change">
+										<el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
+										<el-select v-model="updateData[$index].ConvertType">
+											<el-option label="乘以" :value="1"></el-option>
+											<el-option label="除以" :value="2"></el-option>
+											<el-option label="对数" :value="3"></el-option>
+										</el-select>
+									<el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
+									</div>
+									<div class="unit-change">
+										<label>单位</label>
+										<el-input v-model="updateData[$index].ConvertUnit"></el-input>
+										<label>英文单位</label>
+										<el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
+									</div>
+									<!--柱形图-->
+									<div class="use-change" v-if="chartInfo.ChartType===7">
+										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
+									</div>
+									<div class="confirm-btn">
+										<el-button type="text" @click="changeTableData($index)">保存</el-button>
+									</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column
 							v-for="item in tableColums"
 							:key="item.label"
@@ -779,7 +807,9 @@ export default {
 			needWatch: true,
 			IsNameDefault:true,
 
-			UnitOptions:unitArr
+			UnitOptions:unitArr,
+
+			useUnit:''
 
     };
   },
@@ -803,7 +833,7 @@ export default {
 						}
 					}
 
-					let db_arr = this.tableData.map(item => ({
+					let db_arr = this.tableData.map((item,index) => ({
 							ChartColor: item.ChartColor,
 							PredictChartColor: item.PredictChartColor,
 							ChartStyle: item.ChartStyle,
@@ -826,6 +856,21 @@ export default {
 						hasLimitChange = !limitSame
 					}
 					
+					if(![10,11].includes(this.chartInfo.ChartType)){
+						db_arr = db_arr.map((item,index)=>{
+							const {IsConvert,ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit} = this.updateData[index]
+							return {
+								...item,
+								IsConvert:Number(IsConvert),
+								ConvertType,
+								ConvertValue:Number(ConvertValue),
+								ConvertUnit:IsConvert?ConvertUnit:'',
+								ConvertEnUnit:IsConvert?ConvertEnUnit:''
+							}
+						})
+					}
+					
+
 					const { ChartType,ChartName,ChartThemeId,SourcesFrom,Instructions,MarkersLines,MarkersAreas,ChartThemeStyle } = this.chartInfo;
 					let public_param = {
 						ChartClassifyId: this.chartInfo.classify.length ? this.chartInfo.classify[this.chartInfo.classify.length - 1] : 0,
@@ -1276,6 +1321,23 @@ export default {
 			}
 		}
 	}
+	.expand-wrap{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		gap:30px;
+		.el-checkbox{
+			margin-right: 15px;
+		}
+		.el-input{
+			width:100px;
+			height:27px;
+			line-height: 27px;
+			.el-input__icon{
+				line-height: 27px;
+			}
+		}
+	}
 }
 </style>
 <style lang="scss">

src/views/dataEntry_manage/chartSetting.vue

@@ -30,7 +30,7 @@
         </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}]" v-for="tab in ['目录']" :key="tab" @click="leftShowLabel=tab">{{tab}}</li>
           <li >
             <el-checkbox v-model="isOnlyMe" 
                 v-permission="permissionBtn.chartLibPermission.chartLib_isOnlyMine"

src/views/dataEntry_manage/components/SaveChartOther.vue

@@ -6,7 +6,7 @@
 		@close="cancelHandle"
 		custom-class="saveother-dialog"
 		center
-		width="560px"
+		width="700px"
 		v-dialogDrag
     title="另存为"
   >
@@ -20,7 +20,7 @@
       <el-form-item label="图表名称" prop="name">
         <el-input
           v-model="form.name"
-          style="width: 80%"
+          style="width: 100%"
           placeholder="必填项"
           clearable
         />
@@ -35,7 +35,7 @@
             children: 'Children',
             emitPath: false
           }"
-          style="width: 80%"
+          style="width: 100%"
           placeholder="请选择所属分类"
         />
       </el-form-item>

src/views/dataEntry_manage/editChart.vue

@@ -120,7 +120,7 @@
 							placeholder="请选择所属分类"
 						/>
 					</el-form-item>
-					<el-form-item label="图表单位" prop="Unit" v-if="[7,11].includes(chartInfo.ChartType)">
+					<el-form-item label="图表单位" prop="Unit" v-if="[11].includes(chartInfo.ChartType)">
 						<el-select
 							v-model="chartInfo.Unit"
 							filterable
@@ -611,6 +611,34 @@
 						highlight-current-row
 						border
 					>
+						<el-table-column type="expand" v-if="![10,11].includes(chartInfo.ChartType)">
+							<template slot-scope="{row,$index}">
+								<div class="expand-wrap">
+									<div class="data-change">
+										<el-checkbox v-model="updateData[$index].IsConvert">数据转换</el-checkbox>
+										<el-select v-model="updateData[$index].ConvertType">
+											<el-option label="乘以" :value="1"></el-option>
+											<el-option label="除以" :value="2"></el-option>
+											<el-option label="对数" :value="3"></el-option>
+										</el-select>
+									<el-input type="number" v-model="updateData[$index].ConvertValue"></el-input>
+									</div>
+									<div class="unit-change">
+										<label>单位</label>
+										<el-input v-model="updateData[$index].ConvertUnit"></el-input>
+										<label>英文单位</label>
+										<el-input v-model="updateData[$index].ConvertEnUnit"></el-input>
+									</div>
+									<!--柱形图-->
+									<div class="use-change" v-if="chartInfo.ChartType===7">
+										<el-radio v-model="useUnit" :label="$index">设置为图表单位</el-radio>
+									</div>
+									<div class="confirm-btn">
+										<el-button type="text" @click="changeTableData($index)">保存</el-button>
+									</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column
 							v-for="item in tableColums"
 							:key="item.label"
@@ -800,7 +828,11 @@ export default {
 
 					this.$refs.markerSectionRef.initData(ChartInfo);
 
-          this.tableData = EdbInfoList;
+					this.tableData = EdbInfoList;
+					this.updateData = this.tableData.map(item=>{
+						return this.formatUpdateData(item)
+					})
+			
 
 					this.calendar_type = this.chartInfo.Calendar; //日历类型
 					this.setDefaultPreviewOption() // 设置配置项
@@ -919,6 +951,7 @@ export default {
 							MinData: Number(item.MinData)
 						})
 					)
+<<<<<<< HEAD
 					
 					let hasLimitChange = Boolean(this.chartInfo.MinMaxSave)
 					//需检测上下限是否修改
@@ -926,6 +959,22 @@ export default {
 						const limitSame= this.getLimitInfo()
 						hasLimitChange = !limitSame
 					}
+=======
+					if(![10,11].includes(this.chartInfo.ChartType)){
+						db_arr = db_arr.map((item,index)=>{
+							const {IsConvert,ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit} = this.updateData[index]
+							return {
+								...item,
+								IsConvert:Number(IsConvert),
+								ConvertType,
+								ConvertValue:Number(ConvertValue),
+								ConvertUnit:IsConvert?ConvertUnit:'',
+								ConvertEnUnit:IsConvert?ConvertEnUnit:''
+							}
+						})
+					}
+
+>>>>>>> ETA1.5.8
 					const { ChartType,ChartName,ChartThemeId,SourcesFrom,Instructions,MarkersLines,MarkersAreas,ChartThemeStyle } = this.chartInfo;
 					let public_param = {
 						ChartClassifyId: this.chartInfo.classify.length ? this.chartInfo.classify[this.chartInfo.classify.length - 1] : 0,
@@ -1369,6 +1418,23 @@ export default {
 			}
 		}
 	}
+	.expand-wrap{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		gap:30px;
+		.el-checkbox{
+			margin-right: 15px;
+		}
+		.el-input{
+			width:100px;
+			height:27px;
+			line-height: 27px;
+			.el-input__icon{
+				line-height: 27px;
+			}
+		}
+	}
 }
 </style>
 <style lang="scss">

src/views/dataEntry_manage/mixins/addOreditMixin.js

@@ -83,6 +83,8 @@ export default {
 
 			},
 
+			updateData:[],
+			useUnit:''
 		}
 	},
 	computed: {
@@ -161,6 +163,80 @@ export default {
 	},
 
 	methods: {
+        //转换从接口获取的tableData数据
+		formatUpdateData(data){
+			return {
+				...data,
+				IsConvert:Boolean(data.IsConvert),
+				ConvertType:data.ConvertType||1,
+				ConvertValue:data.ConvertValue||100,
+				ConvertUnit:data.IsConvert?data.ConvertUnit:data.ConvertUnit||data.Unit,
+				ConvertEnUnit:data.ConvertEnUnit||data.UnitEn||''
+			}
+		},
+		//接口获取更新后的数据
+		changeTableData(index){
+			const {IsConvert,ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit,EdbInfoId} = this.updateData[index]
+			//if(!IsConvert) return 
+			//计算方式是否合法
+			if(!this.checkConver(ConvertType,ConvertValue)){
+				return this.$message.warning("数据转换不合法")
+			}
+			//柱形图单独设置
+			if(this.chartInfo.ChartType===7){
+				return this.setChangeBarData(index)
+			}
+			//请求接口...
+			let dateArray=this.chartInfo.ChartType==2?this.season_year:this.select_date
+			dataBaseInterface.getChangeEdbData({
+				EdbInfoId,
+				ChartType: this.chartInfo.ChartType,
+				DateType: this.year_select,
+				StartYear:this.count_year,
+				StartDate:
+						this.year_select === 5 || this.year_select === 6
+							? dateArray[0]
+							: '',
+				EndDate: this.year_select === 5 ? dateArray[1] : '',
+				IsConvert:Number(IsConvert),
+				ConvertType,ConvertValue:Number(ConvertValue),
+				ConvertUnit,ConvertEnUnit
+			}).then(res=>{
+				if(res.Ret!==200) return 
+				const {EdbInfoList=[]} = res.Data||{}
+				if(index===this.useUnit&&this.chartInfo.ChartType===7){
+					this.chartInfo.Unit = ConvertUnit
+					this.chartInfo.UnitEn = ConvertEnUnit
+				}
+				const temp = EdbInfoList[0]
+				temp.EdbAliasName = this.tableData[index].EdbAliasName
+				this.tableData.splice(index,1,temp)
+				//this.updateData[index] = this.formatUpdateData(this.tableData[index])
+			})
+		},
+		setChangeBarData(index){
+			const {ConvertType,ConvertValue,ConvertUnit,ConvertEnUnit} = this.updateData[index]
+			//if(!IsConvert) return 
+			//计算方式是否合法
+			if(!this.checkConver(ConvertType,ConvertValue)){
+				return this.$message.warning("数据转换不合法")
+			}
+			if(index===this.useUnit&&this.chartInfo.ChartType===7){
+				this.chartInfo.Unit = ConvertUnit||'无'
+				this.chartInfo.UnitEn = ConvertEnUnit
+			}
+			this.barDateList.length && this.$refs.BarOptRef.getBarData();
+		},
+		checkConver(type,value){
+			//对数：value>1
+			//乘除：value!=0
+			if(!value) return false
+			if(type===3){
+				return value>1
+			}else{
+				return value!=0
+			}
+		},
 		/* 选择指标 获取指标详情并push到表格中*/
 		selectTarget(item,type='') {
 			if(!item) return
@@ -208,6 +284,8 @@ export default {
 							this.tableData.push(tableItem);
 							this.isSetExtremeValue = true;
 							// console.log(this.tableData)
+							const tempItem = this.formatUpdateData(tableItem)
+							this.updateData.push(tempItem)
 							
 							//默认拼接来源
 							if(!this.chartInfo.SourcesFrom) {
@@ -252,6 +330,8 @@ export default {
 			this.search_txt = '';
 			this.chartInfo.Unit = this.chartInfo.Unit||edb.Unit
 			this.tableData.push(edb)
+			const tempItem = this.formatUpdateData(edb)
+			this.updateData.push(tempItem)
 		},
 
 		/* 奇怪柱形图的日期配置项现在不止柱形图用了 获取数据时扩展一下 */
@@ -269,9 +349,14 @@ export default {
 			if(!this.tableData.length || !dateList.length) return
 
 			let params = {
-				EdbInfoIdList: this.tableData.map(_ => ({
+				EdbInfoIdList: this.tableData.map((_,index) => ({
 					EdbInfoId: _.EdbInfoId,
-					Name:_.EdbAliasName
+					Name:_.EdbAliasName,
+					IsConvert:Number(this.updateData[index].IsConvert),
+					ConvertType:this.updateData[index].ConvertType,
+					ConvertValue:Number(this.updateData[index].ConvertValue),
+					ConvertUnit:this.updateData[index].ConvertUnit,
+					ConvertEnUnit:this.updateData[index].ConvertEnUnit,
 				})),
 				DateList: dateList,
 				Sort: {
@@ -560,6 +645,7 @@ export default {
 		delTarget(item) {
 			let index = this.tableData.findIndex(obj => obj.EdbInfoId === item.EdbInfoId);
 			this.tableData.splice(index, 1);
+			this.updateData.splice(index, 1)
 			this.$message.success('删除成功')
 			//删除指标时，检测上下限，修改上下限
 			this.EdbAxisChange()
@@ -569,6 +655,9 @@ export default {
 			if(!this.tableData.length) {
 				this.chartInfo.MarkersLines = ""
 				this.chartInfo.MarkersAreas = ""
+				this.chartInfo.Unit = ""
+				this.chartInfo.UnitEn = ""
+				this.useUnit = ''
 			}
 		},
 

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -611,13 +611,15 @@ export const chartSetMixin = {
         
         
         //y轴
+        const textZh = item.ConvertUnit||item.Unit
+        const textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
         let yItem = {
           ...basicYAxis,
           title: {
-            text: item.Unit,
-            textCh:item.Unit, // 中文
+            text: textZh,
+            textCh:textZh, // 中文
             // 中文不存在，无论英文有无都显示空
-            textEn:item.UnitEn||item.Unit, // 英文
+            textEn:textZh?textEn:'', // 英文
             style:{
               ...chartTheme&&chartTheme.yAxisOptions.style
             },
@@ -806,13 +808,15 @@ export const chartSetMixin = {
         }
         
         //y轴
+        const textZh = item.ConvertUnit||item.Unit
+        const textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
         let yItem = {
           ...basicYAxis,
           title: {
-            text: item.Unit,
-            textCh:item.Unit, // 中文
+            text: textZh,
+            textCh:textZh, // 中文
             // 中文不存在，无论英文有无都显示空
-            textEn:item.UnitEn||item.Unit, // 英文
+            textEn:textZh?textEn:'', // 英文
             style:{
               ...chartTheme&&chartTheme.yAxisOptions.style
             },
@@ -967,6 +971,8 @@ export const chartSetMixin = {
       }
 
       //y轴
+      const textZh = chartData.ConvertUnit||chartData.Unit
+      const textEn = chartData.ConvertEnUnit||chartData.UnitEn||chartData.ConvertUnit||chartData.Unit
       seasonYdata = [{
         ...seasonOptions.yAxis,
         labels: {
@@ -980,10 +986,10 @@ export const chartSetMixin = {
           }
         },
         title: {
-          text:  `${chartData.Unit}`,
-          textCh:chartData.Unit, // 中文
+          text:  `${textZh}`,
+          textCh:textZh, // 中文
           // 中文不存在，无论英文有无都显示空
-          textEn:chartData.UnitEn||chartData.Unit, // 英文
+          textEn:textZh?textEn:'', // 英文
           style:{
             ...chartTheme&&chartTheme.yAxisOptions.style
           },
@@ -1042,10 +1048,11 @@ export const chartSetMixin = {
     /* 散点图设置  只允许2指标画图第一个指标值为x轴 第二个指标为y轴  */
     setScatterChart(newval) {
       console.log(newval);
-      this.leftIndex = 0;
+      this.leftIndex = 1;
       this.rightIndex = -1;
       this.rightTwoIndex = -1;
       if(newval.length !== 2) {
+        this.leftIndex = -1
         this.options = {}
         return
       };
@@ -1109,13 +1116,14 @@ export const chartSetMixin = {
       }
     
       // 目前指标限制死2个 为了简单 配置项直接关联第一个指标算了  自定义极值只在新增时用
-      if(!this.chartInfo.ChartInfoId && this.isSetExtremeValue) {
+      //ETA1.5.8 增加数据转换功能，不用第一个指标了
+      /* if(!this.chartInfo.ChartInfoId) {
         let maxYData = Math.max(...real_data.map(_ => _.y));
         let minYData = Math.min(...real_data.map(_ => _.y));
         newval[0].MaxData = maxYData;
         newval[0].MinData = minYData;
-        this.isSetExtremeValue = false;
-      }
+      } */
+
 
       //获取对应轴的上下限
         //预测指标-走势图；图表配置-主题设置；不使用自定义上下限，剔除
@@ -1131,13 +1139,15 @@ export const chartSetMixin = {
 
       const { IsOrder,ChartColor } = newval[0];
       //y轴
+      const textYZh = newval[1].ConvertUnit||newval[1].Unit
+      const textYEn = newval[1].ConvertEnUnit||newval[1].UnitEn||newval[1].ConvertUnit||newval[1].Unit
       let yAxis = {
         ...basicYAxis,
         title: {
-          text:  `${newval[1].Unit}`,
-          textCh:newval[1].Unit,// 中文
+          text:  `${textYZh}`,
+          textCh:textYZh,// 中文
           // 中文不存在，无论英文有无都显示空
-          textEn:newval[1].UnitEn||newval[1].Unit, // 英文
+          textEn:textYZh?textYEn:'', // 英文
           style:{
             ...chartTheme&&chartTheme.yAxisOptions.style
           },
@@ -1160,21 +1170,23 @@ export const chartSetMixin = {
         },
         opposite: false,
         reversed: IsOrder,
-        min: Number(newval[0].MinData),
-        max: Number(newval[0].MaxData),
+        min: Number(newval[1].MinData),
+        max: Number(newval[1].MaxData),
         tickWidth: 1,
         plotBands: this.setAxisPlotAreas(1),
         plotLines: this.setAxisPlotLines(1)
       }
 
       //x轴
+      const textXZh = newval[0].ConvertUnit||newval[0].Unit
+      const textXEn = newval[0].ConvertEnUnit||newval[0].UnitEn||newval[0].ConvertUnit||newval[0].Unit
       const xAxis = {
         ...scatterXAxis,
         title: {
-          text:  `${newval[0].Unit}`,
-          textCh:newval[0].Unit, // 中文
+          text:  `${textXZh}`,
+          textCh:textXZh, // 中文
           // 中文不存在，无论英文有无都显示空
-          textEn:newval[0].UnitEn||newval[0].Unit, // 英文
+          textEn:textXZh?textXEn:'', // 英文
           style: {
             ...chartTheme&&chartTheme.xAxisOptions.style
           },

src/views/mychart_manage/components/chartDetailDia.vue

@@ -339,7 +339,7 @@
                   `"
                   >来源:{{JSON.parse(chartInfo.SourcesFrom).text}}</span>
               </div>
-
+              
                <!-- 公历农历切换 只用于季节性图 -->
               <el-radio-group
                 v-if="chartInfo.ChartType === 2 && !chartInfo.WarnMsg"
@@ -361,6 +361,7 @@
                   fontSize: ${ JSON.parse(chartInfo.Instructions).fontSize }px
                 `"
               ></div>
+              <div class="chart-author">作者：{{chartInfo.SysUserRealName}}</div>
             </div>
 
           </div>
@@ -375,16 +376,16 @@
             border
           >
             <!-- 可配置展开 只用于默认图 季节性隐藏-->
-            <el-table-column type="expand" v-if="sameOptionType.includes(chartInfo.ChartType) && chartInfo.ChartType!==5 && chartInfo.Source===1">
+            <!-- <el-table-column type="expand" v-if="sameOptionType.includes(chartInfo.ChartType) && chartInfo.ChartType!==5 && chartInfo.Source===1">
               <template slot-scope="props">
                 <div class="options-cont">
-                  <!-- 堆叠图 或组合图中的堆叠类型 非第一项隐藏配置 -->
+                  //堆叠图 或组合图中的堆叠类型 非第一项隐藏配置
                   <template v-if="showYOptionsHandle(props.row,props.$index)">
                       <el-checkbox v-model="props.row.IsOrder">逆序</el-checkbox>
                       <el-radio-group v-model="props.row.IsAxis" size="mini">
                         <el-radio-button :label="1">左轴</el-radio-button>
                         <el-radio-button :label="0">右轴</el-radio-button>
-                        <!-- 指标有右轴时才可以选右2轴 不然没有右2这个概念的意义 -->
+                        //指标有右轴时才可以选右2轴 不然没有右2这个概念的意义
                         <el-radio-button 
                           v-if="[1,6].includes(chartInfo.ChartType)"
                           :label="2" 
@@ -492,7 +493,7 @@
                   </div>
                 </div>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               v-for="item in tableColums"
               :key="item.label"
@@ -518,7 +519,6 @@
               label="操作"
               key="Copy"
               align="center"
-              v-if="chartInfo.Source!==1 || ![1,4,6].includes(chartInfo.ChartType)"
               width="110"
             >
               <template slot-scope="scope">
@@ -1639,7 +1639,7 @@ export default {
       .chart-author {
         color: #333;
         position: absolute;
-        bottom: 20px;
+        bottom: 10px;
         right: 38px;
       }
       .chartWrapper {

src/views/ppt_manage/mixins/mixins.js

@@ -116,12 +116,14 @@ export default {
         //轴位置值相同的下标
         let sameSideIndex = chartData.findIndex(i => i.IsAxis === item.IsAxis);
         //y轴
+        const textZh = item.ConvertUnit||item.Unit
+        const textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
         let yItem = {
           ...basicYAxis,
           title: {
-            text: item.Unit,
-            textCh:item.Unit,//中文单位
-            textEn:item.Unit?item.UnitEn:'',//英文单位，但如果无中文单位则不显示
+            text: textZh,
+            textCh:textZh,//中文单位
+            textEn:textZh?textEn:'',//英文单位，但如果无中文单位则不显示
             style:{
               ...chartTheme&&chartTheme.yAxisOptions.style
             },
@@ -280,9 +282,9 @@ export default {
         let yItem = {
           ...basicYAxis,
           title: {
-            text:item.Unit,
-            textCh:item.Unit,//中文单位
-            textEn:item.Unit?item.UnitEn:'',//英文单位，但如果无中文单位则不显示
+            text:item.ConvertUnit||item.Unit,
+            textCh:item.ConvertUnit||item.Unit,//中文单位
+            textEn:item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit,//英文单位，但如果无中文单位则不显示
             style:{
               ...chartTheme&&chartTheme.yAxisOptions.style
             },
@@ -423,6 +425,8 @@ export default {
       }
 
       //y轴
+      const textZh = chartData.ConvertUnit||chartData.Unit
+      const textEn = chartData.ConvertEnUnit||chartData.UnitEn||chartData.ConvertUnit||chartData.Unit
       seasonYdata = [{
         ...seasonOptions.yAxis,
         labels: {
@@ -436,10 +440,10 @@ export default {
           }
         },
         title: {
-          text:  `${chartData.Unit}`,
-          textCh:chartData.Unit, // 中文
+          text:  `${textZh}`,
+          textCh:textZh, // 中文
           // 中文不存在，无论英文有无都显示空
-          textEn:chartData.UnitEn||chartData.Unit, // 英文
+          textEn:textZh?textEn:'', // 英文
           style:{
             ...chartTheme&&chartTheme.yAxisOptions.style
           },
@@ -557,11 +561,13 @@ export default {
 
       const { IsOrder,ChartColor,MaxData,MinData } = chartData[0];
       //y轴
+      const textYZh = chartData[1].ConvertUnit||chartData[1].Unit
+      const textYEn = chartData[1].ConvertEnUnit||chartData[1].UnitEn||chartData[1].ConvertUnit||chartData[1].Unit
       let yAxis = {
         title: {
-          text:  `${chartData[1].Unit}`,
-          textCh:chartData[1].Unit,
-          textEn:chartData[1].Unit?chartData[1].UnitEn:'',
+          text:  `${textYZh}`,
+          textCh:textYZh,
+          textEn:textYZh?textYEn:'',
           style:{
             ...chartTheme&&chartTheme.yAxisOptions.style
           },
@@ -581,8 +587,8 @@ export default {
         },
         opposite: false,
         reversed: IsOrder,
-        min: Number(MinData),
-        max: Number(MaxData),
+        min: Number(chartData[1].MinData),
+        max: Number(chartData[1].MaxData),
         tickWidth: 1,
         tickLength: 5,
         lineWidth: 1,
@@ -617,6 +623,8 @@ export default {
         series.data.push([_.x,_.y])
       })
       
+      const textXZh = chartData[0].ConvertUnit||chartData[0].Unit
+      const textXEn = chartData[0].ConvertEnUnit||chartData[0].UnitEn||chartData[0].ConvertUnit||chartData[0].Unit
       this.options = {
         title: {
           text:''
@@ -626,9 +634,9 @@ export default {
         xAxis: {
           ...scatterXAxis,
           title: {
-            text:  `${chartData[0].Unit}`,
-            textCh:chartData[0].Unit,
-            textEn:chartData[0].Unit?chartData[0].UnitEn:'',
+            text:  `${textXZh}`,
+            textCh:textXZh,
+            textEn:textXZh?textXEn:'',
             style: {
               ...chartTheme&&chartTheme.xAxisOptions.style
             },