From 08ffcf9d7ffafaa82d8de7f9b5fcfdb49e9c3688 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 05 十一月 2025 17:33:54 +0800
Subject: [PATCH] 动态溯源 1. 修复CO因子文本没有正常显示的问题；
---
src/views/historymode/component/MissionReport.vue | 434 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 297 insertions(+), 137 deletions(-)
diff --git a/src/views/historymode/component/MissionReport.vue b/src/views/historymode/component/MissionReport.vue
index 8cb9b57..8e772be 100644
--- a/src/views/historymode/component/MissionReport.vue
+++ b/src/views/historymode/component/MissionReport.vue
@@ -14,6 +14,21 @@
></OptionLocation2>
</el-form-item>
<OptionTime v-model="formObj.timeArray"></OptionTime>
+ <el-form-item label="鍖哄幙绛涢��" prop="removeOtherDistrict">
+ <el-checkbox v-model="formObj.removeOtherDistrict"
+ >绉婚櫎鍏朵粬鍖哄幙</el-checkbox
+ >
+ </el-form-item>
+ <el-form-item label="姹℃煋婧愮瓫閫�" prop="removeNoPollutedSource">
+ <el-checkbox v-model="formObj.removeNoPollutedSource"
+ >绉婚櫎鏈彂鐜版薄鏌撴簮鐨勭嚎绱�</el-checkbox
+ >
+ </el-form-item>
+ <el-form-item label="闅愭偅鍖哄煙" prop="showPollutedArea">
+ <el-checkbox v-model="formObj.showPollutedArea"
+ >灏嗗吀鍨嬮殣鎮ｅ尯鍩熻〃鏍间綔涓洪檮浠跺睍绀�</el-checkbox
+ >
+ </el-form-item>
<el-form-item>
<el-button
type="primary"
@@ -23,18 +38,18 @@
>
涓嬭浇鎶ュ憡
</el-button>
- <el-button
+ <!-- <el-button
type="primary"
class="el-button-custom"
@click="handleGenerateImg"
:loading="docLoading"
>
鐢熸垚鍥剧墖
- </el-button>
+ </el-button> -->
</el-form-item>
- <el-form-item>
+ <!-- <el-form-item>
<el-image :src="base64Url" fit="fill" :preview-src-list="[base64Url]" />
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button
type="primary"
@@ -73,6 +88,7 @@
import { Legend } from '@/model/Legend';
import { getHexColor, getColorBetweenTwoColors } from '@/utils/color';
import { getGridDataDetailFactorValue } from '@/model/GridDataDetail';
+import { factorName } from '@/constant/factor-name';
// 鍊熺敤鍗槦閬ユ祴妯″潡涓殑100绫崇綉鏍�
const props = defineProps({
@@ -83,7 +99,7 @@
});
const formObj = ref({
- timeArray: [new Date('2025-07-01T00:00:00'), new Date('2025-08-31T23:59:59')],
+ timeArray: [new Date('2025-07-01T00:00:00'), new Date('2025-09-30T23:59:59')],
location: {}
});
@@ -108,6 +124,8 @@
districtCode: formObj.value.location.dCode,
districtName: formObj.value.location.dName
},
+ removeOtherDistrict: formObj.value.removeOtherDistrict,
+ removeNoPollutedSource: formObj.value.removeNoPollutedSource,
factorTypes: radioOptions(TYPE0).map((e) => e.name)
};
});
@@ -133,16 +151,19 @@
mainFactor: '',
_abnormalFactors: '',
sceneCount: 0,
- _kilometres: '1000'
+ _kilometres: '1000',
+ _keyScene: '1涓浗鎺х偣锛堥潤瀹夌洃娴嬬珯锛夊拰2涓競鎺х偣锛堝拰鐢颁腑瀛︺�佸競鍖楅珮鏂帮級',
+ exceptionCount: 0,
+ _focusScene: ''
}
],
missionDetailList: [
{
_index: 1,
+ missionCode: '',
_startTime: '2025骞�07鏈�29鏃�',
_time: '09:00鑷�14:30',
_kilometres: '1000',
- _keyScene: '1涓浗鎺х偣锛堥潤瀹夌洃娴嬬珯锛夊拰2涓競鎺х偣锛堝拰鐢颁腑瀛︺�佸競鍖楅珮鏂帮級',
_dataStatistics: [
{
factor: 'PM10',
@@ -176,6 +197,19 @@
'1.涓婃捣渚濆痉姹借溅缁翠慨鏈夐檺鍏徃锛屾苯淇紒涓氾紝浣嶄簬涓婃捣甯傞暱瀹佸尯鍖楄櫣璺�1079鍙凤紝璺濅粰闇炵珯1887绫炽�俓r\n鈥︹��'
}
]
+ }
+ ],
+ clueList: [
+ {
+ _factorNames: 'PM2.5',
+ _time: '10:22:28 - 10:22:34',
+ _riskRegion: '闀垮畞鍖烘竻婧矾鍙箰涓滆矾',
+ _exceptionType: '蹇�熶笂鍗�',
+ _chart: '',
+ _conclusion:
+ '鍦�10:22:28鑷�10:22:34涔嬮棿锛屽嚭鐜板揩閫熶笂鍗囷紝VOC鏈�浣庡�间负135.95渭g/m鲁锛屾渶楂樺�间负135.95渭g/m鲁锛屽潎鍊间负135.95渭g/m鲁锛屽彂鐜�3涓闄╂簮锛屽寘鍚�2涓姞娌圭珯锛�1涓苯淇��',
+ _scenes:
+ '1.涓婃捣渚濆痉姹借溅缁翠慨鏈夐檺鍏徃锛屾苯淇紒涓氾紝浣嶄簬涓婃捣甯傞暱瀹佸尯鍖楄櫣璺�1079鍙凤紝璺濅粰闇炵珯1887绫炽�俓r\n鈥︹��'
}
]
}
@@ -223,7 +257,9 @@
};
const handleGenerateImg = () => {
- generateClueByRiskArea(params.value).then(() => {});
+ generateClueByRiskArea(params.value).then(() => {
+ generateDocx();
+ });
};
function generateMissionSummary(param) {
@@ -232,6 +268,10 @@
new Date(res.data.startTime),
new Date(res.data.endTime)
);
+ templateParam.subTitle =
+ templateParam.sryTime.indexOf('瀛ｅ害') !== -1
+ ? templateParam.sryTime.replace(/锛�.*锛�/, '')
+ : templateParam.sryTime;
templateParam.sryArea = res.data.area.districtName;
templateParam.sryCount = res.data.count;
templateParam.sryKm = Math.round(res.data.kilometres / 1000);
@@ -257,9 +297,9 @@
return dataAnalysisApi.fetchMissionList(param).then((res) => {
templateParam.missionInfoList = res.data.map((item) => {
item._time = formatDateTimeRange(item.startTime, item.endTime);
- item._airQulity = `AQI锛�${item.aqi}锛�${item.pollutionDegree}锛塦;
+ item._airQulity = `${item.aqi}锛�${item.pollutionDegree}锛塦;
item._abnormalFactors = item.abnormalFactors
- .map((factor) => factor)
+ .map((factor) => factorName[factor])
.join('銆�');
item._kilometres = Math.round(item.kilometres / 1000);
@@ -294,7 +334,7 @@
item._startTime = t[0];
item._time = t[1];
item._kilometres = Math.round(item.kilometres / 1000);
- item._airQulity = `AQI锛�${item.aqi}锛�${item.pollutionDegree}锛塦;
+ item._airQulity = `${item.aqi}锛�${item.pollutionDegree}锛塦;
const factorNames = radioOptions(TYPE0).map((e) => e.name);
item._dataStatistics = item.dataStatistics.filter((e) => {
@@ -303,9 +343,9 @@
radioOptions(TYPE0).forEach((f) => {
const _factor = item.dataStatistics.find((e) => e.factor == f.name);
- item[`avgValue_${f.name}`] = _factor?.avgValue ?? '-';
- item[`maxValue_${f.name}`] = _factor?.maxValue ?? '-';
- item[`minValue_${f.name}`] = _factor?.minValue ?? '-';
+ item[`avgValue_${f.name}`] = _factor?.avgValue.toFixed(0) ?? '-';
+ item[`maxValue_${f.name}`] = _factor?.maxValue.toFixed(0) ?? '-';
+ item[`minValue_${f.name}`] = _factor?.minValue.toFixed(0) ?? '-';
});
return item;
@@ -314,44 +354,187 @@
}
function generateClueByRiskArea(param) {
- return dataAnalysisApi.fetchClueByRiskArea(param).then((res) => {
- templateParam.clueByAreaList = res.data.map((item, index) => {
- return {
- _index: index + 1,
- _area: `${item.sceneInfo.type}${item.sceneInfo.name}鍛ㄨ竟`,
- clueByFactorList: item.clueByFactorList.map((cbf) => {
- return {
- factor: cbf.factor,
- clues: cbf.clues.map((clue) => {
- return {
- _factorNames: Object.keys(clue.pollutedData.statisticMap)
- .map((e) => e)
- .join('銆�'),
- _time:
- moment(clue.pollutedData.startTime).format('HH:mm:ss') +
- ' - ' +
- moment(clue.pollutedData.endTime).format('HH:mm:ss'),
- _riskRegion: clue.pollutedArea.address
- ? clue.pollutedArea.address
- : '',
- _exceptionType: clue.pollutedData.exception,
- _images: generateChartImg(clue.pollutedData),
- _conclusion: clue.pollutedSource.conclusion,
- _scenes:
- clue.pollutedSource.sceneList.length > 0
- ? clue.pollutedSource.sceneList
- .map(
- (s, index) =>
- `${index + 1}. ${s.name}锛�${s.type}锛屼綅浜�${s.location}锛岃窛${s.closestStation.name}${parseInt(s.length)}绫筹紱`
- )
- .join('\n')
- : '鏃�'
- };
- })
- };
- })
- };
- });
+ const indexArr = [
+ 'A',
+ 'B',
+ 'C',
+ 'D',
+ 'E',
+ 'F',
+ 'G',
+ 'H',
+ 'I',
+ 'J',
+ 'K',
+ 'L',
+ 'M',
+ 'N',
+ 'O',
+ 'P',
+ 'Q',
+ 'R',
+ 'S',
+ 'T',
+ 'U',
+ 'V',
+ 'W',
+ 'X',
+ 'Y',
+ 'Z'
+ ];
+ const _param = {
+ area: param.area,
+ startTime: param.startTime,
+ endTime: param.endTime,
+ removeOtherDistrict: param.removeOtherDistrict,
+ removeNoPollutedSource: param.removeNoPollutedSource
+ };
+ return dataAnalysisApi.fetchClueByRiskArea(_param).then((res) => {
+ templateParam.showPollutedArea = formObj.value.showPollutedArea;
+ templateParam.clueByAreaList = res.data
+ .groupBy((e) => e.township)
+ .map((item, index) => {
+ const { key: township, values: clues } = item;
+ let typeCount = {};
+ let lastSceneType;
+ let sceneIndex = 0;
+
+ const _scenes = clues.flatMap((e) =>
+ e.clue.pollutedSource.sceneList.map((s, index) => {
+ const i = lastSceneType == s.type ? ++sceneIndex : 0;
+ typeCount[s.type] = typeCount[s.type] ? typeCount[s.type] + 1 : 1;
+ lastSceneType = s.type;
+ return {
+ des: `${s.type}${i + 1}锛�${s.name}锛屼綅浜�${s.location}锛岃窛${s.closestStation.name}${parseInt(s.length)}绫筹紱`
+ };
+ })
+ );
+ let _sceneDes = `璧拌埅杩囩▼涓函婧愬埌${_scenes.length}涓闄╂簮`;
+ if (_scenes.length > 0) {
+ _sceneDes += '锛屽叾绫诲瀷鏄�';
+ _sceneDes += Object.keys(typeCount)
+ .map((e) => `${e}锛�${typeCount[e]}涓級`)
+ .join('銆�');
+ _sceneDes += '锛�';
+ } else {
+ _sceneDes = '璧拌埅杩囩▼涓湭婧簮鍒伴闄╂簮銆�';
+ }
+ return {
+ _index: index + 1,
+ // _area: `${item.sceneInfo.type}${item.sceneInfo.name}鍛ㄨ竟`,
+ _area: `${township}`,
+ _sceneDes,
+ _scenes,
+ clueList: clues.map((item3, index3) => {
+ const clue = item3.clue;
+ let _riskRegion = '';
+ if (
+ clue.pollutedArea.address.indexOf(
+ clue.pollutedArea.streetNumber
+ ) == -1
+ ) {
+ // _riskRegion +=
+ // (clue.pollutedArea.address ?? '') +
+ // '锛�' +
+ // (clue.pollutedArea.street ?? '') +
+ // (clue.pollutedArea.streetNumber ?? '') +
+ // (clue.pollutedArea.direction ?? '') +
+ // '锛�';
+ _riskRegion = clue.pollutedArea.address;
+ } else {
+ _riskRegion = clue.pollutedArea.address;
+ }
+ return {
+ index: indexArr[index3],
+ showPollutedArea: formObj.value.showPollutedArea,
+ _title: _riskRegion,
+ _factorNames: Object.keys(clue.pollutedData.statisticMap)
+ .map((e) => factorName[e])
+ .join('銆�'),
+ _date: moment(clue.pollutedData.startTime).format('YYYY-MM-DD'),
+ _time:
+ moment(clue.pollutedData.startTime).format('HH:mm:ss') +
+ ' - ' +
+ moment(clue.pollutedData.endTime).format('HH:mm:ss'),
+ _riskRegion: _riskRegion,
+ _exceptionType: clue.pollutedData.exception,
+ _images: generateChartImg(clue.pollutedData),
+ _conclusion: clue.pollutedSource.conclusion.replace(
+ /锛屽彂鐜癧0-9]*涓闄╂簮锛屽寘鍚玔0-9]*涓�.*銆�/,
+ '銆�'
+ ),
+ _hasScene: clue.pollutedSource.sceneList.length > 0
+ };
+ })
+ // clueByFactorList: clues
+ // .groupBy((e) => e.factorTag)
+ // .map((item2, index2) => {
+ // const { key: factorTag, values: clues2 } = item2;
+ // const factorNames = [...new Set(clues2.flatMap((e) => e.factors))]
+ // .map((e) => factorName[e])
+ // .join('銆�');
+ // return {
+ // index: index2 + 1,
+ // factor: factorNames,
+ // clues: clues2.map((item3, index3) => {
+ // const clue = item3.clue;
+ // let _riskRegion = '';
+ // if (
+ // clue.pollutedArea.address.indexOf(
+ // clue.pollutedArea.streetNumber
+ // ) == -1
+ // ) {
+ // _riskRegion +=
+ // (clue.pollutedArea.address ?? '') +
+ // '锛�' +
+ // (clue.pollutedArea.street ?? '') +
+ // (clue.pollutedArea.streetNumber ?? '') +
+ // (clue.pollutedArea.direction ?? '') +
+ // '锛�';
+ // } else {
+ // _riskRegion = clue.pollutedArea.address;
+ // }
+ // return {
+ // index: index3 + 1 + '',
+ // showPollutedArea: formObj.value.showPollutedArea,
+ // _title:
+ // (clue.pollutedArea.street ?? '') +
+ // (clue.pollutedArea.streetNumber ?? '') +
+ // (clue.pollutedArea.direction ?? ''),
+ // _factorNames: Object.keys(clue.pollutedData.statisticMap)
+ // .map((e) => factorName[e])
+ // .join('銆�'),
+ // _time:
+ // moment(clue.pollutedData.startTime).format(
+ // 'YYYY-MM-DD HH:mm:ss'
+ // ) +
+ // ' - ' +
+ // moment(clue.pollutedData.endTime).format('HH:mm:ss'),
+ // _riskRegion: _riskRegion,
+ // _exceptionType: clue.pollutedData.exception,
+ // _images: generateChartImg(clue.pollutedData),
+ // _conclusion: clue.pollutedSource.conclusion,
+ // _hasScene: clue.pollutedSource.sceneList.length > 0,
+ // // _scenes:
+ // // clue.pollutedSource.sceneList.length > 0
+ // // ? clue.pollutedSource.sceneList
+ // // .map(
+ // // (s, index) =>
+ // // `${index + 1}. ${s.name}锛�${s.type}锛屼綅浜�${s.location}锛岃窛${s.closestStation.name}${parseInt(s.length)}绫筹紱`
+ // // )
+ // // .join('\r\n')
+ // // : '鏃�',
+ // _scenes: clue.pollutedSource.sceneList.map((s, index) => {
+ // return {
+ // des: `${index + 1}. ${s.name}锛�${s.type}锛屼綅浜�${s.location}锛岃窛${s.closestStation.name}${parseInt(s.length)}绫筹紱`
+ // };
+ // })
+ // };
+ // })
+ // };
+ // })
+ };
+ });
});
}
@@ -367,13 +550,17 @@
factorDatas.setData(pollutedData.historyDataList, 0, () => {
for (const key in pollutedData.statisticMap) {
const value = pollutedData.statisticMap[key];
- const _chartOptions = factorDataParser.parseData(factorDatas, [
- {
- label: value.factorName,
- name: value.factorName,
- value: value.factorId + ''
- }
- ]);
+ const _chartOptions = factorDataParser.parseData(
+ factorDatas,
+ [
+ {
+ label: value.factorName,
+ name: value.factorName,
+ value: value.factorId + ''
+ }
+ ],
+ false
+ );
_chartOptions.forEach((o) => {
images.push({
url: chartToImg.generateEchartsImage(o, exceptionIndexArr, 20)
@@ -409,7 +596,37 @@
_missionDes: `${item.missionList.map((m) => m.missionCode).join('銆�')}鍏�${item.missionList.length}娆
};
const _highRiskGridList = [];
- item.highRiskGridList.forEach((g, i) => {
+ Object.keys(item.highRiskGridMap).forEach((key, i) => {
+ const g = item.highRiskGridMap[key][0];
+
+ const infoDes = item.highRiskGridMap[key].map((e) => {
+ return {
+ factorValue: e.factorValue,
+ // 鍥涜嚦鑼冨洿锛岄『搴忎负鏈�灏忕粡搴︼紝鏈�澶х粡搴︼紝鏈�灏忕含搴︼紝鏈�澶х含搴�
+ _boundsDes: `缁忓害${e.bounds[0]}鑷�${e.bounds[1]}锛岀含搴�${e.bounds[2]}鑷�${e.bounds[3]}`,
+ // 娑夊強琛楅晣
+ town: e.town,
+ _scenesDes:
+ e.highRiskScenes.length > 0
+ ? `娑夊強鐨勬薄鏌撳満鏅寘鎷�${e.highRiskScenes.map((s) => s.name).join('銆�')}`
+ : '缃戞牸鍐呭彲鑳藉瓨鍦ㄩ殣钘忛闄╂簮'
+ };
+ });
+ const infoDes2 = item.highRiskGridMap2[key].map((e) => {
+ return {
+ factorValue: e.factorValue,
+ // 鍥涜嚦鑼冨洿锛岄『搴忎负鏈�灏忕粡搴︼紝鏈�澶х粡搴︼紝鏈�灏忕含搴︼紝鏈�澶х含搴�
+ _boundsDes: `缁忓害${e.bounds[0]}鑷�${e.bounds[1]}锛岀含搴�${e.bounds[2]}鑷�${e.bounds[3]}`,
+ // 娑夊強琛楅晣
+ town: e.town,
+ _scenesDes:
+ e.highRiskScenes.length > 0
+ ? `娑夊強鐨勬薄鏌撳満鏅寘鎷�${e.highRiskScenes.map((s) => s.name).join('銆�')}`
+ : '缃戞牸鍐呭彲鑳藉瓨鍦ㄩ殣钘忛闄╂簮'
+ };
+ });
+ // })
+ // item.highRiskGridList.forEach((g, i) => {
// const g = item.highRiskGridList[0];
// const i = 0;
const p = generateGridFusionImg(g.factorType, item.gridFusionList).then(
@@ -417,20 +634,13 @@
const { url1, url2 } = url;
_highRiskGridList.push({
index: i + 1,
- factor: g.factorType,
+ factor: factorName[g.factorType],
// 鏍囧噯鑹茬綉鏍煎浘
gridImgUrl1: url1,
// 瀵规瘮鑹茬綉鏍煎浘
gridImgUrl2: url2,
- factorValue: g.factorValue,
- // 鍥涜嚦鑼冨洿锛岄『搴忎负鏈�灏忕粡搴︼紝鏈�澶х粡搴︼紝鏈�灏忕含搴︼紝鏈�澶х含搴�
- _boundsDes: `缁忓害${g.bounds[0]}鑷�${g.bounds[1]}锛岀含搴�${g.bounds[2]}鑷�${g.bounds[3]}`,
- // 娑夊強琛楅晣
- town: g.town,
- _scenesDes:
- g.highRiskScenes.length > 0
- ? `娑夊強鐨勬薄鏌撳満鏅寘鎷�${g.highRiskScenes.map((s) => s.name).join('銆�')}`
- : '缃戞牸鍐呭彲鑳藉瓨鍦ㄩ殣钘忛闄╂簮'
+ infoDes: infoDes,
+ infoDes2: infoDes2
});
}
);
@@ -558,70 +768,6 @@
function handleMixClick({ tags = [10, 11], factorName = 'PM25' }) {
generateGridFusion(params.value).then(() => {});
- // const fetchGridData = () => {
- // gridApi.mixUnderwayGridData(props.groupId, tags).then((res) => {
- // var min = 1000000;
- // var max = 0;
- // res.data.forEach((v) => {
- // min = Math.min(min, getGridDataDetailFactorValue(v, factorName));
- // max = Math.max(max, getGridDataDetailFactorValue(v, factorName));
- // });
-
- // const gridData = res.data.map((v) => {
- // const data = getGridDataDetailFactorValue(v, factorName);
- // const grid = gridCellList.value.find((g) => {
- // return g.cellIndex == v.cellId;
- // });
- // // const { color, nextColor, range, nextRange } =
- // // Legend.getStandardColorAndNext('PM25', data);
- // // const ratio = (data - range) / (nextRange - range);
- // // const _color = getColorBetweenTwoColors(
- // // color.map((v) => v * 255),
- // // nextColor.map((v) => v * 255),
- // // ratio
- // // );
-
- // // 鏍规嵁閬ユ祴鏁版嵁璁＄畻缃戞牸棰滆壊
- // const { color, nextColor, range, nextRange } =
- // Legend.getCustomColorAndNext(data, min, max);
- // const ratio = (data - range) / (nextRange - range);
-
- // const _color = getColorBetweenTwoColors(
- // color.map((v) => v * 255),
- // nextColor.map((v) => v * 255),
- // ratio
- // );
- // return {
- // centerLng: grid.longitude,
- // centerLat: grid.latitude,
- // value: _color,
- // coordinates: [
- // [grid.point1Lon, grid.point1Lat],
- // [grid.point2Lon, grid.point2Lat],
- // [grid.point3Lon, grid.point3Lat],
- // [grid.point4Lon, grid.point4Lat]
- // ]
- // };
- // });
- // // chartMapAmap.generateGridMap(gridData).then((url) => {
- // // gridBase64Url.value = url;
- // // });
- // chartMap.generateGridMap(gridData).then((url) => {
- // gridBase64Url.value = url;
- // });
- // });
- // };
-
- // if (gridCellList.value.length == 0) {
- // gridApi
- // .fetchGridCell(props.groupId)
- // .then((res) => {
- // gridCellList.value = res.data;
- // })
- // .then(() => fetchGridData());
- // } else {
- // fetchGridData();
- // }
}
function generateDocx() {
@@ -675,19 +821,28 @@
// 涓嶆槸瀛ｅ害绗竴澶╁垯杩斿洖鍏蜂綋鏃ユ湡鑼冨洿
if (!quarter) {
- return `${startYear}骞�${startMonth + 1}鏈�${startDate}鏃�-${endYear}骞�${endMonth + 1}鏈�${endDate}鏃;
+ // return `${startYear}骞�${startMonth + 1}鏈�${startDate}鏃�-${endYear}骞�${endMonth + 1}鏈�${endDate}鏃;
+ return startYear == endYear
+ ? `${startYear}骞�${startMonth + 1}鏈�-${endMonth + 1}鏈坄
+ : `${startYear}骞�${startMonth + 1}鏈�-${endYear}骞�${endMonth + 1}鏈坄;
}
// 楠岃瘉鏄惁涓哄搴斿搴︽渶鍚庝竴涓湀
const expectedEndMonth = quarter * 3 - 1; // Q1:2(3鏈�), Q2:5(6鏈�), Q3:8(9鏈�), Q4:11(12鏈�)
if (endMonth !== expectedEndMonth) {
- return `${startYear}骞�${startMonth + 1}鏈�${startDate}鏃�-${endYear}骞�${endMonth + 1}鏈�${endDate}鏃;
+ // return `${startYear}骞�${startMonth + 1}鏈�${startDate}鏃�-${endYear}骞�${endMonth + 1}鏈�${endDate}鏃;
+ return startYear == endYear
+ ? `${startYear}骞�${startMonth + 1}鏈�-${endMonth + 1}鏈坄
+ : `${startYear}骞�${startMonth + 1}鏈�-${endYear}骞�${endMonth + 1}鏈坄;
}
// 楠岃瘉鏄惁涓哄搴︽渶鍚庝竴澶�
const lastDayOfEndMonth = new Date(endYear, endMonth + 1, 0).getDate();
if (endDate !== lastDayOfEndMonth) {
- return `${startYear}骞�${startMonth + 1}鏈�${startDate}鏃�-${endYear}骞�${endMonth + 1}鏈�${endDate}鏃;
+ // return `${startYear}骞�${startMonth + 1}鏈�${startDate}鏃�-${endYear}骞�${endMonth + 1}鏈�${endDate}鏃;
+ return startYear == endYear
+ ? `${startYear}骞�${startMonth + 1}鏈�-${endMonth + 1}鏈坄
+ : `${startYear}骞�${startMonth + 1}鏈�-${endYear}骞�${endMonth + 1}鏈坄;
}
const quarterNames = ['', '绗竴瀛ｅ害', '绗簩瀛ｅ害', '绗笁瀛ｅ害', '绗洓瀛ｅ害'];
@@ -754,3 +909,8 @@
return `${datePart} ${startTimePart}鑷�${endTimePart}`;
}
</script>
+<style scoped>
+.el-checkbox {
+ --el-checkbox-text-color: white;
+}
+</style>
--
Gitblit v1.9.3