#

src/components/easy2/commpont/markDialog.vue

@@ -4,11 +4,14 @@
       style="overflow: auto;overflow-x: hidden;width: 315px;box-sizing: content-box;border-right: 1px rgba(231, 231, 231, 1) solid;"
     >
       <div class="left">
-        <div v-if="markScoreworksStudent.length - 1 == toolIndex" v-loading="ScLoading">
+        <div
+          v-if="markScoreworksStudent.length - 1 == toolIndex"
+          v-loading="ScLoading"
+        >
           <div class="scoreTit">
             <div>任务得分</div>
             <div>
-              <span style="color: rgba(54, 129, 252, 1);">{{
+              <span style="color: rgba(54, 129, 252, 1);margin-right: 3px;">{{
                 totalScore ? totalScore : 0
               }}</span
               >分
@@ -21,7 +24,7 @@
                 v-for="(e, index) in scoTitList"
                 :key="index + 'a'"
               >
-                <div class="scoreStarBack">
+                <div class="scoreStarBack" >
                   <el-tooltip
                     class="item"
                     effect="dark"
@@ -29,6 +32,7 @@
                     placement="top"
                   >
                     <div class="briefTit">
+                      <img class="titRoot" src="../../../assets/icon/newIcons/blueRoot.png" alt="">
                       {{ e.value }}
                     </div>
                   </el-tooltip>
@@ -48,6 +52,7 @@
                     placement="top"
                   >
                     <div class="briefTit">
+                      <img class="titRoot" src="../../../assets/icon/newIcons/blueRoot.png" alt="">
                       {{ e.value }}
                     </div>
                   </el-tooltip>
@@ -81,12 +86,13 @@
             </el-input>
             <div
               class="AreaBtn"
-              v-if="currentUid.type == 10 || currentUid.type == 13 || isMarkCom == 1"
+              v-if="
+                currentUid.type == 10 || currentUid.type == 13 || isMarkCom == 1
+              "
               @click="generateMsg(currentUid)"
             >
               <span>重新生成</span>
             </div>
-           
           </div>
 
           <div
@@ -126,44 +132,46 @@
         </div>
 
         <!-- 提交列表 -->
-        <div>
+        <div style="flex: 1;display: flex;flex-direction: column;overflow: auto;">
           <div class="workListTit" @click="workListTitBtn">
             <i class="el-icon-arrow-down"></i>提交列表({{ workList.length }})
           </div>
-          <div
-            v-if="workListShow"
-            v-for="(i, index) in workList"
-            :key="index"
-            :class="['schPer', i.userid == DgUid ? 'selBlock' : '']"
-            style="cursor: pointer;"
-            @click="cutPer(i.userid)"
-          >
-            <img v-if="i.headportrait" :src="i.headportrait" alt="" />
-            <img
-              v-else
-              src="https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/static/img/portal.b3cf7fa.png"
-              alt=""
-            />
+          <div style="overflow: auto;flex: 1;">
+            <div
+              v-if="workListShow"
+              v-for="(i, index) in workList"
+              :key="index"
+              :class="['schPer', i.userid == DgUid ? 'selBlock' : '']"
+              style="cursor: pointer;"
+              @click="cutPer(i.userid)"
+            >
+              <img v-if="i.headportrait" :src="i.headportrait" alt="" />
+              <img
+                v-else
+                src="https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/static/img/portal.b3cf7fa.png"
+                alt=""
+              />
 
-            <div class="con">
-              <div class="tit">
-                <span
-                  style="font-size: 14px;color: rgba(0, 0, 0, 0.9);font-weight: 400;"
-                  >{{ i.name }}</span
-                >
+              <div class="con">
+                <div class="tit">
+                  <span
+                    style="font-size: 14px;color: rgba(0, 0, 0, 0.9);font-weight: 400;"
+                    >{{ i.name }}</span
+                  >
 
-                <span
-                  style="font-size: 14px;color:rgba(0, 0, 0, 0.4);"
-                  v-if="i.markSco == null"
-                  >未评分</span
-                >
-                <span
-                  v-else
-                  style="font-size: 16px;color: rgba(0, 0, 0, 0.9);font-weight: 600;"
-                  >{{ i.markSco }}</span
-                >
+                  <span
+                    style="font-size: 14px;color:rgba(0, 0, 0, 0.4);"
+                    v-if="i.markSco == null"
+                    >未评分</span
+                  >
+                  <span
+                    v-else
+                    style="font-size: 16px;color: rgba(0, 0, 0, 0.9);font-weight: 600;"
+                    >{{ i.markSco }}</span
+                  >
+                </div>
+                <div class="Timer">{{ i.time }}</div>
               </div>
-              <div class="Timer">{{ i.time }}</div>
             </div>
           </div>
         </div>
@@ -271,21 +279,21 @@
           </div>
           <div v-if="currentUid.type == 12" style="height: 100%;">
             <div>
-                <div style="cursor: pointer;" @click="downloadFile(currentUid.content)">下载txt</div>
-                <!-- <div>{{ currentUid.content }}</div> -->
+              <div
+                style="cursor: pointer;"
+                @click="downloadFile(currentUid.content)"
+              >
+                下载txt
+              </div>
+              <!-- <div>{{ currentUid.content }}</div> -->
             </div>
           </div>
-          <div v-if="currentUid.type == 15">
+          <div v-if="currentUid.type == 15" style="height: 100%;">
             <div
               class="worksAnswer"
-              v-if="currentUid.content && currentUid.type == 15"
+              v-if="currentUid.content"
               @click="
-                openCocoPi(
-                  57,
-                  this.toolIndex,
-                  currentUid.userid,
-                  currentUid.name
-                )
+                openCocoPi(57, toolIndex, currentUid.userid, currentUid.name)
               "
             >
               <img src="../../../assets/icon/codeFile.png" />
@@ -327,10 +335,7 @@
               v-for="i in commentList"
               :key="i.id"
             >
-              <div
-                class="schPer2"
-                style="border: none;width: 270px;padding: 0;"
-              >
+              <div class="schPer2" style="border: none;width: 90%;padding: 0;">
                 <img v-if="i.headportrait" :src="i.headportrait" alt="" />
                 <img
                   v-else
@@ -338,10 +343,10 @@
                   alt=""
                 />
                 <div class="con">
-                  <div class="tit">
+                  <div class="tit2">
                     <div class="TitName">{{ i.username }}</div>
                     <span
-                      style="font-size: 14px;color: rgba(0, 0, 0, 0.9);font-weight: 400;"
+                      style="font-size: 14px;color: rgba(0, 0, 0, 0.9);font-weight: 400;width: 200px;"
                       >{{ i.time }}</span
                     >
                   </div>
@@ -350,7 +355,6 @@
               </div>
               <div>
                 <span
-                  v-if="cUserid == i.likesId"
                   style="color: #3B7BD7;cursor: pointer;"
                   @click="deleteComment(i.id)"
                   >删除</span
@@ -368,7 +372,15 @@
 import { v4 as uuidv4 } from "uuid";
 
 export default {
-  props: ["uid", "stage", "toolIndex", "task", "scoTit", "markScoreVisible","markScoreworksStudent"],
+  props: [
+    "uid",
+    "stage",
+    "toolIndex",
+    "task",
+    "scoTit",
+    "markScoreVisible",
+    "markScoreworksStudent"
+  ],
   data() {
     return {
       textarea: "",
@@ -415,7 +427,7 @@ export default {
           fullscreenToggle: true //全屏按钮
         }
       },
-      xianObj: ["DOCX", "MD", "TXT", "PDF"],
+      xianObj: ["DOCX", "MD", "TXT", "PDF"]
     };
   },
   watch: {
@@ -431,26 +443,29 @@ export default {
   computed: {
     totalScore() {
       let a = 0;
+
       this.scoTitList.forEach(e => {
         if (e.cog) {
           a += e.cog * 1;
         }
       });
-
+      
       return (a / this.scoTit.length).toFixed(1);
     },
-    isMarkCom(){
+    isMarkCom() {
       // console.log('a',this.currentUid);
       if (this.currentUid.type == 4 || this.currentUid.type == 12) {
-        let a = this.currentUid.content.slice(this.currentUid.content.lastIndexOf(".") + 1)
-        
+        let a = this.currentUid.content.slice(
+          this.currentUid.content.lastIndexOf(".") + 1
+        );
+
         if (this.xianObj.indexOf(a.toUpperCase()) != -1) {
-          return 1
-        }else{
-          return 0
+          return 1;
+        } else {
+          return 0;
         }
-      }else{
-        return 0
+      } else {
+        return 0;
       }
     }
   },
@@ -533,7 +548,7 @@ export default {
           console.error(err);
         });
     },
-   
+
     // 重置
     reset() {
       this.scoTitList.forEach(e => {
@@ -551,8 +566,8 @@ export default {
           e.isai = 1;
         }
       });
-      let _fileid = ''
-      if(work.type == 4 || work.type == 12){
+      let _fileid = "";
+      if (work.type == 4 || work.type == 12) {
         _fileid = await this.createFileid(work.content);
       }
       let con = this.cuScoCon;
@@ -571,7 +586,7 @@ export default {
 
           #Context
           ##要求
-          根据<评价细则>和<作业内容>的相关性评价作业,只用输出作业的综合性“评语”，字数控制在150字左右，不要输出其他无关内容。
+          根据<评价细则>和<作业内容>的相关性评价作业,只用输出作业的综合性“评语”，不要带标题，字数控制在150字左右，不要输出其他无关内容。
 
 
           ##评分资料
@@ -584,14 +599,14 @@ export default {
           `;
       // return console.log(msg);
 
-      this.generateRemark(msg,_fileid);
+      this.generateRemark(msg, _fileid);
     },
     // 重新获取评语
-    generateRemark(messages,_fileid) {
+    generateRemark(messages, _fileid) {
       let _this = this;
 
       let params = {
-        assistant_id: "6063369f-289a-11ef-8bf4-12e77c4cb76b",
+        assistant_id: "f8e1ebb2-2e0d-11ef-8bf4-12e77c4cb76b",
         message: [
           {
             type: "text",
@@ -600,7 +615,7 @@ export default {
         ],
         session_name: uuidv4(),
         userId: this.cUserid,
-        file_ids:  _fileid ? [_fileid] : [],
+        file_ids: _fileid ? [_fileid] : [],
         model: "gpt-4o-2024-08-06"
       };
       this.ajax
@@ -611,7 +626,6 @@ export default {
           this.textarea = data.message;
           // this.selectSWorksData()
           this.ScLoading = false;
-
         })
         .catch(error => {
           this.ScLoading = false;
@@ -624,11 +638,11 @@ export default {
     async AIsubmit(work) {
       // return console.log("con", this.scoTit, this.cuScoCon);
       this.ScLoading = true;
-      let _fileid = ''
-      if(work.type == 4 || work.type == 12){
+      let _fileid = "";
+      if (work.type == 4 || work.type == 12) {
         _fileid = await this.createFileid(work.content);
       }
-      let tit = this.scoTit;
+      let tit = JSON.parse(JSON.stringify(this.scoTit));
       tit.forEach((e, index) => {
         if (!e.isai) {
           e.isai = 1;
@@ -639,7 +653,10 @@ export default {
       let laws = "";
       for (let i = 0; i < tit.length; i++) {
         if (tit[i].isai == 1) {
-          laws += `评价维度：${tit[i].value} 评价细则：${tit[i].rule} \n`;
+          let a = tit[i].value
+          let result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+        
+          laws += `评价维度：“${result}”， 评价细则：${tit[i].rule} \n`;
         }
       }
 
@@ -651,7 +668,7 @@ export default {
 
       #Context
       ##要求
-      根据<评价细则>和<作业内容>的相关性评价作业，判断该作业属于六级中的哪个等级，结合“评价维度”和等级写评语。如果作业内容与评价细则无关，则直接评为0星。
+      根据<评价细则>和<作业内容>的相关性评价作业，判断该作业属于六级中的哪个等级，结合“评价细则”和等级写评语。如果作业内容与评价细则无关，则直接评为0星。
 
       ##评分资料
       评价细则：${laws}
@@ -660,6 +677,7 @@ export default {
       #输出要求#
       输出每个维度的“等级”和作业的综合性“评语”
       “评语”控制在150字左右
+      评价维度要按原样输出，只输出 ##评分资料 “评分细则”引号内的
 
 
       # Format example
@@ -744,7 +762,7 @@ export default {
               }
             }
             delete processedData["评语"];
-console.log('processedData',processedData);
+            console.log("processedData", processedData);
 
             let params = {
               cid: _this.cid,
@@ -776,7 +794,7 @@ console.log('processedData',processedData);
         })
         .catch(error => {
           _this.$message.error("评价失败");
-          _this.ScLoading = true;
+          _this.ScLoading = false;
 
           console.log(error);
         });
@@ -850,6 +868,8 @@ console.log('processedData',processedData);
         .catch(() => {});
     },
     openCocoPi(tool, i, uid, uname) {
+      // return console.log('?????',tool, i, uid, uname);
+
       let student = {
         userid: uid,
         student: uname
@@ -889,16 +909,23 @@ console.log('processedData',processedData);
           data.forEach(e => {
             if (e.rate) {
               let data2 = JSON.parse(e.rate);
-              // console.log("data2", data2);
 
               e.markSco = 0;
+              let k = 0
+
               for (const key in data2) {
-                if (data2[key] && key != "content") {
+                if (data2[key] && key != "content" || data2[key] == "0" ) {
                   e.markSco += data2[key] * 1;
+                }else{
+                  k += 1
                 }
               }
-              // this.scoTitList;
-              e.markSco = (e.markSco / this.scoTitList.length).toFixed(1);
+              
+              if (k > 1) {
+                e.markSco = null;
+              }else{
+                e.markSco = (e.markSco / this.scoTitList.length).toFixed(1);
+              }
             } else {
               e.markSco = null;
             }
@@ -954,13 +981,12 @@ console.log('processedData',processedData);
             }
           });
           this.vLoading = false;
-
         });
     },
     downloadFile(url) {
       var credentials = {
         accessKeyId: "AKIATLPEDU37QV5CHLMH",
-        secretAccessKey: "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",
+        secretAccessKey: "Q2SQw37HfolS7yeaR1Ndpy9Jl4E2YZKUuuy2muZR"
       }; //秘钥形式的登录上传
       window.AWS.config.update(credentials);
       window.AWS.config.region = "cn-northwest-1"; //设置区域
@@ -978,17 +1004,20 @@ console.log('processedData',processedData);
       const loading2 = this.$loading.service({
         background: "rgba(255, 255, 255, 0.7)",
         target: document.body,
-        text: "文件加载中...",
+        text: "文件加载中..."
       });
       var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
-      let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1])
+      let name = decodeURIComponent(
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+      );
       var params = {
         Bucket: "ccrb",
         Key: name
       };
-      s3.getObject(params, function (err, data) {
+      s3.getObject(params, function(err, data) {
         loading2.close();
-        if (err) console.log(err, err.stack); // an error occurred
+        if (err) console.log(err, err.stack);
+        // an error occurred
         else {
           let url = window.URL.createObjectURL(new Blob([data.Body]));
           let a = document.createElement("a");
@@ -996,11 +1025,9 @@ console.log('processedData',processedData);
           a.href = url;
           a.download = name;
           a.click();
-          console.log(data); 
-        }          // sxuccessful response
-
+          console.log(data);
+        } // sxuccessful response
       });
-
     },
     // 处理任务的分展示
     appraise(val) {
@@ -1012,12 +1039,17 @@ console.log('processedData',processedData);
         this.scoTitList.forEach((e, index) => {
           e.cog = null;
           for (const key in data) {
-            if (e.value.endsWith('。')) {
-              e.value = e.value.slice(0, -1); // 如果字符串以句号结尾，则去除最后一个字符
-            }
-            
-            if (e.value == key) {
-              e.cog = data[key] * 1;
+            // if (e.value.endsWith("。")) {
+            //   e.value = e.value.slice(0, -1); // 如果字符串以句号结尾，则去除最后一个字符
+            // }
+
+            let result = e.value.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+            let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+
+
+            if (result.indexOf(key2) != -1) {
+              e.cog = data[key];
             }
             if ("content" == key) {
               this.textarea = data[key];
@@ -1042,12 +1074,15 @@ console.log('processedData',processedData);
   height: 100%;
 }
 .left {
-  overflow: auto;
+  /* overflow: auto; */
   width: 310px;
   /* border-right: 1px rgba(231, 231, 231, 1) solid; */
-  padding: 30px 20px;
+  padding: 20px 20px 0;
   box-sizing: border-box;
   padding-right: 10px;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
 }
 
 .Rig {
@@ -1065,8 +1100,8 @@ console.log('processedData',processedData);
   margin-bottom: 5px;
 }
 .AreaCss >>> .el-textarea__inner {
-  min-height: 60px;
-  max-height: 150px;
+  min-height: 150px !important;
+  /* max-height: 150px; */
   padding-bottom: 20px;
 }
 .AreaBtn {
@@ -1149,9 +1184,10 @@ console.log('processedData',processedData);
 }
 .allD {
   margin: 10px 0;
-  width: 100%;
   min-height: 60px;
   background-color: #f3f7fd;
+  margin-left: 17px;
+
 }
 .scoreStar2 {
   padding: 0 10px 10px;
@@ -1171,6 +1207,7 @@ console.log('processedData',processedData);
   display: flex;
   justify-content: space-between;
   padding-top: 10px;
+  position: relative;
 }
 /* .scoreStar > div:first-child > .scoreStarBack {
   margin-top: 0;
@@ -1191,6 +1228,7 @@ console.log('processedData',processedData);
   font-size: 16px;
   display: flex;
   align-items: center;
+  cursor: pointer;
 }
 
 .worksAnswer > img {
@@ -1206,6 +1244,13 @@ console.log('processedData',processedData);
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
+  
+}
+.briefTit > .titRoot{
+  position: absolute;
+  top: 0;
+  left: -27px;
+  transform: translate(0,10px);
 }
 .workListTit {
   color: rgba(0, 0, 0, 0.6);
@@ -1255,11 +1300,18 @@ console.log('processedData',processedData);
   display: flex;
   justify-content: space-between;
 }
+.con > .tit2 {
+  width: 100%;
+  display: flex;
+  margin-bottom: 15px;
+}
+
 .TitName {
   width: 70px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  margin-right: 10px;
 }
 .worksAnswer {
   color: #4078dd;

src/components/easy2/commpont/markScore.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-loading="loading" @click.stop="markScoreDigBtn">
+    <div v-loading="loading" style="cursor: pointer;" @click.stop="markScoreDigBtn">
       <div class="scoreTit">
         <div>任务得分</div>
         <div>{{ totalScore ? totalScore : 0 }}分</div>
@@ -43,14 +43,15 @@
         </div>
       </div>
       <div class="AreaCss">
-        <el-input
+        {{ textarea }}
+        <!-- <el-input
           type="textarea"
           disabled
           placeholder="您可在此输入评语"
           v-model="textarea"
           style="padding-bottom: 10px;"
         >
-        </el-input>
+        </el-input> -->
       </div>
       <!-- <div style="width:100%;display:flex;justify-content: flex-end;">
         <el-button size="mini" @click="reset">重置</el-button>
@@ -73,12 +74,9 @@ export default {
     "scoCon",
     "task",
     "stage",
-    "allData",
     "loading",
     "wIndex",
     "toolIndex",
-    "toolDetail",
-    "refreshKey"
   ],
 
   data() {
@@ -98,10 +96,10 @@ export default {
       let a = 0;
       let isPing = 0;
       this.scoTitList.forEach(e => {
-        if (!e.cog && e.cog != 0) {
-          isPing += 1;
-        } else {
+        if (e.cog || e.cog == "0") {
           a += e.cog * 1;
+        } else {
+          isPing += 1;
         }
       });
 
@@ -161,6 +159,8 @@ export default {
     // 获取单个数据
     getData() {
       // this.fileId =[]
+      // console.log(' this.scoCon', this.scoCon);
+      
       let params = {
         uid: this.scoCon.userid,
         cid: this.id
@@ -178,6 +178,8 @@ export default {
                 this.homeworkVal = res.data[0][index];
               }
             });
+            // console.log('data2',data2);
+            
             if (data2.length == 0) {
               this.scoTitList = JSON.parse(JSON.stringify(this.scoTit));
             } else {
@@ -185,11 +187,14 @@ export default {
               this.scoTitList.forEach((e, index) => {
                 e.cog = null;
                 for (const key in data) {
-                  if (e.value.endsWith('。')) {
-                    e.value = e.value.slice(0, -1); // 如果字符串以句号结尾，则去除最后一个字符
-                  }
-                  if (e.value == key) {
-                    e.cog = data[key] * 1;
+                  // if (e.value.endsWith('。')) {
+                  //   e.value = e.value.slice(0, -1); // 如果字符串以句号结尾，则去除最后一个字符
+                  // }
+                  let result = e.value.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+                  let key2 = key.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+                  if (result.indexOf(key2) != -1) {
+                    e.cog = data[key];
                   }
                   if ("content" == key) {
                     this.textarea = data[key];
@@ -214,7 +219,8 @@ export default {
       this.$emit("markScoreDig", {
         val: this.stUid,
         val2: this.toolIndex,
-        tit: this.scoTit
+        tit: this.scoTit,
+        uname:this.scoCon.sName
       });
     },
     // 重置
@@ -563,7 +569,8 @@ export default {
             console.log(error);
           });
       });
-    }
+    },
+    
   }
 };
 </script>
@@ -573,11 +580,10 @@ export default {
   font-weight: 600;
   display: flex;
   justify-content: space-between;
-  padding-left: 16px;
   box-sizing: border-box;
 }
 .allD {
-  margin: 10px 0;
+  margin: 5px 0;
   display: flex;
   width: 100%;
   overflow: auto;
@@ -613,6 +619,12 @@ export default {
 
 .AreaCss {
   margin-bottom: 5px;
+  -webkit-line-clamp: 2;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  /* margin-left: 20px; */
 }
 .AreaCss >>> .el-textarea__inner {
   min-height: 60px;

src/components/easy2/studyStudent.vue

@@ -2482,7 +2482,11 @@
                           展开
                         </div>
                       </div>
-                      <div v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex ">
+                      <div  style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex ">
+                        <div  style="margin-right:10px" class="ScoreBtn"  @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
+                          一键重置
+                        </div>
+                      
                         <div class="ScoreBtn" v-if="!loopLoading[toolIndex].loading" @click="loopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           <img src="../../assets/icon/newIcons/rootImg.png" alt="">
                           AI评分
@@ -2491,7 +2495,6 @@
                           <img src="../../assets/icon/newIcons/rootImg.png" alt="">
                           正在评分
                         </div>
-                        
                       </div>
                       <!-- <el-button type="text" @click="jump()" v-if="tType == 2" class="buttonA">我的评价</el-button> -->
                     </div>
@@ -2837,11 +2840,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -2850,7 +2853,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -2928,11 +2931,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -2941,7 +2944,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -3023,11 +3026,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3036,7 +3039,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -3118,11 +3121,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3131,7 +3134,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -3650,11 +3653,11 @@
                                     @handleHide=handleHide
                                     :wIndex="wIndex"
                                     :scoCon="w" 
-                                    :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                    
                                     :toolIndex="toolIndex" 
                                     :key="refreshKey" 
-                                    :refreshKey="refreshKey"
-                                    :toolDetail="tool.toolDetail"
+                                    
+                                    
                                     :stage="courseType"
                                     :task="taskCount"  
                                     :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3663,7 +3666,7 @@
                               
                                 <div
                                   class="answerScore"
-                                @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                 @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                   slot="reference"
                                   :class="{
                                     rightW:
@@ -3774,8 +3777,12 @@
                         展开
                       </div>
                     </div>
-                    <div v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
-                        <div class="ScoreBtn" v-if="!loopLoading[toolIndex].loading" @click="loopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
+                    <div style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                      <div  style="margin-right:10px" class="ScoreBtn"  @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
+                          一键重置
+                      </div> 
+                     
+                      <div  class="ScoreBtn" v-if="!loopLoading[toolIndex].loading" @click="loopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           <img src="../../assets/icon/newIcons/rootImg.png" alt="">
                           AI评分
                         </div>
@@ -3865,11 +3872,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3878,7 +3885,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -3959,11 +3966,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3972,7 +3979,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -4054,11 +4061,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -4067,7 +4074,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -4751,11 +4758,11 @@
                                       @handleHide=handleHide
                                       :wIndex="wIndex"
                                       :scoCon="w" 
-                                      :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                      
                                       :toolIndex="toolIndex" 
                                       :key="refreshKey" 
-                                      :refreshKey="refreshKey"
-                                      :toolDetail="tool.toolDetail"
+                                      
+                                      
                                       :stage="courseType"
                                       :task="taskCount"  
                                       :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -4925,11 +4932,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -5257,11 +5264,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -5270,7 +5277,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -5590,11 +5597,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -5603,7 +5610,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -6206,11 +6213,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -6219,7 +6226,7 @@
                             
                               <div
                                 class="answerScore"
-                               @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -6993,7 +7000,11 @@
                           展开
                         </div>
                       </div>
-                      <div v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                      <div  style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                        <div  style="margin-right:10px" class="ScoreBtn" @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
+                          一键重置
+                        </div>
+                        
                         <div class="ScoreBtn" v-if="!loopLoading[toolIndex].loading" @click="loopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           <img src="../../assets/icon/newIcons/rootImg.png" alt="">
                           AI评分
@@ -7079,11 +7090,11 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  
+                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -7092,7 +7103,7 @@
                             
                               <div
                                 class="answerScore"
-                                @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                 @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -7287,7 +7298,11 @@
                           展开
                         </div>
                       </div>
-                      <div v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                      <div style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                        <div @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)"  style="margin-right:10px" class="ScoreBtn">
+                          一键重置
+                        </div>
+                        
                         <div class="ScoreBtn" v-if="!loopLoading[toolIndex].loading" @click="loopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           <img src="../../assets/icon/newIcons/rootImg.png" alt="">
                           AI评分
@@ -7388,12 +7403,9 @@
                                   @markScoreDig=markScoreDig
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
-                                  :scoCon="w" 
-                                  :TotalScore="AIloading[toolIndex][wIndex].sco"
+                                  :scoCon="w"                                   
                                   :toolIndex="toolIndex" 
-                                  :key="refreshKey" 
-                                  :refreshKey="refreshKey"
-                                  :toolDetail="tool.toolDetail"
+                                  :key="refreshKey"                                                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -7402,7 +7414,7 @@
                             
                               <div
                                 class="answerScore"
-                                 @click="markScoreDig2(worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                 slot="reference"
                                 :class="{
                                   rightW:
@@ -13280,7 +13292,7 @@ export default {
       markScoreUid:'',
       markScoreTit:{},
       markfullscreen:false,
-      xianObj: ["DOCX","PPT","DOC","PPTX", "MD", "TXT", "PDF"],
+      xianObj: ["DOCX", "MD", "TXT", "PDF"],
       markScoreworksStudent:[]
     };
   },
@@ -13348,15 +13360,60 @@ export default {
         }
       });
     },
+    resetLoopEva(con,tit,stage,task,toolIndex,toolDetail,worksStudent){
+      let jude = false
+      this.AIloading.forEach((e,index)=>{
+        if(index == toolIndex){
+          e.forEach(k=>{
+            if(k.loading == true)
+              jude=true
+          })
+        }
+      })
+      if(jude) return this.$message.info('正在进行AI评分中，请稍后')
+
+      this.$confirm('确认一键重置？')
+      .then(_ => {
+          this.allEmptyScoBtn(con,stage,task)
+      })
+      .catch(_ => {});
+
+    },
+    async allEmptyScoBtn(con,stage,task){
+      for (let index = 0; index < con.length; index++) {
+        await this.allEmptySco(con[index].userid,stage,task)
+      }
+
+      this.$message.success('重置完成')
+      this.refreshAssembly();
+    },
+    allEmptySco(uid,stage,task){
+      let params = [{
+        cid: this.id,
+        uid:uid,
+        s:stage,
+        t:task
+      }];
+      return new Promise(resolve => { this.ajax
+        .post(this.$store.state.api + "allWorkEmptySco", params)
+        .then(res => {
+          resolve(1);
+        })
+        .catch(err => {
+          console.error(err);
+        });
+      })
+      .catch(error => {
+        console.log(error);
+      });
+    },
     async loopEva(con,tit,stage,task,toolIndex,toolDetail,worksStudent){
-        console.log(con,tit,stage,task,toolIndex,toolDetail);
        
         tit.forEach((e,index)=>{
           if(!e.isai){
             e.isai=1
           }
         })
-        // return console.log(tit)
 
         let jude = false
         this.AIloading.forEach((e,index)=>{
@@ -13378,23 +13435,27 @@ export default {
         })
 
       this.loopLoading[toolIndex].loading=true
-      // return console.log(this.loopLoading,this.AIloading);
       
       let laws = ""
       for (let i = 0; i < tit.length; i++) {
         if(tit[i].isai == 1){
-          laws += `评价维度：${tit[i].value} 评价细则：${tit[i].rule} \n`
+          let a = tit[i].value
+          let result = a.match(/[\u4e00-\u9fa5a-zA-Z]+/g).join("");
+
+          laws += `评价维度：“${result}”， 评价细则：${tit[i].rule} \n`;
         }
       }
 
        for (let i = 0; i < con.length; i++) {
         let _fileid = ''
-        // console.log('con[i].works',con[i])
         let wok = con[i].works
         if(con[i].type == 1 || con[i].type == 12){
           let a = wok.slice(wok.lastIndexOf(".") + 1)
           if (this.xianObj.indexOf(a.toUpperCase()) != -1) {
             _fileid = await this.createFileid(con[i].works);
+          }else{
+            this.AIloading[toolIndex][i].loading=false;
+            continue;
           }
         }
         if(_fileid == 1 || con[i].type == 0 || con[i].type == 3){
@@ -13409,7 +13470,7 @@ export default {
 
         #Context
         ##要求
-        根据<评价细则>和<作业内容>的相关性评价作业，判断该作业属于六级中的哪个等级，结合“评价维度”和等级写评语。如果作业内容与评价细则无关，则直接评为0星。
+        根据<评价细则>和<作业内容>的相关性评价作业，判断该作业属于六级中的哪个等级，结合“评价细则”和等级写评语。如果作业内容与评价细则无关，则直接评为0星。
 
         ##评分资料
         评价细则：${laws}
@@ -13418,6 +13479,7 @@ export default {
         #输出要求#
         输出每个维度的“等级”和作业的综合性“评语”
         “评语”控制在150字左右
+        评价维度要按原样输出，只输出 ##评分资料 “评分细则”引号内的
 
 
         # Format example
@@ -13565,7 +13627,52 @@ export default {
       let mk = `markSco${toolIndex}${val}`
       this.$refs[mk][0].getData()
     },
+    //点击评分显示评分框, AI循环评分val等于1时正在评分，不让重复点击
+    markScoreDig2(uname,worksStudent,uid,tidx,titlist,val = 0){
+      let jude = false
+        this.AIloading.forEach((e,index)=>{
+          if(index == tidx){
+            e.forEach(k=>{
+              if(k.loading == true)
+                jude=true
+            })
+          }
+        })
+      if(jude) return this.$message.info('正在AI评价进程中请稍后')
+      if(val) return
+      // console.log(uname,worksStudent,uid,tidx,titlist)
+      this.markScoreTit=titlist;
+      // console.log('val',data)
+      this.markScoreUid=uid;
+      this.markScoretoolIndex=tidx;
+      this.markScoreworksStudent = worksStudent;
+      this.markfullscreen = false;
+      this.markScoreVisible = true;
+			this.insertMemorandum(`查看<span class="variable">${uname}</span>的作业`)
+    },
+    // 点击markScore显示评分框
+    markScoreDig(data){
+      // console.log('data',data.uname)
+      let jude = false
+        this.AIloading.forEach((e,index)=>{
+          if(index == data.val2){
+            e.forEach(k=>{
+              if(k.loading == true)
+                jude=true
+            })
+          }
+        })
+      if(jude) return this.$message.info('正在AI评价进程中请稍后')
+      this.markScoreTit=data.tit
+      // console.log('val',data)
+      this.markScoreUid=data.val
+      this.markScoretoolIndex=data.val2
 
+      this.markfullscreen = false
+      this.markScoreVisible = true
+			this.insertMemorandum(`查看<span class="variable">${data.uname}</span>的作业`)
+
+    },
     // 刷新其他组件分数
     refreshOther(toolIndex){
 
@@ -15334,31 +15441,6 @@ export default {
           ].toolChoose[toolIndex].wordJson;
       }
     },
-    //点击评分显示评分框, AI循环评分val等于1时正在评分，不让重复点击
-    markScoreDig2(worksStudent,uid,tidx,titlist,val = 0){
-      if(val) return
-      // console.log('222')
-      this.markScoreTit=titlist;
-      // console.log('val',data)
-      this.markScoreUid=uid;
-      this.markScoretoolIndex=tidx;
-      this.markScoreworksStudent = worksStudent;
-      this.markfullscreen = false;
-      this.markScoreVisible = true;
-    },
-    // 点击markScore显示评分框
-    markScoreDig(data){
-
-      this.markScoreTit=data.tit
-      // console.log('val',data)
-      this.markScoreUid=data.val
-      this.markScoretoolIndex=data.val2
-
-      this.markfullscreen = false
-      this.markScoreVisible = true
-			// this.insertMemorandum(`查看<span class="variable">${w.sName}</span>的作业`)
-
-    },
     async openScore(w, index) {
       console.log(w,index)
       this.wScore = 0;
@@ -15573,12 +15655,15 @@ export default {
         })
         .catch(() => {});
     },
+
     deleteWorksTwo(id,toolIndex,wIndex) {
       console.log(id)
       let mk = `markSco${toolIndex}${wIndex}`
       console.log(this.$refs[mk][0].homeworkVal)
 
       let wid = this.$refs[mk][0].homeworkVal.id
+      console.log('wid',wid);
+      
       this.$confirm("确定删除此作业吗？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -22601,7 +22686,7 @@ export default {
 }
 .markScore_diy >>> .el-dialog__body{
   padding: 0;
-  height: 600px;
+  height: 621px;
   min-height: calc(100% - 60px);
 }
 .markScore_diy >>> .el-dialog__header{