Browse Source

no message

XAWDJ0277HWXPT2\Administrator 5 years atrás
parent
commit
af7e4402fe

File diff suppressed because it is too large
+ 1 - 1
web/index.html


File diff suppressed because it is too large
+ 2 - 2
web/js/app.4c271b23.js


File diff suppressed because it is too large
+ 1 - 0
web/js/app.0d058d1f.js.map


File diff suppressed because it is too large
+ 0 - 1
web/js/app.4c271b23.js.map


File diff suppressed because it is too large
+ 2 - 2
web/js/chunk-e4e87226.ccde4ff5.js


File diff suppressed because it is too large
+ 1 - 0
web/js/chunk-e4e87226.b6a3a48e.js.map


File diff suppressed because it is too large
+ 0 - 1
web/js/chunk-e4e87226.ccde4ff5.js.map


+ 1 - 0
webConfig/src/api/base.js

@@ -254,6 +254,7 @@ export default{
           version:this_.version,
           role:this_.role,
         }, data);
+        console.log(this_,this_.role)
         // console.log(url,data,param)
         // console.log(qs.stringify(data))
         axios.post( url,qs.stringify(data), { params:param }).then(res => {

+ 2 - 1
webConfig/src/components/header.vue

@@ -26,7 +26,7 @@
                             <div class="nav_li" @click="linkToFun('/userManagement')" :class="{'select':routerStr == '/userManagement'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div>
                             <!-- <div class="nav_li"><i class="iconfont icon-daohangjiantou"></i><span class="span">User Management</span></div> -->
                             <div class="nav_li" @click="linkToFun('/operationLog')" :class="{'select':routerStr == '/operationLog'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Operation Log</span></div>
-                            <div class="nav_li" @click="linkToFun('/companyManagement')" :class="{'select':routerStr == '/companyManagement'}"><i class="iconfont icon-daohangjiantou"></i><span class="span">Company management</span></div>
+                            <div class="nav_li" @click="linkToFun('/companyManagement')" :class="{'select':routerStr == '/companyManagement'}" v-if="role == 1"><i class="iconfont icon-daohangjiantou"></i><span class="span">Company management</span></div>
                         </div>
                     </div>
                     <div class="nav_right">
@@ -74,6 +74,7 @@
 				client_key:'client_key',
 				username:'username',
 				version:'version',
+                role:'role',
 
                 routerStr:'routerStr',
 

+ 4 - 3
webConfig/src/views/userManagement.vue

@@ -232,9 +232,9 @@
                             </el-dropdown>
                             <span class="text" v-if="accountForm.roleType == 1">Admin</span>
                         </div>
-                        <div class="form_item" v-if="accountTkTitle == 'Add account'">
+                        <div class="form_item">
                             <span class="laber">Account name</span>
-                            <el-input v-model="accountForm.account" placeholder=""></el-input>
+                            <el-input v-model="accountForm.account" placeholder="" :disabled="accountTkTitle == 'Edit account'"></el-input>
                         </div>
                         <div class="form_item" v-if="accountTkTitle == 'Add account'">
                             <span class="laber">Password</span>
@@ -405,7 +405,7 @@
             this.role_ = 0;
             this.faultInformationArr = [
                 {prop:'role',label:'Type',minWidth:120,type:1},
-                {prop:'name',label:'Name',minWidth:80,align:'left'},
+                {prop:'account',label:'Name',minWidth:80,align:'left'},
                 {prop:'id',label:'ID',minWidth:80,align:'left'},
                 {prop:'phone',label:'phone',minWidth:80,align:'left'},
                 {prop:'email',label:'E-mail',width:80,align:'left'},
@@ -538,6 +538,7 @@
                     for(let key in data.data){
                         this.accountForm[key] = data.data[key];
                     }
+                    this.accountForm.roleType = data.data.role;
                     this.accountTkShow = true;
                 },()=>{
                     this.accountTkShowbg = false;