From 01393bae102e014f64e99e0e6581f7d31aeef4b4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 31 Aug 2022 09:15:12 +0800 Subject: [PATCH 1/3] 111 --- .../visual/command/cpts/yantai-sidemenu1.vue | 309 ++++++ .../visual/command/cpts/yantai-sidemenu2.vue | 309 ++++++ src/views/modules/visual/command/index.vue | 88 +- src/views/modules/visual/command/indexOld.vue | 881 ++++++++++++++++++ 4 files changed, 1568 insertions(+), 19 deletions(-) create mode 100644 src/views/modules/visual/command/cpts/yantai-sidemenu1.vue create mode 100644 src/views/modules/visual/command/cpts/yantai-sidemenu2.vue create mode 100644 src/views/modules/visual/command/indexOld.vue 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 @@ + + + + + From 792e7ce6d29d2bbe94059ad35cf3b2f697a86e29 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 31 Aug 2022 09:16:20 +0800 Subject: [PATCH 2/3] 11 --- .../scss/modules/visual/commandOld.scss | 320 ++++++++++++++++++ 1 file changed, 320 insertions(+) create mode 100644 src/assets/scss/modules/visual/commandOld.scss diff --git a/src/assets/scss/modules/visual/commandOld.scss b/src/assets/scss/modules/visual/commandOld.scss new file mode 100644 index 000000000..ee0138343 --- /dev/null +++ b/src/assets/scss/modules/visual/commandOld.scss @@ -0,0 +1,320 @@ +@import "../../c/config"; +@import "../../c/function"; +@import "./c/common"; + +.m-crumb { + margin-left: 10px; + height: 40px; + line-height: 35px; + .router_line { + width: 212px; + height: 1px; + border: 1px solid #ffffff; + opacity: 0.09; + /* opacity: 0.09; */ + } + .div_router { + font-size: 16px; + font-weight: bold; + + .router_parents { + color: #a0c3d9; + + .arrow { + padding: 0 5px; + } + } + .router_parents:hover { + cursor: pointer; + } + + .router_child { + color: #ffffff; + } + } +} + +.g-cnt { + display: flex; + + /deep/ .ol-viewport { + border-radius: 5px; + } + + /deep/ .ol-overlaycontainer-stopevent { + display: none; + } +} + +.m-map { + box-sizing: border-box; + width: 100%; + height: calc(825px - 15px); + color: #fff; + position: relative; +} + +.m-mapmenu { + position: absolute; + z-index: 100; + left: 20px; + top: 20px; +} + +.m-search { + position: absolute; + z-index: 4; + left: 0; + right: 0; + top: 30px; + width: 630px; + margin: 0 auto; + + .input { + width: 100%; + background-color: #fff; + border-radius: 8px; + display: flex; + align-items: center; + overflow: hidden; + border: 1px solid #5aafff; + box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26); + + > input { + width: 400px; + border: none; + line-height: 45px; + font-size: 18px; + font-family: PingFang SC; + font-weight: 400; + color: #333333; + } + + .i-search { + margin: 0 16px; + width: 24px; + height: 24px; + } + + .i-close { + margin-left: 15px; + opacity: 0.2; + width: 20px; + cursor: pointer; + } + + .btn { + margin-left: auto; + width: 120px; + height: 53px; + line-height: 53px; + background: #0082fb; + border-radius: 0px 8px 8px 0px; + color: #fff; + text-align: center; + font-size: 22px; + font-family: PingFang SC; + font-weight: 500; + color: #ffffff; + cursor: pointer; + } + } + + .result { + position: relative; + box-sizing: border-box; + padding: 0 15px; + width: 509px; + background: rgba(#020340, 0.58); + border-radius: 8px; + .result-item { + position: relative; + padding: 12px 0; + border-bottom: 1px solid rgba(#fff, 0.2); + + .result-panel { + position: absolute; + box-sizing: border-box; + padding: 15px; + left: 509px - 10px; + top: 0; + width: 500px; + background: rgba(#020340, 0.58); + border-radius: 8px; + } + + .result-type { + margin-bottom: 10px; + font-size: 20px; + line-height: 30px; + font-family: PingFang SC; + font-weight: bold; + color: #00f0ff; + } + + .result-more { + position: absolute; + right: 0; + top: 20px; + width: 50px; + height: 22px; + text-align: center; + line-height: 22px; + background: #dd8d02; + border-radius: 2px; + font-size: 14px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + cursor: pointer; + } + + .result-li { + line-height: 28px; + font-size: 16px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + cursor: pointer; + @include toe; + i { + margin-right: 5px; + } + span { + width: 100%; + } + } + } + } +} + +.m-sidemenu { + margin-left: 20px; + width: 360px; + height: calc(825px - 15px); + + .title { + margin-bottom: 10px; + padding: 4px 0; + font-size: 22px; + font-family: PingFang SC; + font-weight: 800; + color: #ffffff; + display: flex; + align-items: center; + + img { + display: block; + margin-right: 5px; + } + span { + display: block; + } + } + + .list { + margin-right: -8px; + height: calc(825px - 120px); + overflow-y: auto; + overflow-x: hidden; + @include scrollBar; + } +} + +.m-sidebar { + position: absolute; + right: 0; + top: 50px; + z-index: 1000; + width: 370px; + height: 470px; + overflow: hidden; + pointer-events: none; + + .wrap { + display: flex; + justify-content: flex-start; + align-items: center; + background-color: rgba(rgb(173, 173, 173), 0); + transform: translateX(-5px); + transition: all ease 1s; + border-radius: 4px; + pointer-events: auto; + } + + .wrap-hidden { + transform: translateX(339px); + } + + .div_agency_list { + width: 320px; + height: 470px; + color: #fff; + background: url("../../../img/modules/visual/box-2.png") no-repeat center; + background-size: 100% 100%; + padding: 45px 20px 35px 20px; + + .agency_main { + height: 100%; + position: relative; + } + + .agency_main { + /deep/ .el-scrollbar__wrap { + overflow-x: hidden !important; + } + } + + .no-data-img { + text-align: center; + margin-top: 50px; + margin-left: 15px; + } + .agency_list { + .agency_item { + // height: 60px; + padding: 15px 0; + font-size: 17px; + font-family: PingFang SC; + font-weight: 400; + color: #ffffff; + // line-height: 50px; + padding-left: 12px; + display: flex; + flex-direction: row; + align-items: center; + // padding-top: 15px; + + .agency_item_name { + // line-height: 20px; + } + } + + .agency_item_on { + background: #08216c; + border-radius: 2px; + } + + .agency_item:hover { + cursor: pointer; + background-color: #011168; + border-radius: 4px 0 0 4px; + border: none; + box-shadow: 0 0 10px inset #1a5afd; + border-radius: 2px; + } + } + } + + .arrow_tip { + margin-right: -2px; + margin-left: 10px; + > img { + width: 22px; + height: 176px; + } + } + .arrow_tip:hover { + cursor: pointer; + } +} From 7fafe606751acf4bde73910cdc24e01e4ca2fc88 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 31 Aug 2022 09:37:45 +0800 Subject: [PATCH 3/3] 1111 --- .env.development | 3 ++- src/assets/scss/modules/visual/command.scss | 11 +++++++++-- src/views/modules/shequzhili/csgltc/csglForm.vue | 8 ++++++-- src/views/modules/shequzhili/ggfwtc/ggfwForm.vue | 6 ++++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index fd937c0d6..af4564f4b 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://epmet-dev.elinkservice.cn:41080/api -VUE_APP_API_SERVER = http://192.168.1.140/api +# VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api # VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api # VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api diff --git a/src/assets/scss/modules/visual/command.scss b/src/assets/scss/modules/visual/command.scss index ee0138343..d827e4cb4 100644 --- a/src/assets/scss/modules/visual/command.scss +++ b/src/assets/scss/modules/visual/command.scss @@ -193,6 +193,13 @@ width: 360px; height: calc(825px - 15px); + .menu { + position: relative; + width: 100%; + margin-bottom: 20px; + // height: calc((825px - 15px - 20px) / 2); + } + .title { margin-bottom: 10px; padding: 4px 0; @@ -212,9 +219,9 @@ } } - .list { + .wrap { margin-right: -8px; - height: calc(825px - 120px); + height: calc(825px - 45px); overflow-y: auto; overflow-x: hidden; @include scrollBar; diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 4d3fe5195..cdde575ea 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -157,8 +157,8 @@ export default { areaCovered: '',//占地面积 capacity: 0,//容纳人数 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519, //纬度 + longitude: null, //经度 + latitude: null, //纬度 principal: '', mobile: '' }, @@ -292,11 +292,15 @@ export default { initMap () { // 定义地图中心点坐标 let { latitude, longitude } = this.$store.state.user; + console.log('lat' + latitude + ',lon' + longitude) if (!latitude || latitude == "" || latitude == "0") { latitude = 39.9088810666821; longitude = 116.39743841556731; } + + this.formData.latitude = latitude + this.formData.longitude = longitude // 定义地图中心点坐标 var center = new window.TMap.LatLng(latitude, longitude); // var center = new window.TMap.LatLng(36.52799, 120.7553) diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 9bfc646b1..ceeb3ab97 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -138,8 +138,8 @@ export default { areaCovered: '',//占地面积 capacity: '',//容纳人数 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519, //纬度 + longitude: null, //经度 + latitude: null, //纬度 principal: '', mobile: '' }, @@ -277,6 +277,8 @@ export default { latitude = 39.9088810666821; longitude = 116.39743841556731; } + this.formData.latitude = latitude + this.formData.longitude = longitude // 定义地图中心点坐标 var center = new window.TMap.LatLng(latitude, longitude); // 定义map变量,调用 TMap.Map() 构造函数创建地图