From ba7065fdcf6fe48d002908a1a7666a480e805021 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 05 十一月 2025 17:35:30 +0800
Subject: [PATCH] Merge branch 'master' of ssh://114.215.109.124:29418/underway-vue
---
src/api/index.js | 8 ++--
src/views/historymode/component/MissionReport.vue | 77 ++++++++++++++++++++++++++++++++++++++
2 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 80bd79b..c2adcb9 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/views/historymode/component/MissionReport.vue b/src/views/historymode/component/MissionReport.vue
index 8e772be..da63ad1 100644
--- a/src/views/historymode/component/MissionReport.vue
+++ b/src/views/historymode/component/MissionReport.vue
@@ -450,6 +450,7 @@
_title: _riskRegion,
_factorNames: Object.keys(clue.pollutedData.statisticMap)
.map((e) => factorName[e])
+<<<<<<< HEAD
.join('銆�'),
_date: moment(clue.pollutedData.startTime).format('YYYY-MM-DD'),
_time:
@@ -533,6 +534,82 @@
// })
// };
// })
+=======
+ .join('銆�');
+ return {
+ index: index2 + 1,
+ factor: factorNames,
+ clues: clues2.map((item3, index3) => {
+ 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.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('銆�'),
+ _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)}绫筹紱`
+ };
+ })
+ };
+ })
+ };
+ })
+>>>>>>> ce17d42203a17120736d796d0e83b3742c4ec441
};
});
});
--
Gitblit v1.9.3