政务网版本

src/App.vue

@@ -7,7 +7,9 @@
 <script>
 
 export default {
-  name: 'App'
+  name: 'App',
+  mounted() {
+  }
 }
 </script>
 

src/main.js

@@ -7,7 +7,8 @@ import './assets/styles/index.scss'
 import { initDynamicRoutes } from './utils/createRoutes'
 
 var axios = require('axios')
-axios.defaults.baseURL = 'http://47.101.207.123:8080/gateway-server'
+// axios.defaults.baseURL = 'http://47.101.207.123:8080/gateway-server'    // 互联网
+axios.defaults.baseURL = 'http://10.83.246.97/gateway-server'    // 政务网
 // axios.defaults.baseURL = 'http://192.168.137.1:9252'
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'
 axios.interceptors.response.use(

src/router/index.js

@@ -155,24 +155,22 @@ router.beforeEach((to, from, next) => {
       deleteCookie('userInfo')
       deleteCookie('authority')
       window.open(
-        `http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home`,
+        `http://10.83.246.97/platform-entrance-s/#/login?url=http://10.83.246.97/user_authentication/#/home`,
         "_self",
         "",
         true
       )
-      // location.href = "http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home"
     }
   },error=>{
     deleteCookie('m_token')
     deleteCookie('userInfo')
     deleteCookie('authority')
      window.open(
-      `http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home`,
+      `http://10.83.246.97/platform-entrance-s/#/login?url=http://10.83.246.97/user_authentication/#/home`,
       "_self",
       "",
       true
     )
-    // location.href = "http://47.101.207.123:8080/platform-rk/#/login?url=http://47.101.207.123:8080/user_authentication/#/home"
   })
   // next()
 })

src/utils/service/user.js

@@ -28,10 +28,10 @@ export function GetUserInfoById(userId) {
 
 export function UpdateUserRole(formInLine) {
   let data = {
-    contact: formInLine.contact,
-    name: formInLine.name,
+    // contact: formInLine.contact,
+    // name: formInLine.name,
     roleArr: JSON.stringify(formInLine.roleArr),
-    unitId: formInLine.unitId,
+    // unitId: formInLine.unitId,
     userId: formInLine.userId,
   }
   return axios.post('user/updateUserRole', qs.stringify(data))

src/views/userManage/AuthManageEdit.vue

@@ -25,6 +25,7 @@
               :default-expanded-keys="defaultExpand[index]"
               :ref="'tree-'+index"
               :filter-node-method="filterNode"
+              @check-change="(node, isCheck, isChildCheck) => handleCheckChange(index, isCheck)"
               show-checkbox>
             </el-tree>
           </el-col>
@@ -63,6 +64,31 @@
       }
     },
     methods: {
+      handleCheckChange(index, isCheck) {
+        if(isCheck) {
+          this.$refs[`tree-${index}`][0].getHalfCheckedNodes().forEach(i => {
+            i.data.forEach(j => {
+              if(j.isShow == 0) {
+                this.$refs[`tree-${index}`][0].setChecked(j.authorityId, true)
+              }
+            })
+          })
+        }else {
+          let checked = this.$refs[`tree-${index}`][0].getCheckedKeys()
+          checked.push(...this.$refs[`tree-${index}`][0].getHalfCheckedKeys())
+          this.$refs[`tree-${index}`][0].getHalfCheckedNodes().forEach(i => {
+            let flag = true
+            i.data.forEach(j => {
+              if(j.isShow == 1 && checked.indexOf(j.authorityId) != -1) {
+                flag = false
+              }
+            })
+            if(flag) {
+              this.$refs[`tree-${index}`][0].setChecked(i.authorityId, false, true)
+            }
+          })
+        }
+      },
       filterNode(value, data, node) {   // 隐藏 isShow=0 的节点
         return +data.isShow===1
       },

src/views/userManage/UserListDetail.vue

@@ -27,14 +27,14 @@
         <el-row>
           <el-col :span="12" :offset="6">
             <el-form-item label="姓名" prop="name">
-              <el-input v-model="form.name" :disabled="pageType==='detail'"/>
+              <el-input v-model="form.name" :disabled="pageType==='detail'||pageType==='edit'"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12" :offset="6">
             <el-form-item label="组织机构" prop="unitId">
-              <el-select v-model="form.unitId" placeholder="请选择" filterable :disabled="pageType==='detail'">
+              <el-select v-model="form.unitId" placeholder="请选择" filterable :disabled="pageType==='detail'||pageType==='edit'">
                 <el-option v-for="item in departmentArr" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
@@ -43,7 +43,7 @@
         <el-row>
           <el-col :span="12" :offset="6">
             <el-form-item label="联系电话">
-              <el-input v-model="form.contact" :disabled="pageType==='detail'"/>
+              <el-input v-model="form.contact" :disabled="pageType==='detail'||pageType==='edit'"/>
             </el-form-item>
           </el-col>
         </el-row>

vue.config.js

@@ -1,4 +1,5 @@
 module.exports = {
+  publicPath: './',
   chainWebpack: (config) => {
     config.plugin('html').tap((args) => {
       args[0].title = '统一用户认证管理系统'