Главная Обзор Помощь
Вход
CocoRoboLabs
/
pbl-teacher-table
3
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

update

lsc 7 месяцев назад
Родитель
8e7189828b
Сommit
c06c610342
16 измененных файлов с 164 добавлено и 21 удалено
Разделённый вид Показать статистику Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.75fe5951dd955ad4ef774ea87fe83291.css
  3. 0 0
      dist/static/css/app.75fe5951dd955ad4ef774ea87fe83291.css.map
  4. 0 0
      dist/static/js/app.7b4827c3a80a895dcf39.js
  5. 0 0
      dist/static/js/app.7b4827c3a80a895dcf39.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 4 0
      src/assets/css/button.css
  8. 3 0
      src/components/pages/aiAddCourse/addCourse.vue
  9. 27 5
      src/components/pages/aiAddCourse/aiCreateDialog.vue
  10. 2 1
      src/components/pages/components/studentWorksDetail.vue
  11. 2 3
      src/components/pages/test/add/components/choice/index.vue
  12. 56 3
      src/components/pages/test/add/edit/edit/index.vue
  13. 12 4
      src/components/pages/test/add/minxins/minxin.js
  14. 54 2
      src/components/pages/test/add/setInfo/manualCreated.vue
  15. 1 1
      src/components/pages/test/check/index.vue
  16. 2 1
      src/components/pages/works.vue

+ 1 - 1
dist/index.html
Просмотреть файл 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.be1abe8f8256d34b6818d0190919db9b.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.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.aa337370f0f43d9da5d2.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.75fe5951dd955ad4ef774ea87fe83291.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.35dfb1d95a63059f336f.js></script><script type=text/javascript src=./static/js/app.7b4827c3a80a895dcf39.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.75fe5951dd955ad4ef774ea87fe83291.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/css/app.75fe5951dd955ad4ef774ea87fe83291.css.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.7b4827c3a80a895dcf39.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/app.7b4827c3a80a895dcf39.js.map


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 4 - 0
src/assets/css/button.css
Просмотреть файл 

@@ -322,6 +322,7 @@
 
 
 .pub_test_btn_text::before,
 
 .pub_test_btn_choose::before,
 
+.pub_test_btn_choose2::before,
 
 .pub_test_btn_page::before,
 
 .pub_test_btn_group::before,
 
 .pub_test_btn_course::before,
 
@@ -345,6 +346,9 @@
 
 .pub_test_btn_choose::before {
 
   background-image: url(../icon/test/type_check_icon.png);
 
 }
 
+.pub_test_btn_choose2::before {
 
+  background-image: url(../icon/test/type_checkO_icon.png);
 
+}
 
 .pub_test_btn_file::before {
 
   background-image: url(../icon/test/type_file_icon.png);
 
 }

+ 3 - 0
src/components/pages/aiAddCourse/addCourse.vue
Просмотреть файл 

@@ -20460,9 +20460,11 @@ ${_text2}`
 
         }
 
       }
 
       let taskN = []
 
+      let taskD = []
 
       for(var ti = 0; ti < _this.unitJson[0].chapterInfo[0].taskJson.length; ti++){
 
         if(_tindex2 != ti){
 
           taskN.push("任务"+(ti+1)+"："+_this.unitJson[0].chapterInfo[0].taskJson[ti].task)
 
+          taskD.push("任务"+(ti+1)+"描述："+_this.unitJson[0].chapterInfo[0].taskJson[ti].taskDetail2.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n',''))
 
         }
 
       }
 
       let messages = `NOTICE
 
@@ -20479,6 +20481,7 @@ ${msg}
 
 其他大纲的任务名：${taskN.join(",")}
 
 ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? 'index:'+(_tindex2+1) : ''}
 
 ${_this.unitJson[0].chapterInfo[0].taskJson[_tindex2].taskDetail2 ? '任务描述：' + _this.unitJson[0].chapterInfo[0].taskJson[_tindex2].taskDetail2.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
 
+其他大纲的任务描述：${taskD.join("\n")}
 
 ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? '#目标层：'+_this.cpote.cpote3.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
 
 ${(_this.templateid == "4480d65a-1e48-11ef-bee5-005056b86db5" || _this.templateid == "cf5722a4-401b-11ef-b873-005056b86dc3") ? '#任务簇：'+_this.cpote.cpote4.replaceAll('#','').replaceAll('*','').replaceAll('-','').replaceAll('\n','') : ''}
 
 `

+ 27 - 5
src/components/pages/aiAddCourse/aiCreateDialog.vue
Просмотреть файл 

@@ -2,6 +2,7 @@
 
     <el-dialog title="AI生成PPT" :visible.sync="dialogVisibleAiCreate" :append-to-body="true" width="700px"
 
         :before-close="handleClose" class="dialog_diy">
 
         <div style="height: 500px; padding: 15px" v-loading="loading" element-loading-text="小可正在努力生成中，请稍等...">
 
+            <div class="c_pub_button_confirm stopBtn" v-if="loading && stopPpt" @click="cancelAjax()">停止</div>
 
             <!-- <div class="t_box">
 
                 <span>选择：</span>
 
                 <el-radio-group v-model="radio" @change="changeRadio">
 
@@ -107,6 +108,7 @@ export default {
 
             },
 
             detail: "",
 
             loading: false,
 
+            stopPpt: null,
 
             url: "",
 
             uJson: {},
 
             outline: "",
 
@@ -832,6 +834,12 @@ export default {
 
         },
 
     },
 
     methods: {
 
+        cancelAjax(){
 
+            this.$message.success("已经成功停止")
 
+            this.stopPpt.cancel('Request canceled by the user.');
 
+            this.stopPpt = null;
 
+            this.loading = false
 
+        },
 
         handleClose(done) {
 
             this.close();
 
             done();
 
@@ -884,8 +892,6 @@ export default {
 
                 this.$message.error("正在生成中，请稍后");
 
                 return;
 
             }
 
-            this.url = "";
 
-            this.uJson = {};
 
             let _this = this;
 
 
             let fileid = [];
 
@@ -929,6 +935,10 @@ export default {
 
             }
 
             let message = "";
 
             if (type == 1) {
 
+                if(!_this.outline){
 
+                    _this.$message.error("请先生成大纲内容");
 
+                    return;
 
+                }
 
                 message = `NOTICE
 
 Role: 你是ppt内容设计大师，能力是从用户提供的文件资料中提取最重要的学科概念作为ppt参考内容，最后根据Context要求的流程要求输出ppt内容。
 
 Output: Provide your output in json format.
 
@@ -989,7 +999,8 @@ ${mclass.length ? "面向年级：" + mclass.join(",") : ""}
 
 
                 }
 
             }
 
-
 
+            this.url = "";
 
+            this.uJson = {};
 
             // let params = JSON.stringify({
 
             //     // "model": "Chat",
 
             //     model: 'gpt-3.5-turbo',
 
@@ -1027,7 +1038,7 @@ ${mclass.length ? "面向年级：" + mclass.join(",") : ""}
 
             //     _this.loading = false
 
             //     console.log(error);
 
             // });
 
-
 
+            _this.stopPpt = _this.ajax.setCancelSource();
 
             let parm = {
 
                 assistant_id:
 
                     type == 1
 
@@ -1041,7 +1052,7 @@ ${mclass.length ? "面向年级：" + mclass.join(",") : ""}
 
             };
 
             _this.loading = true;
 
             this.ajax
 
-                .post("https://gpt4.cocorobo.cn/ai_agent_park_chat", parm)
 
+                .post("https://gpt4.cocorobo.cn/ai_agent_park_chat", parm, _this.stopPpt)
 
                 .then((response) => {
 
                     console.log(response);
 
                     let data = response.data.FunctionResponse;
 
@@ -1083,18 +1094,21 @@ ${mclass.length ? "面向年级：" + mclass.join(",") : ""}
 
                                 } catch (error) {
 
                                     _this.$message.error("生成失败，正在重新生成");
 
                                     _this.loading = false;
 
+                                    _this.stopPpt = null
 
                                     _this.aiGet(type);
 
                                 }
 
                             }
 
                         } else {
 
                             _this.outline = data.message;
 
                             _this.steps = 1;
 
+                            _this.stopPpt = null
 
                             _this.loading = false;
 
                         }
 
                     }
 
                 })
 
                 .catch((error) => {
 
                     _this.loading = false;
 
+                    _this.stopPpt = null
 
                     console.log(error);
 
                 });
 
         },
 
@@ -1371,4 +1385,12 @@ ${mclass.length ? "面向年级：" + mclass.join(",") : ""}
 
     height: 100%;
 
     object-fit: cover;
 
 }
 
+
 
+.stopBtn{
 
+  z-index: 999999;
 
+  position: absolute;
 
+  left: 50%;
 
+  top: calc(50% + 70px);
 
+  transform: translateX(-50%);
 
+}
 
 </style>

+ 2 - 1
src/components/pages/components/studentWorksDetail.vue
Просмотреть файл 

@@ -3421,10 +3421,11 @@ export default {
 
         uid: this.uid,
 
         cname: this.uname,
 
         uClass:this.uClass,
 
+        userid:this.$route.query.userid,
 
         page: this.page
 
       };
 
       this.ajax
 
-        .get(this.$store.state.api + "selectStudentCourseWorksTwo", params)
 
+        .get(this.$store.state.api + "selectStudentCourseWorksTwo2", params)
 
         .then(res => {
 
           this.isLoading = false;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;

+ 2 - 3
src/components/pages/test/add/components/choice/index.vue
Просмотреть файл 

@@ -2,14 +2,13 @@
 
     <div class="choice_box jiao" @click.stop="">
 
         <!-- <div class="title">设置选择题</div> -->
 
         <div class="box">
 
-            <div class="set_type" style="margin-top: 0;">
 
-                <!-- <span>选择题类型：</span> -->
 
+            <!-- <div class="set_type" style="margin-top: 0;">
 
                 <span>题目类型：</span>
 
                 <el-select v-model="checkJson.type" @change="changeAnswer">
 
                     <el-option v-for="item in options" :key="item.type" :label="item.name" :value="item.type">
 
                     </el-option>
 
                 </el-select>
 
-            </div>
 
+            </div> -->
 
             <div class="set_title" style="align-items: flex-start;">
 
                 <span>表单问题：</span><textarea v-autoHeight="68" rows="2" class="binfo_input binfo_textarea" cols v-model="checkJson.title"
 
                     placeholder="请输入标题"></textarea>

+ 56 - 3
src/components/pages/test/add/edit/edit/index.vue
Просмотреть файл 

@@ -19,11 +19,12 @@
 
                 class="pub_test_btn"
 
                 :class="{
 
                   pub_test_btn_text: item.value == 3,
 
-                  pub_test_btn_choose: item.value == 1,
 
+                  pub_test_btn_choose: item.value == 1 || item.value == 10,
 
                   pub_test_btn_file: item.value == 5,
 
                   pub_test_btn_course: item.value == 6,
 
                   pub_test_btn_eva: item.value == 7,
 
                   pub_test_btn_time: item.value == 8,
 
+                  pub_test_btn_choose2: item.value == 9,
 
                 }"
 
               >
 
                 {{ item.label }} 
@@ -207,9 +208,15 @@ export default {
 
       if (this.checkC) {
 
         let _check = this.checkC.replace("x", "").split("-");
 
         let _json = this.manualJson[_check[0]];
 
+        let _topicType = ''
 
+        if(topicType == 9 || topicType == 10){
 
+          _topicType = 1 
+        }else {
 
+          _topicType = topicType
 
+        }
 
         let json = {
 
           ttype: 1,
 
-          type: topicType,
 
+          type: _topicType,
 
         };
 
         if (topicType == 1) {
 
           json.json = {
 
@@ -251,6 +258,26 @@ export default {
 
             title: "标题",
 
             detail: "",
 
           };
 
+        }else if (topicType == 9) {
 
+          json.json = {
 
+            title: "标题",
 
+            type: 1,
 
+            array: [
 
+              { option: "选项1", img: "" },
 
+              { option: "选项2", img: "" },
 
+            ],
 
+            answer: "",
 
+          };
 
+        }else if (topicType == 10) {
 
+          json.json = {
 
+            title: "标题",
 
+            type: 2,
 
+            array: [
 
+              { option: "选项1", img: "" },
 
+              { option: "选项2", img: "" },
 
+            ],
 
+            answer: "",
 
+          };
 
         }
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -292,9 +319,15 @@ export default {
 
         }
 
       } else {
 
         if (type == 1) {
 
+          let _topicType = ''
 
+          if(topicType == 9 || topicType == 10){
 
+            _topicType = 1 
+          }else {
 
+            _topicType = topicType
 
+          }
 
           let json1 = {
 
             ttype: 1,
 
-            type: topicType,
 
+            type: _topicType,
 
           };
 
 
           if (topicType == 1) {
 
@@ -337,6 +370,26 @@ export default {
 
               title: "标题",
 
               detail: "",
 
             };
 
+          } else if (topicType == 9) {
 
+            json1.json = {
 
+              title: "标题",
 
+              type: 1,
 
+              array: [
 
+                { option: "选项1", img: "" },
 
+                { option: "选项2", img: "" },
 
+              ],
 
+              answer: "",
 
+            };
 
+          } else if (topicType == 10) {
 
+            json1.json = {
 
+              title: "标题",
 
+              type: 2,
 
+              array: [
 
+                { option: "选项1", img: "" },
 
+                { option: "选项2", img: "" },
 
+              ],
 
+              answer: "",
 
+            };
 
           }
 
           this.manualJson.push(json1);
 
           this.$forceUpdate()

+ 12 - 4
src/components/pages/test/add/minxins/minxin.js
Просмотреть файл 

@@ -2,10 +2,10 @@ const minxin = {
 
   data() {
 
     return {
 
       options: [
 
-        {
 
-          value: 1,
 
-          label: "选择题"
 
-        },
 
+        // {
 
+        //   value: 1,
 
+        //   label: "选择题"
 
+        // },
 
         // {
 
         //   value: 2,
 
         //   label: "问答题"
 
@@ -34,6 +34,14 @@ const minxin = {
 
           value: 8,
 
           label: "日期"
 
         },
 
+        {
 
+          value: 9,
 
+          label: "单选题"
 
+        },
 
+        {
 
+          value: 10,
 
+          label: "多选题"
 
+        },
 
       ],
 
       optionsPin:[
 
        {

+ 54 - 2
src/components/pages/test/add/setInfo/manualCreated.vue
Просмотреть файл 

@@ -169,9 +169,15 @@ export default {
 
       if (this.checkC) {
 
         let _check = this.checkC.replace("x", "").split("-");
 
         let _json = this.checkJson[_check[0]];
 
+        let topicType = ''
 
+        if(this.topicType == 9 || this.topicType == 10){
 
+          topicType = 1 
+        }else {
 
+          topicType = this.topicType
 
+        }
 
         let json = {
 
           ttype: 1,
 
-          type: this.topicType,
 
+          type: topicType,
 
         };
 
         if (this.topicType == 1) {
 
           json.json = {
 
@@ -213,6 +219,26 @@ export default {
 
             title: "标题",
 
             detail: "",
 
           };
 
+        }else if (this.topicType == 9) {
 
+          json.json = {
 
+            title: "标题",
 
+            type: 1,
 
+            array: [
 
+              { option: "选项1", img: "" },
 
+              { option: "选项2", img: "" },
 
+            ],
 
+            answer: "",
 
+          };
 
+        }else if (this.topicType == 10) {
 
+          json.json = {
 
+            title: "标题",
 
+            type: 2,
 
+            array: [
 
+              { option: "选项1", img: "" },
 
+              { option: "选项2", img: "" },
 
+            ],
 
+            answer: "",
 
+          };
 
         }
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -271,9 +297,15 @@ export default {
 
       } else {
 
         if (type == 1) {
 
           for (var i = 0; i < this.number; i++) {
 
+            let topicType = ''
 
+            if(this.topicType == 9 || this.topicType == 10){
 
+              topicType = 1 
+            }else {
 
+              topicType = this.topicType
 
+            }
 
             let json1 = {
 
               ttype: 1,
 
-              type: this.topicType,
 
+              type: topicType,
 
             };
 
             if (this.topicType == 1) {
 
               json1.json = {
 
@@ -315,6 +347,26 @@ export default {
 
                 title: "标题",
 
                 detail: "",
 
               };
 
+            }else if (this.topicType == 9) {
 
+              json1.json = {
 
+                title: "标题",
 
+                type: 1,
 
+                array: [
 
+                  { option: "选项1", img: "" },
 
+                  { option: "选项2", img: "" },
 
+                ],
 
+                answer: "",
 
+              };
 
+            }else if (this.topicType == 10) {
 
+              json1.json = {
 
+                title: "标题",
 
+                type: 2,
 
+                array: [
 
+                  { option: "选项1", img: "" },
 
+                  { option: "选项2", img: "" },
 
+                ],
 
+                answer: "",
 
+              };
 
             }
 
             this.checkJson.push(json1);
 
           }

+ 1 - 1
src/components/pages/test/check/index.vue
Просмотреть файл 

@@ -146,7 +146,7 @@
 
                   <span class="test_icon"
 
                     :class="{ test_icon_check: item.type == 1 && item.atype == 2, test_icon_checkO: item.type == 1 && item.atype == 1, test_icon_gap: item.type == 3, test_icon_file: item.type == 5, test_course_file: item.type == 6, test_eva_file: item.type == 7,test_icon_time: item.type == 8 }"></span>
 
                 </el-tooltip>
 
-                <span>{{ item.title }}</span>
 
+                <span style="line-height: 25px;">{{ item.title }}</span>
 
 								<el-button v-if="item.type == 5 && item.array.length>0" class="title_downBtn" type="primary" size="small" @click.stop="downloadFileType5(item.array,item.title,index)">批量下载附件</el-button>
 
 								<div v-if="item.type==7" style="right:0;position: absolute;">平均分：{{ getAverageScore(index) }}</div>
 
               </div>

+ 2 - 1
src/components/pages/works.vue
Просмотреть файл 

@@ -525,10 +525,11 @@ export default {
 
         oid: this.oid,
 
         cn: this.cn,
 
         cid: this.classChoose,
 
+        userid: this.userid,
 
         page: this.page,
 
       };
 
       this.ajax
 
-        .get(this.$store.state.api + "selectAllStudent", params)
 
+        .get(this.$store.state.api + "selectAllStudentTeacher", params)
 
         .then((res) => {
 
           this.isLoading = false;
 
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;

Некоторые файлы не были показаны из-за большого количества измененных файлов