Merge branch 'web-v2-temp' into web-v2-pro

src/views/comprehensive/laboratoryManagement/building/newIndex.vue

@@ -4,6 +4,7 @@
     <div class="buildingManagement" v-if="pageType == 1">
       <div class="max-left-box">
         <div class="tree-box scrollbar-box" v-if="treeList[0]">
+          <p style="color:#0183FA;font-size:18px;">{{schoolName}}</p>
           <div class="terr-max-box" v-for="(item,index) in treeList" :key="index">
             <div class="max-name-box">
               <p class="max-name" :class="checkTreeId==item.id?'check-color':''" @click="clickCheckTree(item,1)">
@@ -427,6 +428,7 @@
     },
     data() {
       return {
+        schoolName:'',
         pageType: 1,
         //拖拽起始Y点(用于计算朝向)
         clientY: null,
@@ -496,6 +498,7 @@
 
     },
     mounted() {
+      this.$set(this,'schoolName',localStorage.getItem('schoolName'));
       this.getTreeList()
       this.getDicts('layout_room_type').then(response => {
         this.roomTypeOptions = response.data

src/views/login.vue

@@ -134,6 +134,7 @@ export default {
         localStorage.setItem('circularLogo',response.data.circularLogo)
         localStorage.setItem('rectangleLogo',response.data.rectangleLogo)
         localStorage.setItem('videoCover',response.data.videoCover)
+        localStorage.setItem('schoolName',response.data.schoolName)
       });
     },
     getUrlConfig(){