#

src/components/schoolArea.vue

@@ -73,6 +73,7 @@ export default {
     display: flex;
     width: 230px;
     height: 54px;
+    font-size: 18px;
     align-items: center;
     padding: 16px;
     box-sizing: border-box;

src/components/sidebarL.vue

@@ -159,7 +159,7 @@ import { API_CONFIG } from "@/common/apiConfig";
             async gotoKanban(){
                 // 重新获取基础数据
                 await store.dispatch('user/getschPerInfo')
-                await store.commit('user/SET_USERINFO2', {})
+                // await store.commit('user/SET_USERINFO2', {})
                 let num = this.userinfo.type == 1 && this.userinfo.role == 1 && this.userinfo.rrole == 1 ? 1 : 2
                 this.$router.push({
                     path: '/KanBan',

src/components/topPage.vue

@@ -93,7 +93,13 @@
                         </div>
                            
                             
-                        <div class="TabListName">{{ item.name }}</div>
+                        <div class="TabListName">
+                            <el-tooltip class="item" effect="light" :content="item.name" placement="bottom">
+                                <span>
+                                    {{ item.name }}
+                                </span>
+                            </el-tooltip>
+                        </div>
                         <div class="TabListBri">
                             <el-tooltip class="item" effect="light" :content="item.detail" placement="bottom">
                                 <span>
@@ -118,7 +124,13 @@
                             
                             <!-- <img v-else class="footListConimgPic" :src="require('../assets/img/cocoflow2.svg')" alt=""> -->
                         </div>
-                        <div class="TabListName">{{ item.name }}</div>
+                        <div class="TabListName">
+                            <el-tooltip class="item" effect="light" :content="item.name" placement="bottom">
+                                <span>
+                                    {{ item.name }}
+                                </span>
+                            </el-tooltip>
+                        </div>
                         <div class="TabListBri">
                             <el-tooltip class="item" effect="light" :content="item.detail" placement="bottom">
                                 <span>
@@ -679,9 +691,9 @@ import { API_CONFIG } from "@/common/apiConfig";
 }
 .TabListName{
     color: #1f2937;
-    font-size: 16px;
+    font-size: 18px;
     font-weight: 600;
-    margin: auto 0 5px;
+    margin: 0 0 5px;
     margin-bottom: 4px;
     -webkit-line-clamp: 2;
     display: -webkit-box;
@@ -690,8 +702,8 @@ import { API_CONFIG } from "@/common/apiConfig";
     text-overflow: ellipsis;
 }
 .TabListBri{
-    color: #4b5563;
-    font-size: 12px;
+    color: rgba(0,0,0,.6);
+    font-size: 14px;
     -webkit-line-clamp: 1;
     display: -webkit-box;
     -webkit-box-orient: vertical;

src/views/HomeView.vue

@@ -130,7 +130,7 @@ export default {
 		};
 	},
 	computed: {
-		...mapGetters(["userinfo", "appSign", "fromL", "userinfo2"]),
+		...mapGetters(["userinfo", "appSign", "userinfo2"]),
 		userSuffix() {
 			let yym = "";
 			return function () {
@@ -350,7 +350,6 @@ export default {
 			await store.commit("user/SET_FROM", perData);
 			// 获取后台管理设置常见应用
 			this.$refs.homepageLRef.getadmincocoFlow();
-			console.log("state.fromL", this.fromL);
 		},
 	},
 	mounted() {
@@ -409,7 +408,7 @@ export default {
 .personInfoTit {
 	font-family: PingFang SC;
 	font-weight: 500;
-	font-size: 16px;
+	font-size: 14px;
 	line-height: 100%;
 	color: #000000;
 }

src/views/kanBan/components/AdataKanban.vue

@@ -123,7 +123,7 @@
     gap: 42px;
     font-family: PingFang SC;
     font-weight: 500;
-    font-size: 14px;
+    font-size: 16px;
     line-height: 22px;
     color: #969BA3;
     margin-bottom: 15px;

src/views/kanBan/index.vue

@@ -5,9 +5,10 @@
             <div class="title">
               <span v-if="userinfo.orgName">{{userinfo.orgName}}</span >
               <span style="color: #0663FE;font-weight: 600;">{{ userinfo.schoolName }}</span>
+              <span style="color: #0663FE;cursor: pointer;font-weight: 600;" v-if="isIndex2 == 2" @click="gotoli">返回校区</span>
+
             </div>
             <div class="person">
-                <el-button v-if="isIndex2 == 2" type="text" @click="gotoli" style="margin-right: 20px">返回校区</el-button>
               <div class="person_name">
                 <img
                  @click="openData()"
@@ -28,7 +29,7 @@
         </div>
         <div class="midBlo">
             <div class="buttonArea">
-                <div style="width: 500px;display: flex;gap: 100px;">
+                <div :style="{width: '500px',display: 'flex',justifyContent : userinfo.role == 1 && userinfo.rrole == 1 && userinfo.type ==1? 'space-between' : 'center'}">
                     <div class="btnDiv"  :class="{ active: isActive === 1 }" >
                         <div v-if="userinfo.role == 1 && userinfo.rrole == 1 && userinfo.type ==1" @click="setActive(1)">
                             数据看板
@@ -71,6 +72,7 @@ import AquickEntrance from './components/AquickEntrance';
 import AschoolFeature from './components/AschoolFeature';
 import { mapGetters, mapActions } from 'vuex';
 import { loginOut } from '@/api/user';
+import store from '../../store'
 
 export default {
     name:'kanBan',
@@ -110,7 +112,9 @@ export default {
             logout: 'user/logout'
         }),
         // 返回首页
-        gotoli(){
+        async gotoli(){
+            await store.commit('user/SET_AppSIGN', '')
+
             this.$router.push('/homepageL');
         },
         // 退出登录
@@ -183,6 +187,7 @@ export default {
   color: #969BA3;
   display: flex;
   gap: 11px;
+  display: flex;
 }
 .person{
   display: flex;
@@ -202,7 +207,7 @@ export default {
 .personInfoTit{
   font-family: PingFang SC;
   font-weight: 500;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 100%;
   color: #000000;
 }
@@ -269,16 +274,14 @@ export default {
 
 .btnDiv {
     height: 48px;
-    width: 64px;
+    width: 72px;
     text-align: center;
     line-height: 48px;
-    margin-left: 15px;
+    font-size: 18px;
+    /* margin-left: 15px; */
     cursor: pointer;
 }
 
-/* .btnDiv:hover {
-    background-color: #d6d6e0;
-} */
 
 .btnDiv.active {
     font-weight: 600;