荔园

src/components/pages/classroomObservation/index.vue

@@ -157,7 +157,7 @@
             />
           </el-tooltip>
         </div>
-        <div :class="['co-h2-r-btn2']"  v-if="$route.query.gotype == 1" @click.stop="$router.go(-1)">
+        <div :class="['co-h2-r-btn2']"  v-if="gotype" @click.stop="$router.go(-1)">
           <!-- <span class="co-h2-r-b-icon3"></span> -->
           返回
         </div>
@@ -252,6 +252,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       loading: false,
       createTime: new Date().toLocaleString().replaceAll("/", "-"),
       tid: "",

src/components/pages/course.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="pb_content" style="height: auto; width: 94%; margin: 10px auto;background: unset;"
-  :class="[$route.query.gotype == 1? 'liyuan':'']"
+  :class="[gotype? 'liyuan':'']"
   >
 
-    <backPage style="padding: 30px 0 0;" v-if="$route.query.gotype == 1" tit="课程管理"></backPage>
+    <backPage style="padding: 30px 0 0;" v-if="gotype" tit="课程管理"></backPage>
 
     <div style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
       <div class="pb_head top">
-        <div v-if="!$route.query.gotype" style="
+        <div v-if="!gotype" style="
     display: flex;
     align-items: center;
 ">
@@ -25,7 +25,7 @@
             )
             ">评价管理</span>
         </div>
-        <div v-if="$route.query.gotype == 1"></div>
+        <div v-if="gotype"></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>
@@ -434,6 +434,7 @@ export default {
   mixins: [ myMixin ],
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       itemCount: 1,
       courseTitle: "",
       courseText: "",

src/components/pages/evaluation.vue

@@ -8,10 +8,10 @@
       margin: 0;
       box-sizing: border-box;
     "
-    :style="{padding: $route.query.gotype == 1 ? '0 90px' :'20px'}"
+    :style="{padding: gotype ? '0 90px' :'20px'}"
   >
     <div>
-      <backPage style="padding: 40px 0 0;" v-if="$route.query.gotype == 1" tit="目标管理"></backPage>
+      <backPage style="padding: 40px 0 0;" v-if="gotype" tit="目标管理"></backPage>
       <div
         class="pb_content_body"
         style="
@@ -20,7 +20,7 @@
           box-sizing: border-box;
           border-radius: 5px;
         "
-        :style="{width: $route.query.gotype == 1 ? '100%' :'94%'}"
+        :style="{width: gotype ? '100%' :'94%'}"
       >
         <div class="pb_head top">
           <span>目标管理设置</span>
@@ -39,7 +39,7 @@
           </div>
         </div>
       </div>
-      <div class="pb_content_body" style="height: 100%" :style="{width: $route.query.gotype == 1 ? '100%' :'94%'}">
+      <div class="pb_content_body" style="height: 100%" :style="{width: gotype ? '100%' :'94%'}">
         <el-table
           ref="table"
           :data="dataArray"
@@ -565,6 +565,7 @@ export default {
   },
   data() {
     return {
+        gotype:sessionStorage.getItem('gotype'),
       data: {
         isLoading: false,
         meta: {

src/components/pages/liyuan/CourseCon.vue

@@ -20,9 +20,9 @@ export default {
       cardArray: [
         { title: '课程管理', icon: require('../../../assets/icon/liyuan/niandukaohe.svg'), type: 1, to: "/course" },
         { 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: '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&gotype=1` },
+        { 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&gotype=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&gotype=1`  },
         { title: '协同建构', icon: require('../../../assets/icon/liyuan/zhinengbiaodan.svg'), type: 1, to: "/synergyCourse" },
       ]
     }

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

@@ -10,13 +10,23 @@
         props:['tit'],
         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,
+                to: this.$route.query.to,
             }
         },
         methods:{
             backO(){
-                this.$router.go(-1)
+                this.$router.push({ path: sessionStorage.getItem('gotype'), query: { userid: this.userid, oid: this.oid, org: this.org, role: this.role, gotype: 1,tType:this.tType } })
+                sessionStorage.removeItem('gotype');
             }
+        },
+        mounted(){
+            // this.betaL = window.location.href.includes("beta") ? "beta" : "cloud"
         }
     }
 </script>

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

@@ -36,7 +36,8 @@ export default {
     methods: {
         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 } })
+                sessionStorage.setItem('gotype', this.$route.path);
+                this.$router.push({ path: this.to, query: { userid: this.userid, oid: this.oid, org: this.org, role: this.role,tType: this.tType, gotype: 1 } })
             }else if (this.type == 2) {
                 let con = this.betaL =='beta'? 'https://beta.cloud.cocorobo.cn' : 'https://cloud.cocorobo.cn'
                 console.log( `${con}${this.to}`);

src/components/pages/liyuan/page/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,6 +1,6 @@
 <template>
   <div class="testPersonExamine">
-    <backPage v-if="$route.query.gotype == 1" tit="年度考核"></backPage>
+    <backPage v-if="gotype" tit="年度考核"></backPage>
     <div class="testTit" style="padding: 0 90px;box-sizing: border-box;">
       <div class="teaLis">
         <div
@@ -224,6 +224,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       pType: 2,
       allData: {
         type: 1,

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

@@ -1,6 +1,6 @@
 <template>
   <div class="portrait">
-    <backPage v-if="$route.query.gotype == 1" tit="教师画像"></backPage>
+    <backPage v-if="gotype" tit="教师画像"></backPage>
 
     <div class="p_top" v-if="timeSort.length >1">
       <el-select v-model="selectTime" placeholder="请选择" @change="changeTimeSort">
@@ -228,6 +228,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       teachingActivityNum: 0,
       teachingAndResearchActivitiesNum: 0,
       trainingActivityNum: 0,

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

@@ -1,6 +1,6 @@
 <template>
   <div class="pb_content" style="background: unset">
-    <backPage  v-if="$route.query.gotype == 1" tit="学生管理"></backPage>
+    <backPage  v-if="gotype" tit="学生管理"></backPage>
 
     <div class="sm_box">
 
@@ -229,6 +229,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       tableHeight: "500px",
       isLoading: false,
       formLabelWidth: "100px",

src/components/pages/synergyCourse/course.vue

@@ -1,6 +1,6 @@
 <template>
-  <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 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 style="width:100%;padding:0 21px;background:#fff;border-radius: 5px;box-sizing: border-box;">
       <div class="pb_head top">
@@ -309,6 +309,7 @@ export default {
   components: { EditorBar,backPage },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       itemCount: 1,
       courseTitle: "",
       courseText: "",

src/components/pages/sz/teacher.vue

@@ -2,8 +2,10 @@
   <div
     class="pb_content"
     style="background: unset; height: 100%; overflow: auto"
+    :style="{padding: gotype? '0 57px' :''}"
   >
-      <backPage  v-if="$route.query.gotype == 1" tit="教师管理"></backPage>
+    <backPage style="padding: 40px 33px 0;" v-if="gotype" tit="教师管理"></backPage>
+
     <div
       class="pb_content_body"
       style="
@@ -300,15 +302,16 @@
 
 <script>
 import $ from "jquery";
-import backPage from "../liyuan/components/backPage.vue";
-
 // import pinyin from "../../../../node_modules/js-pinyin/index";
+import backPage from '../liyuan/components/backPage.vue'
+
 export default {
-  components: {
-    backPage
-  },
+  components:{
+        backPage
+    },
   data() {
     return {
+      gotype: sessionStorage.getItem('gotype'),
       tableHeight: "500px",
       isLoading: false,
       formLabelWidth: "100px",

src/components/pages/test/add/addTest.vue

@@ -4,7 +4,7 @@
             <div class="right">
                 <div class="courseTop">
                     <div class="stepsNav">
-                        <el-breadcrumb separator-class="el-icon-arrow-right">
+                        <el-breadcrumb v-if="!gotype" separator-class="el-icon-arrow-right">
                             <el-breadcrumb-item v-if="!back" :to="{
                                 path:
                                     '/test?userid=' +
@@ -65,6 +65,7 @@ export default {
     },
     data() {
         return {
+            gotype:sessionStorage.getItem('gotype'),
             userid: this.$route.query.userid,
             oid: this.$route.query.oid,
             org: this.$route.query.org,
@@ -123,6 +124,8 @@ export default {
                 })
                 .then(() => {
                   console.log(this.back)
+                        if (gotype) return this.$router.go(-1)
+
                         if(!this.back){
                           this.goTo(
                             "/test?userid=" +

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

@@ -50,7 +50,7 @@
               width="130"
               :resizable="false"
             >
-              <template slot="header" slot-scope="{ column, $index }">
+              <template slot="header" slot-scope="{ column }">
                 <el-tooltip
                   class="item"
                   effect="dark"
@@ -122,6 +122,7 @@
 export default {
   data() {
     return {
+      betaL:'',
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
       org: this.$route.query.org,
@@ -136,6 +137,8 @@ export default {
   },
 
   mounted() {
+    this.betaL = window.location.href.includes("beta") ? "beta" : "cloud"
+
     this.getData();
     this.getTeaList();
   },
@@ -159,7 +162,11 @@ export default {
     },
     gotoFrom(val, uid) {
       // return console.log(val, uid);
-      this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
+      if(this.betaL == 'beta'){
+        this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
+      }else{
+        this.ifmUrl = `https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/checkToTest?cid=${val}&oid=${this.oid}&org=${this.org}&type=2&role=0&peopleId=${uid}`;
+      }
       // this.ifmUrl = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/test?userid=${this.userid}&oid=45facc0a-1211-11ec-80ad-005056b86db5&org=&role=0`;
       this.diaIframe = true;
     },

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

@@ -4,7 +4,7 @@
       <div class="right">
         <div class="courseTop" >
           <div class="stepsNav" v-if="!examineId">
-            <el-breadcrumb separator-class="el-icon-arrow-right">
+            <el-breadcrumb v-if="!gotype" separator-class="el-icon-arrow-right">
               <el-breadcrumb-item
               v-if="!back"
                 :to="{
@@ -2070,6 +2070,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       aiscoId:'',
       aiscoLoading:true,
       cueWord:{
@@ -2766,6 +2767,8 @@ for (let index = 0; index < val.array.length; index++) {
       // });
     },
     retrunCourse() {
+      if (this.gotype) return this.$router.go(-1)
+
       if(!this.back){
         this.goTo(
         "/test?userid=" +

src/components/pages/test/index.vue

@@ -1,9 +1,9 @@
 <template>
-    <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 class="pb_content" :style="{padding: gotype ? '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="gotype " tit="智能表单"></backPage>
 
         <div style="width:100%;padding:0;box-sizing: border-box;">
-            <div class="pb_head top" v-if="!$route.query.gotype">
+            <div class="pb_head top" v-if="!gotype">
                 <div style="display: flex;align-items: center;">
                     <span class="sub_head">表单管理</span>
                     <!-- v-show="oid == '4c686762-1d0a-11ed-8c78-005056b86db5'" -->
@@ -439,6 +439,7 @@ export default {
     components: { EditorBar, CourseProblem, pie1, pie2, randar1, randar2, shareBox, examine, aggregate,backPage },
     data() {
         return {
+            gotype:sessionStorage.getItem('gotype'),
             examineData: [],
             cutNumber: 0,
             itemCount: 1,

src/components/pages/testStudent/view/preview.vue

@@ -4,7 +4,7 @@
       <div class="right">
         <div class="courseTop" :style="`justify-content: ${isN==1?'flex-end':'space-between'};`">
           <div class="stepsNav" v-if="isN !=1">
-            <el-breadcrumb separator-class="el-icon-arrow-right">
+            <el-breadcrumb v-if="!gotype" separator-class="el-icon-arrow-right">
               <el-breadcrumb-item :to="{
     path:
       '/testPerson?userid=' +
@@ -65,6 +65,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
       org: this.$route.query.org,
@@ -106,6 +107,7 @@ export default {
           type: "warning",
         })
         .then(() => {
+          if (this.gotype) return this.$router.go(-1)
           if (this.type == 3) {
             this.goTo(
               "/testPerson?userid=" +
@@ -541,6 +543,7 @@ export default {
         .post(this.$store.state.api + ((this.tid) ? "addTestWorks2" : "addTestWorks"), params)
         .then((res) => {
           this.$message.success('提交成功')
+          if (this.gotype) return this.$router.go(-1)
           if (this.type == 3) {
             this.goTo(
               "/testPerson?userid=" +

src/components/pages/works.vue

@@ -19,9 +19,9 @@
         left: 50%;
         transform: translateX(-50%);
       "
-      :style="{width: $route.query.gotype == 1 ? 'calc(100% - 180px) !important' :'100%' }"
+      :style="{width: gotype ? 'calc(100% - 180px) !important' :'100%' }"
     >
-    <backPage style="padding: 40px 0 0;" v-if="$route.query.gotype == 1" tit="学生评价"></backPage>
+    <backPage style="padding: 40px 0 0;" v-if="gotype" tit="学生评价"></backPage>
       <div
         class="pb_content_body"
         style="
@@ -30,10 +30,10 @@
           box-sizing: border-box;
           border-radius: 5px;
         "
-        :style="{width: $route.query.gotype == 1 ? '100%' :'94%' }"
+        :style="{width: gotype ? '100%' :'94%' }"
       >
       
-        <div class="pb_head" style="display: flex;justify-content: space-between;align-items: center;" v-if="!$route.query.gotype">
+        <div class="pb_head" style="display: flex;justify-content: space-between;align-items: center;" v-if="!gotype">
           <!-- <span>备注：教师可以根据课程、班级条件筛选学生并查看该学生信息</span> -->
             <div style="display: flex;align-items: center;">
                 <span
@@ -151,7 +151,7 @@
           </div> -->
         </div>
       </div>
-      <div class="pb_content_body" :style="{width: $route.query.gotype == 1 ? '100%' :'94%' }">
+      <div class="pb_content_body" :style="{width: gotype ? '100%' :'94%' }">
         <div class="student_table">
           <el-table
             ref="table"
@@ -552,6 +552,7 @@ export default {
   },
   data() {
     return {
+      gotype:sessionStorage.getItem('gotype'),
       worksDialog:false,
       exportW:0,
       digNum:0,