浏览代码

放开权限自助菜单、修改全局tootips最大宽度、bugfix

林倩 3 年之前
父节点
当前提交
e5175f1da7

+ 2 - 1
config/dev.env.js

@@ -35,7 +35,8 @@ module.exports = merge(prodEnv, {
         "/dcucauth": {
             // target: "http://10.11.1.237:8861"
             // target: "http://10.254.11.203:8861"
-             target: "http://192.168.10.2:8871"
+            //  target: "http://192.168.10.2:8871"
+             target: "http://192.168.6.133:3471"
 
         }
     })

+ 1 - 1
src/api/permission-selfhelp-manage.js

@@ -34,7 +34,7 @@ export function allAppFuncTree() {
     url: `/authsvr/v2/appfuninfo/allMenuTree`,
     method: 'GET',
     // params: {
-    //   exclude: true
+    //   exclude: true // 去除角色授权的菜单
     // }
   });
 }

+ 6 - 0
src/assets/style/project.scss

@@ -8,6 +8,12 @@
 	width: 100% !important;
 }
 
+/* 控制悬浮最大宽度
+-------------------------- */
+.el-tooltip__popper {
+    max-width: 600px;
+}
+
 // // 重置滚动条样式
 // ::-webkit-scrollbar {
 //     width: 17px;

+ 0 - 1
src/pages/common/table/index.vue

@@ -8,7 +8,6 @@
     ref="grid"
     row-key="id"
     border
-    :auto-page="(h) => h * 0.6"
     :expand-row-keys="expands"
     @change-current="handleChangeCurrent"
     @change-size="handleChangeSize"

+ 3 - 1
src/pages/common/transfer-tree/mixin.js

@@ -36,8 +36,8 @@ export default {
       _treeData.forEach(item => {
         item[this.pidName] = 0;
       });
-
       // 构造除去反向选中值 `this.unselectedKeyValue` 的目标树数据
+      console.log("tar", this.constructTreeBox(this.unselectedKeyValue, _treeData));
       return this.constructTreeBox(this.unselectedKeyValue, _treeData);
     },
     /**
@@ -94,7 +94,9 @@ export default {
     unselectedKeyValue() {
       // 初始化
       let _treeData = _.cloneDeep(this.dataSource);
+      console.log("allkeys", this.allKeyValue(true).length);
       let _selectedKey = _.difference(this.allKeyValue(true), this.selectedKeyValue);
+      console.log("_selectedKey", _selectedKey.length);
       let self = this;
 
       // 递归获取选中的 key 值(包含父级的)

+ 1 - 2
src/pages/permission-selfhelp-manage/component/app-func-form.vue

@@ -12,7 +12,6 @@
       v-model="selectedValue"
       :data="data"
       children-name="child"
-      pid-name="p"
       :open-all="false"
       :transfer-open-node="true"
       :filter-node-from="handleSearch"
@@ -151,7 +150,7 @@ export default {
             keys.push(key);
             return;
           } else {
-            if (item.child.length > 0) {
+            if ( item.child && item.child.length > 0) {
               filterParentKey(item.child, key);
             } else {
               return;

+ 0 - 1
src/pages/user-manage/police-manage/index.vue

@@ -18,7 +18,6 @@
                 <el-form
                     ref="form"
                     label-width="75px"
-                    f
                     label-suffix=":"
                     label-position="left"
                     class="police-form"

+ 2 - 2
src/router/index.js

@@ -122,13 +122,13 @@ export const asyncRouterMap = [
     path: '/permission-selfhelp-manage',
     component: Layout,
     redirect: '/permission-selfhelp-manage/init',
-    meta: { title: '权限自助管理', icon: 'el-icon-goods', noCache: true, permission: ['QXGL_QXZUGL'] },
+    meta: { title: '权限自助管理', icon: 'el-icon-goods', noCache: true},
     children: [
       {
         path: 'init',
         component: () => import('@/pages/permission-selfhelp-manage'),
         name: 'permission-selfhelp-manage',
-        meta: { title: '权限自助管理', noCache: true, permission: ['QXGL_QXZUGL'] }
+        meta: { title: '权限自助管理', noCache: true}
       }
     ]
   },