lsc 2 năm trước cách đây
mục cha
commit
7051bb6ef4

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.efabe635a2fcb2686d9e72055526efea.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b8bed9edc7f1d53713b3.js></script><script type=text/javascript src=./static/js/app.8043e6c9497d26e8da43.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.b677b36d2d575db39453f5c69f660827.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b8bed9edc7f1d53713b3.js></script><script type=text/javascript src=./static/js/app.5358cfea7aa0e372c868.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/css/app.b677b36d2d575db39453f5c69f660827.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/css/app.b677b36d2d575db39453f5c69f660827.css.map


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/css/app.efabe635a2fcb2686d9e72055526efea.css.map


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/app.5358cfea7aa0e372c868.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/static/js/app.8043e6c9497d26e8da43.js


+ 17 - 11
src/components/study.vue

@@ -386,7 +386,7 @@
                         >
                           文档
                         </div>
-                        <div>
+                        <div style="width: calc(100% - 115px)">
                           <div
                             class="navText"
                             @click="lookText(jdIndex, rwIndex, textIndex)"
@@ -422,7 +422,7 @@
                         >
                           链接
                         </div>
-                        <div>
+                        <div style="width: calc(100% - 115px)">
                           <div class="navText">
                             <a
                               style="text-decoration: none; color: #000"
@@ -456,7 +456,7 @@
                         >
                           文档
                         </div>
-                        <div>
+                        <div style="width: calc(100% - 115px)">
                           <div
                             class="navText"
                             @click="downFile(f, fileIndex, jdIndex, rwIndex)"
@@ -1934,7 +1934,7 @@
       :before-close="handleClose"
       class="dialog_diy full_diy"
     >
-      <div style="height:100%">
+      <div style="height: 100%">
         <iframe
           v-if="fulltype == 2"
           style="width: 100%; height: 100%; border: none"
@@ -1946,9 +1946,9 @@
           style="width: 100%; height: 100%; overflow: auto"
         ></pdf>
       </div>
-      <div slot="footer">
+      <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>
-      </div>
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -3676,9 +3676,9 @@ export default {
 
 <style scoped>
 @media screen and (max-width: 1024px) {
-  .navText {
+  /* .navText {
     width: 120px !important;
-  }
+  } */
   .textBox {
     margin: 0 !important;
   }
@@ -3809,7 +3809,7 @@ export default {
 .study_top {
   /* margin-top: 90px; */
   width: 95%;
-  overflow: auto;
+  /* overflow: auto; */
   height: auto;
   margin: 0 auto;
 }
@@ -4568,7 +4568,7 @@ export default {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  width: 300px;
+  width: 100%;
 }
 .noVedio {
   display: flex;
@@ -5202,6 +5202,12 @@ export default {
 }
 
 .full_diy >>> .el-dialog__body {
-  height: calc(100% - 200px);
+  height: calc(100%  - 100px);
 }
+
+.full_diy >>> .el-dialog {
+  margin: 0 !important;
+  height: 100%;
+}
+
 </style>

+ 412 - 10
src/components/studyStudent.vue

@@ -407,7 +407,7 @@
                       >
                         文档
                       </div>
-                      <div>
+                      <div style="width: calc(100% - 115px)">
                         <div
                           class="navText"
                           @click="lookText(taskCount, textIndex)"
@@ -463,7 +463,7 @@
                       >
                         链接
                       </div>
-                      <div>
+                      <div style="width: calc(100% - 115px)">
                         <div class="navText">
                           <a
                             style="text-decoration: none; color: #000"
@@ -497,7 +497,7 @@
                       >
                         文档
                       </div>
-                      <div>
+                      <div style="width: calc(100% - 115px)">
                         <div class="navText" @click="downFile(f, fileIndex)">
                           {{ f.name }}
                         </div>
@@ -1067,6 +1067,407 @@
                       </div>
                     </div>
                   </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(16) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        style="width: 240px; height: 170px; overflow: hidden"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                        :class="w.type == 1 ? 'isTypeOne' : ''"
+                      >
+                        <div class="workImg" v-if="w.type == 0">
+                          <img
+                            :src="w.works"
+                            @click="previewImg(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="workImg" v-if="w.type == 1">
+                          <img
+                            src="../assets/icon/works/noImg.png"
+                            @click="openFile(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="worksName">
+                          <div>{{ w.sName }}</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(4) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div>
+                      <div
+                        class="worksDetailBox"
+                        style="width: calc(100% - 30%)"
+                        v-if="worksStudent[toolIndex].length > 0"
+                      >
+                        <div
+                          class="works"
+                          style="
+                            width: 240px;
+                            height: 170px;
+                            border: 1px solid #f8f8f8;
+                            border-radius: 10px;
+                            box-shadow: 0 0 6px 1px #dfdada;
+                            overflow: hidden;
+                          "
+                          v-for="(w, wIndex) in worksStudent[jdIndex][rwIndex][
+                            toolIndex
+                          ]"
+                          :key="wIndex"
+                        >
+                          <!-- @click="previewImg(w.works)" -->
+                          <div class="workImg">
+                            <img
+                              src="../assets/icon/works/noImg.png"
+                              @click="
+                                openTools(
+                                  4,
+                                  toolIndex,
+                                  taskCount,
+                                  w.works,
+                                  w.sName
+                                )
+                              "
+                              alt
+                            />
+                          </div>
+                          <div class="worksName">
+                            <div>{{ w.sName }}</div>
+                            <div>{{ w.time }}</div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                    <AskStatic
+                      v-if="worksStudent[toolIndex].length > 0"
+                      :askJSON="worksStudent[toolIndex][0].works"
+                      :checkJson="checkJson[toolIndex]"
+                    ></AskStatic>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(15) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                      >
+                        <div class="workImg">
+                          <!-- <img
+                            src="../assets/icon/works/noImg.png"
+                            @click="openTools(15, toolIndex, taskCount, w.works)"
+                            alt=""
+                          />-->
+                          <div class="answerBg">
+                            <div>{{ w.sName }}</div>
+                            <el-tooltip
+                              class="item"
+                              effect="light"
+                              :content="JSON.parse(w.works)[0].answer"
+                              placement="top"
+                            >
+                              <div class="answerContent">
+                                {{ JSON.parse(w.works)[0].answer }}
+                              </div>
+                            </el-tooltip>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(1) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        style="width: 200px; height: 140px; padding-top: 25px"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                      >
+                        <!-- @click="previewImg(w.works)" -->
+                        <div class="workImg">
+                          <img
+                            :src="w.works"
+                            @click="previewImg(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="worksName">
+                          <div>{{ w.sName }}</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(3) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        style="width: 200px; height: 140px; padding-top: 25px"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                      >
+                        <!-- @click="previewImg(w.works)" -->
+                        <div class="workImg">
+                          <img
+                            :src="w.works"
+                            @click="previewImg(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="worksName">
+                          <div>{{ w.sName }}</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(6) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        style="width: 200px; height: 140px; padding-top: 25px"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                      >
+                        <!-- @click="previewImg(w.works)" -->
+                        <div class="workImg">
+                          <img
+                            :src="w.works"
+                            @click="previewImg(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="worksName">
+                          <div>{{ w.sName }}</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(7) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        style="width: 200px; height: 140px; padding-top: 25px"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                      >
+                        <!-- @click="previewImg(w.works)" -->
+                        <div class="workImg">
+                          <img
+                            :src="w.works"
+                            @click="previewImg(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="worksName">
+                          <div>{{ w.sName }}</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    v-if="tType && tType == 1 && tool.tool.indexOf(26) != -1"
+                    class="worksBox"
+                  >
+                    <div
+                      style="padding-top: 15px; font-size: 18px"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      作业预览
+                    </div>
+                    <div
+                      class="worksDetailBox"
+                      v-if="worksStudent[toolIndex].length > 0"
+                    >
+                      <div
+                        class="works"
+                        style="width: 240px; height: 170px; overflow: hidden"
+                        v-for="(w, wIndex) in worksStudent[toolIndex]"
+                        :key="wIndex"
+                        :class="w.type == 1 ? 'isTypeOne' : ''"
+                      >
+                        <div class="workImg" v-if="w.type == 0">
+                          <img
+                            :src="w.works"
+                            @click="previewImg(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="workImg" v-if="w.type == 1">
+                          <img
+                            src="../assets/icon/works/noImg.png"
+                            @click="openFile(w.works)"
+                            alt
+                          />
+                        </div>
+                        <div class="worksName">
+                          <div>{{ w.sName }}</div>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding-top: 15px; font-size: 18px">未提交</div>
+                    <div class="noWorksS">
+                      <div
+                        v-for="(s, sIndex) in noWorksS[toolIndex]"
+                        :key="sIndex"
+                        class="noWorksName"
+                      >
+                        {{ s.student }}
+                      </div>
+                    </div>
+                  </div>
                 </div>
                 <!-- <div class="upload_toolBtn" @click="addImg($event)">
                   上传文件
@@ -1679,9 +2080,9 @@
           style="width: 100%; height: 100%; overflow: auto"
         ></pdf>
       </div>
-      <div slot="footer">
+      <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>
-      </div>
+      </div> -->
     </el-dialog>
   </div>
 </template>
@@ -3373,9 +3774,9 @@ export default {
   /* .courseIndex > div:first-child(2) {
     width: 15% !important;
   } */
-  .navText {
+  /* .navText {
     width: 120px !important;
-  }
+  } */
   .evaCss {
     flex-direction: column !important;
     align-items: center !important;
@@ -3486,7 +3887,7 @@ export default {
 .study_top {
   margin-top: 90px;
   width: 100%;
-  overflow: auto;
+  /* overflow: auto; */
   height: auto;
 }
 .study_top .checkbox {
@@ -4245,7 +4646,8 @@ export default {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  width: 300px;
+  /* width: 300px; */
+  width: 100%;
 }
 .noVedio {
   display: flex;
@@ -4875,6 +5277,6 @@ export default {
 }
 
 .full_diy >>> .el-dialog__body {
-  height: calc(100% - 200px);
+  height: calc(100%  - 100px);
 }
 </style>

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác