live

src/components/liveProjectDetail.vue

@@ -30,7 +30,7 @@
       >
         <div class="blackButton" @click="answerWork" v-if="steps == 0">下一步</div>
         <div class="blackButton" @click="steps = 3" v-if="steps != 3">提交作业</div>
-      </div> -->
+      </div>-->
     </div>
     <div class="isNoOther">
       <div class="imgMiddle" :class="isBlock > 0 ? 'imghalf' : 'imgMiddle'">
@@ -77,6 +77,7 @@
               width: 70px;
               padding-bottom: 3px;
               text-align: center;
+              padding-top: 15px;
             "
             v-if="isBlock == 1"
           >
@@ -154,43 +155,25 @@
             </div>
           </div>
           <div class="answerBox" style="height: 90%" v-if="isBlock == 2">
-            <div
-              v-if="toolsList[0].tools.length == 1"
-              style="height: 100%; width: 100%"
-            >
+            <div v-if="toolsList[0].tools.length == 1" style="height: 100%; width: 100%">
               <!-- <div v-if="toolsList[0].tools[0] == 9" style="height: 90%; width: 100%">
                 选择题
-              </div> -->
-              <div
-                v-if="toolsList[0].tools[0] == 10"
-                style="height: 90%; width: 100%"
-              >
+              </div>-->
+              <div v-if="toolsList[0].tools[0] == 10" style="height: 90%; width: 100%">
                 倒计时
               </div>
-              <div
-                v-if="toolsList[0].tools[0] == 11"
-                style="height: 90%; width: 100%"
-              >
+              <div v-if="toolsList[0].tools[0] == 11" style="height: 90%; width: 100%">
                 问答题
               </div>
-              <div
-                v-if="toolsList[0].tools[0] == 12"
-                style="height: 90%; width: 100%"
-              >
+              <div v-if="toolsList[0].tools[0] == 12" style="height: 90%; width: 100%">
                 选人回答
               </div>
-              <div
-                v-if="toolsList[0].tools[0] == 13"
-                style="height: 90%; width: 100%"
-              >
+              <div v-if="toolsList[0].tools[0] == 13" style="height: 90%; width: 100%">
                 分小组
               </div>
-              <div
-                v-if="toolsList[0].tools[0] == 14"
-                style="height: 90%; width: 100%"
-              >
+              <!-- <div v-if="toolsList[0].tools[0] == 14" style="height: 90%; width: 100%">
                 作业评价
-              </div>
+              </div> -->
               <div class="nextStepOne" @click="isBlock = 0">关闭</div>
             </div>
             <div v-else style="height: 100%; width: 100%">
@@ -291,7 +274,7 @@
                 style="width: 100%; height: 100%; border: none"
                 src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
               ></iframe>
-            </div> -->
+            </div>-->
             <!-- <div class="toolList">
               <div class="tools">
                 <div>
@@ -326,11 +309,7 @@
             </div>-->
             <!-- <div class="nextStepOne" @click="nextTool">下一步</div> -->
           </div>
-          <div
-            class="answerBox"
-            v-if="isBlock == 3"
-            style="padding: 0 0 0 25px"
-          >
+          <div class="answerBox" v-if="isBlock == 3" style="padding: 0 0 0 25px">
             <div>
               <div class="score_box">
                 <span>自我评价</span>
@@ -356,12 +335,7 @@
             <span
               slot="footer"
               class="dialog-footer sztFooter"
-              style="
-                padding: 0 0 30px 0px;
-                position: absolute;
-                right: 20px;
-                bottom: 0;
-              "
+              style="padding: 0 0 30px 0px; position: absolute; right: 20px; bottom: 0"
             >
               <el-button>取消</el-button>
               <el-button type="primary">确定</el-button>
@@ -425,7 +399,7 @@
                 上传截图
               </div>
             </div>
-          </div> -->
+      </div>-->
       <!-- <div
             style="
               display: flex;
@@ -467,7 +441,7 @@
                 上传视频
               </div>
             </div>
-          </div>-->
+      </div>-->
       <!-- <div style="padding-left: 25px"><span style="color: red">*</span> 简要描述</div>
           <div style="padding: 10px 0 0 25px">
             <textarea
@@ -487,15 +461,13 @@
             <el-button type="primary" @click="addWork">确定</el-button>
           </span>
         </div>
-      </div> -->
+      </div>-->
     </div>
 
     <div class="blackBottomB"></div>
     <div v-if="proVisible" class="mask">
       <div class="progressBox">
-        <div class="lbox">
-          <img src="../assets/loading.gif" />上传中，请稍后
-        </div>
+        <div class="lbox"><img src="../assets/loading.gif" />上传中，请稍后</div>
         <el-progress
           :text-inside="true"
           :stroke-width="20"
@@ -637,14 +609,11 @@ export default {
     },
     //uuid生成
     guid() {
-      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(
-        /[xy]/g,
-        function (c) {
-          var r = (Math.random() * 16) | 0,
-            v = c == "x" ? r : (r & 0x3) | 0x8;
-          return v.toString(16);
-        }
-      );
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+        var r = (Math.random() * 16) | 0,
+          v = c == "x" ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+      });
     },
     time() {
       if (!this.now) {
@@ -874,6 +843,12 @@ export default {
       if (page == this.pageTotal) {
         this.isBlock = 3;
       } else {
+        if (this.ppage < 3) {
+          this.isBlock = 0;
+        }
+        if (this.ppage == 3) {
+          this.isBlock = 1;
+        }
         if (this.ppage > 3) {
           this.isBlock = 2;
         }
@@ -884,6 +859,9 @@ export default {
         } else {
           this.toolsList.push({ tools: this.tools[page - 1].tools });
         }
+        if (this.toolsList[0].tools[0] == 14) {
+          this.isBlock = 0;
+        }
       }
     },
 
@@ -897,7 +875,7 @@ export default {
             } else {
               this.ppage = res.data[0][0].page;
               console.log(1);
-              this.isBlock = 1;
+              // this.isBlock = 1;
               this.howPage(this.ppage);
               // if (this.ppage == 3) {
               //   this.isBlock = 1;