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

src/components/pages/course.vue

@@ -1,11 +1,13 @@
 <template>
-  <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;">
+  <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;"
+  :class="[$route.query.gotype == 1? 'liyuan':'']"
+  >
 
-    <backPage  v-if="$route.query.gotype == 1" tit="课程管理"></backPage>
+    <backPage style="padding: 30px 0 0;" v-if="$route.query.gotype == 1" tit="课程管理"></backPage>
 
     <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
       <div class="pb_head top">
-        <div style="
+        <div v-if="!$route.query.gotype" style="
     display: flex;
     align-items: center;
 ">
@@ -23,6 +25,7 @@
             )
             ">评价管理</span>
         </div>
+        <div v-if="$route.query.gotype == 1"></div>
         <div class="student_button">
           <!-- <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button> -->
           <!-- <el-button type="primary" class="bgColor" @click="goToCourse3()">创建极简式课程</el-button>
@@ -2326,4 +2329,10 @@ export default {
 
 .buttonBox>div:hover {
   background: #f6f8ff;
-}</style>
+}
+.liyuan{
+    width: 100% !important;
+    padding: 0 90px !important;
+    box-sizing: border-box !important;
+}
+</style>

src/components/pages/evaluation.vue

@@ -8,9 +8,10 @@
       margin: 0;
       box-sizing: border-box;
     "
+    :style="{padding: $route.query.gotype == 1 ? '0 90px' :'20px'}"
   >
     <div>
-      <backPage v-if="$route.query.gotype == 1" tit="目标管理"></backPage>
+      <backPage style="padding: 40px 0 0;" v-if="$route.query.gotype == 1" tit="目标管理"></backPage>
       <div
         class="pb_content_body"
         style="
@@ -19,6 +20,7 @@
           box-sizing: border-box;
           border-radius: 5px;
         "
+        :style="{width: $route.query.gotype == 1 ? '100%' :'94%'}"
       >
         <div class="pb_head top">
           <span>目标管理设置</span>
@@ -37,7 +39,7 @@
           </div>
         </div>
       </div>
-      <div class="pb_content_body" style="height: 100%">
+      <div class="pb_content_body" style="height: 100%" :style="{width: $route.query.gotype == 1 ? '100%' :'94%'}">
         <el-table
           ref="table"
           :data="dataArray"
@@ -554,7 +556,6 @@ import Mind from "../tools/jsmind";
 import Sunburst from "../tools/sunburst";
 import SeeBoard from "../tools/seeBoard";
 import backPage from "./liyuan/components/backPage.vue";
-
 export default {
   components: {
     Mind,

src/components/pages/liyuan/CourseCon.vue

@@ -19,10 +19,10 @@ export default {
     return {
       cardArray: [
         { title: '课程管理', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/course" },
-        { title: '课程中心', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 2, to: `http://localhost:8082/#/index?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&tType=${this.$route.query.tType}&cid=&screenType=3&gotype=1` },
-        { title: 'AI应用', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 2, to: `//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=0` },
-        { title: '工作空间', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 1, to:`//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=1` },
-        { title: '知识库', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: `//app.cocorobo.cn/#/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=2`  },
+        { title: '课程中心', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 4, to: `/pbl-student-table/dist/#/index?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&tType=${this.$route.query.tType}&cid=&screenType=3&gotype=1` },
+        { title: 'AI应用', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 3, to: `?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=0` },
+        { title: '工作空间', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 3, to:`?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=1` },
+        { title: '知识库', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type:3, to: `?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}&tab=2`  },
         { title: '协同建构', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/synergyCourse" },
       ]
     }
@@ -34,8 +34,11 @@ export default {
 .teacherDevelop{
   width: 100%;
   height: 100%;
-  padding: 40px;
+  padding: 40px 90px;
+
   box-sizing: border-box;
+  background: #FAFAFA;
+
 }
 
 .cardBox{

src/components/pages/liyuan/aiOffice.vue

@@ -20,10 +20,10 @@ export default {
       role: this.$route.query.role,
       cardArray: [
         { title: '资料收集', icon: require('../../../assets/icon/liyuan/zlsj.svg'), type: 1, to: "/teadTest",role:0 },
-        { title: '会议妙记', icon: require('../../../assets/icon/liyuan/hymj.svg'), type: 2, to: `https://beta.cloud.cocorobo.cn/aigpt/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}`,role:0 },
+        { title: '会议妙记', icon: require('../../../assets/icon/liyuan/hymj.svg'), type: 2, to: `/aigpt/?userid=${this.$route.query.userid}&oid=${this.$route.query.oid}&org=${this.$route.query.org}&role=${this.$route.query.role}`,role:0 },
         { title: '教师管理', icon: require('../../../assets/icon/liyuan/teamange.svg'), type: 1, to: "/teacher",role:1 },
         { title: '学生管理', icon: require('../../../assets/icon/liyuan/stumange.svg'), type: 1, to: "/Listudent",role:0 },
-        { title: '智能表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/test",role:1 },
+        { title: '办公表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/test",role:1 },
       ]
     }
   },
@@ -43,8 +43,9 @@ export default {
 .teacherDevelop{
   width: 100%;
   height: 100%;
-  padding: 40px;
+  padding: 40px 90px;
   box-sizing: border-box;
+  background: #FAFAFA;
 }
 
 .cardBox{

src/components/pages/liyuan/components/backPage.vue

@@ -23,13 +23,14 @@
 
 <style scoped>
 .pgb{
-    font-family: PingFang SC;
-    font-weight: 600;
+    /* font-family: PingFang SC; */
+    font-weight: bold;
     font-size: 20px;
-    letter-spacing: 10%;
-    display: flex;align-items: center;gap: 10px;
+    display: flex;align-items: center;
+    gap: 10px;
     cursor: pointer;
-    padding-bottom: 25px;
-    box-sizing: border-box;
+    padding:40px 90px 0;
+    /* height: 23.8px; */
+    margin-bottom: 15px;
 }
 </style>

src/components/pages/liyuan/components/card.vue

@@ -25,9 +25,11 @@ export default {
     },
     data() {
         return {
+            betaL:'beta',
             userid: this.$route.query.userid,
             oid: this.$route.query.oid,
             org: this.$route.query.org,
+            tType: this.$route.query.tType,
             role: this.$route.query.role,
         }
     },
@@ -35,11 +37,26 @@ export default {
         goTo() {
             if (this.type == 1) {
                 this.$router.push({ path: this.to, query: { userid: this.userid, oid: this.oid, org: this.org, role: this.role, gotype: 1 } })
-            } else {
-                window.location.href = this.to;
+            }else if (this.type == 2) {
+                let con = this.betaL =='beta'? 'https://beta.cloud.cocorobo.cn' : 'https://cloud.cocorobo.cn'
+                console.log( `${con}${this.to}`);
+                window.location.href = `${con}${this.to}`;
+                
+            }else if (this.type == 4) {
+                let con = this.betaL =='beta'? 'https://beta.pbl.cocorobo.cn' : 'https://pbl.cocorobo.cn'
+                console.log( `${con}${this.to}`);
+                 window.location.href = `${con}${this.to}`;
+            }else {
+                let con = this.betaL =='beta'? '//beta.app.cocorobo.cn/#/' : '//app.cocorobo.cn/#/'
+                console.log( `${con}${this.to}`);
+
+                window.location.href = `${con}${this.to}`;
             }
         }
     },
+    mounted(){
+        // this.betaL = window.location.href.includes("beta") ? "beta" : "cloud"
+    }
 }
 </script>
 

src/components/pages/liyuan/demo.vue

@@ -1,13 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>

src/components/pages/liyuan/page/examine/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="testPersonExamine">
     <backPage v-if="$route.query.gotype == 1" tit="年度考核"></backPage>
-    <div class="testTit">
+    <div class="testTit" style="padding: 0 90px;box-sizing: border-box;">
       <div class="teaLis">
         <div
           class="teal"
@@ -66,7 +66,7 @@
     <div style="flex: 1;overflow: hidden;" class="notes">
       注：评价积分周期为2023年6月30日至2024年6月30日
     </div>
-    <div style="height:100%;overflow: auto;" v-loading="tabLoad">
+    <div style="height:100%;overflow: auto;padding: 0 90px;box-sizing: border-box;" v-loading="tabLoad">
       <div class="sBox_table">
         <div class="table_title">
           <div style="width: 110px;">一级指标</div>
@@ -568,7 +568,7 @@ export default {
   /* overflow: auto; */
   display: flex;
   flex-direction: column;
-  padding: 10px;
+  /* padding: 10px; */
   box-sizing: border-box;
   background-color: #fff;
 	/* margin: 10px 0; */

src/components/pages/liyuan/page/portrait/index.vue

@@ -856,7 +856,7 @@ export default {
 .portrait {
   width: 100%;
   height: calc(100% - 20px);
-  margin: 10px 0;
+  /* margin: 10px 0; */
   display: flex;
   flex-direction: column;
   overflow: auto;
@@ -865,12 +865,16 @@ export default {
 .p_top {
  width: 100%;
  height: 60px;
+ padding: 0 90px;
+ box-sizing: border-box;
 }
 
 .p_bottom{
   width: 100%;
   flex: 1;
   display: flex;
+  padding: 0 80px;
+  box-sizing: border-box;
 }
 
 .p_bottom > div {

src/components/pages/liyuan/page/safeTest.vue

@@ -1,7 +1,7 @@
 <template>
-    <div class="i_body_box">
-        <backPage tit="安全巡查"></backPage>
-        <div class="check_nav">
+    <div class="i_body_box" style="padding: 0 90px;">
+        <backPage style="padding: 40px 0 0;" tit="安全巡查"></backPage>
+        <div class="check_nav" >
             <!-- <div class="nav all" v-show="this.ExamineBase.length > 0" :class="{ active: type == '1' }" @click="checkType('1')">
                 年度考核
             </div> -->
@@ -13,7 +13,7 @@
             @click="changeShowType(item.id,item)">{{ item.name }}</div>
            
         </div>
-        <div class="check_box" v-loading="loading">
+        <div class="check_box" v-loading="loading" >
             <!-- <examine v-if="type==1"></examine> -->
             <div class="noneData"  v-if="!worksArray.length && type!=1" style="text-align: center; margin-top: 20px;">
                 暂无数据
@@ -807,7 +807,7 @@ export default {
 
 
 .check_box {
-    height: calc(100% - 50px);
+    height: calc(100% - 130px);
     overflow: auto;
     padding: 0 0 20px;
     box-sizing: border-box;

src/components/pages/liyuan/page/student.vue

@@ -1464,6 +1464,8 @@ export default {
   display: flex;
   width: calc(100% - 20px);
   margin: 0 auto;
+  padding: 0 90px;
+  box-sizing: border-box;
 }
 
 .sm_right {
@@ -1534,4 +1536,6 @@ export default {
 
 .nav.active .icon.studentI {
   background-image: url(../../../../assets/icon/studentManage/student-a.png);
-}</style>
+}
+
+</style>

src/components/pages/liyuan/page/teadTest.vue

@@ -708,18 +708,18 @@ export default {
 
 <style scoped>
 .i_body_box {
-    height: calc(100% - 10px);
-    padding: 10px 0 0;
-    box-sizing: border-box;
+    /* height: calc(100% - 10px); */
+    height: 100%;
 }
 
 .check_nav {
     display: flex;
     height: 50px;
     align-items: center;
-    padding: 0;
     box-sizing: border-box;
     width: 100%;
+    padding: 0 90px;
+    box-sizing: border-box;
     overflow: auto;
 }
 
@@ -734,6 +734,7 @@ export default {
     cursor: pointer;
     min-width: fit-content;
     margin-right: 10px;
+    
 }
 
 .check_nav>.active {
@@ -807,9 +808,10 @@ export default {
 
 
 .check_box {
-    height: calc(100% - 50px);
+    height: calc(100% - 90px);
     overflow: auto;
-    padding: 0 0 20px;
+    padding: 0 0px 20px;
+    margin: 0 90px;
     box-sizing: border-box;
     background: rgb(248, 250, 254);
 }

src/components/pages/liyuan/page/userInfoL.vue

@@ -482,7 +482,7 @@ export default {
   height: 100%;
   width: 100%;
   background: #fff;
-  /* padding: 20px; */
+  padding: 0 90px;
   box-sizing: border-box;
 }
 .leftInfo{

src/components/pages/liyuan/schoolSafe.vue

@@ -18,8 +18,8 @@ export default {
   data() {
     return {
       cardArray: [
-        // { title: '安全巡查', icon: require('../../../assets/icon/liyuan/mbll.svg'), type: 1, to: "/examineL" },
-        { title: '安全表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/safeTest" }
+        { title: '安全巡查', icon: require('../../../assets/icon/liyuan/mbll.svg'), type: 1, to: "/safeTest" },
+        { title: '安全表单', icon: require('../../../assets/icon/liyuan/workTest.svg'), type: 1, to: "/test" }
       ]
     }
   },
@@ -30,8 +30,11 @@ export default {
 .teacherDevelop{
   width: 100%;
   height: 100%;
-  padding: 40px;
+  padding: 40px 90px;
+
   box-sizing: border-box;
+  background: #FAFAFA;
+
 }
 
 .cardBox{

src/components/pages/liyuan/studentEva.vue

@@ -31,8 +31,11 @@ export default {
 .teacherDevelop{
   width: 100%;
   height: 100%;
-  padding: 40px;
+  padding: 40px 90px;
+
   box-sizing: border-box;
+  background: #FAFAFA;
+
 }
 
 .cardBox{

src/components/pages/liyuan/teacherDevelop.vue

@@ -2,7 +2,7 @@
   <div class="teacherDevelop">
     <topBar title="教师发展" detail="资料收集 · 智能表单 · 教师管理 · 会议妙计"></topBar>
     <div class="cardBox">
-      <card v-for="item in cardArray" :key="item.title" :title="item.title" :icon="item.icon" :to="item.to" :type="item.type"></card>
+      <card v-for="item in cardData(cardArray)" :key="item.title" :title="item.title" :icon="item.icon" :to="item.to" :type="item.type"></card>
     </div>
   </div>
 </template>
@@ -15,14 +15,25 @@ export default {
     topBar,
     card
   },
+  computed:{
+    // 进行权限判断一些只有管理员能看
+    cardData(){
+      return (val)=>{
+          let com = val.filter(e=> e.role==0 || (this.role == 1 && e.role == 1) )
+          return com
+      }
+    }
+  },
   data() {
     return {
+      role: this.$route.query.role,
+
       cardArray: [
-        { title: '年度考核', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/examineL" },
-        { title: '个人档案', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 1, to: "/userInfoL" },
-        { title: '教师画像', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 1, to: "/portraitL" },
-        { title: '课堂观察', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 1, to: "/classroomObservation" },
-        { title: '智能表单', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/test" },
+        { title: '年度考核', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/examineL",role:0 },
+        { title: '个人档案', icon: require('../../../assets/icon/liyuan/gerendangan.svg'), type: 1, to: "/userInfoL",role:0 },
+        { title: '教师画像', icon: require('../../../assets/icon/liyuan/jiaoshihuaxiang.svg'), type: 1, to: "/portraitL",role:0 },
+        { title: '课堂观察', icon: require('../../../assets/icon/liyuan/ketangguancha.svg'), type: 1, to: "/classroomObservation",role:0 },
+        { title: '智能表单', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/test",role:1 },
       ]
     }
   },
@@ -33,8 +44,9 @@ export default {
 .teacherDevelop{
   width: 100%;
   height: 100%;
-  padding: 40px;
+  padding: 40px 90px;
   box-sizing: border-box;
+  background: #FAFAFA;
 }
 
 .cardBox{

src/components/pages/synergyCourse/course.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;">
-    <backPage v-if="$route.query.gotype == 1" tit="协同建构"></backPage>
-
+  <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;box-sizing: border-box;" :class="[$route.query.gotype == 1 ? 'liyuan' :'']" >
+    <backPage style="padding: 40px 0 0;" v-if="$route.query.gotype == 1" tit="协同建构"></backPage>
+    
     <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
       <div class="pb_head top">
         <div style="
@@ -2038,4 +2038,10 @@ export default {
 .buttonBox>div:hover {
   background: #f6f8ff;
 }
+.liyuan{
+  padding: 0 90px !important;
+  width: 100% !important;
+  box-sizing: border-box !important;
+  margin: 0 !important;
+}
 </style>

src/components/pages/test/check/index.vue

@@ -2409,6 +2409,8 @@ export default {
     async loopSco(val){
       // console.log('6666',val);
 
+      console.log('loopSco',val);
+      
       let userWork =[]
       let _fileid = ''
 for (let index = 0; index < val.array.length; index++) {

src/components/pages/test/index.vue

@@ -1,6 +1,6 @@
 <template>
-    <div class="pb_content" style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;">
-        <backPage  v-if="$route.query.gotype == 1" tit="智能表单"></backPage>
+    <div class="pb_content" :style="{padding: $route.query.gotype == 1 ? '0 90px' :''}" style="height: auto; width: calc(100% - 40px); margin: 0 auto;background: unset;box-sizing: border-box;">
+        <backPage style="padding: 40px 0 0;" v-if="$route.query.gotype == 1" tit="智能表单"></backPage>
 
         <div style="width:100%;padding:0;box-sizing: border-box;">
             <div class="pb_head top" v-if="!$route.query.gotype">

src/components/pages/works.vue

@@ -19,7 +19,9 @@
         left: 50%;
         transform: translateX(-50%);
       "
+      :style="{width: $route.query.gotype == 1 ? 'calc(100% - 180px) !important' :'100%' }"
     >
+    <backPage style="padding: 40px 0 0;" v-if="$route.query.gotype == 1" tit="学生评价"></backPage>
       <div
         class="pb_content_body"
         style="
@@ -28,43 +30,41 @@
           box-sizing: border-box;
           border-radius: 5px;
         "
+        :style="{width: $route.query.gotype == 1 ? '100%' :'94%' }"
       >
-        <div class="pb_head" style="display: flex;justify-content: space-between;align-items: center;">
+      
+        <div class="pb_head" style="display: flex;justify-content: space-between;align-items: center;" v-if="!$route.query.gotype">
           <!-- <span>备注：教师可以根据课程、班级条件筛选学生并查看该学生信息</span> -->
-          <div v-if="!$route.query.gotype" style="display: flex;align-items: center;">
-
-            <span
-              v-if="type == '2'"
-              @click="
-                goTo(
-                  '/tcStudent?userid=' + userid + '&oid=' + oid + '&org=' + org
-                )
-              "
-              >学生管理</span
-            >
-            <span
-              v-else
-              @click="
-                goTo(
-                  '/course?userid=' +
-                    userid +
-                    '&oid=' +
-                    oid +
-                    '&org=' +
-                    org +
-                    '&role=' +
-                    role
-                )
-              "
-              >课程管理</span
-            >
-            <span class="sub_head">评价管理</span>
-          </div>
-          <div v-if="$route.query.gotype == 1"></div>
-          <div style="font-size: 16px;cursor: pointer;" v-if="$route.query.gotype == 1" @click.stop="$router.go(-1)">
-              <!-- <span class="co-h2-r-b-icon3"></span> -->
-              返回
+            <div style="display: flex;align-items: center;">
+                <span
+                  v-if="type == '2'"
+                  @click="
+                    goTo(
+                      '/tcStudent?userid=' + userid + '&oid=' + oid + '&org=' + org
+                    )
+                  "
+                  >学生管理</span
+                >
+                <span
+                  v-else
+                  @click="
+                    goTo(
+                      '/course?userid=' +
+                        userid +
+                        '&oid=' +
+                        oid +
+                        '&org=' +
+                        org +
+                        '&role=' +
+                        role
+                    )
+                  "
+                  >课程管理</span
+                >
+                <span class="sub_head">评价管理</span>
             </div>
+          
+
           <!-- <span
             @click="
               goTo(
@@ -151,7 +151,7 @@
           </div> -->
         </div>
       </div>
-      <div class="pb_content_body">
+      <div class="pb_content_body" :style="{width: $route.query.gotype == 1 ? '100%' :'94%' }">
         <div class="student_table">
           <el-table
             ref="table"
@@ -534,6 +534,7 @@ import StudentWorksDetail from "./components/studentWorksDetail.vue";
 import exportDataDialog from "./components/exportDataDialog.vue";
 import lookReport from './components/lookReport'
 import { myMixin } from "@/mixins/mixin.js"
+import backPage from './liyuan/components/backPage.vue'
 
 
 
@@ -546,7 +547,8 @@ export default {
     studentReport,
     StudentWorksDetail,
     exportDataDialog,
-    lookReport
+    lookReport,
+    backPage
   },
   data() {
     return {