diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 5b17d5bd9..b6d7808e3 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -107,6 +107,7 @@ ref="tree2" node-key="id" class="filter-tree" + style="height: 100%; overflow: auto;" v-if="modalPost" :props="props" :data="postList" diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index 36915c846..0f19d2965 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -102,6 +102,7 @@ ref="tree" node-key="id" class="filter-tree" + style="height: 100%; overflow: auto;" v-if="modalRole" :props="props" :data="roleList" diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue index 19718aa73..fb7287909 100644 --- a/src/pages/config/pages/roleManage/index.vue +++ b/src/pages/config/pages/roleManage/index.vue @@ -206,6 +206,7 @@ class="filter-tree1" :data="treeData" :props="defaultProps" + style="height: 100%; overflow: auto;" default-expand-all check-strictly node-key="id" diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 0b4e6b7a6..214dd7983 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -90,6 +90,7 @@ export default { let userInfoStr = Base64.decode(res.data) let userInfo2 = decodeURIComponent(userInfoStr) let userInfoObj = JSON.parse(userInfo2) + userInfoObj.userId = userInfoObj.usid this.setToken(userInfoObj.usid) // vuex存储token this.getByUserInfoCode(userInfoObj.usid).then((userInfo) => { if (userInfo !== '' && userInfo !== null) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index aaf834d54..94e7d8975 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -563,7 +563,7 @@ size="800px"> 标准法法规业务经理
- +
@@ -126,20 +126,56 @@

分发责任人

- +
- + -

业务经理

+

责任人

- + +
+
+
+
+ + + +

分发责任人

+
+ + +
+
+
+
+ + + +

产品线责任人

+
+ + + +
+
+
+
+ + + +

标准法规部领导

+
+ +
@@ -290,7 +326,7 @@ size="800px"> { this.productData = res.data + //分发责任人 + // this.roleForm.directorUser = res.data. // this.totalNo = res.data }, e => { diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 0b7476a89..6bd16fca3 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,8 +6,8 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' +// const devIp = '192.168.10.248' const devIp = '192.168.10.248' -const devIp = '192.168.10.30' const devInterfacePORT = '9999' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'