Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 7 months ago
parent
e4d4854e60
commit
4566fcde2b
14 changed files with 729 additions and 633 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.8a3e782efe275af5892a82795f699346.css
  3. 0 0
      dist/static/css/app.8a3e782efe275af5892a82795f699346.css.map
  4. 0 0
      dist/static/js/app.b603e6a0010c2556a915.js
  5. 0 0
      dist/static/js/app.b603e6a0010c2556a915.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 40 27
      src/common/axios.config.js
  8. 659 586
      src/components/pages/aiAddCourse/addCourse.vue
  9. 1 1
      src/components/pages/data.vue
  10. 1 1
      src/components/pages/test/add/setInfo/index.vue
  11. 6 4
      src/components/pages/test/aggregate/index.vue
  12. 3 1
      src/components/pages/test/check/index.vue
  13. 12 8
      src/components/pages/test/examine/conpoments/personPage.vue
  14. 6 4
      src/components/pages/test/examine/conpoments/targetPage.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.cd554cab8dba7c271c536fee3140ceff.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.ee476e38463461edca63.js></script><script type=text/javascript src=./static/js/app.f05d8560aef791de2d1b.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.8a3e782efe275af5892a82795f699346.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.571c38d63f24b1ae9e16.js></script><script type=text/javascript src=./static/js/vendor.ee476e38463461edca63.js></script><script type=text/javascript src=./static/js/app.b603e6a0010c2556a915.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.8a3e782efe275af5892a82795f699346.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.8a3e782efe275af5892a82795f699346.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b603e6a0010c2556a915.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.b603e6a0010c2556a915.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 40 - 27
src/common/axios.config.js
View File 

@@ -5,6 +5,10 @@ axios.defaults.timeout = 600000   //响应时间
 
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';        //配置请求头
 
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';        //配置请求头
 
 axios.defaults.baseURL = process.env.NODE_HOST;   //配置接口地址
 
 axios.defaults.baseURL = process.env.NODE_HOST;   //配置接口地址
 
 console.log(process.env)
 
 console.log(process.env)
 
+
 
+const CancelToken = axios.CancelToken;
 
+let cancel; // 用于存储取消请求的方法
 
+
 
 //POST传参序列化(添加请求拦截器)
 
 //POST传参序列化(添加请求拦截器)
 
 axios.interceptors.request.use((config) => {
 
 axios.interceptors.request.use((config) => {
 
     //在发送请求之前做某件事
 
     //在发送请求之前做某件事
 
@@ -22,32 +26,33 @@ axios.interceptors.request.use((config) => {
 
     // } else if (config.method === 'post') {
 
     // } else if (config.method === 'post') {
 
     //     config.data = qs.stringify(config.data)//序列化post 参数
 
     //     config.data = qs.stringify(config.data)//序列化post 参数
 
     // }
 
     // }
 
-    if(config.url === 'https://gpt.cocorobo.cn/search_image' || config.url === 'https://gpt.cocorobo.cn/chat' || config.url === 'https://gpt4.cocorobo.cn/create_free_assistants' || config.url === 'https://gpt4.cocorobo.cn/assistants_completion_response') {
 
+    if (config.url === 'https://gpt.cocorobo.cn/search_image' || config.url === 'https://gpt.cocorobo.cn/chat' || config.url === 'https://gpt4.cocorobo.cn/create_free_assistants' || config.url === 'https://gpt4.cocorobo.cn/assistants_completion_response') {
 
         config.data = config.data//序列化post 参数
 
         config.data = config.data//序列化post 参数
 
-    }else if(config.url.indexOf('https://gpt4.cocorobo.cn/')!=-1 || config.url.indexOf('https://claude3.cocorobo.cn/')!=-1){
 
-			config.headers = {
 
-				'Content-Type': 'application/json',
 
-		}
 
-		}else if (config.data && config.data[0].post == '1' && config.method === 'post') {
 
+    } else if (config.url.indexOf('https://gpt4.cocorobo.cn/') != -1 || config.url.indexOf('https://claude3.cocorobo.cn/') != -1) {
 
+        config.headers = {
 
+            'Content-Type': 'application/json',
 
+        }
 
+    } else if (config.data && config.data[0].post == '1' && config.method === 'post') {
 
         config.data = 'mode=' + (Object.values(config.data[0]).join(','))//序列化post 参数
 
         config.data = 'mode=' + (Object.values(config.data[0]).join(','))//序列化post 参数
 
     } else if (config.method === 'post') {
 
     } else if (config.method === 'post') {
 
 
 
         const encoded = {};
 
         const encoded = {};
 
         for (const key in config.data[0]) {
 
         for (const key in config.data[0]) {
 
             if (Object.hasOwnProperty.call(config.data[0], key)) {
 
             if (Object.hasOwnProperty.call(config.data[0], key)) {
 
-            encoded[key] = encodeURIComponent(config.data[0][key]);
 
+                encoded[key] = encodeURIComponent(config.data[0][key]);
 
             }
 
             }
 
         }
 
         }
 
         config.data = qs.stringify([encoded]) //序列化post 参数
 
         config.data = qs.stringify([encoded]) //序列化post 参数
 
-    }else {
 
+    } else {
 
         const encoded = {};
 
         const encoded = {};
 
         for (const key in config.data) {
 
         for (const key in config.data) {
 
             if (Object.hasOwnProperty.call(config.data, key)) {
 
             if (Object.hasOwnProperty.call(config.data, key)) {
 
-            encoded[key] = encodeURIComponent(config.data[key]);
 
+                encoded[key] = encodeURIComponent(config.data[key]);
 
             }
 
             }
 
         }
 
         }
 
         config.data = encoded
 
         config.data = encoded
 
     }
 
     }
 
+
 
     return config;
 
     return config;
 
 }, (error) => {
 
 }, (error) => {
 
     console.log('错误的传参')
 
     console.log('错误的传参')
 
@@ -64,15 +69,17 @@ axios.interceptors.response.use((res) => {
 
     }
 
     }
 
     return res;
 
     return res;
 
 }, (error) => {
 
 }, (error) => {
 
-    if (error.response.data.status == '401') {    //如果token 过期 则跳转到登录页面
 
+    if (axios.isCancel(error)) {
 
+        console.log('请求已取消', error.message);
 
+    } else if (error.response.data.status == '401') {    //如果token 过期 则跳转到登录页面
 
         this.$router.push('/login');
 
         this.$router.push('/login');
 
     }
 
     }
 
     return Promise.reject(error);
 
     return Promise.reject(error);
 
 });
 
 });
 
 //返回一个Promise(发送post请求)
 
 //返回一个Promise(发送post请求)
 
-function post(url, params) {
 
+function post(url, params, source) {
 
     return new Promise((resolve, reject) => {
 
     return new Promise((resolve, reject) => {
 
-        axios.post(url, params)
 
+        axios.post(url, params, source ? { cancelToken: source.token } : '')
 
             .then(response => {
 
             .then(response => {
 
                 resolve(response);
 
                 resolve(response);
 
             }, err => {
 
             }, err => {
 
@@ -85,25 +92,26 @@ function post(url, params) {
 
 }
 
 }
 
 
 
 //返回一个Promise(发送put请求)
 
 //返回一个Promise(发送put请求)
 
-function put(url, params) {
 
-	return new Promise((resolve, reject) => {
 
-			axios.put(url, params)
 
-					.then(response => {
 
-							resolve(response);
 
-					}, err => {
 
-							reject(err);
 
-					})
 
-					.catch((error) => {
 
-							reject(error)
 
-					})
 
-	})
 
+function put(url, params, source) {
 
+    return new Promise((resolve, reject) => {
 
+        axios.put(url, params, source ? { cancelToken: source.token } : '')
 
+            .then(response => {
 
+                resolve(response);
 
+            }, err => {
 
+                reject(err);
 
+            })
 
+            .catch((error) => {
 
+                reject(error)
 
+            })
 
+    })
 
 }
 
 }
 
 
 
 
 
 ////返回一个Promise(发送get请求)
 
 ////返回一个Promise(发送get请求)
 
-function get(url, param) {
 
+function get(url, param, source) {
 
     return new Promise((resolve, reject) => {
 
     return new Promise((resolve, reject) => {
 
-        axios.get(url, { params: param })
 
+        let cancelToken = source ? source.token : ''
 
+        axios.get(url, { params: param, cancelToken  })
 
             .then(response => {
 
             .then(response => {
 
                 resolve(response)
 
                 resolve(response)
 
             }, err => {
 
             }, err => {
 
@@ -117,5 +125,10 @@ function get(url, param) {
 
 export default {
 
 export default {
 
     get,
 
     get,
 
     post,
 
     post,
 
-		put,
 
+    put,
 
+    setCancelSource: () => {
 
+        // 每次创建新的请求时，可以调用此方法以创建新的取消令牌
 
+        cancel = CancelToken.source();
 
+        return cancel;
 
+    }
 
 }
 
 }

File diff suppressed because it is too large
+ 659 - 586
src/components/pages/aiAddCourse/addCourse.vue


+ 1 - 1
src/components/pages/data.vue
View File 

@@ -387,7 +387,7 @@ export default {
 
           var arr = str.split(",");
 
           var arr = str.split(",");
 
           for (var k = 0; k < cBox.length; k++) {
 
           for (var k = 0; k < cBox.length; k++) {
 
             for (var i = 0; i < arr.length; i++) {
 
             for (var i = 0; i < arr.length; i++) {
 
-              if (cBox[k].id == arr[i]) {
 
+              if (cBox[k].id == arr[i] && cBox[k].parentid == '6') {
 
                 if (this.ccName == "") {
 
                 if (this.ccName == "") {
 
                   this.ccName = cBox[k].name;
 
                   this.ccName = cBox[k].name;
 
                 } else {
 
                 } else {

+ 1 - 1
src/components/pages/test/add/setInfo/index.vue
View File 

@@ -370,7 +370,7 @@ export default {
 
             this.ajax
 
             this.ajax
 
                 .get(this.$store.state.api + "selectTeacherOfficeBySchool", params)
 
                 .get(this.$store.state.api + "selectTeacherOfficeBySchool", params)
 
                 .then((res) => {
 
                 .then((res) => {
 
-                    this.classJuri = res.data[0];
 
+                    this.classJuri = res.data[0].filter((item) => {return item.parentid == '6'});
 
                 })
 
                 })
 
                 .catch((err) => {
 
                 .catch((err) => {
 
                     this.isLoading = false;
 
                     this.isLoading = false;

+ 6 - 4
src/components/pages/test/aggregate/index.vue
View File 

@@ -182,10 +182,12 @@ export default {
 
           let dataCopy = [];
 
           let dataCopy = [];
 
 
 
           data.forEach(e => {
 
           data.forEach(e => {
 
-            let a = {};
 
-            a.value = e.name;
 
-            a.text = e.name;
 
-            dataCopy.push(a);
 
+            if(e.parentid == '6'){
 
+              let a = {};
 
+              a.value = e.name;
 
+              a.text = e.name;
 
+              dataCopy.push(a);
 
+            }
 
           });
 
           });
 
 
 
           this.TeachingOptions = dataCopy;
 
           this.TeachingOptions = dataCopy;

+ 3 - 1
src/components/pages/test/check/index.vue
View File 

@@ -1057,7 +1057,9 @@ export default {
 
           .get(this.$store.state.api + "selectTeacherOfficeBySchool", params)
 
           .get(this.$store.state.api + "selectTeacherOfficeBySchool", params)
 
           .then((res) => {
 
           .then((res) => {
 
             console.log(res.data);
 
             console.log(res.data);
 
-              this.TeachingOptions = res.data[0];
 
+              this.TeachingOptions = res.data[0].filter(item=>{
 
+                return item.parentid == '6'
 
+              });
 
               // console.log('this.TeachingOptions',this.TeachingOptions);
 
               // console.log('this.TeachingOptions',this.TeachingOptions);
 
           })
 
           })
 
           .catch((err) => {
 
           .catch((err) => {

+ 12 - 8
src/components/pages/test/examine/conpoments/personPage.vue
View File 

@@ -548,16 +548,20 @@ export default {
 
           let dataCopy = [];
 
           let dataCopy = [];
 
 
 
           data.forEach(e => {
 
           data.forEach(e => {
 
-            let a = {};
 
-            a.value = e.name;
 
-            a.text = e.name;
 
-            dataCopy.push(a);
 
+            if(e.parentid == '6'){
 
+              let a = {};
 
+              a.value = e.name;
 
+              a.text = e.name;
 
+              dataCopy.push(a);
 
+            }
 
           });
 
           });
 
           data.forEach(e => {
 
           data.forEach(e => {
 
-            let a = {};
 
-            a.id = e.id;
 
-            a.name = e.name;
 
-            this.TeaList.push(a);
 
+            if(e.parentid == '6'){
 
+              let a = {};
 
+              a.id = e.id;
 
+              a.name = e.name;
 
+              this.TeaList.push(a);
 
+            }
 
           });
 
           });
 
 
 
           this.TeachingOptions = dataCopy;
 
           this.TeachingOptions = dataCopy;

+ 6 - 4
src/components/pages/test/examine/conpoments/targetPage.vue
View File 

@@ -1372,10 +1372,12 @@ export default {
 
           let dataCopy = [];
 
           let dataCopy = [];
 
 
 
           data.forEach(e => {
 
           data.forEach(e => {
 
-            let a = {};
 
-            a.value = e.name;
 
-            a.text = e.name;
 
-            dataCopy.push(a);
 
+            if(e.parentid == '6'){
 
+              let a = {};
 
+              a.value = e.name;
 
+              a.text = e.name;
 
+              dataCopy.push(a);
 
+            }
 
           });
 
           });
 
 
 
           this.TeachingOptions = dataCopy;
 
           this.TeachingOptions = dataCopy;

Some files were not shown because too many files changed in this diff