From 4c846958fd4046b7a125224c759ae7ae0af673fa Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期三, 30 八月 2023 14:13:10 +0800
Subject: [PATCH] 需求修改完成
---
src/views/index.vue | 2
src/assets/js/Map/index.js | 1
src/components/dateTimePicker.vue | 56 +++++++++++++++++++++++++--
src/components/BGDC.vue | 2
src/components/reportList.vue | 2
src/components/xgzs/weekzdmax.vue | 2
src/assets/js/menuTool.js | 21 +++++-----
7 files changed, 67 insertions(+), 19 deletions(-)
diff --git a/src/assets/js/Map/index.js b/src/assets/js/Map/index.js
index 2a93321..4837d59 100644
--- a/src/assets/js/Map/index.js
+++ b/src/assets/js/Map/index.js
@@ -44,6 +44,7 @@
this.addMouseLeftClickEvents();
sgworld.setDefaultCallback((type, data) => {
+ // console.log(data);
if (data) {
if (data.message) {
if (data.message == "StartLoad") {
diff --git a/src/assets/js/menuTool.js b/src/assets/js/menuTool.js
index efe2e24..bfa9b3a 100644
--- a/src/assets/js/menuTool.js
+++ b/src/assets/js/menuTool.js
@@ -60,15 +60,15 @@
break;
case "d22": //瑗块儴椋庡満妯℃嫙
this.createFC("fc", "", {
- start: 0,
- end: 30,
+ start: 20,
+ end: 25,
Classify: "West",
});
break;
case "d23": //涓滈儴椋庡満妯℃嫙
this.createFC("fc", "", {
- start: 0,
- end: 30,
+ start: 13,
+ end: 19,
Classify: "East",
});
break;
@@ -147,6 +147,7 @@
this.closePoi();
this.delFC();
this.delLine();
+ this.closeSYWG();
break;
case "d1": //
this.closePoi();
@@ -328,9 +329,9 @@
sgworld.Core.postMessage(
`Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
);
- console.log(
- `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
- );
+ // console.log(
+ // `Type=shunxuwinds;Bool=true;Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
+ // );
} else if (type == "sj") {
let arr = date.split(/\s+/);
@@ -341,9 +342,9 @@
sgworld.Core.postMessage(
`Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
);
- console.log(
- `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};`
- );
+ // console.log(
+ // `Type=customewinds;Bool=true;Year=${day[0]};Mouth=${day[1]};Day=${day[2]};Hour=${Hour};Density=${FC.Density};Speed=${FC.Speed};StartLayer=${config.start};EndLayer=${config.end};Classify=${config.Classify};`
+ // );
}
},
//椋庡満鍒犻櫎
diff --git a/src/components/BGDC.vue b/src/components/BGDC.vue
index 00edf50..e22410f 100644
--- a/src/components/BGDC.vue
+++ b/src/components/BGDC.vue
@@ -293,7 +293,7 @@
selectform.value1[0] + ":00:00" + "-" + selectform.value1[1] + ":00:00";
let begin = selectform.value1[0].replace(" ", "-");
let end = selectform.value1[1].replace(" ", "-");
- console.log(begin, end);
+ // console.log(begin, end);
//鑾峰彇瀹炴椂棰勮鏁版嵁
// const dt = await getRunWarning();
// //鑾峰彇瀹炴椂鎶ヨ鏁版嵁
diff --git a/src/components/dateTimePicker.vue b/src/components/dateTimePicker.vue
index 54ee125..86b28a8 100644
--- a/src/components/dateTimePicker.vue
+++ b/src/components/dateTimePicker.vue
@@ -88,15 +88,15 @@
const store = useStore();
let selectform = reactive({
- value: "",
+ value: null,
fetch: "",
start: 0,
- end: 30,
+ end: 0,
});
let btnState = false;
let CS = {
start: 0,
- end: 30,
+ end: 0,
Classify: "",
};
const selectBtn = () => {
@@ -130,6 +130,13 @@
}
emit("changeTime", { data: newTimeStr, week: week });
+ CS.start = selectform.start;
+ CS.end = selectform.end;
+ CS.Classify = selectform.fetch;
+ if (selectform.start > selectform.end) {
+ CS.start = selectform.end;
+ CS.end = selectform.start;
+ }
if (props.tpData == "d21") {
menuTool.createFC("sj", newTimeStr);
} else if (props.tpData == "d22") {
@@ -144,7 +151,6 @@
}
};
function FQselectBtn() {
- selectform.value = "";
CS.start = selectform.start;
CS.end = selectform.end;
CS.Classify = selectform.fetch;
@@ -154,13 +160,53 @@
}
if (props.tpData == "d22") {
CS.Classify = "West";
- menuTool.createFC("fc", "", CS);
} else if (props.tpData == "d23") {
CS.Classify = "East";
+ }
+ if (btnState) {
+ menuTool.createFC("sj", selectform.value, CS);
+ } else {
menuTool.createFC("fc", "", CS);
}
}
function changeTime() {}
+ watch(
+ () => selectform.value,
+ (nVal, oVal) => {
+ if (nVal == null) {
+ btnState = false;
+ } else {
+ btnState = true;
+ }
+ },
+
+ { deep: true }
+ );
+ watch(
+ () => props.tpData,
+ (nVal, oVal) => {
+ if (nVal == "d22") {
+ selectform.start = 20;
+ selectform.end = 25;
+ selectform.value = null;
+ } else if (nVal == "d23") {
+ selectform.start = 13;
+ selectform.end = 19;
+ selectform.value = null;
+ }
+ },
+
+ { deep: true }
+ );
+ onMounted(() => {
+ if (props.tpData == "d22") {
+ selectform.start = 20;
+ selectform.end = 25;
+ } else if (props.tpData == "d23") {
+ selectform.start = 13;
+ selectform.end = 19;
+ }
+ });
return {
selectBtn,
changeTime,
diff --git a/src/components/reportList.vue b/src/components/reportList.vue
index 65b0523..2bf6b9d 100644
--- a/src/components/reportList.vue
+++ b/src/components/reportList.vue
@@ -105,7 +105,7 @@
data.total = Math.ceil(dt.count / listData.pageSize);
data.tableData = dt.result;
- console.log(dt);
+ // console.log(dt);
};
const download = async (res) => {
let downloadObj = {
diff --git a/src/components/xgzs/weekzdmax.vue b/src/components/xgzs/weekzdmax.vue
index 5213420..3aae574 100644
--- a/src/components/xgzs/weekzdmax.vue
+++ b/src/components/xgzs/weekzdmax.vue
@@ -38,7 +38,7 @@
async getWaringList() {
let dt = await getweekTop();
if (dt.code === 200 && dt.result.length > 0) {
- console.log(dt);
+ // console.log(dt);
const sotrArr = dt.result.sort((a, b) => b - a);
let result = sotrArr.slice(0, 10);
const data = result.map((item) => {
diff --git a/src/views/index.vue b/src/views/index.vue
index caabd72..5e319c9 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -35,7 +35,7 @@
v-if="showFk"
@FKclose="FKclose"
></SYFK>
- <YCWG v-show="checkMenuFlag == 'b2'"></YCWG>
+ <YCWG v-if="checkMenuFlag == 'b2'"></YCWG>
<div class="chart_box" v-if="chart_isshow">
<div class="popout_title">鏇茬嚎缁熻鍥�</div>
<div class="close" @click="popoutClose('QX')"></div>
--
Gitblit v1.9.3