新增站点切换

src/components/newLayout/modules/header.vue

@@ -22,9 +22,15 @@
           {{siteinfo.enterprisename}}<i class="el-icon-arrow-down el-icon--right"></i>
         </div>
       </span>
-      <el-dropdown-menu slot="dropdown">
+      <el-dropdown-menu style="width:200px;text-align:center" slot="dropdown">
         <el-dropdown-item @click.native="$router.replace({path:'/user_center'})">个人中心</el-dropdown-item>
-        <el-dropdown-item v-if="canChangeSite" @click.native="$router.replace({path:'/accounts'})">切换账号</el-dropdown-item>
+        <!-- <el-dropdown-item v-if="canChangeSite" @click.native="$router.replace({path:'/accounts'})">切换账号</el-dropdown-item> -->
+        <el-dropdown-item v-for="item in accountList" :key="item.index" divided @click.native="selectAccount(item)">
+          <div class="flex-align-center flex-between">
+            <p><span class="avatar-mini">{{item.enterprisename?item.enterprisename.substr(0, 1):item.sitename.substr(0, 1)}}</span><span>{{item.enterprisename?item.enterprisename:item.sitename}}</span></p>
+            <small>{{item.name}}</small>
+        </div>
+        </el-dropdown-item>
         <el-dropdown-item divided @click.native="loginOut()">退出登录</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -41,7 +47,8 @@ export default {
       accountInfo:{},
       url:"http://weather.cma.cn/api/weather/view?stationid=",
       weather:{},
-      searchValue:''
+      searchValue:'',
+      accountList:[]
     }
   },
   computed:{
@@ -55,6 +62,11 @@ export default {
     }
   },
   methods:{
+    // 选择登录账号
+    selectAccount (item) {
+      sessionStorage.setItem('active_account',JSON.stringify(item))
+      this.$router.go(0)
+    },
     async getWeather () {
       const res = await axios.get(this.url)
       console.log(res)
@@ -110,6 +122,7 @@ export default {
   mounted () {
     this.siteInfos()
     this.getWeather()
+    this.accountList = JSON.parse(sessionStorage.getItem('account_list'))
     this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))
   },
 }
@@ -207,4 +220,18 @@ export default {
         background-color: rgba(255 ,255,255,.2);
     }
 }
+.avatar-mini{
+  display: inline-block;
+  position: relative;
+  height:20px;
+  width: 20px;
+  line-height: 20px;
+  text-align: center;
+  margin-right: 5px;
+  color:#fff;
+  font-size: 12px;
+  font-weight: 500;
+  border-radius: 100%;
+  background: #3874F6;
+}
 </style>

src/components/normal-basic-layout/index.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <p style="font-size:26px;font-weight:300">{{customTitle ? customTitle : acitveApp.meta.title}}&nbsp;<i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="acitveApp.name === $route.name?'el-icon-star-on collection':'el-icon-star-off'"></i></p>
+            <p style="font-size:26px;font-weight:300">{{customTitle ? customTitle : acitveApp.meta.title}}&nbsp;<i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i></p>
             <div style="margin:0 8px"><el-divider direction="vertical"></el-divider></div>
             <div class="flex-align-center">
               <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
@@ -82,7 +82,8 @@ export default {
   computed:{
     ...mapGetters({
       acitveApp:'acitveApp',
-      searchValue:'searchValue'
+      searchValue:'searchValue',
+      menuApp:'menuApp',
     })
   },
   data () {
@@ -205,7 +206,13 @@ export default {
         }
       })
       this.$store.dispatch('setAppMenu')
-    }
+    },
+    showAppCollection () {
+      
+			let _isSame = this.menuApp.some(m=>this.acitveApp.name === m.systemapp)
+      console.log(this.menuApp,_isSame,this.acitveApp.name)
+			return _isSame
+		},
   },
   mounted () {
     this.autoQuery === false?'':this.listData()

src/style/style.css

@@ -187,22 +187,17 @@ ul{
 .el-notification.right{
   right:70px !important;
 }
-<<<<<<< HEAD
-=======
 
->>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 .search__label{
   display: inline-block;
-  width: 80px;
-  font-size: 14px;
+  width: 100px;
+  font-size: 12px;
   color:rgb(163, 163, 163) !important;
-<<<<<<< HEAD
-=======
+
   margin-right: 10px;
 }
 
 .label_center {
   display: flex;
   align-items: center;
->>>>>>> 05a9622c4006e6e256bf92bebf8922dea785cf95
 }

src/views/login/login.vue

@@ -249,7 +249,7 @@ export default {
   width: 100%;
   height: 100vh;
   /* background: #fff no-repeat 50% url(../../assets/bg.png); */
-  background: url("../../assets/wallhaven-2k987m.jpeg") no-repeat;
+  background: url("../../assets/wallhaven-0pq8gm.jpeg") no-repeat;
   background-size: cover;
 }
 .login-form{