Home Esplora Aiuto
Accedi
CocoRoboLabs
/
pbl-teacher-table
3
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

update

lsc 1 anno fa
parent
b2d21b5905
commit
f35cd9dac6
20 ha cambiato i file con 189 aggiunte e 43 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.99a86940e1704e3fd9476c59804c35af.css
  3. 0 0
      dist/static/css/app.99a86940e1704e3fd9476c59804c35af.css.map
  4. 0 0
      dist/static/js/app.32b4a5c6cf90117f45e4.js
  5. 0 0
      dist/static/js/app.32b4a5c6cf90117f45e4.js.map
  6. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  7. 3 1
      src/components/pages/dataBoardNew/project/index.vue
  8. 17 2
      src/components/pages/scourse.vue
  9. 50 10
      src/components/pages/student/addCourse.vue
  10. 17 1
      src/components/pages/student/course.vue
  11. 14 2
      src/components/pages/test/add/components/GapFilling/gap.vue
  12. 9 2
      src/components/pages/test/add/components/choice/choice.vue
  13. 7 4
      src/components/pages/test/add/components/file/file.vue
  14. 3 1
      src/components/pages/test/add/edit/check/choice.vue
  15. 7 4
      src/components/pages/test/add/edit/check/file.vue
  16. 22 2
      src/components/pages/test/add/edit/check/gap.vue
  17. 13 5
      src/components/pages/test/index.vue
  18. 3 1
      src/components/pages/testStudent/view/component/choice.vue
  19. 7 4
      src/components/pages/testStudent/view/component/file.vue
  20. 16 3
      src/components/pages/testStudent/view/component/gap.vue

+ 1 - 1
dist/index.html
Vedi File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.367a1393c422a7306a686061d5d9ec7e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b99f0ffaf6e2bdd0ae12.js></script><script type=text/javascript src=./static/js/app.ccb2caecd19ca1436235.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.99a86940e1704e3fd9476c59804c35af.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b99f0ffaf6e2bdd0ae12.js></script><script type=text/javascript src=./static/js/app.32b4a5c6cf90117f45e4.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


+ 3 - 1
src/components/pages/dataBoardNew/project/index.vue
Vedi File 

@@ -792,7 +792,9 @@ export default {
 
             for (var j = 0; j < _courseArray[i].subject.length - 1; j++) {
 
               sum += _courseArray[i].subject[j].course
 
             }
 
-            _courseArray[i].subject[_courseArray[i].subject.length - 1].course = (_courseArray[i].courseid.length - sum) < 0 ? 0 : _courseArray[i].courseid.length - sum
 
+            if(_courseArray[i].subject.length){
 
+              _courseArray[i].subject[_courseArray[i].subject.length - 1].course = (_courseArray[i].courseid.length - sum) < 0 ? 0 : _courseArray[i].courseid.length - sum
 
+            }
 
           }
 
           for (var j = 0; j < _subject.length; j++) {
 
             for (var z = 0; z < _course.length; z++) {

+ 17 - 2
src/components/pages/scourse.vue
Vedi File 

@@ -409,6 +409,8 @@ export default {
 
               typec = this.courseTypeId[this.CourseType[0][i].id];
 
             } else if (this.CourseType[0][i].name == "赛道") {
 
               typed = this.courseTypeId[this.CourseType[0][i].id];
 
+            } else if (this.CourseType[0][i].name == "学科") {
 
+              typed = this.courseTypeId[this.CourseType[0][i].id];
 
             } else if (this.CourseType[0][i].name == "项目类型") {
 
               typed = this.courseTypeId[this.CourseType[0][i].id];
 
             } else if (this.CourseType[0][i].name == "主题") {
 
@@ -518,6 +520,8 @@ export default {
 
               res.data[0][i].name = "赛道";
 
             }else if(res.data[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5"){
 
               res.data[0][i].name = "主题";
 
+            }else if(res.data[0][i].id == "34628934-d02f-11ec-8c78-005056b86db5"){
 
+              res.data[0][i].name = "年级";
 
             }
 
             if (!this.cid) {
 
               this.courseTypeId[res.data[0][i].id] = '';
 
@@ -526,9 +530,15 @@ export default {
 
               this.CourseTypeJson[res.data[0][i].id] = [];
 
             }
 
             if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
-              if (res.data[0][i].name == "赛道") {
 
+              if (res.data[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
 
                 this.CourseType[0][i].name = "项目类型";
 
               }
 
+            }else if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
+
 
+            }else{
 
+              if (res.data[0][i].name == "赛道") {
 
+                this.CourseType[0][i].name = "学科";
 
+              }
 
             }
 
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
@@ -544,7 +554,12 @@ export default {
 
                   }
 
                 }
 
               }else{
 
-                this.CourseType = []
 
+                // this.CourseType = []
 
+                for (var j = 0; j < res.data[1].length; j++) {
 
+                  if (res.data[0][i].id == res.data[1][j].pid) {
 
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                  }
 
+                }
 
               }
 
             } else {
 
               if (res.data[2].length > 0) {

+ 50 - 10
src/components/pages/student/addCourse.vue
Vedi File 

@@ -20,8 +20,23 @@
 
                 <div>填写基本信息</div>
 
               </div>
 
             </div>
 
-            <div v-show="cidttt === 0" class="secondNo">
 
-              <div v-if="steps == 2" class="newSteps second" @click="navSteps(2)">
 
+
 
+            <div v-if="cidttt === 0 && steps == 2" class="second" @click="navSteps(2)">
 
+              <div class="cfirst">
 
+                <div>
 
+                  <img src="../../../assets/icon/second.png" alt />
 
+                </div>
 
+                <div>选择项目框架</div>
 
+              </div>
 
+            </div>
 
+            <div v-else-if="cidttt === 0" class="secondNo" @click="navSteps(2)">
 
+              <div class="cfirst">
 
+                  <div>
 
+                    <img src="../../../assets/icon/secondNo.png" alt />
 
+                  </div>
 
+                  <div>选择项目框架</div>
 
+                </div>
 
+              <!-- <div v-if="steps == 2" class="newSteps second" @click="navSteps(2)">
 
                 <div class="cfirst">
 
                   <div>
 
                     <img src="../../../assets/icon/second.png" alt />
 
@@ -36,8 +51,9 @@
 
                   </div>
 
                   <div>选择项目框架</div>
 
                 </div>
 
-              </div>
 
+              </div> -->
 
             </div>
 
+
 
             
             <div v-if="steps == 3" class="third" @click="navSteps(3)">
 
               <div class="cfirst">
 
@@ -3245,7 +3261,10 @@ export default {
 
       if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
         typeT++;
 
       }
 
-      if (this.CourseType.length == 0) {
 
+      // if (this.CourseType.length == 0) {
 
+      //   typeT = 3
 
+      // }
 
+      if(!(this.org == '150e3120-9195-11ed-b13d-005056b86db5') && !(this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5")){
 
         typeT = 3
 
       }
 
       if (this.courseName == "" || typeT != 3) {
 
@@ -3467,7 +3486,10 @@ export default {
 
       if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
         typeT++;
 
       }
 
-      if (this.CourseType.length == 0) {
 
+      // if (this.CourseType.length == 0) {
 
+      //   typeT = 3
 
+      // }
 
+      if(!(this.org == '150e3120-9195-11ed-b13d-005056b86db5') && !(this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5")){
 
         typeT = 3
 
       }
 
       if (this.cidttt == 1) {
 
@@ -7692,21 +7714,28 @@ export default {
 
           let _courseTypeId = [];
 
 
           for (var i = 0; i < res.data[0].length; i++) {
 
-            if (res.data[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
 
+            if(res.data[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5"){
 
               res.data[0][i].name = "赛道";
 
-            } else if (res.data[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5") {
 
+            }else if(res.data[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5"){
 
               res.data[0][i].name = "主题";
 
+            }else if(res.data[0][i].id == "34628934-d02f-11ec-8c78-005056b86db5"){
 
+              res.data[0][i].name = "年级";
 
             }
 
             if (!this.cid) {
 
               this.courseTypeId[res.data[0][i].id] = "";
 
             }
 
             this.CourseTypeJson[res.data[0][i].id] = [];
 
             if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
-              if (res.data[0][i].name == "赛道") {
 
+              if (res.data[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
 
                 this.CourseType[0][i].name = "项目类型";
 
               }
 
-            }
 
+            }else if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
 
+            }else{
 
+              if (res.data[0][i].name == "赛道") {
 
+                this.CourseType[0][i].name = "学科";
 
+              }
 
+            }
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
               if (this.org == '150e3120-9195-11ed-b13d-005056b86db5') {
 
                 for (var j = 0; j < res.data[1].length; j++) {
 
@@ -7721,7 +7750,18 @@ export default {
 
                   }
 
                 }
 
               } else {
 
-                this.CourseType = []
 
+                // this.CourseType = []
 
+                for (var j = 0; j < res.data[1].length; j++) {
 
+                  if (
 
+                    this.courseTypeId.indexOf(res.data[1][j].id) != -1 &&
 
+                    _courseTypeId.indexOf(res.data[1][j].id) == -1
 
+                  ) {
 
+                    _courseTypeId.push(res.data[1][j].id);
 
+                  }
 
+                  if (res.data[0][i].id == res.data[1][j].pid) {
 
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                  }
 
+                }
 
               }
 
             } else {
 
               if (res.data[2].length > 0) {

+ 17 - 1
src/components/pages/student/course.vue
Vedi File 

@@ -420,6 +420,8 @@ export default {
 
               typec = this.courseTypeId[this.CourseType[0][i].id];
 
             } else if (this.CourseType[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
 
               typed = this.courseTypeId[this.CourseType[0][i].id];
 
+            } else if (this.CourseType[0][i].name == "学科") {
 
+              typed = this.courseTypeId[this.CourseType[0][i].id];
 
             } else if (this.CourseType[0][i].name == "项目类型") {
 
               typed = this.courseTypeId[this.CourseType[0][i].id];
 
             }  else if (this.CourseType[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5") {
 
@@ -533,6 +535,8 @@ export default {
 
               res.data[0][i].name = "赛道";
 
             }else if(res.data[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5"){
 
               res.data[0][i].name = "主题";
 
+            }else if(res.data[0][i].id == "34628934-d02f-11ec-8c78-005056b86db5"){
 
+              res.data[0][i].name = "年级";
 
             }
 
             if (!this.cid) {
 
               this.courseTypeId[res.data[0][i].id] = '';
 
@@ -540,10 +544,17 @@ export default {
 
             if (!this.CourseTypeJson[res.data[0][i].id]) {
 
               this.CourseTypeJson[res.data[0][i].id] = [];
 
             }
 
+
 
             if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
 
               if (res.data[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
 
                 this.CourseType[0][i].name = "项目类型";
 
               }
 
+            }else if(this.org == '150e3120-9195-11ed-b13d-005056b86db5'){
 
+
 
+            }else{
 
+              if (res.data[0][i].name == "赛道") {
 
+                this.CourseType[0][i].name = "学科";
 
+              }
 
             }
 
 
             if (res.data[2].length == 0 && res.data[3].length == 0) {
 
@@ -554,7 +565,12 @@ export default {
 
                   }
 
                 }
 
               }else{
 
-                this.CourseType = []
 
+                // this.CourseType = []
 
+                for (var j = 0; j < res.data[1].length; j++) {
 
+                  if (res.data[0][i].id == res.data[1][j].pid) {
 
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
 
+                  }
 
+                }
 
               }
 
 
             } else {

+ 14 - 2
src/components/pages/test/add/components/GapFilling/gap.vue
Vedi File 

@@ -6,7 +6,17 @@
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[cJson.type].name}）` }}</div><div v-html="cJson.title"></div></div> -->
 
             <div class="title">
 
-                {{ `（${option[cJson.type].name}）` + cJson.title }} <span style="color: #efa030;">（{{ cJson.answer ? '参考答案：'+cJson.answer : '暂无参考答案' }} {{ cJson.score ? '分值：'+cJson.score+'分' : '' }}）</span>
 
+                <div style="display: flex;">
 
+                    <span style="min-width:fit-content">{{  `（${option[cJson.type].name}）` }}</span><span>{{cJson.title }}</span>
 
+                    <span style="min-width: fit-content;color: #efa030;">{{ cJson.score ? '（分值：'+cJson.score+'分）' : '' }}</span>
 
+                </div>
 
+                 <span style="color: #efa030;display: flex;margin-top: 5px;line-height: 18px;">
 
+                    <span style="min-width: fit-content;" v-if="!cJson.answer">暂无参考答案</span>
 
+                    <span style="min-width: fit-content;display: flex;" v-else>
 
+                        <span style="min-width: fit-content;">参考答案：</span> 
+                        <span>{{ cJson.answer }}</span>
 
+                    </span> 
+                </span>
 
                 <!-- </div><div v-html="cJson.title"></div> -->
 
             </div>
 
             <div class="choices">
 
@@ -49,7 +59,9 @@ export default {
 
     width: 100%;
 
     z-index: 2;
 
 }
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 9 - 2
src/components/pages/test/add/components/choice/choice.vue
Vedi File 

@@ -4,7 +4,12 @@
 
         <!-- <div v-if="!cJson">暂未设置题目</div> -->
 
         <div class="set_box" v-if="!cJson">请设置题目</div>
 
         <div v-else class="choice_box">
 
-            <div class="title">{{ `（${option[cJson.type].name}）` + cJson.title }} <span style="color: #efa030;" v-if="cJson.score">（{{ '分值：'+cJson.score+'分' }}）</span></div>
 
+            <div class="title"> 
+                <div style="display: flex;">
 
+                    <span style="min-width:fit-content">{{  `（${option[cJson.type].name}）` }}</span><span>{{cJson.title }}</span>
 
+                </div>
 
+                <span style="color: #efa030;" v-if="cJson.score">（{{ '分值：'+cJson.score+'分' }}）</span>
 
+            </div>
 
             <div class="choices">
 
                 <div class="choice" v-for="(item, index) in cJson.array" :key="index">
 
                     <div class="choice_c" v-if="cJson.type == 2"><el-checkbox v-model="cJson.answer" :label="index"></el-checkbox><span :class="{right:cJson.answer.indexOf(index) != -1}">{{ item.option }}</span></div>
 
@@ -47,7 +52,9 @@ export default {
 
     width: 100%;
 
     z-index: 2;
 
 }
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 7 - 4
src/components/pages/test/add/components/file/file.vue
Vedi File 

@@ -9,9 +9,10 @@
 
         </div>
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[cJson.type].name}）` }}</div><div v-html="cJson.title"></div></div> -->
 
-            <div class="title">
 
-                {{ `（${option[cJson.type].name}）` + cJson.title }} <span style="color: #efa030;" v-if="cJson.score">（{{
 
-                    cJson.score ? '分值：' + cJson.score + '分' : '' }}）</span>
 
+            <div class="title" style="display: flex;">
 
+                <span style="min-width:fit-content">{{  `（${option[cJson.type].name}）` }}</span>
 
+                <span>{{cJson.title }}</span>
 
+                <span style="color: #efa030;min-width:fit-content" v-if="cJson.score">（{{ cJson.score ? '分值：' + cJson.score + '分' : '' }}）</span>
 
                 <!-- </div><div v-html="cJson.title"></div> -->
 
             </div>
 
             <div class="detail" v-if="cJson.detail">
 
@@ -62,7 +63,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 3 - 1
src/components/pages/test/add/edit/check/choice.vue
Vedi File 

@@ -97,7 +97,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 7 - 4
src/components/pages/test/add/edit/check/file.vue
Vedi File 

@@ -10,9 +10,10 @@
 
         </div>
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
-            <div class="title">
 
-                {{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` + checkJson.title }}<span style="color: #efa030;"
 
-                    v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span>
 
+            <div class="title" style="display: flex;">
 
+                <span style="min-width: fit-content;">{{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` }}</span>
 
+                <span>{{ checkJson.title }}</span>
 
+                <span style="color: #efa030;min-width: fit-content;" v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span>
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
             </div>
 
             <div class="choices">
 
@@ -360,7 +361,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 22 - 2
src/components/pages/test/add/edit/check/gap.vue
Vedi File 

@@ -6,7 +6,25 @@
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <div class="title">
 
-                {{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` + checkJson.title }}<span v-if="see" style="color: #efa030;">（{{ checkJson.answer ? '参考答案：'+checkJson.answer : '暂无参考答案' }} {{ cJson.score ? '分值：'+cJson.score+'分' : '' }}）</span><span style="color: #efa030;" v-if="checkJson.score && !see">（{{ '分值：'+checkJson.score+'分' }}）</span>
 
+                <div  style="display: flex;">
 
+                    <span style="min-width: fit-content;">{{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` }}</span>
 
+                    <span>{{ checkJson.title }}</span>
 
+                    <span style="min-width: fit-content;color: #efa030;">{{ checkJson.score ? '（分值：'+checkJson.score+'分）' : '' }}</span>
 
+                </div>
 
+                <span style="color: #efa030;display: flex;margin-top: 5px;line-height: 18px;">
 
+                    <span style="min-width: fit-content;" v-if="!checkJson.answer && see">暂无参考答案</span>
 
+                    <span style="min-width: fit-content;display: flex;" v-else-if="see">
 
+                        <span style="min-width: fit-content;">参考答案：</span> 
+                        <span>{{ checkJson.answer }}</span>
 
+                    </span> 
+                    <!-- <span style="min-width: fit-content;margin-left: 10px;">{{ checkJson.score ? '分值：'+checkJson.score+'分' : '' }}</span> -->
 
+                </span>
 
+                
+                <!-- <span v-if="see" style="color: #efa030; display: flex;">
 
+                    
+                    {{ checkJson.answer ? '参考答案：'+checkJson.answer : '暂无参考答案' }} <span style="min-width: fit-content;">{{ cJson.score ? '分值：'+cJson.score+'分' : '' }}</span>
 
+                </span>
 
+                <span style="color: #efa030;" v-if="checkJson.score && !see">（{{ '分值：'+checkJson.score+'分' }}）</span> -->
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
             </div>
 
             <div class="choices">
 
@@ -98,7 +116,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 13 - 5
src/components/pages/test/index.vue
Vedi File 

@@ -784,21 +784,29 @@ export default {
 
                     for (var i = 0; i < test.length; i++) {
 
                         if (test[i].look == '1') {
 
                             dataJ.noLook++
 
+                            console.log('index-----------',i)
 
                         }
 
-
 
                         let now = new Date().getTime()
 
                         let isTime = test[i].over_at && new Date(test[i].over_at).getTime()
 
-                        if (test[i].over_at && test[i].look == '2' && now > isTime) {
 
+                        if (test[i].over_at && test[i].look == '2' && now > isTime && ((test[i].isUserCount > 0 && test[i].isUserCount > test[i].isWorkCount) || test[i].isUserCount == 0)) {
 
                             dataJ.no++
 
+                            console.log('index-----------',i)
 
                         }
 
 
-                        if (((test[i].over_at && test[i].look == '2' && isTime > now) || (!test[i].over_at && test[i].look == '2')) && test[i].isWorkCount > 0) {
 
+                        if (((test[i].over_at && test[i].look == '2' && isTime > now) || (!test[i].over_at && test[i].look == '2')) && ((test[i].isUserCount == 0 &&  test[i].isWorkCount > 0) || (test[i].isUserCount > 0 &&  0 < test[i].isWorkCount && test[i].isWorkCount < test[i].isUserCount))) {
 
                             dataJ.doing++
 
+                            console.log('index-----------',i)
 
                         }
 
 
 
                         if (((test[i].over_at && test[i].look == '2' && isTime > now) || (!test[i].over_at && test[i].look == '2')) && test[i].isWorkCount == 0) {
 
                             dataJ.nodo++
 
+                            console.log('index-----------',i)
 
+                        }
 
+
 
+                        if(test[i].look == '2' && (test[i].isUserCount > 0 && test[i].isUserCount <= test[i].isWorkCount)){
 
+                            dataJ.is++
 
+                            console.log('index-----------',i)
 
                         }
 
                     }
 
                     this.dataJ = dataJ
 
@@ -842,9 +850,9 @@ export default {
 
                         for(var i = 0; i < test.length; i++){
 
                             let now = new Date().getTime()
 
                             let isTime = test[i].over_at && new Date(test[i].over_at).getTime()
 
-                            if (test[i].over_at && test[i].look == '2' && now > isTime && test[i].typeid) {
 
+                            if (test[i].over_at && test[i].look == '2' && now > isTime && test[i].typeid && ((test[i].isUserCount > 0 && test[i].isUserCount > test[i].isWorkCount) || test[i].isUserCount == 0)) {
 
                                 typeJ[test[i].typeid].kcount++
 
-                            }else if (test[i].over_at && test[i].look == '1' && now > isTime) {
 
+                            }else if (test[i].over_at && test[i].look == '1' && now > isTime && ((test[i].isUserCount > 0 && test[i].isUserCount > test[i].isWorkCount) || test[i].isUserCount == 0)) {
 
                                 typeJ['qita'].kcount++
 
                             }
 
                         }

+ 3 - 1
src/components/pages/testStudent/view/component/choice.vue
Vedi File 

@@ -115,7 +115,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box> .c_title .title {
 
     font-weight: bold;

+ 7 - 4
src/components/pages/testStudent/view/component/file.vue
Vedi File 

@@ -5,9 +5,10 @@
 
         <div v-else class="choice_box">
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <div class="c_title">
 
-                <div class="title">
 
-                    {{ tindex + 1 + "、" +`（${option[checkJson.type].name}）` + checkJson.title }}<span style="color: #efa030;"
 
-                        v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span>
 
+                <div class="title" style="display: flex;">
 
+                    <span style="min-width: fit-content;">{{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` }}</span>
 
+                    <span>{{ checkJson.title }}</span>
 
+                    <span style="color: #efa030;min-width: fit-content;" v-if="checkJson.score">（{{ '分值：' + checkJson.score + '分' }}）</span>
 
                 </div>
 
 
                 <!-- </div><div v-html="checkJson.title"></div> -->
 
@@ -423,7 +424,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box>.title {
 
     font-weight: bold;

+ 16 - 3
src/components/pages/testStudent/view/component/gap.vue
Vedi File 

@@ -6,8 +6,19 @@
 
             <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
             <div class="c_title">
 
                 <div class="title">
 
-                    {{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` + checkJson.title }}<span v-if="see" style="color: #efa030;">（{{ checkJson.answer ? '参考答案：'+checkJson.answer : '暂无参考答案' }} {{ cJson.score ? '分值：'+cJson.score+'分' : '' }}）</span>
 
-                    <span style="color: #efa030;" v-if="checkJson.score && !see">（{{ '分值：'+checkJson.score+'分' }}）</span>
 
+                    <div  style="display: flex;">
 
+                    <span style="min-width: fit-content;">{{ tindex + 1 + "、" + `（${option[checkJson.type].name}）` }}</span>
 
+                    <span>{{ checkJson.title }}</span>
 
+                    <span style="min-width: fit-content;color: #efa030;">{{ checkJson.score ? '（分值：'+checkJson.score+'分）' : '' }}</span>
 
+                </div>
 
+                <span style="color: #efa030;display: flex;margin-top: 5px;line-height: 18px;">
 
+                    <span style="min-width: fit-content;" v-if="!checkJson.answer && see">暂无参考答案</span>
 
+                    <span style="min-width: fit-content;display: flex;" v-else-if="see">
 
+                        <span style="min-width: fit-content;">参考答案：</span> 
+                        <span>{{ checkJson.answer }}</span>
 
+                    </span> 
+                    <!-- <span style="min-width: fit-content;margin-left: 10px;">{{ checkJson.score ? '分值：'+checkJson.score+'分' : '' }}</span> -->
 
+                </span>
 
                     <!-- </div><div v-html="checkJson.title"></div> -->
 
                 </div>
 
                 <div class="p_box" v-if="isTeacher == 1 && checkJson.score">
 
@@ -121,7 +132,9 @@ export default {
 
     z-index: 2;
 
 }
 
 
-.choice_box {}
 
+.choice_box {
 
+    white-space: pre-line;
 
+}
 
 
 .choice_box> .c_title .title {
 
     font-weight: bold;

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