Browse Source

Merge branch 'beta' into HK

lsc 2 years ago
parent
commit
99d92a1cbd

+ 4 - 0
dist/index.html

@@ -18,7 +18,11 @@
       border-radius: 10px;
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
       background-color: rgba(0, 0, 0, 0.1);
+<<<<<<< HEAD
     }</style><link href=./static/css/app.fdc715d6a472a6fb9f9739782f316e92.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.6ce63202945bed04a56b.js></script></body></html><script>function stopSafari() {
     }</style><link href=./static/css/app.fdc715d6a472a6fb9f9739782f316e92.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.e272a0df0fb3ce5b6fea.js></script><script type=text/javascript src=./static/js/app.6ce63202945bed04a56b.js></script></body></html><script>function stopSafari() {
+=======
+    }</style><link href=./static/css/app.09e69a2306a7898ea33b441dbdaffd84.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.99d7412b421aaa12f6f9.js></script></body></html><script>function stopSafari() {
+>>>>>>> beta
     //阻止safari浏览器双击放大功能
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.09e69a2306a7898ea33b441dbdaffd84.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.09e69a2306a7898ea33b441dbdaffd84.css.map


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.fdc715d6a472a6fb9f9739782f316e92.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.fdc715d6a472a6fb9f9739782f316e92.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.6ce63202945bed04a56b.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.99d7412b421aaa12f6f9.js


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.99d7412b421aaa12f6f9.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 5 - 0
src/components/courseDetail.vue

@@ -222,6 +222,11 @@
               >
               >
                 <div class="jdAndTask">
                 <div class="jdAndTask">
                   <div>第{{ index + 1 }}阶段</div>
                   <div>第{{ index + 1 }}阶段</div>
+                  <div
+                    v-if="courseDetail.state == 2 || courseDetail.state == 3"
+                  >
+                    任务查看
+                  </div>
                   <div :title="item.dyName">
                   <div :title="item.dyName">
                     {{ item.dyName }}
                     {{ item.dyName }}
                   </div>
                   </div>

+ 15 - 33
src/components/easy2/studyStudent.vue

@@ -58,7 +58,7 @@
           "
           "
         >
         >
           <div class="courseTitle">
           <div class="courseTitle">
-            <div style="max-width: 295px">
+            <div style="max-width: 285px">
               <div class="ctitle">{{ courseDetail.title }}</div>
               <div class="ctitle">{{ courseDetail.title }}</div>
             </div>
             </div>
             <el-tooltip effect="light" content="收缩" placement="top">
             <el-tooltip effect="light" content="收缩" placement="top">
@@ -380,7 +380,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -396,7 +396,7 @@
                             >
                             >
                               {{ vitem.name }}.doc
                               {{ vitem.name }}.doc
                             </div>
                             </div>
-                            <div
+                            <!-- <div
                               class="downIcon"
                               class="downIcon"
                               @click="downloadFile(vitem.url)"
                               @click="downloadFile(vitem.url)"
                             >
                             >
@@ -404,7 +404,7 @@
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
                                 alt
                                 alt
                               />
                               />
-                            </div>
+                            </div> -->
                           </div>
                           </div>
                           <div class="navListItem" v-if="vitem.type == 8">
                           <div class="navListItem" v-if="vitem.type == 8">
                             <div
                             <div
@@ -414,7 +414,7 @@
                             >
                             >
                               {{ vitem.title ? vitem.title : vitem.url }}
                               {{ vitem.title ? vitem.title : vitem.url }}
                             </div>
                             </div>
-                            <div
+                            <!-- <div
                               class="downIcon"
                               class="downIcon"
                               @click="downloadFile(vitem.url)"
                               @click="downloadFile(vitem.url)"
                             >
                             >
@@ -422,7 +422,7 @@
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
                                 alt
                                 alt
                               />
                               />
-                            </div>
+                            </div> -->
                           </div>
                           </div>
                           <div class="navListItem" v-if="vitem.type == 3">
                           <div class="navListItem" v-if="vitem.type == 3">
                             <div
                             <div
@@ -435,7 +435,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -450,7 +450,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -468,7 +468,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -488,7 +488,7 @@
                             :key="vindex + '1'"
                             :key="vindex + '1'"
                           >
                           >
                             <div class="navListItem" v-if="vitem.type == 12">
                             <div class="navListItem" v-if="vitem.type == 12">
-                              <div class="navText">
+                              <div class="navText" style="color:#ACB4BF">
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                                 >{{ vitem.name }}
                               </div>
                               </div>
@@ -572,7 +572,7 @@
                 "
                 "
               >
               >
                 <div
                 <div
-                  style="padding: 15px 0; line-height: 29px; font-size: 18px"
+                  style="padding: 20px 0px 15px 0; line-height: 29px; font-size: 18px"
                   class="cont"
                   class="cont"
                   v-if="
                   v-if="
                     chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
                     chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
@@ -17943,7 +17943,7 @@ export default {
 }
 }
 
 
 .study_top {
 .study_top {
-  margin-top: 80px;
+  margin-top: 100px;
   width: 100%;
   width: 100%;
   /* overflow: auto; */
   /* overflow: auto; */
   height: auto;
   height: auto;
@@ -20186,7 +20186,7 @@ export default {
   cursor: pointer;
   cursor: pointer;
   z-index: 999;
   z-index: 999;
   right: 0;
   right: 0;
-  top: 83px;
+  top: 110px;
   width: 50px;
   width: 50px;
   height: 50px;
   height: 50px;
   background: #fff;
   background: #fff;
@@ -20213,7 +20213,7 @@ export default {
   z-index: 999; */
   z-index: 999; */
   position: fixed;
   position: fixed;
   right: 0;
   right: 0;
-  top: 70px;
+  top: 101px;
   width: 340px;
   width: 340px;
   height: calc(100% - 80px);
   height: calc(100% - 80px);
   z-index: 999;
   z-index: 999;
@@ -20344,7 +20344,7 @@ export default {
 
 
 .pzListBox {
 .pzListBox {
   padding-top: 15px;
   padding-top: 15px;
-  height: calc(100% - 100px);
+  height: calc(100% - 110px);
   overflow: auto;
   overflow: auto;
 }
 }
 
 
@@ -21402,24 +21402,6 @@ ol {
   cursor: pointer;
   cursor: pointer;
 }
 }
 
 
-.stageItemTitle {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  align-items: center;
-  margin-left: 6px;
-}
-.stageItemTitle > div:first-child {
-  color: #0e1e33;
-  font-size: 16px;
-  font-weight: bold;
-}
-.stageItemTitle > div:last-child {
-  margin-left: 10px;
-  font-size: 14px;
-  font-weight: 400;
-  color: #acb4bf;
-}
 .closeTri {
 .closeTri {
   width: 20px;
   width: 20px;
   height: 20px;
   height: 20px;

+ 7 - 7
src/components/easy3/studyStudent.vue

@@ -369,7 +369,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -387,7 +387,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -405,7 +405,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -424,7 +424,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -439,7 +439,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -457,7 +457,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img
                               <img
                                 src="../../assets/icon/newIcon/down.png"
                                 src="../../assets/icon/newIcon/down.png"
@@ -474,7 +474,7 @@
                             :key="vindex + '1'"
                             :key="vindex + '1'"
                           >
                           >
                             <div class="navListItem" v-if="vitem.type == 12">
                             <div class="navListItem" v-if="vitem.type == 12">
-                              <div class="navText">
+                              <div class="navText" style="color:#ACB4BF">
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                                 >{{ vitem.name }}
                               </div>
                               </div>

+ 154 - 160
src/components/studyStudent.vue

@@ -2,7 +2,13 @@
   <div class="pb_content" style="overflow: unset">
   <div class="pb_content" style="overflow: unset">
     <div
     <div
       class="pb_content_body"
       class="pb_content_body"
-      style="display: flex; height: 900px; position: relative;padding: 20px 0 20px 20px;box-sizing: border-box;"
+      style="
+        display: flex;
+        height: 900px;
+        position: relative;
+        padding: 20px 0 20px 20px;
+        box-sizing: border-box;
+      "
     >
     >
       <div
       <div
         class="pButton"
         class="pButton"
@@ -19,14 +25,10 @@
       <div class="pb_left" v-else-if="!(IsFollow && tType == 2)">
       <div class="pb_left" v-else-if="!(IsFollow && tType == 2)">
         <!-- <div class="courseTitle">{{ courseDetail.title }}</div> -->
         <!-- <div class="courseTitle">{{ courseDetail.title }}</div> -->
         <div
         <div
-          style="
-            border-bottom: 1px solid #cad1dc;
-            padding: 13px 0;
-            width: 100%;
-          "
+          style="border-bottom: 1px solid #cad1dc; padding: 13px 0; width: 100%"
         >
         >
           <div class="courseTitle">
           <div class="courseTitle">
-            <div style="max-width: 295px">
+            <div style="max-width: 285px">
               <div class="ctitle">{{ courseDetail.title }}</div>
               <div class="ctitle">{{ courseDetail.title }}</div>
             </div>
             </div>
             <el-tooltip effect="light" content="收缩" placement="top">
             <el-tooltip effect="light" content="收缩" placement="top">
@@ -102,6 +104,9 @@
                       </div>
                       </div>
                     </el-tooltip>
                     </el-tooltip>
                   </div>
                   </div>
+                  <div class="lockTaskIcon">
+                    <img src="../assets/lock.png" v-if="IsLookOpen && !nav.isLook" alt="" />
+                  </div>
                 </div>
                 </div>
               </div>
               </div>
             </div>
             </div>
@@ -118,8 +123,8 @@
             width: 77%;
             width: 77%;
             z-index: 999;
             z-index: 999;
             border-radius: 12px 12px 0 0;
             border-radius: 12px 12px 0 0;
-            border-bottom: 1px solid #CAD1DC;
-    padding: 10px 0;
+            border-bottom: 1px solid #cad1dc;
+            padding: 10px 0;
           "
           "
           :class="{ navLeftCss: !mlDialog }"
           :class="{ navLeftCss: !mlDialog }"
         >
         >
@@ -232,10 +237,8 @@
           <div
           <div
             class="vedioBox"
             class="vedioBox"
             v-if="
             v-if="
-              vChapterData[taskCount].length > 0 ||
-              fileC[taskCount].length > 0
+              vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
             "
             "
-            style="padding-top: 40px"
           >
           >
             <div
             <div
               class="student_head"
               class="student_head"
@@ -413,7 +416,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img src="../assets/icon/newIcon/down.png" alt />
                               <img src="../assets/icon/newIcon/down.png" alt />
                             </div>
                             </div>
@@ -427,12 +430,12 @@
                             >
                             >
                               {{ vitem.name }}.doc
                               {{ vitem.name }}.doc
                             </div>
                             </div>
-                            <div
+                            <!-- <div
                               class="downIcon"
                               class="downIcon"
                               @click="downloadFile(vitem.url)"
                               @click="downloadFile(vitem.url)"
                             >
                             >
                               <img src="../assets/icon/newIcon/down.png" alt />
                               <img src="../assets/icon/newIcon/down.png" alt />
-                            </div>
+                            </div> -->
                           </div>
                           </div>
                           <div class="navListItem" v-if="vitem.type == 8">
                           <div class="navListItem" v-if="vitem.type == 8">
                             <div
                             <div
@@ -442,12 +445,12 @@
                             >
                             >
                               {{ vitem.title ? vitem.title : vitem.url }}
                               {{ vitem.title ? vitem.title : vitem.url }}
                             </div>
                             </div>
-                            <div
+                            <!-- <div
                               class="downIcon"
                               class="downIcon"
                               @click="downloadFile(vitem.url)"
                               @click="downloadFile(vitem.url)"
                             >
                             >
                               <img src="../assets/icon/newIcon/down.png" alt />
                               <img src="../assets/icon/newIcon/down.png" alt />
-                            </div>
+                            </div> -->
                           </div>
                           </div>
                           <div class="navListItem" v-if="vitem.type == 3">
                           <div class="navListItem" v-if="vitem.type == 3">
                             <div
                             <div
@@ -460,7 +463,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img src="../assets/icon/newIcon/down.png" alt />
                               <img src="../assets/icon/newIcon/down.png" alt />
                             </div>
                             </div>
@@ -472,7 +475,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img src="../assets/icon/newIcon/down.png" alt />
                               <img src="../assets/icon/newIcon/down.png" alt />
                             </div>
                             </div>
@@ -487,7 +490,7 @@
                             </div>
                             </div>
                             <div
                             <div
                               class="downIcon"
                               class="downIcon"
-                              @click="downloadFile(vitem.url)"
+                              @click="downloadFile2(vitem)"
                             >
                             >
                               <img src="../assets/icon/newIcon/down.png" alt />
                               <img src="../assets/icon/newIcon/down.png" alt />
                             </div>
                             </div>
@@ -504,7 +507,7 @@
                             :key="vindex + '1'"
                             :key="vindex + '1'"
                           >
                           >
                             <div class="navListItem" v-if="vitem.type == 12">
                             <div class="navListItem" v-if="vitem.type == 12">
-                              <div class="navText">
+                              <div class="navText" style="color:#ACB4BF">
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 <span v-if="vitem.text">{{ vitem.text }}-</span
                                 >{{ vitem.name }}
                                 >{{ vitem.name }}
                               </div>
                               </div>
@@ -583,11 +586,13 @@
                   .toolChoose[0].tool.length > 0
                   .toolChoose[0].tool.length > 0
               "
               "
             >
             >
-              <div class="taskBox" v-if="
-                      chapInfoList[courseType].chapterInfo[0].taskJson[
-                        taskCount
-                      ].taskDetail != ''
-                    ">
+              <div
+                class="taskBox"
+                v-if="
+                  chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                    .taskDetail != ''
+                "
+              >
                 <div
                 <div
                   style="
                   style="
                     display: flex;
                     display: flex;
@@ -701,10 +706,9 @@
                             v-if="checktoolArray.indexOf(10) == -1"
                             v-if="checktoolArray.indexOf(10) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -725,10 +729,9 @@
                             v-if="checktoolArray.indexOf(7) == -1"
                             v-if="checktoolArray.indexOf(7) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -747,10 +750,9 @@
                             v-if="checktoolArray.indexOf(1) == -1"
                             v-if="checktoolArray.indexOf(1) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -769,10 +771,9 @@
                             v-if="checktoolArray.indexOf(52) == -1"
                             v-if="checktoolArray.indexOf(52) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -791,10 +792,9 @@
                             v-if="checktoolArray.indexOf(3) == -1"
                             v-if="checktoolArray.indexOf(3) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -813,10 +813,9 @@
                             v-if="checktoolArray.indexOf(48) == -1"
                             v-if="checktoolArray.indexOf(48) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -847,10 +846,9 @@
                             v-if="checktoolArray.indexOf(16) == -1"
                             v-if="checktoolArray.indexOf(16) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -869,10 +867,9 @@
                             v-if="checktoolArray.indexOf(50) == -1"
                             v-if="checktoolArray.indexOf(50) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -893,10 +890,9 @@
                             v-if="checktoolArray.indexOf(18) == -1"
                             v-if="checktoolArray.indexOf(18) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -915,10 +911,9 @@
                             v-if="checktoolArray.indexOf(21) == -1"
                             v-if="checktoolArray.indexOf(21) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -937,10 +932,9 @@
                             v-if="checktoolArray.indexOf(22) == -1"
                             v-if="checktoolArray.indexOf(22) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -959,10 +953,9 @@
                             v-if="checktoolArray.indexOf(23) == -1"
                             v-if="checktoolArray.indexOf(23) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -981,10 +974,9 @@
                             v-if="checktoolArray.indexOf(24) == -1"
                             v-if="checktoolArray.indexOf(24) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1003,10 +995,9 @@
                             v-if="checktoolArray.indexOf(32) == -1"
                             v-if="checktoolArray.indexOf(32) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1025,10 +1016,9 @@
                             v-if="checktoolArray.indexOf(57) == -1"
                             v-if="checktoolArray.indexOf(57) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1047,10 +1037,9 @@
                             v-if="checktoolArray.indexOf(63) == -1"
                             v-if="checktoolArray.indexOf(63) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1071,10 +1060,9 @@
                             v-if="checktoolArray.indexOf(40) == -1"
                             v-if="checktoolArray.indexOf(40) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1095,10 +1083,9 @@
                             v-if="checktoolArray.indexOf(28) == -1"
                             v-if="checktoolArray.indexOf(28) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1117,10 +1104,9 @@
                             v-if="checktoolArray.indexOf(37) == -1"
                             v-if="checktoolArray.indexOf(37) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1139,10 +1125,9 @@
                             v-if="checktoolArray.indexOf(38) == -1"
                             v-if="checktoolArray.indexOf(38) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1161,10 +1146,9 @@
                             v-if="checktoolArray.indexOf(31) == -1"
                             v-if="checktoolArray.indexOf(31) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1183,10 +1167,9 @@
                             v-if="checktoolArray.indexOf(39) == -1"
                             v-if="checktoolArray.indexOf(39) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1205,10 +1188,9 @@
                             v-if="checktoolArray.indexOf(58) == -1"
                             v-if="checktoolArray.indexOf(58) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1227,10 +1209,9 @@
                             v-if="checktoolArray.indexOf(59) == -1"
                             v-if="checktoolArray.indexOf(59) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1249,10 +1230,9 @@
                             v-if="checktoolArray.indexOf(60) == -1"
                             v-if="checktoolArray.indexOf(60) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1271,10 +1251,9 @@
                             v-if="checktoolArray.indexOf(61) == -1"
                             v-if="checktoolArray.indexOf(61) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1295,10 +1274,9 @@
                             v-if="checktoolArray.indexOf(26) == -1"
                             v-if="checktoolArray.indexOf(26) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -1317,10 +1295,9 @@
                             v-if="checktoolArray.indexOf(25) == -1"
                             v-if="checktoolArray.indexOf(25) == -1"
                           />
                           />
                           <div class="checkDiv" v-else>
                           <div class="checkDiv" v-else>
-                            <img
-                              src="../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
+                            <img src="../assets/icon/checkedIs.png" alt /><span
+                              >已选择</span
+                            >
                           </div>
                           </div>
                         </div>
                         </div>
                       </div>
                       </div>
@@ -16142,13 +16119,6 @@ export default {
       // _this.$message.success("文件下载中...");
       // _this.$message.success("文件下载中...");
       x.onload = function (e) {
       x.onload = function (e) {
         loading.close();
         loading.close();
-        // const url = window.URL.createObjectURL(x.response);
-        // const a = document.createElement("a");
-        // a.href = url;
-        // a.target = "_blank";
-        // a.download = url;
-        // a.click();
-        // a.remove();
         let content = x.response;
         let content = x.response;
         let elink = document.createElement("a");
         let elink = document.createElement("a");
         elink.download = decodeURI(
         elink.download = decodeURI(
@@ -16793,6 +16763,9 @@ export default {
   /* .textTitle >>> .el-form-item__label {
   /* .textTitle >>> .el-form-item__label {
     width: 150px !important;
     width: 150px !important;
   } */
   } */
+  /* .stageItemTitle > div:last-child{
+    max-width: 50px;
+  } */
 }
 }
 
 
 .evaCssMax {
 .evaCssMax {
@@ -16830,7 +16803,7 @@ export default {
   position: fixed;
   position: fixed;
   height: calc(100% - 40px);
   height: calc(100% - 40px);
   border-radius: 20px;
   border-radius: 20px;
-    padding-bottom: 15px;
+  padding-bottom: 15px;
   box-sizing: border-box;
   box-sizing: border-box;
 }
 }
 
 
@@ -16945,7 +16918,7 @@ export default {
 }
 }
 
 
 .study_top {
 .study_top {
-  margin-top: 80px;
+  margin-top: 100px;
   width: 100%;
   width: 100%;
   height: auto;
   height: auto;
   padding-bottom: 20px;
   padding-bottom: 20px;
@@ -17503,14 +17476,14 @@ export default {
   position: relative;
   position: relative;
 }
 }
 
 
-.new_top::before{
-  content: '';
+.new_top::before {
+  content: "";
   width: 100%;
   width: 100%;
-    height: 20px;
-    position: absolute;
-    top: -20px;
-    display: block;
-    background: #f2f2f2;
+  height: 20px;
+  position: absolute;
+  top: -20px;
+  display: block;
+  background: #f2f2f2;
 }
 }
 
 
 .before {
 .before {
@@ -17578,7 +17551,7 @@ export default {
   height: 445px;
   height: 445px;
   border-radius: 10px;
   border-radius: 10px;
   overflow: hidden;
   overflow: hidden;
-  box-shadow: 0px 0px 12px 1px rgba(0,0,0,0.16);
+  box-shadow: 0px 0px 12px 1px rgba(0, 0, 0, 0.16);
 }
 }
 
 
 .vedioNav {
 .vedioNav {
@@ -17876,7 +17849,7 @@ export default {
 .toolHeng2 {
 .toolHeng2 {
   width: 100%;
   width: 100%;
   padding-left: 37px;
   padding-left: 37px;
-  box-sizing:border-box;
+  box-sizing: border-box;
 }
 }
 
 
 .workNav {
 .workNav {
@@ -19169,7 +19142,7 @@ export default {
   cursor: pointer;
   cursor: pointer;
   z-index: 999;
   z-index: 999;
   right: 0;
   right: 0;
-  top: 83px;
+  top: 110px;
   width: 50px;
   width: 50px;
   height: 50px;
   height: 50px;
   background: #fff;
   background: #fff;
@@ -19196,7 +19169,7 @@ export default {
   z-index: 999; */
   z-index: 999; */
   position: fixed;
   position: fixed;
   right: 0;
   right: 0;
-  top: 70px;
+  top: 101px;
   width: 340px;
   width: 340px;
   height: calc(100% - 80px);
   height: calc(100% - 80px);
   z-index: 999;
   z-index: 999;
@@ -19327,7 +19300,7 @@ export default {
 
 
 .pzListBox {
 .pzListBox {
   padding-top: 15px;
   padding-top: 15px;
-  height: calc(100% - 60px);
+  height: calc(100% - 110px);
   overflow: auto;
   overflow: auto;
 }
 }
 
 
@@ -20298,6 +20271,7 @@ ol {
   height: 50px;
   height: 50px;
   border-bottom: 1px solid #e2f5fc;
   border-bottom: 1px solid #e2f5fc;
   cursor: pointer;
   cursor: pointer;
+  width: 100%;
 }
 }
 
 
 .stageItemTitle {
 .stageItemTitle {
@@ -20306,20 +20280,28 @@ ol {
   flex-wrap: nowrap;
   flex-wrap: nowrap;
   align-items: center;
   align-items: center;
   margin-left: 6px;
   margin-left: 6px;
+  width: calc(100% - 60px);
 }
 }
 .stageItemTitle > div:first-child {
 .stageItemTitle > div:first-child {
   color: #0e1e33;
   color: #0e1e33;
   font-size: 16px;
   font-size: 16px;
   font-weight: bold;
   font-weight: bold;
+  min-width: 41px;
 }
 }
 .stageItemTitle > div:last-child {
 .stageItemTitle > div:last-child {
   margin-left: 10px;
   margin-left: 10px;
   font-size: 14px;
   font-size: 14px;
   font-weight: 400;
   font-weight: 400;
   color: #acb4bf;
   color: #acb4bf;
+  max-width: 190px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  word-break: break-word;
+  width: calc(100% - 40px);
 }
 }
 .closeTri {
 .closeTri {
-  width: 20px;
+  min-width: 20px;
   height: 20px;
   height: 20px;
   padding-left: 15px;
   padding-left: 15px;
 }
 }
@@ -20340,6 +20322,7 @@ ol {
   border-radius: 4px;
   border-radius: 4px;
   width: 90%;
   width: 90%;
   margin: 16px auto 0;
   margin: 16px auto 0;
+  position: relative;
 }
 }
 .navItemList {
 .navItemList {
   display: flex;
   display: flex;
@@ -20448,4 +20431,15 @@ ol {
   width: 20px;
   width: 20px;
   height: 20px;
   height: 20px;
 }
 }
+.lockTaskIcon{
+    width: 25px;
+    height: 25px;
+    position: absolute;
+    right: 0;
+    top: 23px;
+}
+.lockTaskIcon>img{
+  width: 100%;
+  height: 100%;
+}
 </style>
 </style>

Some files were not shown because too many files changed in this diff