From 87e19b5a396ac8fed6a551828b87d263f6425c31 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 16 十月 2025 10:26:12 +0800
Subject: [PATCH] 2025.10.16 修改季度报告生成逻辑
---
src/views/underwaymix/UnderwayMixMode.vue | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/views/underwaymix/UnderwayMixMode.vue b/src/views/underwaymix/UnderwayMixMode.vue
index fed5590..de55333 100644
--- a/src/views/underwaymix/UnderwayMixMode.vue
+++ b/src/views/underwaymix/UnderwayMixMode.vue
@@ -128,13 +128,13 @@
prop="zone"
label="鍖哄煙"
align="center"
- width="50"
+ width="60"
/>
<el-table-column
prop="pollutionDegree"
label="姹℃煋鑳屾櫙"
align="center"
- width="70"
+ width="66"
/>
</el-table>
@@ -158,6 +158,14 @@
>
{{ '铻嶅悎鍒嗘瀽' }}
</el-button>
+ <el-button
+ type="primary"
+ class="el-button-custom"
+ size="small"
+ @click="underwayMixDialogVisible = true"
+ >
+ {{ '铻嶅悎绠＄悊' }}
+ </el-button>
<!-- <CheckButton
active-text="铻嶅悎鍒嗘瀽"
:default-value="false"
@@ -180,12 +188,21 @@
<!-- </el-row> -->
</el-col>
</el-row>
- <GridStyleTool
- :gridCtrls="gridCtrls"
- @show-underway="handleUnderwayClick"
- @on-delete="handleFusionDelete"
- ></GridStyleTool>
</el-row>
+ <GridStyleTool
+ class="style-tool"
+ :gridCtrls="gridCtrls"
+ @show-underway="handleUnderwayClick"
+ @on-delete="handleFusionDelete"
+ ></GridStyleTool>
+ <!-- <el-row class="m-t-2">
+ <FactorLegend class="m-t-2" @change="handleLegendTypeChange"></FactorLegend>
+ </el-row> -->
+ <UnderwayMixManage
+ :groupId="groupId"
+ v-model="underwayMixDialogVisible"
+ @onUpdated="fetchFusionData"
+ ></UnderwayMixManage>
<!-- </div> -->
</template>
@@ -194,12 +211,14 @@
import moment from 'moment';
import gridApi from '@/api/gridApi';
import { SatelliteGrid } from '@/model/SatelliteGrid';
-import GridStyleTool from './component/GridStyleTool.vue';
import { useGridStore } from '@/stores/grid-info';
import { TYPE0 } from '@/constant/device-type';
import { defaultOptions } from '@/constant/radio-options';
import { useMessageBox } from '@/composables/messageBox';
import { useCloned } from '@vueuse/core';
+
+import GridStyleTool from './component/GridStyleTool.vue';
+import UnderwayMixManage from './component/UnderwayMixManage.vue';
const gridStore = useGridStore();
@@ -210,7 +229,7 @@
const props = defineProps({
groupId: {
type: Number,
- default: 3
+ default: import.meta.env.VITE_DATA_MODE == 'jingan' ? 2 : 3
}
});
const show = ref(true);
@@ -218,14 +237,18 @@
// 鐩戞祴鍥犲瓙鐨勭被鍨嬬紪鍙�
const factorType = ref(defaultOptions(TYPE0));
satelliteGrid.setShowFactorType(toRaw(factorType.value));
+// const factor = computed(()=>{
+
+// })
function handleFactorTypeChange(e, item) {
factorType.value = item;
- console.log(toRaw(factorType.value));
+ // console.log(toRaw(factorType.value));
satelliteGrid.setShowFactorType(toRaw(factorType.value));
}
const mission = ref(undefined);
+const underwayMixDialogVisible = ref(false);
const gridCellList = ref(undefined);
const fusionData = ref(undefined);
@@ -393,38 +416,8 @@
.finally(() => (fusionLoading.value = false));
}
-// 妫�鏌ヨ蛋鑸暟鎹槸鍚﹀拰100绫崇綉鏍煎凡铻嶅悎
-// function checkUnderwayFusionResult() {
-// const time = moment(mission.value.startTime).format('YYYY-MM-DD HH:mm:ss');
-// gridApi.fetchGridData(props.groupId, time, 3).then((res) => {
-// if (res.data.length > 0) {
-// fusionData.value = res.data[0];
-// } else {
-// fusionData.value = undefined;
-// }
-// });
-// }
-
function prepareGrid(gridInfo) {
- satelliteGrid.gridPrepare(gridInfo, function (polygon) {
- // const originOption = polygon.getOptions();
- // //榧犳爣绉诲叆浜嬩欢
- // polygon.on('mouseover', () => {
- // polygon.setOptions({
- // //淇敼澶氳竟褰㈠睘鎬х殑鏂规硶
- // strokeWeight: 2,
- // strokeColor: 'red'
- // });
- // });
- // //榧犳爣绉诲嚭浜嬩欢
- // polygon.on('mouseout', () => {
- // // polygon.setOptions({
- // // strokeWeight: originOption.strokeWeight,
- // // strokeColor: originOption.strokeColor
- // // });
- // polygon.setOptions(originOption);
- // });
- });
+ satelliteGrid.gridPrepare(gridInfo);
}
watch(
@@ -462,7 +455,7 @@
tag: d.id,
data: gdd,
extData: {
- name: `璧拌埅缃戞牸 - ${d.mixDataId}`,
+ name: `璧拌埅缃戞牸 - ${d.missionCode}`,
type: 0
}
});
@@ -523,7 +516,7 @@
} else {
const d = fusionDataList.value.find((v) => v.id == dataId);
const mission = missionStore.missionList.find((v) => {
- return v.missionCode == d.mixDataId;
+ return v.missionCode == d.missionCode;
});
mapLine.hideLine(mission.missionCode);
done();
@@ -552,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: '璧拌埅璁板綍閫夋嫨杩囧璀﹀憡'
@@ -578,7 +572,7 @@
tag: d.id,
data: gdd,
extData: {
- name: `璧拌埅缃戞牸 - ${d.mixDataId}`,
+ name: `璧拌埅缃戞牸 - ${d.missionCode}`,
type: 0
}
});
@@ -602,7 +596,7 @@
tag: d.id,
data: gdd,
extData: {
- name: `璧拌埅缃戞牸 - ${d.mixDataId}`,
+ name: `璧拌埅缃戞牸 - ${d.missionCode}`,
type: 0
}
});
@@ -679,7 +673,7 @@
if (isUnmounted.value) return Promise.resolve();
const d = fusionDataList.value.find((v) => v.id == dataId);
const mission = missionStore.missionList.find((v) => {
- return v.missionCode == d.mixDataId;
+ return v.missionCode == d.missionCode;
});
if (factorDataMap.has(mission.missionCode)) {
@@ -707,6 +701,12 @@
}
</script>
<style scoped>
+.style-tool {
+ position: absolute;
+ top: 0;
+ right: 0;
+}
+
:deep(.el-table) {
--el-table-bg-color: transparent;
--el-table-row-hover-bg-color: var(--select_color);
--
Gitblit v1.9.3