From 6d4bd532d2d559f1c00b7f30b70bd276c763ec34 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Dec 2021 09:48:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 12 +++++++++++-
src/store/modules/control.js | 7 +++++++
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/store/modules/control.js b/src/store/modules/control.js
index d0526c8..2d6d484 100644
--- a/src/store/modules/control.js
+++ b/src/store/modules/control.js
@@ -20,6 +20,13 @@
windowHeight: '',
},
actions: {
+ WHchangeHight({ state, commit }, data) {
+ if (data.fn) {
+ data.fn();
+ }
+ data.option.height = +state.windowHeight + +data.add;
+ // console.log(data);
+ }
},
mutations: {
setWindowSize: (state, data) => {
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index d53ea30..f997a1d 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1278,6 +1278,16 @@
};
},
watch: {
+ // windowHeight() {
+ // let d = {
+ // option: this.option,
+ // fn: function () {
+ // console.log(123);
+ // },
+ // add: 100,
+ // };
+ // this.$store.dispatch("WHchangeHight", d);
+ // },
radio() {
if (this.radio) {
this.SFZloding = true;
@@ -1385,7 +1395,7 @@
},
},
computed: {
- ...mapGetters(["userInfo", "permission"]),
+ ...mapGetters(["userInfo", "permission", "windowHeight"]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.securityGuard_add, false),
--
Gitblit v1.9.3