修改校区特色更改信息bug

src/components/schoolArea.vue

@@ -1,9 +1,9 @@
 <template>
 	<div class="schoolArea">
-		<div class="allView">
+		<!-- <div class="allView">
 			<div class="allView_icon"></div>
 			<div>集团特色</div>
-		</div>
+		</div> -->
 
 		<div v-if="fromL.admin.school">
 			<div
@@ -18,7 +18,7 @@
 				<div class="priSchArea">
 					<div
 						class="schArea"
-						@click="cutS(item.schoolid)"
+						@click="cutS(item)"
 						v-for="(item, index) in i.children"
 						:key="index"
 						:class="{ active: activeSchool == item.schoolid }"
@@ -34,10 +34,11 @@
 import { mapGetters } from "vuex";
 
 export default {
-	props: ["schId"],
+	props: ["schId","schOrg"],
 	data() {
 		return {
 			activeSchool: "",
+			schorg:''
 		};
 	},
 	computed: {
@@ -50,18 +51,22 @@ export default {
 	},
 	methods: {
 		cutS(val) {
+			console.log('cuts',val);
+			
 			if (
 				this.userinfo.role == 1 &&
 				this.userinfo.rrole == 1 &&
 				this.userinfo.type == 1
 			) {
-				this.activeSchool = val;
-				this.$emit("cutSch", val);
+				this.activeSchool = val.schoolid;
+				this.schorg = val.orgid
+				this.$emit("cutSch",{ oid:val.schoolid, org :val.orgid});
 			}
 		},
 	},
 	mounted() {
 		this.activeSchool = this.schId;
+		this.schorg = this.schOrg;
 	},
 };
 </script>

src/views/kanBan/components/AquickEntrance.vue

@@ -1,23 +1,31 @@
 <template>
-    <div>
-        <div class="EntBlo" v-loading="loading">
+    <div class="EntBlo" v-loading="loading">
+        <!-- <div > -->
             <!-- <div style="text-align: center;margin-bottom: 60px;">
                 小学部
             </div> -->
-            <div v-if="CampusList.length" class="EntBloConList">
-                <div class="EntBloCon" @click="loginLiyuan(i)" v-for="(i,index) in CampusList" :key="index">
-                    <img style="width: 26px;margin-bottom: 10px;" :src="JSON.parse(i.json).basics.logo" alt="">
-                    <div>{{ i.name }}</div>
+            <div v-if="fromL.admin.school.list.length" >
+                <div v-for="(item, index) in fromL.admin.school.list" :key="index + 'a'">
+                    <div style="margin: 30px 0 40px;text-align: center;font-weight: 600;">
+                        {{ item.menuName }}
+                    </div>
+                    <div class="EntBloConList">
+                        <div class="EntBloCon" @click="loginLiyuan(i)" v-for="(i,index) in item.children" :key="index">
+                            <img style="width: 26px;margin-bottom: 10px;" :src="i.img ? '' :'https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/tese1745913146000.svg'" alt="">
+                            <div>{{ i.name }}</div>
+                        </div>
+                    </div>
+                    
                 </div>
             </div>
 
-            <div v-else class="EntBloCon2" @click="loginBen()">
+            <!-- <div v-else class="EntBloCon2" @click="loginBen()">
                 <img style="width: 26px;margin-bottom: 10px;" :src="fromL.basics.logo ? fromL.basics.logo : require('../../../assets/img/moren.png')" alt="">
                 <div>{{ fromL.basics.title }}</div>
-            </div>
-        </div>
-
-        <!-- <div class="EntBlo">
+            </div> -->
+        <!-- </div> -->
+<!-- 
+        <div class="EntBlo">
             <div style="text-align: center;margin-bottom: 60px;">
                 初中部
             </div>
@@ -162,7 +170,7 @@ import { addrrole } from "@/api/user";
 .EntBloConList{
     grid-template-columns: repeat(5, 1fr);
     display: grid;
-    gap: 10px;
+    gap: 20px;
 }
 
 

src/views/kanBan/components/AschoolFeature.vue

@@ -357,7 +357,7 @@ import axios from "@/common/axios.config"; // 引入 axios 配置实例
 
 export default {
     mixins: [myMixin],
-    props:['schId'],
+    props:['schId','schOrg'],
     components: {
         addCampusDialog,
     },
@@ -441,7 +441,7 @@ export default {
 		schId(newValue) {
             console.log('newValue',newValue);
             
-			this.getSchFacility(newValue)
+			this.getSchFacility()
 		},
     },
     methods: {
@@ -542,11 +542,11 @@ export default {
                     } else {
                         this.CampusF.appList.splice(index, 1);
                     }
-                    this.$message.success('删除成功！');
+                    // this.$message.success('删除成功！');
                 })
                 .catch(() => {
                     // 用户点击“取消”后执行的操作
-                    this.$message.error('已取消删除');
+                    // this.$message.error('已取消删除');
                 });
         },
         getAppData() {
@@ -646,10 +646,10 @@ export default {
             console.log("_form", _form);
             let params = [
                 {
-                    functionName: "update_orgOroid_json_byId",
-                    id: this.schId,
+                    functionName: "update_orgOroid_json_liyuan",
+                    oid: this.schId,
+                    orgid: this.schOrg,
                     ujson: JSON.stringify(_form),
-                    type: "school",
                 },
             ];
             axios
@@ -660,7 +660,7 @@ export default {
                         this.$message.success("修改权限成功");
                         // this.$emit("getData");
 
-                        this.getSchFacility(this.schId)
+                        this.getSchFacility()
                         // await store.dispatch("user/getschPerInfo");
 
                         // await addOp({
@@ -705,12 +705,12 @@ export default {
                     );
                 });
         },
-        async getSchFacility(val){
+        async getSchFacility(){
             this.AllLoading=true
             let params = [{
                 functionName: API_CONFIG.ajax_schoolPermission.functionName, // 调用存储过程的名称
-                org: this.userinfo.org, //组织id
-                oid: val, //学校id
+                org: this.schOrg, //组织id
+                oid: this.schId, //学校id
             }];
 
             console.log('params',params);
@@ -845,7 +845,7 @@ export default {
         }
     },
     mounted() {
-        this.getSchFacility(this.schId)
+        this.getSchFacility()
         
         // console.log("CampusF", this.CampusF.appList);
     },

src/views/kanBan/index.vue

@@ -46,7 +46,7 @@
             
             <div class="mainArea">
                 <div v-if="isActive === 1 || isActive === 2">
-                    <schoolArea :schId="schId" @cutSch="cutSch"/>
+                    <schoolArea :schId="schId" :schOrg="schOrg" @cutSch="cutSch"/>
                 </div>
 
                 <div class="right_content">
@@ -54,7 +54,7 @@
                         <AdataKanban></AdataKanban>
                     </div>
                     <div class="Con" v-if="isActive === 2">
-                        <AschoolFeature :schId="schId"></AschoolFeature>
+                        <AschoolFeature :schId="schId" :schOrg="schOrg"></AschoolFeature>
                     </div>
                     <div class="Con" v-if="isActive === 3">
                         <AquickEntrance :key="isActive"></AquickEntrance>
@@ -106,12 +106,15 @@ export default {
             isActive: 1,
             isIndex2:'',
             schId:'',
+            schOrg:''
         }
     },
     methods: {
         cutSch(val){
             console.log('val',val);
-            this.schId = val
+            this.schId = val.oid
+            this.schOrg = val.org
+
         },
         ...mapActions({
             logout: 'user/logout'
@@ -161,8 +164,10 @@ export default {
         && this.fromL.admin.school.list[0].children
         && this.fromL.admin.school.list[0].children.length) {
             this.schId = this.fromL.admin.school.list[0].children[0].schoolid
+            this.schOrg = this.fromL.admin.school.list[0].children[0].orgid
         }else{
             this.schId = this.userinfo.organizeid
+            this.schOrg = this.userinfo.orgid
         }
 
 

src/views/login/loginPage.vue

@@ -216,6 +216,8 @@ export default {
 		}),
 		async loginFn() {
 			if (this.loading) return;
+			await this.getOrgData();
+
 			const regEmail = new RegExp(
 				"^[A-Za-z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"
 			);