Merge branch 'master' of https://gitee.com/longyears/patrol-maintain-web

src/views/system/user.vue

@@ -24,6 +24,12 @@
           </el-table-column>
           <el-table-column prop="username" label="用户名">
           </el-table-column>
+          <el-table-column prop="department" label="部门">
+            <template slot-scope="scope">
+              <el-tag size="medium">{{ scope.row.department.name }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="address" label="角色">
             <template slot-scope="scope">
               <el-tag size="medium" v-for="(item,index) in scope.row.roles" style="margin-right: 10px;">{{ item.name }}

vue.config.js

@@ -46,8 +46,8 @@ module.exports = {
     //before: require('./mock/mock-server.js')
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
+        //target: 'http://patrol.115.langye.net/',
         target: 'http://192.168.60.100:9001/',
-        // target: 'http://patrol.115.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''