From dd2ff26f240bcb79de082f1de4eaf6d2c973b28e Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期一, 20 十月 2025 08:38:01 +0800
Subject: [PATCH] 2025.10.18 修改嫉妒报告生成逻辑
---
public/underway_season_report.docx | 0
src/api/index.js | 8 ++++----
src/components.d.ts | 2 --
src/views/historymode/component/MissionReport.vue | 23 +++++++++++++----------
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/public/underway_season_report.docx b/public/underway_season_report.docx
index 5e6f7d4..0a7dc0c 100644
--- a/public/underway_season_report.docx
+++ b/public/underway_season_report.docx
Binary files differ
diff --git a/src/api/index.js b/src/api/index.js
index 19b0941..8eac640 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -13,10 +13,10 @@
}
if (debug) {
- ip1 = 'http://192.168.0.103:8084/';
- // ip1 = 'http://localhost:8084/';
- ws = `192.168.0.103:9031`;
- // ws = `localhost:9031`;
+ // ip1 = 'http://192.168.0.103:8084/';
+ ip1 = 'http://localhost:8084/';
+ // ws = `192.168.0.103:9031`;
+ ws = `localhost:9031`;
}
const $http = axios.create({
diff --git a/src/components.d.ts b/src/components.d.ts
index 8ecc1ef..462a661 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -31,7 +31,6 @@
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDialog: typeof import('element-plus/es')['ElDialog']
- ElDivider: typeof import('element-plus/es')['ElDivider']
ElDropdown: typeof import('element-plus/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
@@ -39,7 +38,6 @@
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElInput: typeof import('element-plus/es')['ElInput']
- ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
diff --git a/src/views/historymode/component/MissionReport.vue b/src/views/historymode/component/MissionReport.vue
index 422c678..15ca99d 100644
--- a/src/views/historymode/component/MissionReport.vue
+++ b/src/views/historymode/component/MissionReport.vue
@@ -350,14 +350,15 @@
_area: `${township}`,
clueByFactorList: clues
.groupBy((e) => e.factorTag)
- .map((item2) => {
+ .map((item2, index2) => {
const { key: factorTag, values: clues2 } = item2;
const factorNames = [...new Set(clues2.flatMap((e) => e.factors))]
- .map((e) => factorName(e))
+ .map((e) => factorName[e])
.join('銆�');
return {
+ index: index2 + 1,
factor: factorNames,
- clues: clues2.map((clue) => {
+ clues: clues2.map((item3, index3) => {
// const _riskRegion = [];
// if (clue.pollutedArea.address) {
// _riskRegion.push(clue.pollutedArea.address);
@@ -368,13 +369,15 @@
// if (clue.pollutedArea.roadinter) {
// _riskRegion.push(clue.pollutedArea.roadinter);
// }
+ const clue = item3.clue
return {
+ index: index3+1,
_title:
(clue.pollutedArea.street ?? '') +
(clue.pollutedArea.streetNumber ?? '') +
(clue.pollutedArea.direction ?? ''),
_factorNames: Object.keys(clue.pollutedData.statisticMap)
- .map((e) => factorName(e))
+ .map((e) => factorName[e])
.join('銆�'),
_time:
moment(clue.pollutedData.startTime).format(
@@ -468,14 +471,14 @@
const infoDes = item.highRiskGridMap[key].map((e) => {
return {
- factorValue: g.factorValue,
+ factorValue: e.factorValue,
// 鍥涜嚦鑼冨洿锛岄『搴忎负鏈�灏忕粡搴︼紝鏈�澶х粡搴︼紝鏈�灏忕含搴︼紝鏈�澶х含搴�
- _boundsDes: `缁忓害${g.bounds[0]}鑷�${g.bounds[1]}锛岀含搴�${g.bounds[2]}鑷�${g.bounds[3]}`,
+ _boundsDes: `缁忓害${e.bounds[0]}鑷�${e.bounds[1]}锛岀含搴�${e.bounds[2]}鑷�${e.bounds[3]}`,
// 娑夊強琛楅晣
- town: g.town,
+ town: e.town,
_scenesDes:
- g.highRiskScenes.length > 0
- ? `娑夊強鐨勬薄鏌撳満鏅寘鎷�${g.highRiskScenes.map((s) => s.name).join('銆�')}`
+ e.highRiskScenes.length > 0
+ ? `娑夊強鐨勬薄鏌撳満鏅寘鎷�${e.highRiskScenes.map((s) => s.name).join('銆�')}`
: '缃戞牸鍐呭彲鑳藉瓨鍦ㄩ殣钘忛闄╂簮'
};
});
@@ -488,7 +491,7 @@
const { url1, url2 } = url;
_highRiskGridList.push({
index: i + 1,
- factor: factorName(g.factorType),
+ factor: factorName[g.factorType],
// 鏍囧噯鑹茬綉鏍煎浘
gridImgUrl1: url1,
// 瀵规瘮鑹茬綉鏍煎浘
--
Gitblit v1.9.3