Parcourir la source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

zengyicheng il y a 2 ans
Parent
commit
bd53f3650f
2 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 1 1
      src/components/study.vue
  2. 1 1
      src/components/studyStudent.vue

+ 1 - 1
src/components/study.vue

@@ -1178,7 +1178,7 @@
                         tType &&
                         tType &&
                         tType == 3 &&
                         tType == 3 &&
                         tool.tool.indexOf(4) != -1 &&
                         tool.tool.indexOf(4) != -1 &&
-                        (tool.askJson[0].answer || tool.askJson[0].answer === 0)
+                        (tool.askJson[0].answer || tool.askJson[0].answer === 0)  && checkJson[jdIndex][rwIndex][toolIndex].length
                       "
                       "
                       class="xuan_right_box"
                       class="xuan_right_box"
                     >
                     >

+ 1 - 1
src/components/studyStudent.vue

@@ -878,7 +878,7 @@
                   <div v-if="
                   <div v-if="
                     tType &&
                     tType &&
                     ((tType == 2 && sIsOpen == true) || tType == 1 || tType == 4) &&
                     ((tType == 2 && sIsOpen == true) || tType == 1 || tType == 4) &&
-                    tool.tool.indexOf(4) != -1 && (tool.askJson[0].answer || tool.askJson[0].answer === 0)
+                    tool.tool.indexOf(4) != -1 && (tool.askJson[0].answer || tool.askJson[0].answer === 0) && checkJson[toolIndex].length
                   " class="xuan_right_box">
                   " class="xuan_right_box">
                     <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
                     <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
                       <div>
                       <div>