Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

src/components/pages/synergyCourse/addCourse.vue

@@ -16,10 +16,12 @@
                     '&org=' +
                     org +
                     '&role=' +
-                    role,
-                }">协同建构</el-breadcrumb-item>
+                    role +
+                    '&person=' +
+                    this.person,
+                }"> {{this.person ? '跨学科学习平台' : '协同建构'}}</el-breadcrumb-item>
                 <el-breadcrumb-item>
-                  <span style="color: rgb(15, 126, 255)">创建协同建构</span>
+                  <span style="color: rgb(15, 126, 255)">{{this.person ? '创建项目' : '创建协同建构'}} </span>
                 </el-breadcrumb-item>
               </el-breadcrumb>
             </div>
@@ -2728,6 +2730,7 @@ export default {
   },
   data() {
     return {
+      person: this.$route.query.person,
       checkAll: false,
       chooseType: 1,
       checkedCities: [],
@@ -3180,7 +3183,9 @@ export default {
           "&org=" +
           this.org +
           "&role=" +
-          this.role
+          this.role+
+          '&person=' +
+          this.person
         );
       }
     },
@@ -3424,7 +3429,9 @@ export default {
           "&org=" +
           this.org +
           "&role=" +
-          this.role
+          this.role +
+          '&person=' +
+          this.person
         );
       } else {
         this
@@ -3466,7 +3473,9 @@ export default {
                 "&org=" +
                 this.org +
                 "&role=" +
-                this.role
+                this.role+
+                '&person=' +
+                this.person
               );
             }
 

src/components/pages/synergyCourse/course.vue

@@ -1,18 +1,31 @@
 <template>
   <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;box-sizing: border-box;" :class="[gotype ? 'liyuan' :'']" >
     <backPage style="padding: 40px 0 0;" v-if="gotype" tit="协同建构"></backPage>
-    
+    <div class="topL"  v-if="person">
+        <div class="topBlock">
+            <div class="topTit">
+                <div>欢迎使用</div>
+                <div style="color: #0354D7;margin: 0 15px;">荔园・博通 跨学科学习平台</div>
+                <!-- <div style="color: #0354D7;margin: 0 15px;"><span v-if="roleUser.orgName">{{roleUser.orgName}}—</span>{{ roleUser.schoolName }}</div>
+                <div>AI平台！</div> -->
+            </div>
+            <div class="topDetail">
+                  博采众科之长，贯通知识万象
+            </div>
+        </div>
+        <img style="width: 150px;object-fit: cover;transform: scaleX(-1);" src="../../../assets/icon/liyuan/cocoloading.gif" alt="">
+    </div>
     <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
       <div class="pb_head top">
         <div style="
     display: flex;
     align-items: center;
 ">
-          <span>协同建构</span>
+          <span>{{this.person ? '跨学科学习平台' : '协同建构'}}</span>
         </div>
         <div class="student_button">
           <button class="r_pub_button_course" @mouseenter="btnDisplay = true" @mouseleave="btnDisplay = false">
-            <span>创建协同建构</span>
+            <span>{{this.person ? '创建项目' : '创建协同建构'}}</span>
             <div v-show="btnDisplay" class="buttonBox">
               <div type="primary" @click="goToCourse3()">标准创建</div>
               <div type="primary" @click="goToCourseSimple()">快速创建</div>
@@ -311,6 +324,7 @@ export default {
   components: { EditorBar,backPage },
   data() {
     return {
+      person: this.$route.query.person,
       gotype:(window.topU && window.topU.gotype) ?  window.topU.gotype : '',
       itemCount: 1,
       courseTitle: "",
@@ -507,7 +521,9 @@ export default {
           "&org=" +
           this.org +
           "&role=" +
-          this.role
+          this.role +
+          "&person=" +
+          this.person
         );
       } else {
         this.$router.push(
@@ -518,7 +534,9 @@ export default {
           "&org=" +
           this.org +
           "&role=" +
-          this.role
+          this.role +
+          "&person=" +
+          this.person
         );
         this.addOp3('1', "", { type: "CocoNote_standard_add" }, "success")
       }
@@ -2047,4 +2065,36 @@ export default {
   box-sizing: border-box !important;
   margin: 0 !important;
 }
+.topL{
+    display: flex;
+    height: 154px;
+    justify-content: space-between;
+    background-color: #fff;
+    align-items: center;
+    padding: 24px;
+    box-sizing: border-box;
+    margin-bottom: 14px;
+    border-radius: 10px;
+    box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1)
+}
+
+/* 顶部区域 */
+.topBlock{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+}
+.topTit{
+    display: flex;
+    font-size: 30px;
+    height: 100%;
+    /* align-items: center; */
+    color: #000;
+    align-items: baseline;
+    font-weight: 600;
+}
+.topDetail{
+    color: #64748B;
+    margin-top: 16px;
+}
 </style>