From 8d7fca46fd7f1bf85dbe9fa6fcfd287f45ad1b71 Mon Sep 17 00:00:00 2001
From: guonan <guonan201020@163.com>
Date: 星期二, 22 四月 2025 16:45:03 +0800
Subject: [PATCH] tab报错
---
src/store/simAPI.js | 90 ++++-------
src/api/trApi.js | 2
src/views/left/CitySim.vue | 92 ++--------
src/components/monifangzhen/schemeCard.vue | 260 --------------------------------
src/views/left/Simulation.vue | 2
5 files changed, 59 insertions(+), 387 deletions(-)
diff --git a/src/api/trApi.js b/src/api/trApi.js
index 0630534..9d7bd66 100644
--- a/src/api/trApi.js
+++ b/src/api/trApi.js
@@ -1,7 +1,7 @@
import instance from "./requestTR.js";
// 鑾峰彇鍖哄煙鏁版嵁
-export async function getData(params = {}) {
+export async function getRegionData(params = {}) {
try {
const defaultParams = {
id: undefined,
diff --git a/src/components/monifangzhen/schemeCard.vue b/src/components/monifangzhen/schemeCard.vue
index 71fc0d5..dc61337 100644
--- a/src/components/monifangzhen/schemeCard.vue
+++ b/src/components/monifangzhen/schemeCard.vue
@@ -1,9 +1,6 @@
<template>
<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 schemeList" :key="key"
:class="{ selected: selectedId === item.id }" @click="selectScheme(item.id)">
<div>
@@ -50,248 +47,7 @@
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",
-// },
-// ]);
+
const statusText = {
0: "鏈紑濮�",
1: "杩涜涓�",
@@ -338,24 +94,12 @@
// 娉ㄥ唽浜嬩欢鐩戝惉鍣�
EventBus.on("hide-schemeInfo", handleHideSchemeInfo);
-//////////////////////////////////// 鏆撮湶閫変腑鐨� ID 缁欑埗缁勪欢锛堟帴鍙ｇ増鏈垹闄わ級////////////////////////////////////
-// defineExpose({
-// getSelectedId: () => selectedId.value,
-// });
/////////////////////// 璋冪敤鎺ュ彛锛堜娇鐢ㄦ椂鎵撳紑锛� ///////////////////////
-import { getData, getSimData, deleteSimData } from "@/api/trApi.js";
+import { getRegionData, getSimData, deleteSimData } from "@/api/trApi.js";
onMounted(() => {
getScheme();
- // 111
- getData({ type:2 })
- .then(data => {
- console.log('Data:', data);
- })
- .catch(error => {
- console.error('Error:', error);
- });
});
const props = defineProps({
diff --git a/src/store/simAPI.js b/src/store/simAPI.js
index c009a7d..c62550f 100644
--- a/src/store/simAPI.js
+++ b/src/store/simAPI.js
@@ -45,8 +45,38 @@
return true
}
- // 寮圭獥
- const openSaveDialog = async (forms) => {
+ // 淇濆瓨鏂规閫昏緫
+ const saveScheme = async (forms) => {
+ if (isLoading.value) {
+ ElMessage.warning('姝ｅ湪淇濆瓨锛岃绋嶅��...')
+ return
+ }
+
+ isLoading.value = true
+
+ try {
+ const params = {
+ areaType: getAreaType(selectTab.value),
+ createTime: Date.now(),
+ name: forms.name,
+ type: getRainType(forms.type),
+ status: 0,
+ data: forms.data
+ }
+ const res = await createSimData(params)
+ ElMessage.success('鏂规淇濆瓨鎴愬姛')
+ return res
+ } catch (error) {
+ console.error('淇濆瓨澶辫触:', error)
+ ElMessage.error('淇濆瓨澶辫触: ' + (error.message || '璇风◢鍚庨噸璇�'))
+ throw error
+ } finally {
+ isLoading.value = false
+ }
+ }
+
+ // 淇濆瓨鏂规寮圭獥
+ const addSimCheme = async (forms) => {
if (!validateForm(forms)) return
try {
@@ -66,66 +96,12 @@
}
}
- const saveScheme = async (forms) => {
- if (isLoading.value) {
- ElMessage.warning('姝ｅ湪淇濆瓨锛岃绋嶅��...')
- return
- }
- isLoading.value = true
-
- try {
- const params = {
- areaType: getAreaType(selectTab.value),
- createTime: Date.now(),
- name: forms.name,
- type: getRainType(forms.type),
- status: 0,
- data: forms.data
- }
-
- const response = await createSimData(params)
- ElMessage.success('鏂规淇濆瓨鎴愬姛')
- return response
- } catch (error) {
- console.error('淇濆瓨澶辫触:', error)
- ElMessage.error('淇濆瓨澶辫触: ' + (error.message || '璇风◢鍚庨噸璇�'))
- throw error
- } finally {
- isLoading.value = false
- }
- }
-
-
- // // 鏂板缓鏂规
- // const createSimulation = async (forms) => {
- // console.log(forms, 'ffffffff')
-
- // const params = {
- // areaType: getAreaType(selectTab),
- // createTime: Date.now(),
- // name: forms.name,
- // // 1涓洪娴嬫ā鎷燂紝2涓哄疄鏃舵ā鎷燂紝3涓哄巻鍙叉ā鎷�
- // type: getRainType(forms.type),
- // // 0涓哄垱寤轰豢鐪燂紝1涓洪澶勭悊锛�2涓哄垎鏋愪腑锛�10涓哄畬鎴愶紝20涓哄嚭閿�
- // status: 0,
- // data: forms.data
- // }
- // console.log(params, 'params')
-
- // try {
- // await createSimData(params)
- // } catch (error) {
- // console.error('鍒涘缓浠跨湡澶辫触:', error)
- // }
- // }
return {
- // 鐘舵��
selectTab,
isLoading,
- // 鏂规硶
handleClickTab,
- openSaveDialog,
+ addSimCheme,
saveScheme,
}
})
\ No newline at end of file
diff --git a/src/views/left/CitySim.vue b/src/views/left/CitySim.vue
index 20eca2a..7565ca9 100644
--- a/src/views/left/CitySim.vue
+++ b/src/views/left/CitySim.vue
@@ -104,7 +104,7 @@
<!-- <el-form-item label="浠跨湡鍙傛暟:"></el-form-item> -->
</el-form>
<div style="display: flex; justify-content: flex-end">
- <el-button type="primary" @click="openSaveDialog">淇濆瓨鏂规</el-button>
+ <el-button type="primary" @click="addSimCheme">淇濆瓨鏂规</el-button>
<el-button type="success" @click="startPlay">寮�濮嬫ā鎷�</el-button>
</div>
</div>
@@ -112,12 +112,30 @@
</template>
<script setup>
-import { reactive, ref, watch, inject, computed } from "vue";
+import { reactive, ref, watch, inject, computed, onMounted } from "vue";
import * as XLSX from "xlsx";
import Papa from "papaparse";
import { ElMessage, ElMessageBox } from "element-plus";
import { initeWaterPrimitiveView } from "@/utils/water";
import { SimAPIStore } from "@/store/simAPI";
+import { getRegionData } from "@/api/trApi";
+
+const cityOptions = reactive([]);
+
+onMounted(() => {
+ getRegionData({ type: 1 }).then((res) => {
+ console.log(res, "res");
+ // 浣跨敤鍝嶅簲寮忔暟缁勭殑鏂规硶鏇存柊鍐呭
+ cityOptions.splice(
+ 0,
+ cityOptions.length,
+ ...res.data.map((item) => ({
+ value: item.geom,
+ label: item.name,
+ }))
+ );
+ });
+});
const simStore = SimAPIStore();
@@ -134,26 +152,6 @@
fileList: [],
});
-// 鍩庡競鍜岄噸鐐瑰尯鍩熼�夐」
-const cityOptions = [
- { value: "鍖椾含甯�", label: "鍖椾含甯�" },
- { value: "涓滃煄鍖�", label: "涓滃煄鍖�" },
- { value: "瑗垮煄鍖�", label: "瑗垮煄鍖�" },
- { value: "鏈濋槼鍖�", label: "鏈濋槼鍖�" },
- { value: "娴锋穩鍖�", label: "娴锋穩鍖�" },
- { value: "涓板彴鍖�", label: "涓板彴鍖�" },
- { value: "鐭虫櫙灞卞尯", label: "鐭虫櫙灞卞尯" },
- { value: "闂ㄥご娌熷尯", label: "闂ㄥご娌熷尯" },
- { value: "鎴垮北鍖�", label: "鎴垮北鍖�" },
- { value: "閫氬窞鍖�", label: "閫氬窞鍖�" },
- { value: "椤轰箟鍖�", label: "椤轰箟鍖�" },
- { value: "鏄屽钩鍖�", label: "鏄屽钩鍖�" },
- { value: "澶у叴鍖�", label: "澶у叴鍖�" },
- { value: "鎬�鏌斿尯", label: "鎬�鏌斿尯" },
- { value: "骞宠胺鍖�", label: "骞宠胺鍖�" },
- { value: "瀵嗕簯鍖�", label: "瀵嗕簯鍖�" },
- { value: "寤跺簡鍖�", label: "寤跺簡鍖�" },
-];
const earesOptions = [
{ value: "瀛欒儭娌�", label: "瀛欒儭娌�" },
{ value: "楸兼按娲炲悗娌�", label: "楸兼按娲炲悗娌�" },
@@ -174,55 +172,9 @@
return forms.fileList.map((file) => file.name).join(", ") || "鏃�";
});
-//////////////////////////////////鎺ュ彛鐗堟湰鍚敤//////////////////////////////////
-const openSaveDialog = async () => {
- await simStore.openSaveDialog(forms);
+const addSimCheme = async () => {
+ await simStore.addSimCheme(forms);
};
-
-// 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("姝ｅ湪淇濆瓨锛岃绋嶅��...");
-// 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 resetForm = () => {
diff --git a/src/views/left/Simulation.vue b/src/views/left/Simulation.vue
index 4a1d764..e530de0 100644
--- a/src/views/left/Simulation.vue
+++ b/src/views/left/Simulation.vue
@@ -44,7 +44,7 @@
// 鏍囩鐐瑰嚮浜嬩欢
const handleClick = (tab) => {
- SimAPIStore.handleClickTab(tab.props.label);
+ simStore.handleClickTab(tab.props.label);
};
// 杩斿洖涓婁竴绾�
--
Gitblit v1.9.3