Browse Source

Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

csx 6 years ago
parent
commit
a1e21c5ad8

+ 4 - 3
src/views/layout/components/Navbar.vue View File

7
       <div>
7
       <div>
8
         <el-dropdown trigger="click" style="color:#fff;">
8
         <el-dropdown trigger="click" style="color:#fff;">
9
         <span class="el-dropdown-link">{{ this.$store.getters.xt_user.org.org_name }}
9
         <span class="el-dropdown-link">{{ this.$store.getters.xt_user.org.org_name }}
10
+          <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
10
         </span>
11
         </span>
11
         </el-dropdown>
12
         </el-dropdown>
12
       </div>
13
       </div>
116
       }
117
       }
117
     },
118
     },
118
     create() {
119
     create() {
119
-      // var xtuser = this.$store.getters.xt_user
120
-      // this.orgname = xtuser.org.org_name
121
-      // console.log(this.orgname)
120
+      var xtuser = this.$store.getters.xt_user
121
+      this.orgname = xtuser.org.org_name
122
+      console.log(this.orgname)
122
 
123
 
123
     }
124
     }
124
   }
125
   }

+ 6 - 1
src/views/layout/components/Sidebar/index.vue View File

5
     </div>
5
     </div>
6
     <el-menu
6
     <el-menu
7
       mode="vertical"
7
       mode="vertical"
8
-      unique-opened="ture"
8
+      :unique-opened="uniqueOpened"
9
       :show-timeout="200"
9
       :show-timeout="200"
10
       :default-active="$route.path"
10
       :default-active="$route.path"
11
       :collapse="isCollapse"
11
       :collapse="isCollapse"
32
       return !this.sidebar.opened;
32
       return !this.sidebar.opened;
33
     }
33
     }
34
   },
34
   },
35
+  data(){
36
+    return{
37
+      uniqueOpened:true,
38
+    }
39
+  },
35
   methods:{
40
   methods:{
36
     toggleSideBar() {
41
     toggleSideBar() {
37
       this.$store.dispatch("toggleSideBar");
42
       this.$store.dispatch("toggleSideBar");

+ 2 - 2
src/xt_pages/home/modify_user_info_dialog.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
-        <el-dialog title="修改个人信息" modal-append-to-body="false" append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
3
+        <el-dialog title="修改个人信息" :modal-append-to-body="false" :append-to-body="true" width="50%" :visible.sync="visible" :before-close="_close">
4
             <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
4
             <el-form ref="form" :model="form"  :rules="rules" label-width="80px" 
5
                     v-loading="uploading">
5
                     v-loading="uploading">
6
                 <el-form-item label="账号:">
6
                 <el-form-item label="账号:">
34
             </div>
34
             </div>
35
         </el-dialog>
35
         </el-dialog>
36
 
36
 
37
-        <el-dialog title="修改密码" modal-append-to-body="false" append-to-body="true" :visible.sync="pwd_dialog_visible">
37
+        <el-dialog title="修改密码" :modal-append-to-body="false" :append-to-body="true" :visible.sync="pwd_dialog_visible">
38
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
38
             <el-form ref="pwd_form" :model="pwd_form" label-width="80px">
39
                 <el-form-item label="账号:">
39
                 <el-form-item label="账号:">
40
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>
40
                     <span>{{ this.$store.getters.xt_user.user.mobile }}</span>