|
@@ -305,7 +305,9 @@ export default defineComponent({
|
|
|
|
|
|
//校验英文名称是否完整
|
|
|
if(route.query.fromPage === 'en' && language.value==='en') {
|
|
|
- const { XNameEn,XUnitNameEn,YNameEn,YUnitNameEn,DataList } = data.DataResp;
|
|
|
+ const { XNameEn,XUnitNameEn,YNameEn,YUnitNameEn } = data.DataResp;
|
|
|
+ // DataList可能是null
|
|
|
+ const DataList = data.DataResp.DataList||[]
|
|
|
let isAllEn = true;
|
|
|
if(!XNameEn || !XUnitNameEn || !YNameEn || !YUnitNameEn) isAllEn = false;
|
|
|
if(DataList.some(_ => !_.NameEn)) isAllEn = false;
|
|
@@ -319,6 +321,11 @@ export default defineComponent({
|
|
|
const setSectionScatterChart = () => {
|
|
|
const { chartLimit } = state;
|
|
|
const { DataList,XName,XNameEn,XUnitName,XUnitNameEn,YName,YNameEn,YUnitName,YUnitNameEn } = sectionScatterData.value;
|
|
|
+
|
|
|
+ if(!DataList){
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
const { min,max,x_min,x_max } = chartLimit;
|
|
|
|
|
|
//y轴
|
|
@@ -476,7 +483,9 @@ export default defineComponent({
|
|
|
/* 统计频率图 */
|
|
|
const setStatisticFrequency = () => {
|
|
|
const { DataList,LeftMaxValue,LeftMinValue,RightMaxValue,RightMinValue } = state.statisticFrequencyData;
|
|
|
-
|
|
|
+ if(!DataList){
|
|
|
+ return
|
|
|
+ }
|
|
|
let xAxis = {
|
|
|
...scatterXAxis,
|
|
|
tickWidth: 1,
|
|
@@ -917,8 +926,12 @@ export default defineComponent({
|
|
|
|
|
|
/* 季节图 */
|
|
|
const setSeasonOptions = () => {
|
|
|
+
|
|
|
const chartData = state.dataList[0];
|
|
|
// 农历数据需要去除第一项 在ETA1.0.5之后,除了这里 农历和公历处理逻辑一样
|
|
|
+ if(!chartData.DataList){
|
|
|
+ return
|
|
|
+ }
|
|
|
const chartDataHandle=state.chartInfo.Calendar === '农历'?
|
|
|
chartData.DataList.filter((item:ISeasonDataItemProps, index:number) => index > 0):
|
|
|
chartData.DataList
|