Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

src/components/liveProjectDetail.vue

@@ -519,7 +519,11 @@
             style="padding: 0 0 0 25px"
           >
             <div>
-              <div v-for="(tk, tIndex) in tools[ppage - 1].choice" :key="tIndex" class="tkCss">
+              <div
+                v-for="(tk, tIndex) in tools[ppage - 1].choice"
+                :key="tIndex"
+                class="tkCss"
+              >
                 <div style="margin-right: 10px; font-size: 18px">
                   {{ tIndex + 1 }}、
                 </div>
@@ -710,7 +714,7 @@
       </div>
     </div>
 
-    <div class="blackBottomB">
+    <div class="blackBottomB" v-if="false">
       <!-- <div
         class="nextStepOne"
         style="float: right"
@@ -802,7 +806,7 @@
           border-radius: 5px;
           cursor: pointer;
         "
-        @click="pick"
+        @click="pick2"
       >
         确定
       </div>
@@ -883,7 +887,7 @@ export default {
       typeC: [],
       toolCount: 0,
       tools: [
-        {  },//tools: [30]
+        {}, //tools: [30]
         //  {
         //   file: [
         //     {
@@ -1421,6 +1425,10 @@ export default {
             type: "success",
           });
           this.selectSWork();
+          if(this.tools[this.ppage - 1].tools.indexOf(12) != -1){
+            this.pick();
+            this.isBlock = 0
+          }
         })
         .catch((err) => {
           this.$message.error("提交成功");
@@ -1448,7 +1456,10 @@ export default {
           _type = 6;
         } else if (this.tools[this.ppage - 1].tools.indexOf(29) != -1) {
           _type = 7;
-        } else if (this.tools[this.ppage - 1].tools.indexOf(30) != -1) {
+        } else if (
+          this.tools[this.ppage - 1].tools.indexOf(30) != -1 ||
+          this.tools[this.ppage - 1].tools.indexOf(12) != -1
+        ) {
           _type = 8;
         }
       }
@@ -1744,12 +1755,16 @@ export default {
       this.ajax
         .post(this.$store.state.api + "updatePPTHandle", params)
         .then((res) => {
-          this.dialogVisiblePick = false;
+          // this.dialogVisiblePick = false;
         })
         .catch((err) => {
           console.error(err);
         });
     },
+    pick2() {
+      this.dialogVisiblePick = false;
+      this.isBlock = 10;
+    },
     setPage() {
       let params = {
         id: this.cid,
@@ -1761,7 +1776,9 @@ export default {
             if (
               res.data[0][0].handle &&
               JSON.parse(res.data[0][0].handle).type == 2 &&
-              JSON.parse(res.data[0][0].handle).userid == this.userid
+              JSON.parse(res.data[0][0].handle).userid == this.userid &&
+              this.isBlock != 10 && 
+              this.tools[res.data[0][0].page - 1].tools.indexOf(12) != -1
             ) {
               this.dialogVisiblePick = true;
             }
@@ -1957,7 +1974,7 @@ export default {
 .isNoOther {
   width: 100%;
   display: flex;
-  height: calc(100% - 90px);
+  height: calc(100% - 45px);
 }
 
 .imghalf {