11wqe1 2 часов назад
Родитель
Сommit
d14ee67e7a

+ 3 - 23
src/components/pages/liyuan/bjspersonTop.vue

@@ -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
         }
       ]
     };
@@ -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({
@@ -770,25 +768,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 - 19
src/components/pages/test/checkAi/aiLeader.vue

@@ -684,6 +684,7 @@ export default {
   data() {
     return {
       stype: 1,
+      gotype: window.topU && window.topU.gotype ? window.topU.gotype : '',
       typeArray: [],
       array: [],
       jArray: [],
@@ -1162,7 +1163,6 @@ ${fileText}
           "d87b62d3-1b6d-11f0-a66a-005056924926",
           "c25ea59b-1b6d-11f0-a66a-005056924926",
         ]
-
       let jk = 'selectTestType'
       if (list.includes(this.org)) {
         jk = 'selectTestType_liYuan'
@@ -1171,7 +1171,7 @@ ${fileText}
         .get(this.$store.state.api + jk, params)
         .then(res => {
           try {
-            if (window.topU.gotype == 'bjspersonTop') {
+            if (this.gotype == 'bjspersonTop') {
               this.typeArray = res.data[0].filter(e => e.pid == "ce4f1224-37a5-11f1-bcd9-005056924926");
               this.getData();
             } else {
@@ -1269,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;