diff --git a/src/assets/images/ui/legend.png b/src/assets/images/ui/legend.png new file mode 100644 index 0000000..44b30a1 Binary files /dev/null and b/src/assets/images/ui/legend.png differ diff --git a/src/assets/styles/map.scss b/src/assets/styles/map.scss index 5bc375d..c8aaa33 100644 --- a/src/assets/styles/map.scss +++ b/src/assets/styles/map.scss @@ -413,3 +413,6 @@ font-size: 14px; } } +.popperclass { + background: transparent !important; +} diff --git a/src/components/NavigationBar/index.vue b/src/components/NavigationBar/index.vue index 43d1b05..c0486bd 100644 --- a/src/components/NavigationBar/index.vue +++ b/src/components/NavigationBar/index.vue @@ -137,11 +137,12 @@ export default { }, }, computed: { - ...mapGetters(["name", "yjTotal"]), + ...mapGetters(["name", "yjTotal", "dept"]), handlerBtn() { return ( this.$route.name == "xiaoqu" && - this.$auth.hasRoleOr(["admin", "leader"]) + (this.$auth.hasRoleOr(["admin", "leader"]) || + (this.$auth.hasRoleOr(["xiaoqu"]) && this.dept.xiaoquId == 238)) ); }, }, diff --git a/src/components/NavigationBar/logCentre.vue b/src/components/NavigationBar/logCentre.vue index 7531fe5..50e5698 100644 --- a/src/components/NavigationBar/logCentre.vue +++ b/src/components/NavigationBar/logCentre.vue @@ -6,6 +6,7 @@ v-model="queryParams.shequId" placeholder="选择社区" clearable + v-show="deptXiaoqu" > diff --git a/src/views/components/foldPaneBottom/index.vue b/src/views/components/foldPaneBottom/index.vue index 61c0a16..fa3a121 100644 --- a/src/views/components/foldPaneBottom/index.vue +++ b/src/views/components/foldPaneBottom/index.vue @@ -11,6 +11,19 @@ alt="" /> +
+ + +
+ 查看图例 +
+
@@ -25,7 +38,7 @@ export default { return {}; }, computed: { - ...mapGetters(["panel"]), + ...mapGetters(["panel", "queryParamsXiaoqu"]), }, created() {}, @@ -61,6 +74,12 @@ export default { width: 100%; } } + .fold-buttom { + position: absolute; + top: 6px; + right: 10px; + } + .panel-main { position: relative; width: 100%; @@ -76,4 +95,11 @@ export default { } } } + +.legend-img { + height: 500px; + width: 400px; + background: url("~@/assets/images/ui/legend.png"); + background-size: 100% 100%; +} diff --git a/src/views/components/xiaoqu/bottomList.vue b/src/views/components/xiaoqu/bottomList.vue index b82d74e..55d6ed2 100644 --- a/src/views/components/xiaoqu/bottomList.vue +++ b/src/views/components/xiaoqu/bottomList.vue @@ -134,9 +134,9 @@ export default { "queryParamsXiaoqu.type"(newValue, oldValue) { this.handleChange(); }, - // "queryParamsXiaoqu.buildingId"(newValue, oldValue) { - // this.handleChange(); - // }, + "queryParamsXiaoqu.buildingId"(newValue, oldValue) { + this.handleChange(); + }, }, created() { this.handleChange(); @@ -154,7 +154,7 @@ export default { handleChange(newValue) { this.reset(); this.queryParams = { ...this.queryParams, ...this.queryParamsXiaoqu }; - this.queryParams.buildingId = undefined; + // this.queryParams.buildingId = undefined; // this.queryParams.deptId = undefined; this.disabled = false; this.load();