diff --git a/package-lock.json b/package-lock.json index f35f88e..9d5bf2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "core-js": "^3.6.5", "less": "^4.1.2", "less-loader": "5.0.0", + "momen": "^0.0.1-security", "nprogress": "^0.2.0", "vue": "^2.6.11", "vue-router": "^3.5.3", @@ -9146,6 +9147,11 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/momen": { + "version": "0.0.1-security", + "resolved": "https://registry.npmjs.org/momen/-/momen-0.0.1-security.tgz", + "integrity": "sha512-pFEyYVJ8FmAj6+WfCRZGVJKFI9I7XHS8jy2LdTuOPR8Qiq72rXGajxToS9E62DuJ3v4sFwcv2GnOVlhDWoCjVg==" + }, "node_modules/moment": { "version": "2.29.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", @@ -21502,6 +21508,11 @@ "minimist": "^1.2.5" } }, + "momen": { + "version": "0.0.1-security", + "resolved": "https://registry.npmjs.org/momen/-/momen-0.0.1-security.tgz", + "integrity": "sha512-pFEyYVJ8FmAj6+WfCRZGVJKFI9I7XHS8jy2LdTuOPR8Qiq72rXGajxToS9E62DuJ3v4sFwcv2GnOVlhDWoCjVg==" + }, "moment": { "version": "2.29.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", diff --git a/package.json b/package.json index 8df430c..886ae96 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "ant-design-vue": "^1.7.8", "axios": "^0.24.0", "core-js": "^3.6.5", - "element-ui": "^2.15.6", "less": "^4.1.2", "less-loader": "5.0.0", "momen": "^0.0.1-security", diff --git a/src/api/basic/role/index.js b/src/api/basic/role/index.js index 2906a53..cc3ab87 100644 --- a/src/api/basic/role/index.js +++ b/src/api/basic/role/index.js @@ -2,7 +2,7 @@ import httpService from "@/request" // 权限 角色 // 角色列表 -export function rolelist(params) { +export function getrolelist(params) { return httpService({ url: `/user/role/list`, method: 'get', diff --git a/src/main.js b/src/main.js index 500d370..8f35e61 100644 --- a/src/main.js +++ b/src/main.js @@ -3,8 +3,8 @@ import App from './App.vue' import './styles/index.less'; import mixins from "@/mixins" import Antd from 'ant-design-vue'; -import {Cascader} from 'element-ui'; -import 'element-ui/lib/theme-chalk/index.css'; +// import {Cascader} from 'element-ui'; +// import 'element-ui/lib/theme-chalk/index.css'; // import moment from 'moment'; import util from '@/utils/util.js' import 'ant-design-vue/dist/antd.css'; @@ -12,7 +12,7 @@ import 'ant-design-vue/dist/antd.css'; Vue.use(util); Vue.use(Antd); Vue.use(mixins); -Vue.use(Cascader); +// Vue.use(Cascader); import store from "@/store"; import router from "@/permission"; diff --git a/src/utils/util.js b/src/utils/util.js index 4253d95..624c142 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -1,8 +1,7 @@ import store from '@/store' export default { install: function (Vue) { - const communityCode = store.getters.getCommunityCode; - Vue.prototype.$upload = process.env.VUE_APP_URL + communityCode +'/manage/user/upload/uploadTestMinioImg' + Vue.prototype.$upload = process.env.VUE_APP_URL + store.getters.getCommunityCode +'/manage/user/upload/uploadTestMinioImg' Vue.prototype.ImgUrl = (src) => { return process.env.VUE_APP_STATIC + src } diff --git a/src/views/Basic/Authority/depend/config.js b/src/views/Basic/Authority/depend/config.js index fd0010c..0f540b3 100644 --- a/src/views/Basic/Authority/depend/config.js +++ b/src/views/Basic/Authority/depend/config.js @@ -18,7 +18,11 @@ export const columns = [ dataIndex: "roleNameList", width: "20%", customRender: function (roleNameList) { - return roleNameList.toString(); + let arr = [] + for (let item of roleNameList) { + arr.push(item.name) + } + return arr.toString() }, }, { diff --git a/src/views/Basic/Authority/depend/form.vue b/src/views/Basic/Authority/depend/form.vue index 4a9a143..c378b9d 100644 --- a/src/views/Basic/Authority/depend/form.vue +++ b/src/views/Basic/Authority/depend/form.vue @@ -49,7 +49,7 @@ export default { form:{ id: undefined, name: '', - parentId: null, + parentId: undefined, authorityLevel: '', remakes: '', }, diff --git a/src/views/Basic/Authority/depend/permissions.vue b/src/views/Basic/Authority/depend/permissions.vue index 9db1268..fd33b58 100644 --- a/src/views/Basic/Authority/depend/permissions.vue +++ b/src/views/Basic/Authority/depend/permissions.vue @@ -67,7 +67,7 @@