Merge branches 'dev-publish' and 'master' of...

Merge branches 'dev-publish' and 'master' of ssh://103.249.252.28:10022/wangxu/mt-education-mobile into dev-publish

src/assets/style/resetui.less

@@ -188,6 +188,7 @@
     text-align: center;
     border-bottom: 1px solid #e7e7e7;
     font-size: 16px;
+    border-radius: 0px;
   }
 }
 /*在线考试 样式*/

src/components/CourseDiscuss/Coursediscuss.vue

@@ -56,7 +56,7 @@
             </div>
           </div>
           <div
-            @click="ReplyShow(i, singleDiscuss.studentName)"
+            @click="discussContentReplyShow(i, singleDiscuss.studentName)"
             class="discuss-content"
             v-html="singleDiscuss.content.replace(/ /g,'&nbsp;').replace(formatAscal,'<br/>')"
           />
@@ -159,6 +159,7 @@ export default {
         this.removeDiscuss(this.optionIndex)
       } else {
         this.optionShow = false
+        document.getElementById('discussInput').focus()
         setTimeout(() => {
           this.ReplyShow(this.optionIndex, this.currentDiscuss.studentName)
         }, 500)
@@ -176,6 +177,13 @@ export default {
       this.saveDiscussIndex = index
       this.$emit('ReplyParentInputShow', 1, replyName)
     },
+    // 回复评论
+    discussContentReplyShow(index, replyName) {
+      document.getElementById('discussInput').focus()
+      setTimeout(() => {
+        this.ReplyShow(index, replyName)
+      }, 500)
+    },
     // 发表一层楼的评论 有头像的最外层
     sendMyDiscuss() {
       this.$emit('loadingShow')
@@ -497,19 +505,19 @@ export default {
     background:rgba(237,240,245,1);
     border-radius:10px 10px 0px 0px;
   }
-.Coursediscuss{
+  .Coursediscuss{
     width: 100%;
     height: 100%;
     padding: 0 0 30px;
     overflow-y: auto;
     overflow-x: hidden;
     margin-top: 20px;
-}
-.discussHeader{
+  }
+  .discussHeader{
     border-bottom: 1px solid rgba(231,231,231,1);
     padding: 0 0 5px 38px;
     margin-bottom: 20px;
-}
+  }
   .discussContent{
     padding: 0 16px 15px 20px;
   }

src/components/CourseDiscuss/DiscusssingleReply.vue

@@ -42,7 +42,7 @@
       </div>
       <div
         class="reply-con"
-        @click="sendReplyEmit"
+        @click="replyConSendReplyEmit"
         v-html="(replyData.replyToId === '' ? '':replyData.studentName + '：回复@'+replyData.replyToName+'：')+replyData.content.replace(/ /g,'&nbsp;').replace(formatAscal, '<br/>')"
       >
         <!--         {{}} <span style="color: #4098f0" v-if="replyData.replyToId !== '' ">@{{replyData.replyToName}}</span> {{replyData.content.replace(/ /g,'&nbsp;').replace(/\n/g,'<br>')}}-->
@@ -95,12 +95,19 @@ export default {
         this.optionShow = false
         this.removeThisRepply()
       } else if (item.name === '回复') {
+        document.getElementById('discussInput').focus()
         this.optionShow = false
         setTimeout(() => {
           this.sendReplyEmit()
         }, 300)
       }
     },
+    replyConSendReplyEmit() {
+      document.getElementById('discussInput').focus()
+      setTimeout(() => {
+        this.sendReplyEmit()
+      }, 300)
+    },
     sendReplyEmit() {
       this.$emit('ReplyInputShow', this.discussIndex, this.replyIndex, this.replyData.businessId, this.replyData.studentName)
     },

src/components/OnlineExamination/labelExamination.vue

@@ -128,10 +128,14 @@ export default {
       .time{
         font-size: 12px;
         color: #999999;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
         .pass{
-          position: absolute;
+         /* position: absolute;
           right: 15px;
-          bottom: 18px;
+          bottom: 1rem;*/
+          margin-right: 21px;
           color: #4CC660;
           font-size: 18px;
           & > span{
@@ -139,9 +143,10 @@ export default {
           }
         }
         .fail{
-          position: absolute;
+         /* position: absolute;
           right: 15px;
-          bottom: 18px;
+          bottom: 1rem;*/
+          margin-right: 21px;
           color: #FF7271;
           font-size: 18px;
           & > span{

src/views/CourseDetail/index.vue

@@ -298,7 +298,8 @@
             >
           </div>
         </div>
-        <div class="input"
+        <div
+          class="input"
           v-if="currentTag == tags[2] && !isOutLine && !isFull"
         >
           <van-field
@@ -696,14 +697,14 @@ export default {
     },
     // 回复点击
     textareaHeightBiggerRe(type, replyName) {
-      const input = document.getElementById('discussInput'),
-        focusBtn = document.getElementById('btnFocus2')
+      /* const input = document.getElementById('discussInput'),
+        focusBtn = document.getElementById('btnFocus2') */
       this.discussType = type
       this.discussPlaceHloder = '回复@' + replyName
-      focusBtn.addEventListener('click', function() {
+      /* focusBtn.addEventListener('click', function() {
         input.focus()
       })
-      focusBtn.click()
+      focusBtn.click() */
     },
     textareaHeightSmaller() {
       if (this.commentContent.trim() === '') {

src/views/More/index.vue

@@ -175,7 +175,6 @@
       </div>
     </transition>
     <search-box
-      v-show="hackReset"
       @onCancel="onCancel"
       :hackReset = 'hackReset'
     />
@@ -239,6 +238,10 @@ export default {
   methods: {
     // 点击搜索 事件
     search() {
+      const that = this
+      if (that.$route.params.searchFocus !== 'focus') {
+        document.getElementById('searchInputP').focus()
+      }
       const navBar = document.getElementById('navBar')
       navBar.style.display = 'none'
       // 重建组件
@@ -247,8 +250,12 @@ export default {
         // this.$refs.scollElement.scrollIntoView()
         this.hackReset = true
         setTimeout(() => {
-          document.getElementById('searchInputP').focus()
-        }, 100)
+          if (that.$route.params.searchContent !== undefined) {
+            that.$refs.searchBox.backToSearch(that.$route.params.searchContent)
+          }
+          delete that.$route.params.searchContent
+          delete that.$route.params.searchFocus
+        }, 500)
       })
     },
     // 搜索取消关闭事件

src/views/OnlineExamination/paperDetail.vue

@@ -30,7 +30,7 @@
           :key="index"
         >
           <div class="subject-name">
-            <p class="name">
+            <p class="name" v-if="item.type !== '4'">
               {{ index + 1 }}、<label v-html="item.content" />
             </p>
             <p
@@ -53,6 +53,26 @@
               <span class="fraction-num">{{ item.score }}分</span>
             </p>
           </div>
+          <div
+            class="fillEmpyt-box"
+            v-if="item.type === '4'"
+          >
+            <div class="right-indent"></div>
+            <span>{{ index + 1 }}、</span>
+            <span
+              class="name"
+              v-for="(item1,index1) in item.textArea"
+              :key="index1"
+            ><label v-html="item1"/>&nbsp;
+            <field
+              maxlength="30"
+              class="fillEmpyt"
+              v-if="item.textArea.length - 1 !== index1"
+              type="text"
+              v-model="item1.fillEmpty"
+              readonly
+            />&nbsp;</span>
+          </div>
           <!--单选题-->
           <div
             :class="['option-box', detailObj.data.paper.showKey ? '' : 'noShowKey']"
@@ -190,11 +210,11 @@
             >
               {{value}}
                 <span
-                  style="color:#4CC660;float: right;margin-right: 4px;"
+                  style="color:#4CC660;float: right;margin-right: 4px;line-height: normal;"
                   v-if="item.key[blanksIndex] === value && detailObj.data.paper.showKey"
                 >正确答案</span>
                 <span
-                  style="color:#FF7271;float: right;margin-right: 4px;"
+                  style="color:#FF7271;float: right;margin-right: 4px;line-height: normal;"
                   v-if="item.key[blanksIndex] !== value && detailObj.data.paper.showKey"
                 >{{value === '' ? '未作答' : '回答错误'}}</span>
             </span>
@@ -366,7 +386,8 @@ export default {
                 key: key, // 正确答案
                 score: this.detailObj.data.check[Qid], // 分数
                 Answer: Answer, // 回答
-                blanks: item.blanks // 填空题正确答案 数组
+                blanks: item.blanks, // 填空题正确答案 数组
+                textArea: item.content.split(/\[.*?\]/)
               })
             }
           } else {
@@ -380,11 +401,13 @@ export default {
               key: key, // 正确答案
               score: this.detailObj.data.check[Qid], // 分数
               Answer: Answer, // 回答
-              blanks: item.blanks // 填空题正确答案 数组
+              blanks: item.blanks, // 填空题正确答案 数组
+              textArea: item.content.split(/\[BlankArea[0-9]\]/)
             })
           }
         })
       })
+      console.log(this.paper, 'OIOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOoo')
       // this.subjectContent()
     },
     /**
@@ -465,6 +488,26 @@ export default {
       background: #ffffff;
       margin-bottom: 10px;
       padding: 0 15px;
+      .fillEmpyt-box{
+        // margin-right: 30px;
+        margin-top: 0;
+        text-align: left;
+        font-size: 16px;
+        color: #333333;
+        & > span{
+          line-height: 35px;
+          .van-cell{
+            width: 120px;
+            display: inline;
+            padding: 0;
+            color: #333333;
+          }
+        }
+        .right-indent {
+          width: 28px;
+          float: right;
+        }
+      }
       .subject-name{
         display: flex;
         justify-content: space-between;

src/views/OnlineExamination/startExamination.vue

@@ -101,7 +101,8 @@
             class="name"
             v-for="(item,index) in fillEmpytList"
             :key="index"
-          ><label v-html="item.text"/>&nbsp;<field
+          ><label v-html="item.text"/>&nbsp;
+            <field
             maxlength="30"
             class="fillEmpyt"
             v-if="fillEmpytList.length - 1 !== index"

src/views/TrainDetail/index.vue

@@ -79,14 +79,17 @@
               >
                 <!-- {{ item ==='评论' ? item +'(' + (discussLen > 999 ? '999+' : discussLen) + ')': item }} -->
                 <div style="height: 100%;position: relative;white-space: nowrap">
-                {{item}}
-                <span v-if="item === '评论'" class="count">
+                  {{ item }}
+                  <span
+                    v-if="item === '评论'"
+                    class="count"
+                  >
                     {{ item ==='评论' ? (discussLen === 0 ? '' : (discussLen > 999 ? '999+' : discussLen)) : '' }}
                   </span>
                   <div
                     v-show="currentTag === item"
                     class="bottom_line"
-                ></div>
+                  />
                 </div>
               </li>
             </div>
@@ -104,7 +107,10 @@
               <p class="title">
                 培训介绍
               </p>
-              <div class="attr" style="color: #333333;">
+              <div
+                class="attr"
+                style="color: #333333;"
+              >
                 {{ (!courseInfo.courseDescription || courseInfo.courseDescription === '' || courseInfo.courseDescription === undefined) ? '-暂无内容-' : courseInfo.courseDescription }}
               </div>
               <div class="attr">
@@ -123,7 +129,7 @@
                   :key="key"
                   class="item_left"
                 >
-                  <span style="font-size: 12px;text-align: center;position: relative;top: -1px;">{{key===0?'':'|'}}</span>&nbsp;{{ item.lname }}
+                  <span style="font-size: 12px;text-align: center;position: relative;top: -1px;">{{ key===0?'':'|' }}</span>&nbsp;{{ item.lname }}
                 </em>
               </div>
             </div>
@@ -196,12 +202,18 @@
             class="person"
             v-if="currentTag == tags[1]"
           >
-            <div class="panel" :style="{'padding-bottom': learnAllCount==0?'15px': '0px'}">
+            <div
+              class="panel"
+              :style="{'padding-bottom': learnAllCount==0?'15px': '0px'}"
+            >
               <p class="title">
                 已报名
                 <span class="num">{{ learnAllCount }}人</span>
               </p>
-              <div class="person-detail" v-show="enrolment.length!=0">
+              <div
+                class="person-detail"
+                v-show="enrolment.length!=0"
+              >
                 <div
                   class="person-head"
                   :isTagCoverEnrolment="isTagCoverEnrolment"
@@ -242,12 +254,12 @@
                       v-if="isTagCoverEnrolment === false"
                       name="ellipsis"
                     />
-<!--                    <span v-if="isTagCoverEnrolment === false" class="three_porint">...</span>-->
-<!--                    <van-icon-->
-<!--                      style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
-<!--                      v-if="isTagCoverEnrolment === true"-->
-<!--                      name="arrow-up"-->
-<!--                    />-->
+                    <!--                    <span v-if="isTagCoverEnrolment === false" class="three_porint">...</span>-->
+                    <!--                    <van-icon-->
+                    <!--                      style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
+                    <!--                      v-if="isTagCoverEnrolment === true"-->
+                    <!--                      name="arrow-up"-->
+                    <!--                    />-->
                     <!-- <van-icon
                       style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
                       v-if="isTagCoverEnrolment === false"
@@ -299,7 +311,7 @@
                       v-if="isTagCoverEnrolment === false"
                       name="arrow-down"
                     />-->
-<!--                    <span class="three_porint">...</span>-->
+                    <!--                    <span class="three_porint">...</span>-->
                   </button>
                   <!-- <span
                     style="font-size: 14px;font-weight: bold;margin-left: 8px;"
@@ -309,12 +321,18 @@
                 </div>
               </div>
             </div>
-            <div class="panel bottom" :style="{'padding-bottom': finishCount==0?'15px': '0px'}">
+            <div
+              class="panel bottom"
+              :style="{'padding-bottom': finishCount==0?'15px': '0px'}"
+            >
               <p class="title">
                 已到场
                 <span class="num">{{ finishCount }}人</span>
               </p>
-              <div class="person-detail" v-show="arrived.length!=0">
+              <div
+                class="person-detail"
+                v-show="arrived.length!=0"
+              >
                 <div
                   class="person-head"
                   :isTagCoverArrived="isTagCoverArrived"
@@ -349,11 +367,11 @@
                     @click="isTagCoverArrived = !isTagCoverArrived"
                     style="width:12vw;height:12vw;margin-top: 1.19vw;margin-left: 2vw;border-radius: 30px 30px 30px 30px;border: white;position: relative;background-color: #f3f3f3"
                   >
-<!--                    <van-icon-->
-<!--                      style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
-<!--                      v-if="isTagCoverArrived === true"-->
-<!--                      name="arrow-up"-->
-<!--                    />-->
+                    <!--                    <van-icon-->
+                    <!--                      style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"-->
+                    <!--                      v-if="isTagCoverArrived === true"-->
+                    <!--                      name="arrow-up"-->
+                    <!--                    />-->
                     <!--<van-icon
                       style="position:absolute;top: 50%;left: 50%;transform: translate(-50%,-50%);-webkit-appearance:none"
                       v-if="isTagCoverArrived === false"
@@ -364,8 +382,7 @@
                       v-if="isTagCoverArrived === false"
                       name="ellipsis"
                     />
-<!--                    <span  v-if="isTagCoverArrived === false" class="three_porint">...</span>-->
-
+                    <!--                    <span  v-if="isTagCoverArrived === false" class="three_porint">...</span>-->
                   </button>
                   <!-- <span
                     style="font-size: 14px;font-weight: bold;margin-left: 8px;"
@@ -417,8 +434,7 @@
                       v-if="isTagCoverArrived === false"
                       name="arrow-down"
                     />-->
-<!--                    <span  class="three_porint">...</span>-->
-
+                    <!--                    <span  class="three_porint">...</span>-->
                   </button>
                   <!--<span
                     style="font-size: 14px;font-weight: bold;margin-left: 8px;"
@@ -428,12 +444,18 @@
                 </div>
               </div>
             </div>
-            <div class="panel bottom" :style="{'padding-bottom': notFinishCount==0?'15px': '0px'}">
+            <div
+              class="panel bottom"
+              :style="{'padding-bottom': notFinishCount==0?'15px': '0px'}"
+            >
               <p class="title">
                 未到场
                 <span class="num">{{ notFinishCount }}人</span>
               </p>
-              <div class="person-detail" v-show="absent.length!=0">
+              <div
+                class="person-detail"
+                v-show="absent.length!=0"
+              >
                 <div
                   class="person-head"
                   :isTagCoverAbsent="isTagCoverAbsent"
@@ -483,8 +505,7 @@
                       v-if="isTagCoverAbsent === false"
                       name="ellipsis"
                     />
-<!--                    <span v-if="isTagCoverAbsent === false" class="three_porint">...</span>-->
-
+                    <!--                    <span v-if="isTagCoverAbsent === false" class="three_porint">...</span>-->
                   </button>
                   <!--<span
                     style="font-size: 14px;font-weight: bold;margin-left: 8px;"
@@ -536,8 +557,7 @@
                       v-if="isTagCoverAbsent === false"
                       name="arrow-down"
                     />-->
-<!--                    <span class="three_porint">...</span>-->
-
+                    <!--                    <span class="three_porint">...</span>-->
                   </button>
                   <!--<span
                     style="font-size: 14px;font-weight: bold;margin-left: 8px;"
@@ -641,7 +661,7 @@
             :start-page="1"
             @loaded="onPdfLoaded"
             v-if="previewType === 'pdf'"
-            :showPage = "100"
+            :show-page="100"
             :pdf-src="priviewPicture"
             :show-loading="false"
           />
@@ -661,7 +681,7 @@
       @blur="nextTime"
       style="position: fixed;width: 1px;height: 1px;z-index: -1;"
       v-if="currentTag == tags[2]"
-    />
+    >
     <div
       v-if="currentTag == tags[2]"
       class="inputPL"
@@ -1138,18 +1158,18 @@ export default {
     },
     // 回复点击
     textareaHeightBiggerRe(type, replyName) {
-      const input = document.getElementById('discussInput'),
-        focusBtn = document.getElementById('btnFocus2')
+      /* const input = document.getElementById('discussInput'),
+        focusBtn = document.getElementById('btnFocus2')*/
       if (this.saveReplyName !== replyName) {
         this.commentContent = ''
         this.saveReplyName = replyName
       }
       this.discussType = type
       this.discussPlaceHloder = '回复@' + replyName
-      focusBtn.addEventListener('click', function() {
+      /* focusBtn.addEventListener('click', function() {
         input.focus()
       })
-      focusBtn.click()
+      focusBtn.click() */
     },
     textareaHeightSmaller() {
       if (this.commentContent.trim() === '') {

src/views/addTrain/index.vue

@@ -1619,6 +1619,7 @@ export default {
     }
     .cancel{
       margin-top: 8px;
+      border-bottom: 0px solid #e7e7e7;
     }
   }
   *::-webkit-scrollbar{