diff --git a/epmet-oper-web/package-lock.json b/epmet-oper-web/package-lock.json
index 568b04a..9c36793 100644
--- a/epmet-oper-web/package-lock.json
+++ b/epmet-oper-web/package-lock.json
@@ -5365,6 +5365,15 @@
"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
"dev": true
},
+ "dai-js": {
+ "version": "0.0.12",
+ "resolved": "https://registry.npm.taobao.org/dai-js/download/dai-js-0.0.12.tgz",
+ "integrity": "sha1-Yk4eqh6Q5p2bFrYcl3cUDIZoF70=",
+ "dev": true,
+ "requires": {
+ "babel-runtime": "^6.11.6"
+ }
+ },
"dashdash": {
"version": "1.14.1",
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
diff --git a/epmet-oper-web/public/index.html b/epmet-oper-web/public/index.html
index 4e072fb..a60d38f 100644
--- a/epmet-oper-web/public/index.html
+++ b/epmet-oper-web/public/index.html
@@ -29,7 +29,7 @@
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
-
+
<% } %>
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
diff --git a/epmet-oper-web/src/views/modules/sys/role-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/role-add-or-update.vue
index fec6908..c645b63 100644
--- a/epmet-oper-web/src/views/modules/sys/role-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/sys/role-add-or-update.vue
@@ -20,18 +20,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48,12 +48,12 @@ export default {
return {
visible: false,
menuList: [],
- deptList: [],
+ // deptList: [],
dataForm: {
id: '',
name: '',
menuIdList: [],
- deptIdList: [],
+ // deptIdList: [],
remark: ''
}
}
@@ -73,10 +73,10 @@ export default {
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
this.$refs.menuListTree.setCheckedKeys([])
- this.$refs.deptListTree.setCheckedKeys([])
+ // this.$refs.deptListTree.setCheckedKeys([])
Promise.all([
- this.getMenuList(),
- this.getDeptList()
+ this.getMenuList()
+ // this.getDeptList()
]).then(() => {
if (this.dataForm.id) {
this.getInfo()
@@ -86,7 +86,7 @@ export default {
},
// 获取菜单列表
getMenuList () {
- return this.$http.get('/sys/menu/select').then(({ data: res }) => {
+ return this.$http.get('/oper/access/menu/select').then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -94,17 +94,17 @@ export default {
}).catch(() => {})
},
// 获取部门列表
- getDeptList () {
- return this.$http.get('/sys/dept/list').then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
- }
- this.deptList = res.data
- }).catch(() => {})
- },
+ // getDeptList () {
+ // return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+ // if (res.code !== 0) {
+ // return this.$message.error(res.msg)
+ // }
+ // this.deptList = res.data
+ // }).catch(() => {})
+ // },
// 获取信息
getInfo () {
- this.$http.get(`/sys/role/${this.dataForm.id}`).then(({ data: res }) => {
+ this.$http.get(`/oper/access/operrole/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
@@ -113,7 +113,7 @@ export default {
...res.data
}
this.dataForm.menuIdList.forEach(item => this.$refs.menuListTree.setChecked(item, true))
- this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
+ // this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
}).catch(() => {})
},
// 表单提交
@@ -126,8 +126,8 @@ export default {
...this.$refs.menuListTree.getCheckedKeys(),
...this.$refs.menuListTree.getHalfCheckedKeys()
]
- this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
- this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm).then(({ data: res }) => {
+ // this.dataForm.deptIdList = this.$refs.deptListTree.getCheckedKeys()
+ this.$http[!this.dataForm.id ? 'post' : 'put']('/oper/access/operrole', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
diff --git a/epmet-oper-web/src/views/modules/sys/role.vue b/epmet-oper-web/src/views/modules/sys/role.vue
index 6b30169..7194036 100644
--- a/epmet-oper-web/src/views/modules/sys/role.vue
+++ b/epmet-oper-web/src/views/modules/sys/role.vue
@@ -56,9 +56,9 @@ export default {
data () {
return {
mixinViewModuleOptions: {
- getDataListURL: '/sys/role/page',
+ getDataListURL: '/oper/access/operrole/page',
getDataListIsPage: true,
- deleteURL: '/sys/role',
+ deleteURL: '/oper/access/operrole',
deleteIsBatch: true
},
dataForm: {
diff --git a/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
index a41499f..36e7422 100644
--- a/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/sys/user-add-or-update.vue
@@ -26,7 +26,7 @@
-
+
@@ -100,26 +100,20 @@ export default {
callback()
}
return {
- username: [
+ realName: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
],
- deptName: [
- { required: true, message: this.$t('validate.required'), trigger: 'change' }
- ],
password: [
{ validator: validatePassword, trigger: 'blur' }
],
confirmPassword: [
{ validator: validateConfirmPassword, trigger: 'blur' }
],
- realName: [
- { required: true, message: this.$t('validate.required'), trigger: 'blur' }
- ],
email: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ validator: validateEmail, trigger: 'blur' }
],
- mobile: [
+ phone: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ validator: validateMobile, trigger: 'blur' }
]