From ce17d42203a17120736d796d0e83b3742c4ec441 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期二, 21 十月 2025 21:54:52 +0800
Subject: [PATCH] 2025.10.21
---
src/views/historymode/component/MissionReport.vue | 152 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 105 insertions(+), 47 deletions(-)
diff --git a/src/views/historymode/component/MissionReport.vue b/src/views/historymode/component/MissionReport.vue
index 9eb05e6..e95f0a8 100644
--- a/src/views/historymode/component/MissionReport.vue
+++ b/src/views/historymode/component/MissionReport.vue
@@ -14,14 +14,19 @@
></OptionLocation2>
</el-form-item>
<OptionTime v-model="formObj.timeArray"></OptionTime>
- <el-form-item label="绉婚櫎鍏朵粬鍖哄幙" prop="removeOtherDistrict">
+ <el-form-item label="鍖哄幙绛涢��" prop="removeOtherDistrict">
<el-checkbox v-model="formObj.removeOtherDistrict"
>绉婚櫎鍏朵粬鍖哄幙</el-checkbox
>
</el-form-item>
- <el-form-item label="绉婚櫎鏈薄鏌撴簮" prop="removeNoPollutedSource">
+ <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>
@@ -45,7 +50,7 @@
<!-- <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"
class="el-button-custom"
@@ -63,7 +68,7 @@
/>
</el-form-item>
</el-form-item>
- </el-form-item> -->
+ </el-form-item>
</el-form>
</CardDialog>
</template>
@@ -250,6 +255,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);
@@ -275,7 +284,7 @@
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) => factorName[factor])
.join('銆�');
@@ -312,7 +321,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) => {
@@ -340,6 +349,7 @@
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) => {
@@ -359,23 +369,43 @@
index: index2 + 1,
factor: factorNames,
clues: clues2.map((item3, index3) => {
- // const _riskRegion = [];
- // if (clue.pollutedArea.address) {
- // _riskRegion.push(clue.pollutedArea.address);
- // }
- // if (clue.pollutedArea.streetNumber) {
- // _riskRegion.push(clue.pollutedArea.streetNumber);
- // }
- // if (clue.pollutedArea.roadinter) {
- // _riskRegion.push(clue.pollutedArea.roadinter);
- // }
- const clue = item3.clue
- return {
- index: index3+1,
- _title:
+ const clue = item3.clue;
+ let _riskRegion = '';
+ if (
+ parseInt(clue.pollutedArea.distance) <
+ parseInt(clue.pollutedArea.distance2)
+ ) {
+ 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;
+ }
+ } else {
+ _riskRegion +=
+ (clue.pollutedArea.address ?? '') +
+ '锛�' +
(clue.pollutedArea.street ?? '') +
- (clue.pollutedArea.streetNumber ?? '') +
- (clue.pollutedArea.direction ?? ''),
+ (clue.pollutedArea.roadinter ?? '') +
+ '锛�';
+ }
+ return {
+ index: index3 + 1 + '',
+ showPollutedArea: formObj.value.showPollutedArea,
+ _title:
+ // (clue.pollutedArea.street ?? '') +
+ // (clue.pollutedArea.streetNumber ?? '') +
+ // (clue.pollutedArea.direction ?? ''),
+ clue.pollutedArea.address ?? '',
_factorNames: Object.keys(clue.pollutedData.statisticMap)
.map((e) => factorName[e])
.join('銆�'),
@@ -385,24 +415,25 @@
) +
' - ' +
moment(clue.pollutedData.endTime).format('HH:mm:ss'),
- _riskRegion:
- (clue.pollutedArea.address ?? '') +
- (clue.pollutedArea.street ?? '') +
- (clue.pollutedArea.streetNumber ?? '') +
- (clue.pollutedArea.direction ?? ''),
+ _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('\n')
- : '鏃�'
+ // _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)}绫筹紱`
+ };
+ })
};
})
};
@@ -424,13 +455,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)
@@ -482,6 +517,19 @@
: '缃戞牸鍐呭彲鑳藉瓨鍦ㄩ殣钘忛闄╂簮'
};
});
+ 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];
@@ -496,7 +544,8 @@
gridImgUrl1: url1,
// 瀵规瘮鑹茬綉鏍煎浘
gridImgUrl2: url2,
- infoDes: infoDes
+ infoDes: infoDes,
+ infoDes2: infoDes2
});
}
);
@@ -677,19 +726,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 = ['', '绗竴瀛ｅ害', '绗簩瀛ｅ害', '绗笁瀛ｅ害', '绗洓瀛ｅ害'];
--
Gitblit v1.9.3