lsc преди 2 години
родител
ревизия
5cfd7b3b1b

+ 1 - 1
dist/index.html

@@ -18,7 +18,7 @@
       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.0537fbf86f60aa9323a90131ecf21696.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.8d7171b1fe858bda1433.js></script><script type=text/javascript src=./static/js/app.5ce6c27cf77634841c2c.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.b2c47281a2d7591f120632898babd3e1.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.8d7171b1fe858bda1433.js></script><script type=text/javascript src=./static/js/app.a9284ea091d3ebabe07d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.0537fbf86f60aa9323a90131ecf21696.css.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.b2c47281a2d7591f120632898babd3e1.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.b2c47281a2d7591f120632898babd3e1.css.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.5ce6c27cf77634841c2c.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.a9284ea091d3ebabe07d.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.a9284ea091d3ebabe07d.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 3 - 1
src/components/index.vue

@@ -158,7 +158,7 @@
           </div>
         </div>
         <div class="student_page" style="margin: 15px 0 0" v-if="zoneClass.length > 0 && !typeCheck">
-          <el-pagination background layout="prev, pager, next" :page-size="10" :total="total" v-if="page"
+          <el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total" v-if="page"
             @current-change="handleCurrentChange">
           </el-pagination>
         </div>
@@ -175,6 +175,7 @@ export default {
       zoneClass: [],
       page: 1,
       total: 0,
+      pageSize: 20, //每页显示记录数(10)。必须设置为正确的值,以便生成href
       isListAjax: false,
       zoneListId: "",
       bannerList: [],
@@ -445,6 +446,7 @@ export default {
         classid: this.classId,
         org: this.org,
         page: this.page,
+        pageSize:this.pageSize
       };
       this.ajax
         .get(this.$store.state.api + "selectTypeCourse2", params)

+ 108 - 108
src/components/noTerminal/studyStudent.vue

@@ -605,9 +605,9 @@
                         </div>
                       </div>
                     </div>
-                    <div class="tooldetail" v-if="tool.toolDetail != ''">
+                    <div class="tooldetail">
                       <!-- <div class="toolTitle">工具描述</div> -->
-                      <div v-html="contentConvent(tool.toolDetail)"></div>
+                      <div v-html="contentConvent(tool.toolDetail ? tool.toolDetail : '暂无描述')"></div>
                     </div>
                     <el-button type="primary" v-if="tool.tool[0] == 32" style="
                                                           position: absolute;
@@ -1082,8 +1082,6 @@
                     <div class="worksTop">
                       <div>作业预览</div>
                     </div>
-
-
                   </div>
                   <div>
                     <div class="worksDetailBox" v-if="
@@ -1821,7 +1819,108 @@
                 </div>
               </div>
             </div>
-
+            <div class="vedioBox">
+              <div v-if="
+                  tType &&
+                  ((tType == 2 && sIsOpen == true) ||
+                    tType == 1 ||
+                    tType == 4) &&
+                  tool.tool.indexOf(4) != -1 && worksStudent.length &&
+                  worksStudent[toolIndex].length &&
+                  (tool.askJson[0].answer ||
+                    tool.askJson[0].answer === 0) &&
+                  checkJson[toolIndex].length
+                " class="xuan_right_box">
+                  <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
+                    <div>
+                      <span>{{ index + 1 + "、" + item.askstitle }}</span>
+                    </div>
+                    <div class="right_box_xuan">
+                      <span>正确率</span>
+                      <span>{{
+                        (checkJson[toolIndex][index].right
+                          ? checkJson[toolIndex][index].right
+                          : 0) + "%"
+                      }}</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="xuan_right_box" style="background: unset" v-if="
+                  tType &&
+                  ((tType == 2 && sIsOpen == true) ||
+                    tType == 1 ||
+                    tType == 4) &&
+                  tool.tool.indexOf(4) != -1 && worksStudent.length &&
+                  worksStudent[toolIndex].length
+                ">
+                  <AskStatic v-if="
+                    worksStudent.length &&
+                    worksStudent[toolIndex].length > 0
+                  " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic>
+                </div>
+                <div v-if="
+                  tType &&
+                  ((tType == 2 && sIsOpen == true) ||
+                    tType == 1 ||
+                    tType == 4) &&
+                  tool.tool.indexOf(45) != -1 && worksStudent.length &&
+                  worksStudent[toolIndex].length &&
+                  (tool.testJson.testJson[0].answer ||
+                    tool.testJson.testJson[0].answer === 0) &&
+                  checkJson[toolIndex].length
+                " class="xuan_right_box">
+                  <div class="tool_right_box" v-for="(item, index) in tool.testJson.testJson" :key="index">
+                    <div>
+                      <span>{{ index + 1 + "、" + item.teststitle }}</span>
+                    </div>
+                    <div class="right_box_xuan">
+                      <span>正确率</span>
+                      <span>{{
+                        (checkJson[toolIndex][index].right
+                          ? checkJson[toolIndex][index].right
+                          : 0) + "%"
+                      }}</span>
+                    </div>
+                  </div>
+                </div>
+                <div class="xuan_right_box" style="background: unset" v-if="
+                  tType &&
+                  ((tType == 2 && sIsOpen == true) ||
+                    tType == 1 ||
+                    tType == 4) &&
+                  tool.tool.indexOf(45) != -1 && worksStudent.length &&
+                  worksStudent[toolIndex].length
+                ">
+                  <AskStatic2 v-if="
+                    worksStudent.length &&
+                    worksStudent[toolIndex].length > 0
+                  " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic2>
+                </div> 
+                <div v-if="
+                  tType &&
+                  ((tType == 2 && sIsOpen == true) ||
+                    tType == 1 ||
+                    tType == 4) &&
+                  tool.tool.indexOf(41) != -1
+                ">
+                  <AnswerData2 v-if="
+                    worksStudent.length &&
+                    worksStudent[toolIndex].length > 0
+                  " :problemJson="tool.selectJson.answer" :people="worksStudent[toolIndex]"></AnswerData2>
+                </div>
+                <div v-if="
+                  tType &&
+                  ((tType == 2 && sIsOpen == true) ||
+                    tType == 1 ||
+                    tType == 4) &&
+                  tool.tool.indexOf(47) != -1
+                ">
+                  <AnswerData v-if="
+                    checkJson[toolIndex].length &&
+                    (tool.sentenceList || tool.sentenceList.length > 0)
+                  " :people="checkJson[toolIndex]"></AnswerData>
+                </div>   
+            </div>
             <div class="vedioBox" v-if="arrayToArray(tool.tool, isWorkTool).length">
               <div class="queTop" style="
                                                     font-size: 25px;
@@ -2336,44 +2435,6 @@
                     </div>
                   </div>
                 </div>
-                <div v-if="
-                  tType &&
-                  ((tType == 2 && sIsOpen == true) ||
-                    tType == 1 ||
-                    tType == 4) &&
-                  tool.tool.indexOf(4) != -1 && worksStudent.length &&
-                  worksStudent[toolIndex].length &&
-                  (tool.askJson[0].answer ||
-                    tool.askJson[0].answer === 0) &&
-                  checkJson[toolIndex].length
-                " class="xuan_right_box">
-                  <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
-                    <div>
-                      <span>{{ index + 1 + "、" + item.askstitle }}</span>
-                    </div>
-                    <div class="right_box_xuan">
-                      <span>正确率</span>
-                      <span>{{
-                        (checkJson[toolIndex][index].right
-                          ? checkJson[toolIndex][index].right
-                          : 0) + "%"
-                      }}</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="xuan_right_box" style="background: unset" v-if="
-                  tType &&
-                  ((tType == 2 && sIsOpen == true) ||
-                    tType == 1 ||
-                    tType == 4) &&
-                  tool.tool.indexOf(4) != -1 && worksStudent.length &&
-                  worksStudent[toolIndex].length
-                ">
-                  <AskStatic v-if="
-                    worksStudent.length &&
-                    worksStudent[toolIndex].length > 0
-                  " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic>
-                </div>
                 <div v-if="
                   tType &&
                   ((tType == 2 && sIsOpen == true) ||
@@ -2425,44 +2486,6 @@
                   </div>
 
                 </div>
-                <div v-if="
-                  tType &&
-                  ((tType == 2 && sIsOpen == true) ||
-                    tType == 1 ||
-                    tType == 4) &&
-                  tool.tool.indexOf(45) != -1 && worksStudent.length &&
-                  worksStudent[toolIndex].length &&
-                  (tool.testJson.testJson[0].answer ||
-                    tool.testJson.testJson[0].answer === 0) &&
-                  checkJson[toolIndex].length
-                " class="xuan_right_box">
-                  <div class="tool_right_box" v-for="(item, index) in tool.testJson.testJson" :key="index">
-                    <div>
-                      <span>{{ index + 1 + "、" + item.teststitle }}</span>
-                    </div>
-                    <div class="right_box_xuan">
-                      <span>正确率</span>
-                      <span>{{
-                        (checkJson[toolIndex][index].right
-                          ? checkJson[toolIndex][index].right
-                          : 0) + "%"
-                      }}</span>
-                    </div>
-                  </div>
-                </div>
-                <div class="xuan_right_box" style="background: unset" v-if="
-                  tType &&
-                  ((tType == 2 && sIsOpen == true) ||
-                    tType == 1 ||
-                    tType == 4) &&
-                  tool.tool.indexOf(45) != -1 && worksStudent.length &&
-                  worksStudent[toolIndex].length
-                ">
-                  <AskStatic2 v-if="
-                    worksStudent.length &&
-                    worksStudent[toolIndex].length > 0
-                  " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic2>
-                </div>
                 <div v-if="
                   tType &&
                   ((tType == 2 && sIsOpen == true) ||
@@ -3102,18 +3125,6 @@
                     </div>
                   </div>
                 </div>
-                <div v-if="
-                  tType &&
-                  ((tType == 2 && sIsOpen == true) ||
-                    tType == 1 ||
-                    tType == 4) &&
-                  tool.tool.indexOf(41) != -1
-                ">
-                  <AnswerData2 v-if="
-                    worksStudent.length &&
-                    worksStudent[toolIndex].length > 0
-                  " :problemJson="tool.selectJson.answer" :people="worksStudent[toolIndex]"></AnswerData2>
-                </div>
                 <div v-if="
                   tType &&
                   ((tType == 2 && sIsOpen == true) ||
@@ -3159,18 +3170,6 @@
                     </div>
                   </div>
                 </div>
-                <div v-if="
-                  tType &&
-                  ((tType == 2 && sIsOpen == true) ||
-                    tType == 1 ||
-                    tType == 4) &&
-                  tool.tool.indexOf(47) != -1
-                ">
-                  <AnswerData v-if="
-                    checkJson[toolIndex].length &&
-                    (tool.sentenceList || tool.sentenceList.length > 0)
-                  " :people="checkJson[toolIndex]"></AnswerData>
-                </div>
                 <div v-if="
                   tType &&
                   ((tType == 2 && sIsOpen == true) ||
@@ -4592,7 +4591,7 @@
         <el-button type="primary" @click="dialogVisibleSentence1 = false">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="教师提交作业" :visible.sync="dialogVisibleWorks" :append-to-body="true" width="500px"
+    <el-dialog title="提交作业" :visible.sync="dialogVisibleWorks" :append-to-body="true" width="500px"
       :before-close="handleClose" class="dialog_change">
       <div class="marginT">
         <div class="w_name">
@@ -12209,6 +12208,7 @@ export default {
   border-radius: 20px;
   background: #fff;
   margin-bottom: 10px;
+  overflow:auto;
 }
 
 .taskBox {
@@ -12228,7 +12228,7 @@ export default {
 }
 
 .toolBox {
-  padding: 20px 60px 0;
+  padding: 20px 60px 15px;
   display: flex;
   position: relative;
 }
@@ -14273,7 +14273,7 @@ ol {
 
 .toolBoxSteps:nth-child(1)>img,
 .toolBoxSteps:nth-child(2)>img {
-  width: 35px;
+  width: 24px;
 }
 
 .toolBoxSteps:nth-child(1) {

+ 1 - 1
src/components/student/courseDetail.vue

@@ -3,7 +3,7 @@
     <div class="pb_content_body" style="height: 100%">
       <div class="body_student">
         <div class="student_head">
-          <div v-if="screenType != 2" class="return" @click.stop="
+          <div v-if="screenType != 2 && screenType != '2s'" class="return" @click.stop="
             goTo(
               '/studentIndex?userid=' +
               userid +

+ 1 - 1
src/components/studentIndex.vue

@@ -179,7 +179,7 @@ export default {
       zoneClass: [],
       page: 1,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       isListAjax: false,
       zoneListId: "",
       bannerList: [],

Някои файлове не бяха показани, защото твърде много файлове са промени