cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 修改配置文件，修改字段定义 

SOL：
修改人：maxiaonan
检视人：maxiaonan
This commit is contained in:
maxiaonan 2019-07-10 09:27:58 +08:00
parent aaeafa3f83
commit 245a0f7312
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ControlPlatform/web/config/index.js
View File

@ -12,7 +12,7 @@ module.exports = {
assetsPublicPath: '/',
proxyTable: {
'/api': {
target: 'http://192.168.100.98:8181/',
target: `http://${this.targetUrl}:8181/`,
changeOrigin: true,
pathRewrite: {
'^/api': '/'
@ -20,8 +20,9 @@ module.exports = {
}
},
targetUrl: '172.28.72.152',
// Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST
host: '172.28.72.152', // can be overwritten by process.env.HOST
port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false,
errorOverlay: true,

4
ControlPlatform/web/src/views/system/resource/ResourceInfo.vue
View File

@ -8,8 +8,8 @@
@close="close"
:visible="resourceInfoVisiable"
style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
<p><a-icon type="crown" />&nbsp;&nbsp;资源名称：{{resourceInfoData.roleName}}</p>
<p :title="resourceInfoData.remark"><a-icon type="book" />&nbsp;&nbsp;资源描述：{{resourceInfoData.remark}}</p>
<p><a-icon type="crown" />&nbsp;&nbsp;资源名称：{{resourceInfoData.name}}</p>
<p :title="resourceInfoData.remark"><a-icon type="book" />&nbsp;&nbsp;资源描述：{{resourceInfoData.description}}</p>
<p><a-icon type="clock-circle" />&nbsp;&nbsp;创建时间：{{resourceInfoData.createTime}}</p>
<p><a-icon type="clock-circle" />&nbsp;&nbsp;修改时间：{{resourceInfoData.modifyTime? resourceInfoData.modifyTime : '暂未修改'}}</p>
</a-drawer>

2
ControlPlatform/web/src/views/system/role/RoleInfo.vue
View File

@ -9,7 +9,7 @@
:visible="roleInfoVisiable"
style="height: calc(100% - 55px);overflow: auto;padding-bottom: 53px;">
<p><a-icon type="crown" />&nbsp;&nbsp;角色名称：{{roleInfoData.roleid}}</p>
<p :title="roleInfoData.remark"><a-icon type="book" />&nbsp;&nbsp;角色描述：{{roleInfoData.description}}</p>
<p :title="roleInfoData.description"><a-icon type="book" />&nbsp;&nbsp;角色描述：{{roleInfoData.description}}</p>
<p><a-icon type="clock-circle" />&nbsp;&nbsp;创建时间：{{roleInfoData.createTime}}</p>
<p><a-icon type="clock-circle" />&nbsp;&nbsp;修改时间：{{roleInfoData.modifyTime? roleInfoData.modifyTime : '暂未修改'}}</p>
<!-- <p><a-icon type="trophy" />&nbsp;&nbsp;所拥有的权限：-->

18
ControlPlatform/web/src/views/system/user/UserEdit.vue
View File

@ -37,7 +37,7 @@
'roleid',
{rules: [{ required: true, message: '请选择角色' }]}
]">
<a-select-option v-for="r in roleData" :key="r.roleId.toString()">{{r.roleName}}</a-select-option>
<a-select-option v-for="r in roleData" :key="r.roleId.toString()">{{r.name}}</a-select-option>
</a-select>
</a-form-item>
<a-form-item label='域' v-bind="formItemLayout">
@ -130,13 +130,10 @@ export default {
this.form.setFieldsValue(obj)
}
})
if (user.roleId) {
this.form.getFieldDecorator('roleId')
let roleArr = user.roleId.split(',')
this.form.setFieldsValue({'roleId': roleArr})
}
if (user.deptId) {
this.userDept = [user.deptId]
if (user.roleid) {
this.form.getFieldDecorator('roleid')
let roleArr = user.roleid.split(',')
this.form.setFieldsValue({'roleid': roleArr})
}
},
onDeptChange (value) {
@ -147,7 +144,6 @@ export default {
if (!err) {
this.loading = true
let user = this.form.getFieldsValue()
user.roleid = user.roleid
user.userid = this.userid
this.$bodyRequest('put', 'auth/v1/users', {
...user
@ -155,8 +151,8 @@ export default {
this.loading = false
this.$emit('success')
// 如果修改用户就是当前登录用户的话，更新其state
if (user.username === this.currentUser.username) {
this.$get(`auth/v1/users/${user.username}`).then((r) => {
if (user.name === this.currentUser.name) {
this.$get(`auth/v1/users/${user.userid}`).then((r) => {
this.setUser(r.data)
})
}