From 6db6811b1a0dbff49f75415c45e16470615d5fe8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 15 十月 2025 17:36:26 +0800
Subject: [PATCH] 2025.10.15 修改季度报告生成逻辑
---
src/api/dataAnalysisApi.js | 8 ++--
src/api/index.js | 3 +
src/views/underwaymix/UnderwayMixMode.vue | 3 +
src/views/historymode/component/MissionReport.vue | 100 +++++++++++++++----------------------------------
4 files changed, 39 insertions(+), 75 deletions(-)
diff --git a/src/api/dataAnalysisApi.js b/src/api/dataAnalysisApi.js
index 66726a6..d2eceb1 100644
--- a/src/api/dataAnalysisApi.js
+++ b/src/api/dataAnalysisApi.js
@@ -84,13 +84,13 @@
* @param {*} startTime 寮�濮嬫椂闂达紝鏍煎紡YYYY-MM-DD HH:mm:ss
* @param {*} endTime 缁撴潫鏃堕棿锛屾牸寮廦YYY-MM-DD HH:mm:ss
* @param {*} area 鍖哄煙
+ * @param {*} removeOtherDistrict 鏄惁绉婚櫎鍏朵粬鍖哄幙
+ * @param {*} removeNoPollutedSource 鏄惁绉婚櫎鏈薄鏌撴簮
* @returns
*/
- fetchClueByRiskArea({ startTime, endTime, area }) {
+ fetchClueByRiskArea(analysisOption) {
return $http
- .post(`air/analysis/report/clueByRiskArea`, area, {
- params: { startTime, endTime }
- })
+ .post(`air/analysis/report/clueByRiskArea`, analysisOption)
.then((res) => res.data);
},
diff --git a/src/api/index.js b/src/api/index.js
index ef12b54..19b0941 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -21,7 +21,8 @@
const $http = axios.create({
baseURL: ip1,
- timeout: 30000
+ // timeout: 30000,
+ timeout: 0
});
//娣诲姞鎷︽埅鍣�
diff --git a/src/views/historymode/component/MissionReport.vue b/src/views/historymode/component/MissionReport.vue
index cc0878c..4a0a9d2 100644
--- a/src/views/historymode/component/MissionReport.vue
+++ b/src/views/historymode/component/MissionReport.vue
@@ -14,6 +14,16 @@
></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>
<el-button
type="primary"
@@ -35,7 +45,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"
@@ -53,7 +63,7 @@
/>
</el-form-item>
</el-form-item>
- </el-form-item> -->
+ </el-form-item>
</el-form>
</CardDialog>
</template>
@@ -83,7 +93,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 +118,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)
};
});
@@ -314,7 +326,14 @@
}
function generateClueByRiskArea(param) {
- return dataAnalysisApi.fetchClueByRiskArea(param).then((res) => {
+ const _param = {
+ area: param.area,
+ startTime: param.startTime,
+ endTime: param.endTime,
+ removeOtherDistrict: param.removeOtherDistrict,
+ removeNoPollutedSource: param.removeNoPollutedSource
+ };
+ return dataAnalysisApi.fetchClueByRiskArea(_param).then((res) => {
templateParam.clueByAreaList = res.data.map((item, index) => {
return {
_index: index + 1,
@@ -329,7 +348,9 @@
.map((e) => e)
.join('銆�'),
_time:
- moment(clue.pollutedData.startTime).format('HH:mm:ss') +
+ moment(clue.pollutedData.startTime).format(
+ 'YYYY-MM-DD HH:mm:ss'
+ ) +
' - ' +
moment(clue.pollutedData.endTime).format('HH:mm:ss'),
_riskRegion: clue.pollutedArea.address
@@ -559,70 +580,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() {
@@ -755,3 +712,8 @@
return `${datePart} ${startTimePart}鑷�${endTimePart}`;
}
</script>
+<style scoped>
+.el-checkbox {
+ --el-checkbox-text-color: white;
+}
+</style>
diff --git a/src/views/underwaymix/UnderwayMixMode.vue b/src/views/underwaymix/UnderwayMixMode.vue
index 060cb1d..de55333 100644
--- a/src/views/underwaymix/UnderwayMixMode.vue
+++ b/src/views/underwaymix/UnderwayMixMode.vue
@@ -545,7 +545,8 @@
return !lastSelectedfusionData.value.find((t) => t.id == v.id);
});
- if (val.length > 4) {
+ // 鍘婚櫎閫夋嫨涓婇檺璀﹀憡
+ if (false && val.length > 4) {
useMessageBox({
confirmMsg: '鏈�澶氬厑璁稿悓鏃跺睍绀�4娆¤蛋鑸褰�',
confirmTitle: '璧拌埅璁板綍閫夋嫨杩囧璀﹀憡'
--
Gitblit v1.9.3