Merge branch 'develop-laiyh-bug' into 'develop'

修复统一权限新缺陷

See merge request dcuc-web/auth-web!1

README.md

@@ -1,4 +1,4 @@
-#
+# 统一授权
 > UI-DESIGN-V4
 #搭建和运行前端开发环境
 #从svn下载前端工程目录

config/dev.env.js

@@ -35,7 +35,8 @@ module.exports = merge(prodEnv, {
     PROXY_TABLE: JSON.stringify({
         "/dcucauth": {
             // target: "http://10.11.1.155:8871" // 傅志强
-            target: "http://10.11.1.192:8871" // 马志强
+            // target: "http://10.11.1.192:8871" // 马志强
+            target:"http://10.11.1.142:8871" // 易长安
         }
     })
 });

package.json

@@ -1,133 +1,133 @@
 {
-   "name": "dcuc-web-auth",
-   "version": "1.2.89",
-   "description": "",
-   "private": false,
-   "main": "lib/static/js/app.js",
-   "scripts": {
-      "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-      "update:ui": "npm uninstall ui-component-v4&&npm install ui-component-v4",
-      "build": "cross-env NODE_ENV=production env_config=prod node build/build.js",
-      "theme": "gulp --gulpfile src/assets/gulpfile.js ",
-      "theme:watch": "gulp watching --gulpfile src/assets/gulpfile.js",
-      "theme:copyResources": "gulp copyResources --gulpfile src/assets/gulpfile.js",
-      "analyz": "cross-env NODE_ENV=production npm_config_report=true npm run build",
-      "merge": "gulp merge --gulpfile src/assets/gulpfile.js",
-      "deploy:base": "node deploy base",
-      "deploy:common": "node deploy common",
-      "install:ueditor": "node src/utils/installer",
-      "gen:fetchApis": "node ./mock/fetchApis.js",
-      "clean:node": "rimraf node_modules&&rimraf package-lock.json&&npm cache clean --force"
-   },
-   "publishConfig": {
-      "registry": "http://192.168.6.13:8082/repository/npm_ui"
-   },
-   "dependencies": {
-      "axios": "^0.18.0",
-      "babel-polyfill": "^6.26.0",
-      "dayjs": "^1.9.7",
-      "echarts": "^4.2.0-rc.2",
-      "gojs": "^2.0.15",
-      "html": "^1.0.0",
-      "ip": "^1.1.5",
-      "jquery": "^3.4.1",
-      "jquery.nicescroll": "^3.7.6",
-      "js-cookie": "^2.2.0",
-      "lodash": "^4.17.11",
-      "mockjs": "^1.1.0",
-      "moment": "^2.24.0",
-      "normalize.css": "^7.0.0",
-      "nprogress": "^0.2.0",
-      "path-to-regexp": "^3.0.0",
-      "pdfobject": "^2.1.1",
-      "postcss-salad": "^2.0.1",
-      "screenfull": "^4.0.0",
-      "ui-component-v4": "^1.2.19",
-      "ui-jz-v4-common": "^1.2.217",
-      "vue": "2.6.10",
-      "vue-codemirror": "^4.0.6",
-      "vue-count-to": "^1.0.13",
-      "vue-i18n": "^8.0.0",
-      "vue-loader": "^15.3.0",
-      "vue-router": "^3.0.1",
-      "vue-template-compiler": "2.6.10",
-      "vuebar": "^0.0.20",
-      "vuex": "^3.0.1"
-   },
-   "devDependencies": {
-      "autoprefixer": "^8.5.0",
-      "babel-core": "^6.26.3",
-      "babel-eslint": "^8.2.6",
-      "babel-helper-vue-jsx-merge-props": "^2.0.3",
-      "babel-loader": "^7.1.5",
-      "babel-plugin-dynamic-import-node": "^2.0.0",
-      "babel-plugin-syntax-jsx": "^6.18.0",
-      "babel-plugin-transform-runtime": "^6.23.0",
-      "babel-plugin-transform-vue-jsx": "^3.7.0",
-      "babel-preset-env": "^1.7.0",
-      "babel-preset-stage-2": "^6.24.1",
-      "chalk": "^2.4.1",
-      "clean-webpack-plugin": "^2.0.1",
-      "compression-webpack-plugin": "^2.0.0",
-      "connect": "^3.6.6",
-      "copy-webpack-plugin": "^4.5.2",
-      "cross-env": "^5.2.0",
-      "css-loader": "1.0.0",
-      "eslint": "^5.14.0",
-      "eslint-config-prettier": "^4.0.0",
-      "eslint-config-standard": "^12.0.0",
-      "eslint-plugin-html": "^5.0.0",
-      "eslint-plugin-import": "^2.16.0",
-      "eslint-plugin-node": "^8.0.1",
-      "eslint-plugin-prettier": "^3.0.1",
-      "eslint-plugin-promise": "^4.0.1",
-      "eslint-plugin-standard": "^4.0.0",
-      "eslint-plugin-vue": "^5.2.1",
-      "extract-text-webpack-plugin": "^4.0.0-beta.0",
-      "file-loader": "1.1.11",
-      "friendly-errors-webpack-plugin": "1.7.0",
-      "gulp": "^3.9.1",
-      "gulp-autoprefixer": "^4.0.0",
-      "gulp-cssmin": "^0.1.7",
-      "gulp-postcss": "^6.1.1",
-      "gulp-rename": "^0.2.2",
-      "gulp-replace": "^1.0.0",
-      "gulp-rev-collector": "^1.3.1",
-      "gulp-sass": "^3.1.0",
-      "html-webpack-plugin": "4.0.0-alpha",
-      "mini-css-extract-plugin": "^0.5.0",
-      "node-notifier": "^5.1.2",
-      "node-sass": "^4.13.0",
-      "optimize-css-assets-webpack-plugin": "^3.2.0",
-      "ora": "^1.2.0",
-      "portfinder": "^1.0.13",
-      "postcss-import": "11.1.0",
-      "postcss-loader": "2.1.6",
-      "postcss-url": "^7.2.1",
-      "raw-loader": "^1.0.0",
-      "rimraf": "^2.6.0",
-      "sass-loader": "^7.0.3",
-      "sass-resources-loader": "^2.0.0",
-      "script-ext-html-webpack-plugin": "^2.1.3",
-      "semver": "^5.3.0",
-      "shelljs": "^0.7.6",
-      "uglifyjs-webpack-plugin": "^1.3.0",
-      "url-loader": "^1.0.1",
-      "vue-infinite-scroll": "^2.0.2",
-      "vue-style-loader": "^4.1.2",
-      "webpack": "^4.29.5",
-      "webpack-bundle-analyzer": "^2.13.1",
-      "webpack-cli": "~3.1.2",
-      "webpack-dev-server": "~3.1.14",
-      "webpack-merge": "^4.1.4"
-   },
-   "engines": {
-      "node": ">= 6.0.0",
-      "npm": ">= 3.0.0"
-   },
-   "browserslist": [
-      "> 1%",
-      "last 2 versions",
-      "not ie <= 8"
-   ]
+    "name": "dcuc-web-auth",
+    "version": "1.2.89",
+    "description": "",
+    "private": false,
+    "main": "lib/static/js/app.js",
+    "scripts": {
+        "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+        "update:ui": "npm uninstall ui-component-v4&&npm install ui-component-v4",
+        "build": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+        "theme": "gulp --gulpfile src/assets/gulpfile.js ",
+        "theme:watch": "gulp watching --gulpfile src/assets/gulpfile.js",
+        "theme:copyResources": "gulp copyResources --gulpfile src/assets/gulpfile.js",
+        "analyz": "cross-env NODE_ENV=production npm_config_report=true npm run build",
+        "merge": "gulp merge --gulpfile src/assets/gulpfile.js",
+        "deploy:base": "node deploy base",
+        "deploy:common": "node deploy common",
+        "install:ueditor": "node src/utils/installer",
+        "gen:fetchApis": "node ./mock/fetchApis.js",
+        "clean:node": "rimraf node_modules&&rimraf package-lock.json&&npm cache clean --force"
+    },
+    "publishConfig": {
+        "registry": "http://192.168.6.13:8082/repository/npm_ui"
+    },
+    "dependencies": {
+        "axios": "^0.18.0",
+        "babel-polyfill": "^6.26.0",
+        "dayjs": "^1.9.7",
+        "echarts": "^4.2.0-rc.2",
+        "gojs": "^2.0.15",
+        "html": "^1.0.0",
+        "ip": "^1.1.5",
+        "jquery": "^3.4.1",
+        "jquery.nicescroll": "^3.7.6",
+        "js-cookie": "^2.2.0",
+        "lodash": "^4.17.11",
+        "mockjs": "^1.1.0",
+        "moment": "^2.24.0",
+        "normalize.css": "^7.0.0",
+        "nprogress": "^0.2.0",
+        "path-to-regexp": "^3.0.0",
+        "pdfobject": "^2.1.1",
+        "postcss-salad": "^2.0.1",
+        "screenfull": "^4.0.0",
+        "ui-component-v4": "^1.2.19",
+        "ui-jz-v4-common": "^1.2.222",
+        "vue": "2.6.10",
+        "vue-codemirror": "^4.0.6",
+        "vue-count-to": "^1.0.13",
+        "vue-i18n": "^8.0.0",
+        "vue-loader": "^15.3.0",
+        "vue-router": "^3.0.1",
+        "vue-template-compiler": "2.6.10",
+        "vuebar": "^0.0.20",
+        "vuex": "^3.0.1"
+    },
+    "devDependencies": {
+        "autoprefixer": "^8.5.0",
+        "babel-core": "^6.26.3",
+        "babel-eslint": "^8.2.6",
+        "babel-helper-vue-jsx-merge-props": "^2.0.3",
+        "babel-loader": "^7.1.5",
+        "babel-plugin-dynamic-import-node": "^2.0.0",
+        "babel-plugin-syntax-jsx": "^6.18.0",
+        "babel-plugin-transform-runtime": "^6.23.0",
+        "babel-plugin-transform-vue-jsx": "^3.7.0",
+        "babel-preset-env": "^1.7.0",
+        "babel-preset-stage-2": "^6.24.1",
+        "chalk": "^2.4.1",
+        "clean-webpack-plugin": "^2.0.1",
+        "compression-webpack-plugin": "^2.0.0",
+        "connect": "^3.6.6",
+        "copy-webpack-plugin": "^4.5.2",
+        "cross-env": "^5.2.0",
+        "css-loader": "1.0.0",
+        "eslint": "^5.14.0",
+        "eslint-config-prettier": "^4.0.0",
+        "eslint-config-standard": "^12.0.0",
+        "eslint-plugin-html": "^5.0.0",
+        "eslint-plugin-import": "^2.16.0",
+        "eslint-plugin-node": "^8.0.1",
+        "eslint-plugin-prettier": "^3.0.1",
+        "eslint-plugin-promise": "^4.0.1",
+        "eslint-plugin-standard": "^4.0.0",
+        "eslint-plugin-vue": "^5.2.1",
+        "extract-text-webpack-plugin": "^4.0.0-beta.0",
+        "file-loader": "1.1.11",
+        "friendly-errors-webpack-plugin": "1.7.0",
+        "gulp": "^3.9.1",
+        "gulp-autoprefixer": "^4.0.0",
+        "gulp-cssmin": "^0.1.7",
+        "gulp-postcss": "^6.1.1",
+        "gulp-rename": "^0.2.2",
+        "gulp-replace": "^1.0.0",
+        "gulp-rev-collector": "^1.3.1",
+        "gulp-sass": "^3.1.0",
+        "html-webpack-plugin": "4.0.0-alpha",
+        "mini-css-extract-plugin": "^0.5.0",
+        "node-notifier": "^5.1.2",
+        "node-sass": "^4.13.0",
+        "optimize-css-assets-webpack-plugin": "^3.2.0",
+        "ora": "^1.2.0",
+        "portfinder": "^1.0.13",
+        "postcss-import": "11.1.0",
+        "postcss-loader": "2.1.6",
+        "postcss-url": "^7.2.1",
+        "raw-loader": "^1.0.0",
+        "rimraf": "^2.6.0",
+        "sass-loader": "^7.0.3",
+        "sass-resources-loader": "^2.0.0",
+        "script-ext-html-webpack-plugin": "^2.1.3",
+        "semver": "^5.3.0",
+        "shelljs": "^0.7.6",
+        "uglifyjs-webpack-plugin": "^1.3.0",
+        "url-loader": "^1.0.1",
+        "vue-infinite-scroll": "^2.0.2",
+        "vue-style-loader": "^4.1.2",
+        "webpack": "^4.29.5",
+        "webpack-bundle-analyzer": "^2.13.1",
+        "webpack-cli": "~3.1.2",
+        "webpack-dev-server": "~3.1.14",
+        "webpack-merge": "^4.1.4"
+    },
+    "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+    },
+    "browserslist": [
+        "> 1%",
+        "last 2 versions",
+        "not ie <= 8"
+    ]
 }

src/api/role-auth-info.js

@@ -48,5 +48,4 @@ export function savePersion(data){
 // 业务域
 export function getBusiness(value){
     return axios.get(`/duceap/v2/resource/codelist/code/DM_ROLE_LEVEL`)
-    // return axios.getBu(`/duacm/codeSon/v2/searchColumn`,{codeDicId:'DM_POLICE_BUSINESS',columnName:'police_type_id',columnValue:value})
 }

src/assets/style/my-card.scss

@@ -2,7 +2,7 @@
     .el-card.is-base {
         .el-card__header {
             display: block !important;
-            background-color: #eef2fa;
+            //background-color: #eef2fa;
         }
     }
 }

src/pages/authorization-manage/author-source-manage.vue

@@ -4,6 +4,10 @@
     <dg-row :gutter="10" class="edit-source-box">
         <dg-col :span="10">
             <dg-card shadow="never" header="应用资源信息">
+                <div style="text-align: left;margin-bottom: 10px;">
+                    <dg-button type="primary" @click="handleAddSource">新增根资源</dg-button>
+                </div>
+
                 <menu-tree
                     :isNeedRightMenu="true"
                     apiName="menuTree"
@@ -17,9 +21,6 @@
         </dg-col>
         <dg-col :span="14">
             <dg-card shadow="never" header="资源详细信息">
-                <div style="text-align: right;margin-bottom: 10px;">
-                    <dg-button type="primary" @click="handleAddSource">新增</dg-button>
-                </div>
                 <div v-show="isShowForm">
                     <el-form
                         ref="sizeForm"
@@ -205,7 +206,7 @@ export default {
                 deletedId: id,
                 appId: that.appId
             };
-            that.$confirm("确认删除？", "确认信息", {
+            that.$confirm("删除资源将会删除该资源及其下级资源，确认删除？", "确认信息", {
                 distinguishCancelAndClose: true,
                 confirmButtonText: "确定",
                 cancelButtonText: "取消"

src/pages/authorization-manage/edit.vue

@@ -69,7 +69,6 @@ export default {
         margin-bottom: 10px;
         padding-left: 10px;
         border-bottom-style: dashed;
-        background-color: white;
     }
 }
 </style>

src/pages/common/menu-tree/index.vue

@@ -5,6 +5,29 @@
 -->
 <template>
     <div class="u-tree__bar">
+        <!--        右键可以打开菜单-->
+        <!--        <dg-scrollbar>-->
+        <!--            <dg-tree-->
+        <!--                ref="tree"-->
+        <!--                icon-class="el-icon-folder-opened"-->
+        <!--                icon-leaf="el-icon-document"-->
+        <!--                node-key="id"-->
+        <!--                :data="source"-->
+        <!--                :props="props"-->
+        <!--                default-expand-all-->
+        <!--                highlight-current-->
+        <!--                :filter-node-method="filterNode"-->
+        <!--                :expand-on-click-node="false"-->
+        <!--                @node-contextmenu="rightClick"-->
+        <!--            >-->
+        <!--                <div slot-scope="{ node, data }" class="u-tree-label" style="width: 100%">-->
+        <!--                    <p @dblclick="handlerNodeDoubleClick(data)" @click="handleNodeClick(data)">-->
+        <!--                        {{ data[props.label] }}-->
+        <!--                    </p>-->
+        <!--                </div>-->
+        <!--            </dg-tree>-->
+        <!--        </dg-scrollbar>-->
+        <!--todo 修改成无右键菜单-->
         <dg-scrollbar>
             <dg-tree
                 ref="tree"
@@ -17,17 +40,24 @@
                 highlight-current
                 :filter-node-method="filterNode"
                 :expand-on-click-node="false"
-                @node-contextmenu="rightClick"
             >
-                <div slot-scope="{ node, data }" class="u-tree-label" style="width: 100%">
-                    <p @dblclick="handlerNodeDoubleClick(data)" @click="handleNodeClick(data)">
+                <div slot-scope="{ node, data }" class="u-tree-label el-tree-node__edit" style="width: 100%">
+                    <span
+                        @dblclick="handlerNodeDoubleClick(data)"
+                        @click="handleNodeClick(data)"
+                        style="display: inline-block;flex: 1;"
+                    >
                         {{ data[props.label] }}
-                    </p>
+                    </span>
+                    <span class="operation-icons">
+                        <i class="el-icon-circle-plus-outline" @click="handleSelect('add', node, data)"> </i>
+                        <i class="el-icon-delete" @click="handleSelect('delete', node, data)"> </i>
+                    </span>
                 </div>
             </dg-tree>
         </dg-scrollbar>
         <!--右键菜单-->
-        <div v-show="menuVisible && isNeedRightMenu" id="menu" class="tree-operation-box">
+        <div v-show="menuVisible && isNeedRightMenu" id="menu_contain" class="tree-operation-box">
             <el-menu id="menu" @select="handleSelect" text-color="#000">
                 <el-menu-item
                     v-for="(op, i) in treeRightOperations"
@@ -50,6 +80,7 @@
 <script>
 //  一次性请求数据源
 import * as commonApi from "@/api/common";
+
 let debounceTimer;
 export default {
     name: "menuTree",
@@ -148,7 +179,7 @@ export default {
             this.menuVisible = true; // 显示菜单
             this.nodedata = data; // 节点信息存下来
             this.Node = node;
-            let menu = document.querySelector("#menu");
+            let menu = document.querySelector("#menu_contain");
             let x = event.pageX || event.clientX,
                 y = event.pageY || event.clientY;
             // menu.style.cssText =
@@ -162,8 +193,10 @@ export default {
             this.menuVisible = false;
             document.removeEventListener("click", this.Listen); // 监听鼠标事件
         },
-        handleSelect(val) {
-            // console.log(val);
+        handleSelect(val, node, data) {
+            console.log(val);
+            this.Node = node;
+            this.nodedata = data;
             this.$emit("selectOperaOptions", { type: val, nodedata: this.nodedata, node: this.Node });
         },
         remove() {
@@ -198,8 +231,10 @@ export default {
     width: 100px;
     position: absolute;
     color: #fff;
+
     ul {
         list-style: none;
+
         li {
             width: 100%;
             cursor: pointer;
@@ -209,13 +244,30 @@ export default {
             text-align: center;
             font-size: 14px;
             border-bottom: 1px solid #fff;
+
             &:last-child {
                 border-bottom: none;
             }
         }
     }
 }
+
 .u-tree__bar {
     height: calc(100vh - 28rem);
+    .el-tree-node__edit {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding-right: 20px;
+        i {
+            color: #1890ff;
+        }
+        .operation-icons {
+            display: none;
+        }
+        &:hover .operation-icons {
+            display: block;
+        }
+    }
 }
 </style>

src/pages/empower-manage/institutional-quotas-manage/edit.vue

@@ -408,7 +408,7 @@ export default {
                         that.getOrgQuotas(); //配额树刷新
                     })
                     .catch(err => {
-                        that.$message.error("保存失败");
+                        that.$message.error(err);
                     });
             });
         },

src/pages/log-report/persionnel-author-audit/timeLine.vue

@@ -302,7 +302,7 @@ export default {
         font-size: 12px;
         .color-blue {
             font-size: 15px;
-            color: rgba(0, 0, 255, 0.72);
+            color: #5e8afa;
         }
     }
     .line-sub-text {

src/pages/log-report/scope-author-audit/timeLine.vue

@@ -277,7 +277,7 @@ export default {
         font-size: 12px;
         .color-blue {
             font-size: 15px;
-            color: rgba(0, 0, 255, 0.72);
+            color: #5e8afa
         }
     }
     .line-sub-text {