From 7fbe838496148877bc5fe055e3098b3bc00a113d Mon Sep 17 00:00:00 2001
From: zhengpz <1838927346@qq.com>
Date: Fri, 20 Aug 2021 08:55:35 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
vue.config.js | 4 ++--
src/views/securityGuardManagement/register.vue | 7 ++++++-
src/styles/element-ui.scss | 5 +++++
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index a62a7a0..4b1f49f 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -587,3 +587,8 @@
.el-range-editor--mini .el-range-input {
background-color: transparent !important;
}
+
+// 右侧弹窗 表格显影功能 背景
+.el-drawer__open .el-drawer.rtl {
+ background-color: $mainB !important;
+}
diff --git a/src/views/securityGuardManagement/register.vue b/src/views/securityGuardManagement/register.vue
index f721e45..e25d0c1 100644
--- a/src/views/securityGuardManagement/register.vue
+++ b/src/views/securityGuardManagement/register.vue
@@ -847,7 +847,12 @@
},
nodeClick(data) {
// this.treeDeptId = data.id;
- this.jurisdiction = data.id;
+ // console.log(data, 55555);
+ if (data.title != "南昌市公安局") {
+ this.jurisdiction = data.id;
+ } else {
+ this.jurisdiction = "";
+ }
this.page.currentPage = 1;
this.onLoad(this.page);
},
diff --git a/vue.config.js b/vue.config.js
index 0e750f0..c82e3eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -30,10 +30,10 @@
// target: 'http://192.168.0.109:1',
//远程演示服务地址,可用于直接启动项目
// target: 'http://2h3f861221.wicp.vip:58646',
- target: 'http://s16s652780.51mypc.cn/api',
+ // target: 'http://s16s652780.51mypc.cn/api',
// target: 'http://192.168.0.114:82',
// target: 'http://192.168.0.109:82',
- // target: 'http://s16s652780.51mypc.cn/api',
+ target: 'http://s16s652780.51mypc.cn/api',
// 服务器使用
// target: 'http://localhost:82',
ws: true,
--
Gitblit v1.9.3