diff --git a/src/views/modules/visual/command/cpts/yantai-sidemenu1.vue b/src/views/modules/visual/command/cpts/yantai-sidemenu1.vue new file mode 100644 index 000000000..84987fb13 --- /dev/null +++ b/src/views/modules/visual/command/cpts/yantai-sidemenu1.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/src/views/modules/visual/command/cpts/yantai-sidemenu2.vue b/src/views/modules/visual/command/cpts/yantai-sidemenu2.vue new file mode 100644 index 000000000..ab06949f2 --- /dev/null +++ b/src/views/modules/visual/command/cpts/yantai-sidemenu2.vue @@ -0,0 +1,309 @@ + + + + + diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue index 56017d830..d135daabf 100644 --- a/src/views/modules/visual/command/index.vue +++ b/src/views/modules/visual/command/index.vue @@ -160,17 +160,36 @@
-
- - 指挥调度 -
+
+ -
- +
@@ -215,7 +234,8 @@ import { requestPost } from "@/js/dai/request"; import People from "@/views/modules/visual/basicinfo/people"; import cptCard from "@/views/modules/visual/cpts/card"; import gridMap from "@/views/modules/visual/command/cpts/map"; -import sidemenu from "@/views/modules/visual/command/cpts/sidemenu"; +import sidemenu1 from "@/views/modules/visual/command/cpts/yantai-sidemenu1"; +import sidemenu2 from "@/views/modules/visual/command/cpts/yantai-sidemenu2"; import sidemenuLeft from "@/views/modules/visual/command/cpts/sidemenu-left"; import ScreenLoading from "@/views/modules/visual/cpts/loading"; @@ -267,7 +287,8 @@ export default { cptCard, ScreenLoading, gridMap, - sidemenu, + sidemenu1, + sidemenu2, sidemenuLeft, eventInfo, serviceInfo, @@ -297,8 +318,8 @@ export default { selUserId: "", dotList: [], - categoryKeys: [], - coverageTypes: [], + categoryKeys: [[], []], + coverageTypes: [[], []], dotIcoList: { anzhibangjiao: require("@/assets/img/shuju/command/ico/anzhibangjiao.png"), @@ -550,7 +571,36 @@ export default { console.log(obj); }, - handleChangeMenu(list) { + handleChangeMenu1(list) { + console.log("handleChangeMenu", list); + let categoryKeys = []; + let coverageTypes = []; + list.forEach((item) => { + if (item.selected) { + coverageTypes.push(item.coverageType); + } + item.categories.forEach((subitem) => { + if (subitem.selected) { + coverageTypes.push(item.coverageType); + categoryKeys.push(subitem.categoryKey); + } + }); + + item.placeTypesInAnalysis.forEach((subitem) => { + subitem.categories.forEach((subitem2) => { + if (subitem2.selected) { + categoryKeys.push(subitem2.categoryKey); + coverageTypes.push(subitem2.coverageType); + } + }); + }); + }); + this.categoryKeys[0] = [...new Set(categoryKeys)]; + this.coverageTypes[0] = [...new Set(coverageTypes)]; + this.requestMapDot(); + }, + + handleChangeMenu2(list) { console.log("handleChangeMenu", list); let categoryKeys = []; let coverageTypes = []; @@ -574,8 +624,8 @@ export default { }); }); }); - this.categoryKeys = [...new Set(categoryKeys)]; - this.coverageTypes = [...new Set(coverageTypes)]; + this.categoryKeys[1] = [...new Set(categoryKeys)]; + this.coverageTypes[1] = [...new Set(coverageTypes)]; this.requestMapDot(); }, @@ -585,8 +635,8 @@ export default { let params = { orgId: this.orgId, orgType: "agency", - coverageTypes: this.coverageTypes, - categoryKeys: this.categoryKeys, + coverageTypes: [...this.coverageTypes[0], ...this.coverageTypes[1]], + categoryKeys: [...this.categoryKeys[0], ...this.categoryKeys[1]], isPage: false, }; diff --git a/src/views/modules/visual/command/indexOld.vue b/src/views/modules/visual/command/indexOld.vue new file mode 100644 index 000000000..56017d830 --- /dev/null +++ b/src/views/modules/visual/command/indexOld.vue @@ -0,0 +1,881 @@ + + + + +