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{
-  width: 100%;
-  height: 100%;
-  padding: 0 0 30px;
-  overflow-y: auto;
-  overflow-x: hidden;
-  margin-top: 20px;
-}
-.discussHeader{
-  border-bottom: 1px solid rgba(231,231,231,1);
-  padding: 0 0 5px 38px;
-  margin-bottom: 20px;
-}
+  .Coursediscuss{
+    width: 100%;
+    height: 100%;
+    padding: 0 0 30px;
+    overflow-y: auto;
+    overflow-x: hidden;
+    margin-top: 20px;
+  }
+  .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

@@ -141,8 +141,8 @@
                   v-if="item === '评论'"
                   class="count"
                 >
-                {{ item ==='评论' ? (discussLen === 0 ? '' : (discussLen > 999 ? '999+' : discussLen)) : '' }}
-              </span>
+                  {{ item ==='评论' ? (discussLen === 0 ? '' : (discussLen > 999 ? '999+' : discussLen)) : '' }}
+                </span>
                 <div
                   v-show="currentTag === item"
                   class="bottom_line"
@@ -213,12 +213,12 @@
               <div class="lecturer">
                 <img :src="course.lecturerPic">
                 <div class="content">
-                <span class="name">
-                  {{ course.lecturerName || '无' }}
-                </span>
+                  <span class="name">
+                    {{ course.lecturerName || '无' }}
+                  </span>
                   <span class="info">
-                  {{ course.lecturerDeptName || '无' }}
-                </span>
+                    {{ course.lecturerDeptName || '无' }}
+                  </span>
                 </div>
               </div>
             </div>
@@ -298,8 +298,9 @@
             >
           </div>
         </div>
-        <div class="input"
-             v-if="currentTag == tags[2] && !isOutLine && !isFull"
+        <div
+          class="input"
+          v-if="currentTag == tags[2] && !isOutLine && !isFull"
         >
           <van-field
             :disabled="course.releaseState === '4'"
@@ -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() === '') {
@@ -741,20 +742,20 @@ export default {
     saveImg() {
       this.$refs.codeUtil.saveImg()
       /* const canvasData = this.$refs.canvas
-        //   a = document.createElement('a')
-        // a.href = canvasData.toDataURL()
-        // a.download = 'drcQrcode'
-        // a.click()
-        this.$wnsdk.media.saveBase64AsImage({
-          base64: canvasData.toDataURL(),
-          success(result) {
-            console.log(result)
-          },
-          error(error) {
-            // 失败处理...
-            console.log(error)
-          }
-        }) */
+          //   a = document.createElement('a')
+          // a.href = canvasData.toDataURL()
+          // a.download = 'drcQrcode'
+          // a.click()
+          this.$wnsdk.media.saveBase64AsImage({
+            base64: canvasData.toDataURL(),
+            success(result) {
+              console.log(result)
+            },
+            error(error) {
+              // 失败处理...
+              console.log(error)
+            }
+          }) */
     },
     /* 复制链接 */
     copyUrl() {
@@ -858,8 +859,8 @@ export default {
           this.fromName = this.$route.query.fromName
 
           /* QRCode.toCanvas(this.$refs.qRCode, process.env.VUE_APP_BASE_API4 + '/#/CourseTrainOut?id=' + this.businessId, {width: 80, margin: 1}, function(error) {
-              console.log(error)
-            }) */
+                console.log(error)
+              }) */
           this.bQrUrl = process.env.VUE_APP_BASE_API4 + '/#/CourseTrainOut?id=' + this.businessId
         })
       } else {

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/addTrain/index.vue

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