From 245a0f7312d78da344f8c35b5f8937cf13a74c41 Mon Sep 17 00:00:00 2001
From: maxiaonan <maxiaonan@cmhi.chinamobile.com>
Date: Wed, 10 Jul 2019 09:27:58 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E4=BF=AE=E6=94=B9=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=AE=9A=E4=B9=89=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9Amaxiaonan=20=E6=A3=80=E8=A7=86=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9Amaxiaonan?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ControlPlatform/web/config/index.js            |  5 +++--
 .../src/views/system/resource/ResourceInfo.vue |  4 ++--
 .../web/src/views/system/role/RoleInfo.vue     |  2 +-
 .../web/src/views/system/user/UserEdit.vue     | 18 +++++++-----------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/ControlPlatform/web/config/index.js b/ControlPlatform/web/config/index.js
index 130d445dd..57484ae56 100644
--- a/ControlPlatform/web/config/index.js
+++ b/ControlPlatform/web/config/index.js
@@ -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,
diff --git a/ControlPlatform/web/src/views/system/resource/ResourceInfo.vue b/ControlPlatform/web/src/views/system/resource/ResourceInfo.vue
index 888cf3b2a..f7f00e0b8 100644
--- a/ControlPlatform/web/src/views/system/resource/ResourceInfo.vue
+++ b/ControlPlatform/web/src/views/system/resource/ResourceInfo.vue
@@ -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>
diff --git a/ControlPlatform/web/src/views/system/role/RoleInfo.vue b/ControlPlatform/web/src/views/system/role/RoleInfo.vue
index f0932599d..4d33f843a 100644
--- a/ControlPlatform/web/src/views/system/role/RoleInfo.vue
+++ b/ControlPlatform/web/src/views/system/role/RoleInfo.vue
@@ -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;所拥有的权限：-->
diff --git a/ControlPlatform/web/src/views/system/user/UserEdit.vue b/ControlPlatform/web/src/views/system/user/UserEdit.vue
index a823ab974..aad44e758 100644
--- a/ControlPlatform/web/src/views/system/user/UserEdit.vue
+++ b/ControlPlatform/web/src/views/system/user/UserEdit.vue
@@ -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)
               })
             }