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/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..52d637a5b 100644 --- a/src/views/modules/visual/command/index.vue +++ b/src/views/modules/visual/command/index.vue @@ -159,20 +159,39 @@
- -
- - 指挥调度 -
+ +
+
+
+ + 指挥调度 +
-
- -
- +
+ +
+
+ +
+
+ + 十五分钟生活圈 +
+ +
+ +
+
+
+
@@ -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/worklog/icworklog-add-or-update.vue b/src/views/modules/worklog/icworklog-add-or-update.vue index 0b28978eb..bacf3a21e 100644 --- a/src/views/modules/worklog/icworklog-add-or-update.vue +++ b/src/views/modules/worklog/icworklog-add-or-update.vue @@ -10,9 +10,10 @@ > @@ -69,7 +70,6 @@ --> { this.$refs['dataForm'].resetFields() this.dataForm.fileList = [] @@ -171,6 +166,15 @@ export default { ...this.dataForm, ...res.data } + + const grid = this.optionsG.filter(item => item.gridId === res.data.gridId) + if (grid.length < 1 && res.data.gridId !== '') { + this.gridState = false + this.optionsG.push({gridName:res.data.gridName, gridId:res.data.gridId, disabled: true}) + } else { + this.gridState = true + } + const { id } = this.$store.state.user if (this.dataForm.createdBy == id) { // 是本人可以修改 this.formType = 'update' @@ -197,9 +201,8 @@ export default { } }, getGridList() { - const { user } = this.$store.state this.$http - .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' }) + .post('/gov/mine/agency/getmygrids') .then(({ data: res }) => { if (res.code !== 0) { return this.$message.error(res.msg) @@ -327,6 +330,11 @@ export default { }, // 表单提交 dataFormSubmitHandle: debounce(function () { + if (!this.gridState) { + this.dataForm.gridId = '' + this.gridState = true + return this.$message.error("请重新选择网格") + } if (this.dataForm.content.length < 70) { return this.$message.error("内容不能少于70字") }