diff --git a/.env.development b/.env.development
index b1cf2b1..fbf0dba 100644
--- a/.env.development
+++ b/.env.development
@@ -7,5 +7,5 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://127.0.0.1:4523/m1/4061550-0-default"
-VUE_APP_URL = "http://192.168.0.105:8114"
+VUE_APP_URL = "http://192.168.0.105:8115"
##VUE_APP_URL = "https://wms.yxtsoft.com"
diff --git a/.env.production b/.env.production
index b150b78..0cb8471 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,4 @@ ENV = 'production'
VUE_APP_BASE_API = '/api'
## 配置 正式接口地址
-VUE_APP_URL = "https://wms.yxtsoft.com"
+VUE_APP_URL = "https://admin.yxtsoft.com"
diff --git a/src/api/system/roleAdminister/index.js b/src/api/system/roleAdminister/index.js
index 228b471..a34d243 100644
--- a/src/api/system/roleAdminister/index.js
+++ b/src/api/system/roleAdminister/index.js
@@ -141,7 +141,7 @@ export function roleMenuTree(data) {
// 菜单授权保存
export function saveorgrolemenus(data) {
return request({
- url: `/admin/apiadmin/sysroleauthorize/updateRoleAndMenu`,
+ url: `/admin/apiadmin/sysroleauthorize/updateRoleAndMenuAdmin`,
method: 'POST',
data: data,
headers: {
diff --git a/src/api/system/unitAuthorizeManage/unitAuthorizeManage.js b/src/api/system/unitAuthorizeManage/unitAuthorizeManage.js
index 8684f29..8ba4951 100644
--- a/src/api/system/unitAuthorizeManage/unitAuthorizeManage.js
+++ b/src/api/system/unitAuthorizeManage/unitAuthorizeManage.js
@@ -27,5 +27,25 @@ export default {
});
},
+ // 查询单位管理资源注册信息
+ getRegistrationInformation: function(data) {
+ return request({
+ url: '/admin/apiadmin/sysorgauthorize/getRegistrationInformation/' + data,
+ method: 'get'
+ })
+ },
+
+ // 保存注册信息
+ saveReg: function(data) {
+ return request({
+ // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+ url: '/admin/apiadmin/sysorgregister/save',
+ method: 'post',
+ data: data,
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ });
+ },
}
diff --git a/src/api/system/userManage/index.js b/src/api/system/userManage/index.js
index 464099a..b970b75 100644
--- a/src/api/system/userManage/index.js
+++ b/src/api/system/userManage/index.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
let tokens = window.sessionStorage.getItem('token');
export function userList(data) {
return request({
- url: '/admin/apiadmin/sysuser/listPage',
+ url: '/admin/apiadmin/sysuser/listPageVoAdmin',
method: 'post',
data: data,
headers: {
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index dbb2e0b..f592b6d 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -417,6 +417,15 @@
if (response.code == 200) {
+ if (response.data.userName != "yxt_admin") {
+ this.$message({
+ message: '此账号不能登录.',
+ type: 'warning'
+ })
+ loading.close()
+ return
+ }
+
this.$router.push({
path: '/index'
})
diff --git a/src/views/system/purviewManage/purviewManage.vue b/src/views/system/purviewManage/purviewManage.vue
index 990c28b..c1f573e 100644
--- a/src/views/system/purviewManage/purviewManage.vue
+++ b/src/views/system/purviewManage/purviewManage.vue
@@ -205,7 +205,7 @@
editRow(row) {
this.dialogTitle = '编辑'
this.editDialog = true
- this.roleForm = row
+ this.roleForm = Object.assign({}, row)
this.checkedId = []
this.groupSid = row.sid
diff --git a/src/views/system/roleAdminister/roleAdminister.vue b/src/views/system/roleAdminister/roleAdminister.vue
index 02de08e..f10e82a 100644
--- a/src/views/system/roleAdminister/roleAdminister.vue
+++ b/src/views/system/roleAdminister/roleAdminister.vue
@@ -943,24 +943,55 @@
// roleMenus = this.$refs.Tree.getCheckedKeys()
console.log('已选节点、半选节点node', roleMenus)
const roleMenus_sid = []
+ var menuSidList = []
+ var top_level_menuSid = '' // 顶级菜单sid
+
+ // menuSidList.push({
+ // menuSid: roleMenus[i].sid,
+ // menuName: roleMenus[i].name,
+ // roleSid: this.Thisrow.sid,
+ // sourceSid: roleMenus[i].sourceSid == "" ? roleMenus[i].sid : roleMenus[i].sourceSid
+ // })
+
+
for (var i = 0; i < roleMenus.length; i++) {
roleMenus_sid.push(roleMenus[i].sid)
+
+ if (roleMenus[i].psid == "") {
+ top_level_menuSid += roleMenus[i].sid + ","
+ }
+
}
- console.log('已选节点、半选节点sid', roleMenus_sid)
- // let parentTrue = this.$refs.Tree.getHalfCheckedKeys()
- // for (let i = 0; i < parentTrue.length; i++) {
- // for (let j = 0; j < this.chace.length; j++) {
- // if (parentTrue[i] == this.chace[j]) {
- // parentTrue.splice(i, 1);
- // }
- // }
- // }
- let params = {
- menuSid: roleMenus_sid.toString(),
- roleSid: this.Thisrow.sid,
- sourceSid: "d936f1ba-03c3-11ec-bf08-48452053aa45"
+ console.log('顶级sid', top_level_menuSid.substring(0, top_level_menuSid.length - 1))
+ var top_level_menuSidList = top_level_menuSid.substring(0, top_level_menuSid.length - 1).split(",") // 顶级菜单集合
+
+ for (var i = 0; i < top_level_menuSidList.length; i++) {
+
+ var top_level_menuSid = top_level_menuSidList[i]
+
+ var roleMenusList = []
+
+ for (var j = 0; j < roleMenus.length; j++) {
+ if (roleMenus[j].sourceSid == top_level_menuSid) {
+ roleMenusList.push((roleMenus[j].sid))
+ }
+ }
+
+ menuSidList.push({
+ menuSid: roleMenusList.toString(),
+ roleSid: this.Thisrow.sid,
+ sourceSid: top_level_menuSid
+ })
+
}
- saveorgrolemenus(params).then(res => {
+
+ console.log('已选节点、半选节点sid', menuSidList)
+ // let params = {
+ // menuSid: roleMenus_sid.toString(),
+ // roleSid: this.Thisrow.sid,
+ // sourceSid: "d936f1ba-03c3-11ec-bf08-48452053aa45"
+ // }
+ saveorgrolemenus(menuSidList).then(res => {
this.roleDialog = false
this.charactarDialog = false
this.checkStrictly = true
diff --git a/src/views/system/unitAuthorizeManage/unitAuthorizeManage.vue b/src/views/system/unitAuthorizeManage/unitAuthorizeManage.vue
index 7f6b65a..aef0273 100644
--- a/src/views/system/unitAuthorizeManage/unitAuthorizeManage.vue
+++ b/src/views/system/unitAuthorizeManage/unitAuthorizeManage.vue
@@ -16,7 +16,7 @@
-
+
+
@@ -81,6 +82,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 正式版
+ 体验版
+
+
+
+
+
+
+
+
+ 保 存
+ 关 闭
+
+
+
+
@@ -125,7 +167,11 @@
groupSids: [],
orgSid: ''
},
- roleList: []
+ roleList: [],
+ orgNameTitle: "",
+ radio: "",
+ roleDialog2: false,
+ registerList: []
}
},
mounted() {
@@ -207,6 +253,10 @@
this.roleForm.groupSids = row.groupSids
},
+ doClose() {
+ this.$store.dispatch('tagsView/delView', this.$route)
+ this.$router.go(-1)
+ },
saveRole() {
@@ -224,7 +274,34 @@
groupSids: [],
orgSid: ''
}
+ },
+
+ toDialog(row) {
+ this.orgNameTitle = "单位注册信息：" + row.orgName
+
+ req.getRegistrationInformation(row.orgSid).then(res => {
+ this.registerList = res.data
+ this.roleDialog2 = true
+ })
+
+ },
+ radioChange(val) {
+
+ },
+ saveRegister() {
+ console.log("aaa", this.registerList);
+
+ req.saveReg(this.registerList).then(res => {
+ this.roleDialog2 = false
+ })
+
+ },
+ dialogClose2() {
+ this.roleDialog2 = false
}
+
+
+
}
}
diff --git a/vue.config.js b/vue.config.js
index c632086..704429c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,18 +40,18 @@ module.exports = {
},
proxy: {
'/api': { // 匹配所有以 '/api'开头的请求路径
- // target: 'http://192.168.0.105:8114',
+ // target: 'http://192.168.0.105:8115',
target: process.env.VUE_APP_URL, // 代理目标的基础路径
- // target: 'https://wms.yxtsoft.com/api', // 代理目标的基础路径
+ // target: 'https://admin.yxtsoft.com/api', // 代理目标的基础路径
changeOrigin: true, // 支持跨域
pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
'^/api': ''
}
},
'/upload': { // 匹配所有以 '/api'开头的请求路径
- // target: 'http://192.168.0.105:8114',
+ // target: 'http://192.168.0.105:8115',
target: process.env.VUE_APP_URL, // 代理目标的基础路径
- // target: 'https://wms.yxtsoft.com/api', // 代理目标的基础路径
+ // target: 'https://admin.yxtsoft.com/api', // 代理目标的基础路径
changeOrigin: true, // 支持跨域
pathRewrite: { // 重写路径: 去掉路径中开头的'/api'
'^/upload': ''