Răsfoiți Sursa

- 资源管理去掉右键菜单
- 配额下发保存修改

赖云浩 4 ani în urmă
părinte
comite
dd829e6ae1

+ 131 - 131
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"
+    ]
 }

+ 6 - 3
src/pages/common/menu-tree/index.vue

@@ -40,10 +40,13 @@
                 highlight-current
                 :filter-node-method="filterNode"
                 :expand-on-click-node="false"
-                @node-contextmenu="rightClick"
             >
                 <div slot-scope="{ node, data }" class="u-tree-label el-tree-node__edit" style="width: 100%">
-                    <span @dblclick="handlerNodeDoubleClick(data)" @click="handleNodeClick(data)">
+                    <span
+                        @dblclick="handlerNodeDoubleClick(data)"
+                        @click="handleNodeClick(data)"
+                        style="display: inline-block;flex: 1;"
+                    >
                         {{ data[props.label] }}
                     </span>
                     <span class="operation-icons">
@@ -255,7 +258,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
-        padding-right: 10px;
+        padding-right: 20px;
         i {
             color: #1890ff;
         }

+ 1 - 1
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);
                     });
             });
         },