11wqe1 1 week ago
parent
commit
7b581f445f

+ 1 - 1
src/components/Choice/index.vue

@@ -90,7 +90,7 @@ export default {
             type: String,
             type: String,
         },
         },
         courseType: {
         courseType: {
-            type: String || Number,
+            type: [String, Number],
         },
         },
         taskCount: {
         taskCount: {
             type: Number,
             type: Number,

+ 2 - 2
src/components/classRoomHelper/component/countdown.vue

@@ -219,8 +219,8 @@
                     version="1.1"
                     version="1.1"
                     xmlns="http://www.w3.org/2000/svg"
                     xmlns="http://www.w3.org/2000/svg"
                     p-id="4250"
                     p-id="4250"
-                    width="200"
-                    height="200"
+                    width="100%"
+                    height="100%"
                   >
                   >
                     <path
                     <path
                       d="M814.795 320.301c9.571 0 12.392 6.018 6.264 13.372l-297.761 357.392c-6.128 7.355-16.154 7.355-22.281 0l-297.761-357.392c-6.128-7.355-3.309-13.372 6.264-13.372l605.275 0z"
                       d="M814.795 320.301c9.571 0 12.392 6.018 6.264 13.372l-297.761 357.392c-6.128 7.355-16.154 7.355-22.281 0l-297.761-357.392c-6.128-7.355-3.309-13.372 6.264-13.372l605.275 0z"

+ 18 - 12
src/components/classRoomHelper/component/taskArea.vue

@@ -57,7 +57,7 @@
               </div>
               </div>
             </div>
             </div>
           </div>
           </div>
-          <div class="tt_i_b_item" style="width: 290px;">
+          <div class="tt_i_b_item" style="flex: 1;">
             <div class="tt_i_b_title">{{ lang.ssCommunication }}</div>
             <div class="tt_i_b_title">{{ lang.ssCommunication }}</div>
             <div class="tt_i_b_box" >
             <div class="tt_i_b_box" >
               <div class="tt_i_b_b_item">
               <div class="tt_i_b_b_item">
@@ -1367,20 +1367,26 @@ ${taskText}
         .then(res => {
         .then(res => {
           let _data = res.data.FunctionResponse.message;
           let _data = res.data.FunctionResponse.message;
           _data = _data.replaceAll("```json", "").replaceAll("```", "");
           _data = _data.replaceAll("```json", "").replaceAll("```", "");
+          console.log(_data,'_data');
+          
           const match = _data.match(
           const match = _data.match(
-            /{[^{}]*"teststitle"[\s\S]*?"end":\s*""[^{}]*}/
+            /\{"teststitle"[\s\S]*?end\s*:\s*""\s*\}/
           );
           );
-          let _result = JSON.parse(match[0]);
-          (_result.answer2 = _result.answer.length ? [] : ""),
-            (_result.uuid = uuidv4());
-          delete _result.end;
-          this.topicList.splice(this.showTopicIndex + 1, 0, _result);
-          // this.saveTaskList(1);
-          this.saveTaskList(2).then(_ => {
-            this.saveTaskList().then(_ => {
-              this.next();
+          if (match && match[0]) {
+            // 修复 end:"" 为 "end":"" 以符合JSON格式
+            let jsonStr = match[0].replace(/([{,]\s*)end\s*:\s*""/g, '$1"end":""');
+            let _result = JSON.parse(jsonStr);
+            (_result.answer2 = _result.answer.length ? [] : ""),
+              (_result.uuid = uuidv4());
+            delete _result.end;
+            this.topicList.splice(this.showTopicIndex + 1, 0, _result);
+            // this.saveTaskList(1);
+            this.saveTaskList(2).then(_ => {
+              this.saveTaskList().then(_ => {
+                this.next();
+              });
             });
             });
-          });
+          }
           this.aiBoxLoading = false;
           this.aiBoxLoading = false;
         })
         })
         .catch(e => {
         .catch(e => {

+ 1 - 0
src/components/components/choseWorksDetailDialog.vue

@@ -1435,6 +1435,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      isAnswer:false,
       homeWorkLoading:false,
       homeWorkLoading:false,
       toolsList:toolsList,
       toolsList:toolsList,
       appStoreUrl:'',
       appStoreUrl:'',

+ 1 - 1
src/components/components/statisticalAnalysis.vue

@@ -222,7 +222,7 @@ export default {
   mixins: [myMixin],
   mixins: [myMixin],
   props: {
   props: {
     courseType: {
     courseType: {
-      type: String || Number,
+      type: [String, Number],
       default: ""
       default: ""
     },
     },
     taskCount: {
     taskCount: {

+ 1 - 0
src/components/components/studentWorkPreviewDialog.vue

@@ -384,6 +384,7 @@ export default {
   components: {},
   components: {},
   data() {
   data() {
     return {
     return {
+      isAnswer:false,
       show: false,
       show: false,
       toolList: [
       toolList: [
         {
         {

+ 2 - 2
src/components/easy/studyStudent.vue

@@ -10529,8 +10529,8 @@ export default {
 /* code 样式 */
 /* code 样式 */
 .cont>>>code {
 .cont>>>code {
   display: inline-block;
   display: inline-block;
-  *display: inline;
-  *zoom: 1;
+  /* *display: inline;
+  *zoom: 1; */
   background-color: #f1f1f1;
   background-color: #f1f1f1;
   border-radius: 3px;
   border-radius: 3px;
   padding: 3px 5px;
   padding: 3px 5px;

+ 4 - 4
src/components/easy3/studyStudent.vue

@@ -1606,7 +1606,7 @@
                       style="position: absolute; right: 30px; top: -45px"
                       style="position: absolute; right: 30px; top: -45px"
                       @click="openWordCloud(toolIndex)"
                       @click="openWordCloud(toolIndex)"
                       >{{ lang.ssGenerateWordCloud }}
                       >{{ lang.ssGenerateWordCloud }}
-                    ></el-button>
+                    </el-button>
                     <el-button
                     <el-button
                       type="primary"
                       type="primary"
                       v-if="
                       v-if="
@@ -1615,7 +1615,7 @@
                       style="position: absolute; right: 30px; top: -45px"
                       style="position: absolute; right: 30px; top: -45px"
                       @click="uploadWorks(toolIndex)"
                       @click="uploadWorks(toolIndex)"
                       >{{ lang.ssExportHomework }}
                       >{{ lang.ssExportHomework }}
-                    ></el-button>
+                    </el-button>
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
                         position: absolute;
                         position: absolute;
                         right: 30px;
                         right: 30px;
@@ -9381,7 +9381,7 @@
               <img src="../../assets/icon/question.png" alt />
               <img src="../../assets/icon/question.png" alt />
             </div>
             </div>
             <div class="queTitle">
             <div class="queTitle">
-              <div style="min-width: 90px">{{lang.ssAskQuestion}}</div>
+              <div style="min-width: 90px">{{lang.ssAsk}}</div>
               <div>{{ answerQ }}</div>
               <div>{{ answerQ }}</div>
             </div>
             </div>
           </div>
           </div>
@@ -9426,7 +9426,7 @@
               <img src="../../assets/icon/question.png" alt />
               <img src="../../assets/icon/question.png" alt />
             </div>
             </div>
             <div class="queTitle">
             <div class="queTitle">
-              <div style="min-width: 90px">{{lang.ssAskQuestion}}</div>
+              <div style="min-width: 90px">{{lang.ssAsk}}</div>
               <div>{{ answerQ }}</div>
               <div>{{ answerQ }}</div>
             </div>
             </div>
           </div>
           </div>

+ 1 - 1
src/components/interVideo/index.vue

@@ -69,7 +69,7 @@ export default {
             type: String,
             type: String,
         },
         },
         courseType: {
         courseType: {
-            type: String || Number,
+            type: [String, Number],
         },
         },
         taskCount: {
         taskCount: {
             type: Number,
             type: Number,

+ 1 - 1
src/components/studyStudent.vue

@@ -94,7 +94,7 @@
                }"
                }"
             >
             >
               <div class="stageItemTitle" :class="{ stageNav: item.isOpen }">
               <div class="stageItemTitle" :class="{ stageNav: item.isOpen }">
-                <div>{{ lang.ssStage.replace(/\*/g, stageIndex + 1) }}</div>
+                <div>{{ lang.ssStage2.replace(/\*/g, stageIndex + 1) }}</div>
                 <el-tooltip
                 <el-tooltip
                   effect="light"
                   effect="light"
                   :content="item.dyName"
                   :content="item.dyName"