From dd527b7615517c53d7e4de92ae6cc87c18fa844c Mon Sep 17 00:00:00 2001 From: guonan <guonan201020@163.com> Date: 星期二, 22 四月 2025 11:12:22 +0800 Subject: [PATCH] 保留api --- src/api/requestTR.js | 2 vue.config.js | 6 src/api/trApi.js | 10 src/views/Home.vue | 4 src/views/left/Left.vue | 69 ++-- src/views/left/CitySim.vue | 138 ++++---- src/components/monifangzhen/schemeCard.vue | 614 +++++++++++++++++++++------------------- 7 files changed, 430 insertions(+), 413 deletions(-) diff --git a/src/api/requestTR.js b/src/api/requestTR.js index 8ad4b02..c404aac 100644 --- a/src/api/requestTR.js +++ b/src/api/requestTR.js @@ -5,7 +5,7 @@ baseURL: "/api", // 浣跨敤浣犻厤缃殑 /auth 浠g悊 timeout: 1000 * 60, // 璇锋眰瓒呮椂鏃堕棿锛堝崟浣嶏細姣锛� headers: { - "Content-Type": "application/x-www-form-urlencoded", // 榛樿璇锋眰澶� + "Content-Type": "application/x-www-form-urlencoded", // 榛樿璇锋眰澶碼pplication/json }, }); // 璇锋眰鎷︽埅鍣� diff --git a/src/api/trApi.js b/src/api/trApi.js index b479b83..3eac1ae 100644 --- a/src/api/trApi.js +++ b/src/api/trApi.js @@ -1,9 +1,9 @@ -import axios from "./requestTR.js"; +import instance from "./requestTR.js"; // 鑾峰彇闆ㄩ噺鏁版嵁 export async function getData() { try { - const response = await axios.get("/region/selectPage", { + const response = await instance.get("/region/selectPage", { }); // console.log("Response:", response); } catch (error) { @@ -14,7 +14,7 @@ // 鑾峰彇鏂规鍒楄〃 export async function getSimData() { try { - const res = await axios.get("/simu/selectPage"); + const res = await instance.get("/simu/selectPage"); return res.data; // 杩斿洖瀹為檯鏁版嵁锛堥�氬父 res.data 鎵嶆槸鎺ュ彛杩斿洖鐨勫唴瀹癸級 } catch (error) { console.error("Error fetching data:", error); @@ -25,7 +25,7 @@ // 鏂板缓浠跨湡鏂规 export async function createSimData(simData) { try { - const res = await axios.post("/simu/insert", simData, { + const res = await instance.post("/simu/insert", simData, { headers: { "Content-Type": "application/json", }, @@ -40,7 +40,7 @@ // 鍒犻櫎浠跨湡鏂规 export async function deleteSimData(ids) { try { - const res = await axios.delete(`/simu/deleteByIds?ids=${ids}`); + const res = await instance.delete(`/simu/deleteByIds?ids=${ids}`); return res.data; } catch (error) { console.error('Error deleting simulation data:', error); diff --git a/src/components/monifangzhen/schemeCard.vue b/src/components/monifangzhen/schemeCard.vue index b2f8994..0d2c57c 100644 --- a/src/components/monifangzhen/schemeCard.vue +++ b/src/components/monifangzhen/schemeCard.vue @@ -2,8 +2,15 @@ <div class="listCard"> <!-- <div>鏂规鏁伴噺: {{ simStore.schemCard.length }}</div> --> <!-- 鎺ュ彛鐗堟湰鍒犻櫎璇ヤ唬鐮佸潡 --> - <el-card v-if="!schemeInfoShow" v-for="(item, key) in simStore.schemCard" :key="key" - :class="{ selected: selectedId === item.id }" @click="selectScheme(item.id)"> + <!-- <el-card v-if="!schemeInfoShow" v-for="(item, key) in simStore.schemCard" :key="key" + :class="{ selected: selectedId === item.id }" @click="selectScheme(item.id)"> --> + <el-card + v-if="!schemeInfoShow" + v-for="(item, key) in schemeList" + :key="key" + :class="{ selected: selectedId === item.id }" + @click="selectScheme(item.id)" + > <div> <p>鏂规鍚嶇О : {{ item.name }}</p> <p>鍒涘缓鏃堕棿 : {{ formatTime(item.createTime) }}</p> @@ -16,16 +23,27 @@ </div> <div class="cardMenu"> <div style="float: right; margin-top: 3px"> - <el-button size="small" @click="setSchemClick(item)">鏂规璇︽儏</el-button> + <el-button size="small" @click="setSchemClick(item)" + >鏂规璇︽儏</el-button + > <el-button size="small" @click="startPlay(item)">杩涘叆妯℃嫙</el-button> <!-- :disabled="item.taskStatus !== 2" --> </div> </div> </el-card> - <schemeInfo v-if="schemeInfoShow" :selectedScheme="currentScheme" @back="handleBack" /> + <schemeInfo + v-if="schemeInfoShow" + :selectedScheme="currentScheme" + @back="handleBack" + /> </div> - <Message @close="close" class="mess" v-show="messageShow" :mesData="mesData" /> + <Message + @close="close" + class="mess" + v-show="messageShow" + :mesData="mesData" + /> </template> <script setup> @@ -48,248 +66,248 @@ function selectScheme(id) { selectedId.value = id; } -simStore.setSchemCard([ - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2025-01-13 19:33:04", - datPath: "e:/data/hydro/11011611021801/1878767214615695362", - dataType: 2, - dataValue: "", - depthThreshold: 0, - endTime: "2023-08-01 01:59:59", - fileCount: 299, - fileName: "涓滄睙娌熼洦閲忚0110.xls", - hotStart: false, - id: "1878767214431145986", - name: "闄嶉洦鏁版嵁锛氭埧灞卞尯涓滄睙娌熸暟鎹�", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2023-07-30 00:00:00", - taskId: "1878767214615695362", - taskStatus: 2, - updateTime: "2025-01-13 19:33:04", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2025-01-10 14:33:49", - datPath: "e:/data/hydro/11011611021801/1877604741980196866", - dataType: 2, - dataValue: "", - depthThreshold: 0, - endTime: "2023-08-02 01:00:00", - fileCount: 450, - fileName: "涓滄睙娌熼洦閲忚0110.xls", - hotStart: false, - id: "1877604741590126594", - name: "涓滄睙娌�0729-0801", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2023-07-29 22:00:00", - taskId: "1877604741980196866", - taskStatus: 2, - updateTime: "2025-01-10 14:33:49", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-12-27 12:28:45", - datPath: "e:/data/hydro/11011611021801/1872499838538584065", - dataType: 2, - dataValue: "", - depthThreshold: 0, - endTime: "2023-08-02 09:00:00", - fileCount: 654, - fileName: "涓滄睙娌熼洦閲忚0110.xls", - hotStart: false, - id: "1872499838278537217", - name: "鍖椾含甯�731鏆撮洦", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2023-07-28 20:00:00", - taskId: "1872499838538584065", - taskStatus: 2, - updateTime: "2024-12-27 12:28:45", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-12-20 15:00:11", - datPath: "e:/data/hydro/11011611021801/1870001233680502786", - dataType: 0, - dataValue: "", - depthThreshold: 0, - endTime: "2024-12-20 06:00:00", - fileCount: 86, - fileName: "", - hotStart: false, - id: "1870001233646948354", - name: "闆ㄥ己30mm", - noRainTime: 0, - outputPeriod: 300, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2024-12-20 00:00:00", - taskId: "1870001233680502786", - taskStatus: 2, - updateTime: "2024-12-20 15:00:11", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-12-19 17:34:34", - datPath: "e:/data/hydro/11011611021801/1869677696923045889", - dataType: 2, - dataValue: "", - depthThreshold: 0, - endTime: "2023-08-01 03:00:44", - fileCount: 388, - fileName: "鎴祦鍧濋洦閲忚0068.xls", - hotStart: false, - id: "1869677696608473090", - name: "鎴祦鍧濇暟鎹ā鎷�0729-0731", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2023-07-29 21:00:13", - taskId: "1869677696923045889", - taskStatus: 2, - updateTime: "2024-12-19 17:34:34", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-12-13 15:03:24", - datPath: "e:/data/hydro/11011611021801/1867465327392165890", - dataType: 2, - dataValue: "", - depthThreshold: 0, - endTime: "2023-07-31 12:00:00", - fileCount: 288, - fileName: "涓滄睙娌熼洦閲忚0110.xls", - hotStart: false, - id: "1867465327106953218", - name: "涓滄睙娌熸暟鎹ā鎷�0729-0731", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2023-07-29 12:00:00", - taskId: "1867465327392165890", - taskStatus: 2, - updateTime: "2024-12-13 15:03:24", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-11-28 19:01:16", - datPath: "e:/data/hydro/11011611021801/1862089369491931138", - dataType: 2, - dataValue: "", - depthThreshold: 0, - endTime: "2023-07-31 00:00:00", - fileCount: 145, - fileName: "涓滄睙娌熼洦閲忚0110.xls", - hotStart: false, - id: "1862089369462571010", - name: "涓滄睙娌熼洦閲�0731", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2023-07-30 00:00:00", - taskId: "1862089369491931138", - taskStatus: 2, - updateTime: "2024-11-28 19:01:16", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-11-28 18:47:45", - datPath: "e:/data/hydro/11011611021801/1862085967261270017", - dataType: 0, - dataValue: "", - depthThreshold: 0, - endTime: "2024-08-31 00:00:00", - fileCount: 145, - fileName: "", - hotStart: false, - id: "1862085967252881410", - name: "闆ㄥ己妯℃嫙鏂规0830", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2024-08-30 00:00:00", - taskId: "1862085967261270017", - taskStatus: 2, - updateTime: "2024-11-28 18:47:45", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-11-28 18:39:49", - datPath: "e:/data/hydro/11011611021801/1862083971414294529", - dataType: 1, - dataValue: "", - depthThreshold: 0, - endTime: "2024-07-31 00:00:00", - fileCount: 145, - fileName: "", - hotStart: false, - id: "1862083971003252737", - name: "闆ㄩ噺妯℃嫙鏂规0730", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2024-07-30 00:00:00", - taskId: "1862083971414294529", - taskStatus: 2, - updateTime: "2024-11-28 18:39:49", - userId: "0", - }, - { - area: "瀛欒儭娌�", - areaId: "0", - createTime: "2024-11-28 17:26:45", - datPath: "e:/data/hydro/11011611021801/1862065584806100994", - dataType: 0, - dataValue: "", - depthThreshold: 0, - endTime: "2024-11-28 09:26:17", - fileCount: 57, - fileName: "", - hotStart: false, - id: "1862065584743186434", - name: "闆ㄥ己妯℃嫙鏂规1128", - noRainTime: 0, - outputPeriod: 600, - shpPath: "e:/data/hydro/11011611021801/shp", - simulateType: 1, - startTime: "2024-11-28 00:00:00", - taskId: "1862065584806100994", - taskStatus: 2, - updateTime: "2024-11-28 17:26:45", - userId: "0", - }, -]); +// simStore.setSchemCard([ +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2025-01-13 19:33:04", +// datPath: "e:/data/hydro/11011611021801/1878767214615695362", +// dataType: 2, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2023-08-01 01:59:59", +// fileCount: 299, +// fileName: "涓滄睙娌熼洦閲忚0110.xls", +// hotStart: false, +// id: "1878767214431145986", +// name: "闄嶉洦鏁版嵁锛氭埧灞卞尯涓滄睙娌熸暟鎹�", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2023-07-30 00:00:00", +// taskId: "1878767214615695362", +// taskStatus: 2, +// updateTime: "2025-01-13 19:33:04", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2025-01-10 14:33:49", +// datPath: "e:/data/hydro/11011611021801/1877604741980196866", +// dataType: 2, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2023-08-02 01:00:00", +// fileCount: 450, +// fileName: "涓滄睙娌熼洦閲忚0110.xls", +// hotStart: false, +// id: "1877604741590126594", +// name: "涓滄睙娌�0729-0801", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2023-07-29 22:00:00", +// taskId: "1877604741980196866", +// taskStatus: 2, +// updateTime: "2025-01-10 14:33:49", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-12-27 12:28:45", +// datPath: "e:/data/hydro/11011611021801/1872499838538584065", +// dataType: 2, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2023-08-02 09:00:00", +// fileCount: 654, +// fileName: "涓滄睙娌熼洦閲忚0110.xls", +// hotStart: false, +// id: "1872499838278537217", +// name: "鍖椾含甯�731鏆撮洦", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2023-07-28 20:00:00", +// taskId: "1872499838538584065", +// taskStatus: 2, +// updateTime: "2024-12-27 12:28:45", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-12-20 15:00:11", +// datPath: "e:/data/hydro/11011611021801/1870001233680502786", +// dataType: 0, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2024-12-20 06:00:00", +// fileCount: 86, +// fileName: "", +// hotStart: false, +// id: "1870001233646948354", +// name: "闆ㄥ己30mm", +// noRainTime: 0, +// outputPeriod: 300, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2024-12-20 00:00:00", +// taskId: "1870001233680502786", +// taskStatus: 2, +// updateTime: "2024-12-20 15:00:11", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-12-19 17:34:34", +// datPath: "e:/data/hydro/11011611021801/1869677696923045889", +// dataType: 2, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2023-08-01 03:00:44", +// fileCount: 388, +// fileName: "鎴祦鍧濋洦閲忚0068.xls", +// hotStart: false, +// id: "1869677696608473090", +// name: "鎴祦鍧濇暟鎹ā鎷�0729-0731", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2023-07-29 21:00:13", +// taskId: "1869677696923045889", +// taskStatus: 2, +// updateTime: "2024-12-19 17:34:34", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-12-13 15:03:24", +// datPath: "e:/data/hydro/11011611021801/1867465327392165890", +// dataType: 2, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2023-07-31 12:00:00", +// fileCount: 288, +// fileName: "涓滄睙娌熼洦閲忚0110.xls", +// hotStart: false, +// id: "1867465327106953218", +// name: "涓滄睙娌熸暟鎹ā鎷�0729-0731", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2023-07-29 12:00:00", +// taskId: "1867465327392165890", +// taskStatus: 2, +// updateTime: "2024-12-13 15:03:24", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-11-28 19:01:16", +// datPath: "e:/data/hydro/11011611021801/1862089369491931138", +// dataType: 2, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2023-07-31 00:00:00", +// fileCount: 145, +// fileName: "涓滄睙娌熼洦閲忚0110.xls", +// hotStart: false, +// id: "1862089369462571010", +// name: "涓滄睙娌熼洦閲�0731", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2023-07-30 00:00:00", +// taskId: "1862089369491931138", +// taskStatus: 2, +// updateTime: "2024-11-28 19:01:16", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-11-28 18:47:45", +// datPath: "e:/data/hydro/11011611021801/1862085967261270017", +// dataType: 0, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2024-08-31 00:00:00", +// fileCount: 145, +// fileName: "", +// hotStart: false, +// id: "1862085967252881410", +// name: "闆ㄥ己妯℃嫙鏂规0830", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2024-08-30 00:00:00", +// taskId: "1862085967261270017", +// taskStatus: 2, +// updateTime: "2024-11-28 18:47:45", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-11-28 18:39:49", +// datPath: "e:/data/hydro/11011611021801/1862083971414294529", +// dataType: 1, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2024-07-31 00:00:00", +// fileCount: 145, +// fileName: "", +// hotStart: false, +// id: "1862083971003252737", +// name: "闆ㄩ噺妯℃嫙鏂规0730", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2024-07-30 00:00:00", +// taskId: "1862083971414294529", +// taskStatus: 2, +// updateTime: "2024-11-28 18:39:49", +// userId: "0", +// }, +// { +// area: "瀛欒儭娌�", +// areaId: "0", +// createTime: "2024-11-28 17:26:45", +// datPath: "e:/data/hydro/11011611021801/1862065584806100994", +// dataType: 0, +// dataValue: "", +// depthThreshold: 0, +// endTime: "2024-11-28 09:26:17", +// fileCount: 57, +// fileName: "", +// hotStart: false, +// id: "1862065584743186434", +// name: "闆ㄥ己妯℃嫙鏂规1128", +// noRainTime: 0, +// outputPeriod: 600, +// shpPath: "e:/data/hydro/11011611021801/shp", +// simulateType: 1, +// startTime: "2024-11-28 00:00:00", +// taskId: "1862065584806100994", +// taskStatus: 2, +// updateTime: "2024-11-28 17:26:45", +// userId: "0", +// }, +// ]); const statusText = { 0: "鏈紑濮�", 1: "杩涜涓�", @@ -315,7 +333,7 @@ // return; // } currentScheme.value = item; - schemeInfoShow.value = true + schemeInfoShow.value = true; emit("closeBtn", false); initeWaterPrimitiveView(); emit("start"); @@ -338,63 +356,63 @@ EventBus.on("hide-schemeInfo", handleHideSchemeInfo); //////////////////////////////////// 鏆撮湶閫変腑鐨� ID 缁欑埗缁勪欢锛堟帴鍙g増鏈垹闄わ級//////////////////////////////////// -defineExpose({ - getSelectedId: () => selectedId.value, -}); +// defineExpose({ +// getSelectedId: () => selectedId.value, +// }); /////////////////////// 璋冪敤鎺ュ彛锛堜娇鐢ㄦ椂鎵撳紑锛� /////////////////////// -// import { getData, getSimData, deleteSimData } from "@/api/trApi.js"; -// onMounted(() => { -// getScheme(); -// }); +import { getData, getSimData, deleteSimData } from "@/api/trApi.js"; +onMounted(() => { + getScheme(); +}); -// const props = defineProps({ -// deleteSim: Boolean, // 鎺ユ敹鐖剁粍浠朵紶閫掔殑鍑芥暟 -// }); +const props = defineProps({ + deleteSim: Boolean, // 鎺ユ敹鐖剁粍浠朵紶閫掔殑鍑芥暟 +}); -// watch( -// () => props.deleteSim, -// (newVal) => { -// if (newVal) { -// console.log(newVal); -// deleteSim(); -// emit("reset"); -// } -// } -// ); +watch( + () => props.deleteSim, + (newVal) => { + if (newVal) { + console.log(newVal); + deleteSim(); + emit("reset"); + } + } +); -// const schemeList = ref([]); +const schemeList = ref([]); -// async function getScheme() { -// try { -// const res = await getSimData(); -// schemeList.value = res.data; -// } catch (error) { -// console.error("Error fetching data:", error); -// } -// } +async function getScheme() { + try { + const res = await getSimData(); + schemeList.value = res.data; + } catch (error) { + console.error("Error fetching data:", error); + } +} -// const deleteSim = () => { -// ElMessageBox.confirm("纭畾瑕佸垹闄よ鏂规鍚�?", "鍒犻櫎鏂规", { -// confirmButtonText: "OK", -// cancelButtonText: "Cancel", -// }) -// .then(() => { -// deleteSimData(selectedId.value).then((res) => { -// getScheme(); -// }); -// ElMessage({ -// type: "success", -// message: "鍒犻櫎鎴愬姛", -// }); -// }) -// .catch(() => { -// ElMessage({ -// type: "info", -// message: "宸插彇娑堝垹闄�", -// }); -// }); -// }; +const deleteSim = () => { + ElMessageBox.confirm("纭畾瑕佸垹闄よ鏂规鍚�?", "鍒犻櫎鏂规", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + }) + .then(() => { + deleteSimData(selectedId.value).then((res) => { + getScheme(); + }); + ElMessage({ + type: "success", + message: "鍒犻櫎鎴愬姛", + }); + }) + .catch(() => { + ElMessage({ + type: "info", + message: "宸插彇娑堝垹闄�", + }); + }); +}; /////////////////////// 璋冪敤鎺ュ彛缁撴潫 /////////////////////// onUnmounted(() => { EventBus.off("hide-schemeInfo", handleHideSchemeInfo); diff --git a/src/views/Home.vue b/src/views/Home.vue index ba522a0..2404851 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -57,7 +57,7 @@ // import DangerAssess from "@/components/monifangzhen/DangerAssess.vue"; import { showDeviceDetail } from "@/store"; import { setupTokenRefresh } from "@/api/hpApi.js" -import { getData } from "@/api/trApi.js" +import { getSimData } from "@/api/trApi.js" import { convertToWKT } from '@/utils/wktUtils'; const route = useRoute(); @@ -101,7 +101,7 @@ const showDetail = computed(() => showDeviceDetail.value); onMounted(() => { setupTokenRefresh()// 鑾峰彇瀹忓浘token - getData() //娴嬭瘯tr鍚庣 + getSimData() //娴嬭瘯tr鍚庣 try { const wktResult = convertToWKT(multiPolygonCoordinates); console.log(wktResult); diff --git a/src/views/left/CitySim.vue b/src/views/left/CitySim.vue index ef72134..5fdc7bf 100644 --- a/src/views/left/CitySim.vue +++ b/src/views/left/CitySim.vue @@ -108,7 +108,7 @@ <el-button type="success" @click="startPlay">寮�濮嬫ā鎷�</el-button> </div> <!---------------------------- 淇濆瓨鏂规瀵硅瘽妗嗭紙鎺ュ彛鐗堟湰闇�鍒犻櫎锛� --------------------------------> - <el-dialog + <!-- <el-dialog v-model="saveDialogVisible" :title="dialogTitle" width="50%" @@ -134,7 +134,7 @@ <el-button type="primary" @click="confirmSave">纭畾淇濆瓨</el-button> </span> </template> - </el-dialog> + </el-dialog> --> </div> </div> </template> @@ -145,8 +145,6 @@ import Papa from "papaparse"; import { ElMessage, ElMessageBox } from "element-plus"; import { initeWaterPrimitiveView } from "@/utils/water"; -import { createSimData } from "@/api/trApi"; - import { useSimStore } from "@/store/simulation"; const simStore = useSimStore(); @@ -206,44 +204,7 @@ }); ////////////////////////////////////// 鎺ュ彛鐗堟湰闇�鍒犻櫎////////////////////////////////////// -// 鎵撳紑淇濆瓨鏂规瀵硅瘽妗� -const openSaveDialog = () => { - if ( - !forms.rainfall || - !forms.duration || - !forms.intensity || - (simStore.selectTab === "琛屾斂鍖哄垝浠跨湡" && !forms.eare) || - (simStore.selectTab === "閲嶇偣鍖哄煙浠跨湡" && !forms.eares) - ) { - ElMessage.warning("璇峰厛濉啓鎵�鏈夊繀濉」"); - return; - } - saveDialogVisible.value = true; -} -const handleClose = () => { - saveDialogVisible.value = false; -}; - -// 纭淇濆瓨 -const confirmSave = () => { - console.log("淇濆瓨鏂规鎴愬姛", { - 妯℃嫙绫诲瀷: dialogTitle.value, - 琛屾斂鍖哄煙: simStore.selectTab === "琛屾斂鍖哄垝浠跨湡" ? forms.eare : null, - 閲嶇偣鍖哄煙: simStore.selectTab === "閲嶇偣鍖哄煙浠跨湡" ? forms.eares : null, - 闄嶉洦閲�: `${forms.rainfall} mm`, - 闄嶉洦鏃堕暱: `${forms.duration} h`, - 闄嶉洦寮哄害: `${forms.intensity} mm/h`, - 涓婁紶鏂囦欢: forms.fileList.map((file) => file.name), - }); - ElMessage.success("鏂规宸蹭繚瀛�"); - saveDialogVisible.value = false; - resetForm(); -}; -////////////////////////////////////// 缁撴潫鍒犻櫎////////////////////////////////////// - -//////////////////////////////////鎺ュ彛鐗堟湰鍚敤////////////////////////////////// -// const isLoading = ref(false); -// // 淇濆瓨鏂规 +// // 鎵撳紑淇濆瓨鏂规瀵硅瘽妗� // const openSaveDialog = () => { // if ( // !forms.rainfall || @@ -255,36 +216,73 @@ // ElMessage.warning("璇峰厛濉啓鎵�鏈夊繀濉」"); // return; // } -// ElMessageBox.confirm("纭畾瑕佷繚瀛樺綋鍓嶆柟妗堝悧?", dialogTitle.value, { -// confirmButtonText: "纭畾", -// cancelButtonText: "鍙栨秷", -// type: "warning", -// }) -// .then(confirmSave) -// .catch(() => { -// ElMessage({ -// type: "info", -// message: "宸插彇娑堜繚瀛�", -// }); -// }); +// saveDialogVisible.value = true; +// } +// const handleClose = () => { +// saveDialogVisible.value = false; // }; -// const confirmSave = async () => { -// if (isLoading.value) { -// ElMessage.warning("姝e湪淇濆瓨锛岃绋嶅��..."); -// return; // 闃叉閲嶅鎻愪氦 -// } -// isLoading.value = true; // 寮�濮嬪姞杞界姸鎬� -// try { -// await simStore.createSimulation(forms); // 璋冪敤 Store 涓殑淇濆瓨鏂规硶 -// ElMessage.success("淇濆瓨鎴愬姛"); -// saveDialogVisible.value = true; // 鏄剧ず淇濆瓨瀵硅瘽妗嗭紙濡傛灉闇�瑕侊級 -// } catch (error) { -// console.error("淇濆瓨澶辫触:", error); -// ElMessage.error("淇濆瓨澶辫触锛岃绋嶅悗閲嶈瘯"); -// } finally { -// isLoading.value = false; // 缁撴潫鍔犺浇鐘舵�� -// } + +// // 纭淇濆瓨 +// const confirmSave = () => { +// console.log("淇濆瓨鏂规鎴愬姛", { +// 妯℃嫙绫诲瀷: dialogTitle.value, +// 琛屾斂鍖哄煙: simStore.selectTab === "琛屾斂鍖哄垝浠跨湡" ? forms.eare : null, +// 閲嶇偣鍖哄煙: simStore.selectTab === "閲嶇偣鍖哄煙浠跨湡" ? forms.eares : null, +// 闄嶉洦閲�: `${forms.rainfall} mm`, +// 闄嶉洦鏃堕暱: `${forms.duration} h`, +// 闄嶉洦寮哄害: `${forms.intensity} mm/h`, +// 涓婁紶鏂囦欢: forms.fileList.map((file) => file.name), +// }); +// ElMessage.success("鏂规宸蹭繚瀛�"); +// saveDialogVisible.value = false; +// resetForm(); // }; +////////////////////////////////////// 缁撴潫鍒犻櫎////////////////////////////////////// + +//////////////////////////////////鎺ュ彛鐗堟湰鍚敤////////////////////////////////// +const isLoading = ref(false); +// 淇濆瓨鏂规 +const openSaveDialog = () => { + if ( + !forms.rainfall || + !forms.duration || + !forms.intensity || + (simStore.selectTab === "琛屾斂鍖哄垝浠跨湡" && !forms.eare) || + (simStore.selectTab === "閲嶇偣鍖哄煙浠跨湡" && !forms.eares) + ) { + ElMessage.warning("璇峰厛濉啓鎵�鏈夊繀濉」"); + return; + } + ElMessageBox.confirm("纭畾瑕佷繚瀛樺綋鍓嶆柟妗堝悧?", dialogTitle.value, { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", + }) + .then(confirmSave) + .catch(() => { + ElMessage({ + type: "info", + message: "宸插彇娑堜繚瀛�", + }); + }); +}; +const confirmSave = async () => { + if (isLoading.value) { + ElMessage.warning("姝e湪淇濆瓨锛岃绋嶅��..."); + return; // 闃叉閲嶅鎻愪氦 + } + isLoading.value = true; // 寮�濮嬪姞杞界姸鎬� + try { + await simStore.createSimulation(forms); // 璋冪敤 Store 涓殑淇濆瓨鏂规硶 + ElMessage.success("淇濆瓨鎴愬姛"); + saveDialogVisible.value = true; // 鏄剧ず淇濆瓨瀵硅瘽妗嗭紙濡傛灉闇�瑕侊級 + } catch (error) { + console.error("淇濆瓨澶辫触:", error); + ElMessage.error("淇濆瓨澶辫触锛岃绋嶅悗閲嶈瘯"); + } finally { + isLoading.value = false; // 缁撴潫鍔犺浇鐘舵�� + } +}; //////////////////////////////////鎺ュ彛鐗堟湰鍚敤////////////////////////////////// // 閲嶇疆琛ㄥ崟 diff --git a/src/views/left/Left.vue b/src/views/left/Left.vue index 053fe28..474cacd 100644 --- a/src/views/left/Left.vue +++ b/src/views/left/Left.vue @@ -13,14 +13,15 @@ <el-button style="width: 45%;" @click="handleClick">鏂板缓浠跨湡鏂规</el-button> <el-button style="width: 45%;" @click="deleteSelectedScheme">鍒犻櫎浠跨湡鏂规</el-button> </div> - <schemeCard ref="schemeCardRef" @start="start" @end="end" @reset="reset" @closeBtn="handleBackFromParent" /> - <!-- <schemeCard + <!-- <schemeCard ref="schemeCardRef" @start="start" @end="end" @reset="reset" @closeBtn="handleBackFromParent" /> --> + <schemeCard ref="schemeCardRef" @start="start" @end="end" @reset="reset" :deleteSim="deleteSim" - /> --> + @closeBtn="handleBackFromParent" + /> </div> </div> <div class="left" v-show="showAddIns"> @@ -398,30 +399,30 @@ } const schemeCardRef = ref(null); -function deleteSelectedScheme() { - const selectedId = schemeCardRef.value.getSelectedId(); - const selectedScheme = simStore.schemCard.find( - (item) => item.id === selectedId - ); - if (!selectedId) { - ElMessage.warning("璇峰厛閫夋嫨涓�涓柟妗堬紒"); - return; - } - ElMessageBox.confirm( - `纭畾瑕佸垹闄� "${selectedScheme.name}" 鏂规鍚楋紵`, - "鍒犻櫎纭", - { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning", - } - ) - .then(() => { - simStore.removeSchemCardItem(selectedId); - ElMessage.success(`鏂规 "${selectedScheme.name}" 鍒犻櫎鎴愬姛锛乣); - }) - .catch(() => { }); -} +// function deleteSelectedScheme() { +// const selectedId = schemeCardRef.value.getSelectedId(); +// const selectedScheme = simStore.schemCard.find( +// (item) => item.id === selectedId +// ); +// if (!selectedId) { +// ElMessage.warning("璇峰厛閫夋嫨涓�涓柟妗堬紒"); +// return; +// } +// ElMessageBox.confirm( +// `纭畾瑕佸垹闄� "${selectedScheme.name}" 鏂规鍚楋紵`, +// "鍒犻櫎纭", +// { +// confirmButtonText: "纭畾", +// cancelButtonText: "鍙栨秷", +// type: "warning", +// } +// ) +// .then(() => { +// simStore.removeSchemCardItem(selectedId); +// ElMessage.success(`鏂规 "${selectedScheme.name}" 鍒犻櫎鎴愬姛锛乣); +// }) +// .catch(() => { }); +// } function start(form) { emits("start", form); @@ -443,14 +444,14 @@ }); ///////////////////////////鍒犻櫎浠跨湡鏂规/////////////////////////// -// const deleteSim = ref(false); +const deleteSim = ref(false); -// function reset() { -// deleteSim.value = false; // 閲嶇疆鏍囧織浣� -// } -// function deleteSelectedScheme() { -// deleteSim.value = true; -// } +function reset() { + deleteSim.value = false; // 閲嶇疆鏍囧織浣� +} +function deleteSelectedScheme() { + deleteSim.value = true; +} ///////////////////////////鍒犻櫎浠跨湡鏂规/////////////////////////// </script> <style lang="less" scoped> diff --git a/vue.config.js b/vue.config.js index 7e985b7..eb25a59 100644 --- a/vue.config.js +++ b/vue.config.js @@ -23,9 +23,9 @@ '/api': { target: 'http://192.168.56.107:8078', changeOrigin: true, - pathRewrite: { - '^/api': '' - }, + // pathRewrite: { + // '^/api': '' + // }, secure: false }, '/hp': { -- Gitblit v1.9.3