Inicio Explorar Axuda
Iniciar sesión
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

lsc hai 3 meses
pai
6bed2210e2 a4b3e92c37
achega
9c99cdfdb6
Modificáronse 12 ficheiros con 161 adicións e 140 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.71da5bc3da701a5144364e4e25ea113c.css
  3. 0 0
      dist/static/css/app.71da5bc3da701a5144364e4e25ea113c.css.map
  4. 0 0
      dist/static/js/app.1ecaa2548c4f42d3ea26.js
  5. 0 0
      dist/static/js/app.1ecaa2548c4f42d3ea26.js.map
  6. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  7. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  8. 10 9
      src/components/pages/contrastObservation/index.vue
  9. 22 95
      src/components/pages/liyuan/bjspersonTop.vue
  10. 49 14
      src/components/pages/liyuan/page/courseCenter.vue
  11. 78 21
      src/components/pages/test/checkAi/aiLeader.vue
  12. 1 0
      src/components/pages/testStudent/view/preview.vue

+ 1 - 1
dist/index.html
Ver ficheiro 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.3874b050134db1ae1e03fc2e11d85654.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.93a3a72be10b52f8086f.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.71da5bc3da701a5144364e4e25ea113c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.1ecaa2548c4f42d3ea26.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.71da5bc3da701a5144364e4e25ea113c.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.71da5bc3da701a5144364e4e25ea113c.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.1ecaa2548c4f42d3ea26.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.1ecaa2548c4f42d3ea26.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


+ 10 - 9
src/components/pages/contrastObservation/index.vue
Ver ficheiro 

@@ -772,10 +772,10 @@ ${this.editorBarData.type == 0 ? this.editorBarData.content : ""}
 
 						// console.log("👇教师观察👇")
 
 						// console.log(_jsonData)
 
 						// console.log("👆教师观察👆")
 
-						// _jsonData = _jsonData
 
-						// 	.replaceAll("```json", "")
 
-						// 	.replaceAll("```", "");
 
-						// _jsonData.replace(/'/g, '"').replace(/(\w+):/g, '"$1":');
 
+						_jsonData = _jsonData
 
+							.replaceAll("```json", "")
 
+							.replaceAll("```", "");
 
+						_jsonData.replace(/'/g, '"').replace(/(\w+):/g, '"$1":');
 
 						let _result = JSON.parse(_jsonData);
 
 						this.teacherData = _result;
 
 						resolve();
 
@@ -1019,10 +1019,10 @@ ${this.editorBarData.type == 0 ? this.editorBarData.content : ""}
 
 						// console.log("👇AI观察👇")
 
 						// console.log(_jsonData)
 
 						// console.log("👆AI观察👆")
 
-						// _jsonData = _jsonData
 
-						// 	.replaceAll("```json", "")
 
-						// 	.replaceAll("```", "");
 
-						// _jsonData.replace(/'/g, '"').replace(/(\w+):/g, '"$1":');
 
+						 _jsonData = _jsonData
 
+							.replaceAll("```json", "")
 
+							.replaceAll("```", "");
 
+						 _jsonData.replace(/'/g, '"').replace(/(\w+):/g, '"$1":');
 
 						let _result = JSON.parse(_jsonData);
 
 						this.aiData = _result;
 
 						resolve();
 
@@ -1209,9 +1209,10 @@ ${_aiWorkText}
 
 					.then((res) => {
 
 						let _data = res.data.FunctionResponse.choices[0];
 
 						let _jsonData = _data.message.content;
 
-						_jsonData = _jsonData
 
+					 _jsonData = _jsonData
 
 							.replaceAll("```json", "")
 
 							.replaceAll("```", "");
 
+						 _jsonData.replace(/'/g, '"').replace(/(\w+):/g, '"$1":');
 
 						let _result = JSON.parse(_jsonData);
 
 
 						this.contrastData = _result;

+ 22 - 95
src/components/pages/liyuan/bjspersonTop.vue
Ver ficheiro 

@@ -16,7 +16,7 @@
 
       <div>
 
         <div style="font-weight: 600;">功能导航</div>
 
         <div class="cardBox">
 
-          <div v-for="item in cardArray" :key="item.title" @click="goToPage(item.to)" class="cardItem">
 
+          <div v-for="item in cardData(cardArray)" :key="item.title" @click="goToPage(item.to)" class="cardItem">
 
             <img :src="item.icon" alt="" />
 
             <div>{{ item.title }}</div>
 
           </div>
 
@@ -308,14 +308,12 @@ export default {
 
           type: 1,
 
           to: "/sassPlatform",
 
           sassPlatFormTypeId: "eefb7195-8ee7-11f0-9c7b-005056924926",
 
-          tType: this.$route.query.tType
 
         },
 
         {
 
           title: "学生画像",
 
           icon: require("../../../assets/icon/liyuan/jiaoshihuaxiang.svg"),
 
           type: 0,
 
           to: "/testReview",
 
-          tType: this.$route.query.tType
 
         }
 
       ]
 
     };
 
@@ -324,8 +322,8 @@ export default {
 
     goToPage(to) {
 
       if (to == '/testReview') return this.$message.info('该功能尚未上线，敬请期待')
 
       try {
 
-          window.topU.gotype = this.$route.path
 
-          console.log('top',this.$route.path);
 
+          window.topU.gotype = 'bjspersonTop'
 
+          // console.log('top',this.$route.path);
 
       } catch (error) {
 
           console.log(error);
 
       }
 
@@ -333,8 +331,8 @@ export default {
 
         userid: this.userid,
 
         oid: this.userInfo.organizeid,
 
         org: this.userInfo.org,
 
-        role: this.role,
 
-        tType: this.$route.query.type,
 
+        role: this.userInfo.role,
 
+        tType: this.userInfo.type,
 
         sassPlatFormTypeId:'ce4f1224-37a5-11f1-bcd9-005056924926'
 
       };
 
       this.$router.push({
 
@@ -342,82 +340,19 @@ export default {
 
         query: params
 
       });
 
     },
 
-    getPageBase(type = 1) {
 
-      let params = {
 
-        typ: type,
 
-        org: this.org,
 
-        oid: this.oid
 
-      };
 
-      this.ajax
 
-        .get(this.$store.state.api + "selectTestExamineBase", params)
 
-        .then(res => {
 
-          this.ExamineBase = res.data[0];
 
-          if (type == 1 && !res.data[0].length) {
 
-            this.getPageBase(2);
 
-          }
 
-        })
 
-        .catch(error => {
 
-          console.log(error);
 
-        });
 
-    },
 
+
 
     isDeadlinePassed(deadline) {
 
       let _line = new Date(deadline);
 
       const currentDate = new Date();
 
       return currentDate > _line;
 
     },
 
-    checkType(type) {
 
-      this.type = type;
 
-      this.getWorks();
 
-    },
 
-    selectTestType(type) {
 
-      let params = {
 
-        oid: this.oid
 
-      };
 
-      this.ajax
 
-        .get(this.$store.state.api + "selectTestType", params)
 
-        .then(res => {
 
-          this.typeArray = res.data[0];
 
-          if (type == 1) {
 
-            this.type = "";
 
-          }
 
-          this.getWorks();
 
-        })
 
-        .catch(err => {
 
-          console.error(err);
 
-        });
 
-    },
 
- 
 
-    returnA() {
 
-      this.$router.push(
 
-        "/testStudent?userid=" +
 
-          this.userid +
 
-          "&oid=" +
 
-          this.oid +
 
-          "&org=" +
 
-          this.org +
 
-          "&role=" +
 
-          this.role
 
-      );
 
-    },
 
-    checkTest(cid, tid) {
 
-      this.$router.push(
 
-        "/checkTest?cid=" +
 
-          cid +
 
-          "&tid=" +
 
-          tid +
 
-          "&userid=" +
 
-          this.userid +
 
-          "&oid=" +
 
-          this.oid +
 
-          "&org=" +
 
-          this.org +
 
-          "&type=3" +
 
-          "&role=" +
 
-          this.role
 
-      );
 
-    },
 
     doTest(cid, tid) {
 
+      try {
 
+          window.topU.gotype = 'bjspersonTop'
 
+      } catch (error) {
 
+          console.log(error);
 
+      }
 
       this.$router.push(
 
         "/doTest?cid=" +
 
           cid +
 
@@ -435,6 +370,11 @@ export default {
 
       );
 
     },
 
     doTest2(cid) {
 
+      try {
 
+          window.topU.gotype = 'bjspersonTop'
 
+      } catch (error) {
 
+          console.log(error);
 
+      }
 
       this.$router.push(
 
         "/doTest?cid=" +
 
           cid +
 
@@ -450,6 +390,11 @@ export default {
 
       );
 
     },
 
     doTest3(item, course) {
 
+      try {
 
+          window.topU.gotype = 'bjspersonTop'
 
+      } catch (error) {
 
+          console.log(error);
 
+      }
 
       if (course.array.length) {
 
         this.$router.push(
 
           "/doTest?cid=" +
 
@@ -770,25 +715,7 @@ export default {
 
       }
 
       return courseJson;
 
     },
 
-    goTo(path, cid) {
 
-      // console.log('cid',cid);
 
-      try {
 
-        window.topU.gotype = this.$route.path;
 
-        console.log("top", this.$route.path);
 
-      } catch (error) {
 
-        console.log(error);
 
-      }
 
-      // console.log('path',path);
 
-      let query = {
 
-        cid: cid,
 
-        userid: this.userid,
 
-        oid: this.userInfo.organizeid,
 
-        org: this.userInfo.org,
 
-        role: this.userInfo.role,
 
-        type: 3
 
-      };
 
-      this.$router.push({ path: path, query: query });
 
-    },
 
+
 
     openWork(index) {
 
       if (
 
         this.worksArray[index].array.length === 0 &&

+ 49 - 14
src/components/pages/liyuan/page/courseCenter.vue
Ver ficheiro 

@@ -1,12 +1,14 @@
 
 <template>
 
   <div class="courseCenter">
 
     <div class="header">
 
-      <img
 
-        @click="$router.go(-1)"
 
-        style="cursor: pointer;"
 
-        src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/default%2F%E8%BF%94%E5%9B%9E1776417712913.png"
 
-        alt=""
 
-      />
 
+      <div @click="$router.go(-1)" style="cursor: pointer;display: flex;align-items: center;">
 
+        <img
 
+          style="cursor: pointer;"
 
+          src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/default%2F%E8%BF%94%E5%9B%9E1776417712913.png"
 
+          alt=""
 
+        />
 
+      </div>
 
+     
       <div class="header_title">
 
         <div>课程中心</div>
 
         <div>汇聚拔尖名师资源，提供定制化、进阶式的拓展课程。</div>
 
@@ -21,7 +23,7 @@
 
       >
 
       </el-input>
 
     </div>
 
-    <div class="courseDataL" v-loading="loading">
 
+    <div :class="courseList.length > 5 ? 'courseDataL' : 'courseDataLFlex'" v-loading="loading">
 
       <div class="Conblock" v-for="(i, index) in courseList" :key="index">
 
         <img
 
           class="PimgL"
 
@@ -65,7 +67,9 @@
 
   </div>
 
 </template>
 
 <script>
 
+import { myMixin } from "@/mixins/mixin.js";
 
 export default {
 
+  mixins: [ myMixin ],
 
   name: "courseCenter",
 
   data() {
 
     return {
 
@@ -105,7 +109,7 @@ export default {
 
           console.log(err);
 
         });
 
     },
 
-    entCourse(item) {
 
+    async entCourse(item) {
 
       let _str = "";
 
       if (item.state == 1) {
 
         _str = "course_stageMode_open";
 
@@ -122,10 +126,36 @@ export default {
 
       if (item.state == 6) {
 
         _str = "course_aiEasyMode_open";
 
       }
 
-      this.addOp3("1", "", { courseid: item.courseId, type: _str }, "success");
 
+      const user = await this.getUser();
 
 
-      window.topU.postMessage({ cid: item.courseId, screenType: "3" }, "*");
 
-    }
 
+      let url = '';
 
+      if (user.type == '1') {
 
+        url = `https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?userid=${user.userid}&oid=${user.organizeid}&org=${user.org}&courseId=${item.courseId}&tType=${user.type}&cid=${user.classid}&screenType=2`
 
+        // https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=&oid=&org=&tType=&cid=TscreenType=1
 
+      }else{
 
+        url = `https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?courseId=${item.courseId}&userid=${user.userid}&oid=${user.organizeid}&org=${user.org}&cid=${user.classid}&tType=${user.type}&screenType=2`
 
+      }
 
+      console.log('url',url);
 
+      window.topU.U.MD.D.I.openInApplication('setUrl',{url:url,title:'课程详情',id:new Date().getTime()})
 
+      this.addOp3("1", "", { courseid: item.courseId, type: _str }, "success");
 
+    },
 
+     // 获取创建学生用户后缀
 
+    async getUser() {
 
+      return new Promise((resolve, reject) => {
 
+        let params = {
 
+          userid: this.userid
 
+        };
 
+        this.ajax
 
+          .get(this.$store.state.api + "selectUser", params)
 
+          .then(res => {
 
+            resolve(res.data[0][0]);
 
+          })
 
+          .catch(err => {
 
+            reject(err);
 
+          });
 
+      })
 
+      
+    },
 
   },
 
   mounted() {
 
     this.getCourseList();
 
@@ -199,9 +229,14 @@ export default {
 
   flex-direction: column;
 
 }
 
 .courseDataL {
 
-    grid-template-columns: repeat(4, 1fr);
 
-    gap: 20px;
 
     display: grid;
 
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
 
+    gap: 20px;
 
+}
 
+.courseDataLFlex {
 
+  display: flex;
 
+  gap: 20px;
 
+  flex-wrap: wrap;
 
 }
 
 .Conblock {
 
   display: flex;
 
@@ -209,9 +244,9 @@ export default {
 
   gap: 10px;
 
   background: #fff;
 
   border-radius: 12px;
 
+  min-width: 300px;
 
   overflow: hidden;
 
   padding-bottom: 10px;
 
-  /* padding: 14px 16px; */
 
   box-sizing: border-box;
 
   box-shadow: 0px 4px 10px 0px #0000001a;
 
 }

+ 78 - 21
src/components/pages/test/checkAi/aiLeader.vue
Ver ficheiro 

@@ -684,6 +684,7 @@ export default {
 
   data() {
 
     return {
 
       stype: 1,
 
+      gotype: window.topU && window.topU.gotype ? window.topU.gotype : '',
 
       typeArray: [],
 
       array: [],
 
       jArray: [],
 
@@ -1152,11 +1153,37 @@ ${fileText}
 
       let params = {
 
         oid: this.oid
 
       };
 
+      let list = [
 
+          "3823a6a5-1b6e-11f0-a66a-005056924926",
 
+          "292e34dc-1b6e-11f0-a66a-005056924926",
 
+          "21d6b367-1b6e-11f0-a66a-005056924926",
 
+          "1a1a172d-1b6e-11f0-a66a-005056924926",
 
+          "1197f86b-1b6e-11f0-a66a-005056924926",
 
+          "f235659b-1b6d-11f0-a66a-005056924926",
 
+          "d87b62d3-1b6d-11f0-a66a-005056924926",
 
+          "c25ea59b-1b6d-11f0-a66a-005056924926",
 
+        ]
 
+      let jk = 'selectTestType'
 
+      if (list.includes(this.org)) {
 
+        jk = 'selectTestType_liYuan'
 
+      } 
       this.ajax
 
-        .get(this.$store.state.api + "selectTestType", params)
 
+        .get(this.$store.state.api + jk, params)
 
         .then(res => {
 
-          this.typeArray = res.data[0];
 
-          this.getData();
 
+          try {
 
+            if (this.gotype == 'bjspersonTop') {
 
+              this.typeArray = res.data[0].filter(e => e.pid == "ce4f1224-37a5-11f1-bcd9-005056924926");
 
+              this.getData();
 
+            } else {
 
+              this.typeArray = res.data[0];
 
+              this.getData();
 
+            }
 
+          } catch (error) {
 
+            console.error(error);
 
+            this.typeArray = res.data[0];
 
+            this.getData();
 
+          }
 
+          
         })
 
         .catch(err => {
 
           console.error(err);
 
@@ -1242,24 +1269,54 @@ ${fileText}
 
     },
 
     getCourse() {
 
       this.isLoading = true;
 
-      let params = {
 
-        type: this.groupA,
 
-        uid: this.userid,
 
-        oid: this.oid,
 
-        org: this.org,
 
-        typea: "",
 
-        typeb: "",
 
-        typec: "",
 
-        typed: "",
 
-        typef: this.typeCheck,
 
-        typeE: "",
 
-        cu: "",
 
-        cn: this.courseName,
 
-        page: this.page,
 
-        pageSize: this.pageSize
 
-      };
 
+      // let params = {
 
+      //   type: this.groupA,
 
+      //   uid: this.userid,
 
+      //   oid: this.oid,
 
+      //   org: this.org,
 
+      //   typea: "",
 
+      //   typeb: "",
 
+      //   typec: "",
 
+      //   typed: "",
 
+      //   typef: this.typeCheck,
 
+      //   typeE: "",
 
+      //   cu: "",
 
+      //   cn: this.courseName,
 
+      //   page: this.page,
 
+      //   pageSize: this.pageSize
 
+      // };
 
+
 
+      let params = {}
 
+
 
+      if (this.gotype == 'bjspersonTop') {
 
+        params = {
 
+          uid: this.userid,
 
+          type: 0,
 
+          oid: this.oid,
 
+          org: this.org,
 
+          typeId: this.typeCheck ? this.typeCheck : 'ce4f1224-37a5-11f1-bcd9-005056924926',
 
+          textValue: this.courseName || ''
 
+        }
 
+      }else{
 
+        params = {
 
+          type: this.groupA,
 
+          uid: this.userid,
 
+          oid: this.oid,
 
+          org: this.org,
 
+          typea: "",
 
+          typeb: "",
 
+          typec: "",
 
+          typed: "",
 
+          typef: this.typeCheck,
 
+          typeE: "",
 
+          cu: "",
 
+          cn: this.courseName,
 
+          page: this.page,
 
+          pageSize: this.pageSize
 
+        };
 
+      }
 
       this.ajax
 
-        .get(this.$store.state.api + "selectTesttCourse", params)
 
+        .get(this.$store.state.api + (this.gotype == 'bjspersonTop' ? 'selectTesttCourse_sass' : "selectTesttCourse"), params)
 
         .then(res => {
 
           console.log("API返回的数据", res.data);
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
@@ -2816,7 +2873,7 @@ ${_echartsType[type].text}
 
     // 		this.setJson(el)
 
     // 	})
 
     // }
 
-    // this.selectTestType();
 
+    this.selectTestType();
 
     // 添加初始消息
 
     this.array.push({
 
       uid: "", // 生成唯一 ID

+ 1 - 0
src/components/pages/testStudent/view/preview.vue
Ver ficheiro 

@@ -528,6 +528,7 @@ export default {
 
            if(this.back==1){
 
             return this.$router.back()
 
           }
 
+          if (this.gotype) return this.$router.go(-1)
 
           // this.goTo(
 
           //   "/testStudent?userid=" +
 
           //   this.userid +

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio