Kezdőlap Felfedezés Súgó
Bejelentkezés
CocoRoboLabs
/
pbl-teacher-table
3
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

update

lsc 1 éve
szülő
7aedd6a7ae
commit
58077857b4
17 módosított fájl, 517 hozzáadás és 132 törlés
Egyesített Nézet Diff Statisztika Mutatása
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css
  3. 0 0
      dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css.map
  4. 0 0
      dist/static/css/app.f52bf5753c3a98390e06c8465b34c311.css
  5. 0 0
      dist/static/css/app.f52bf5753c3a98390e06c8465b34c311.css.map
  6. 0 0
      dist/static/js/app.99652a1fa67b1c8516e9.js
  7. 0 0
      dist/static/js/app.99652a1fa67b1c8516e9.js.map
  8. 0 0
      dist/static/js/app.db7bd40f6a6974b97747.js
  9. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  10. BIN
      src/assets/icon/new/icon_arrow.png
  11. BIN
      src/assets/icon/new/icon_arrow_a.png
  12. 1 1
      src/components/pages/CaseDesign.vue
  13. 196 37
      src/components/pages/addCourse.vue
  14. 96 26
      src/components/pages/easy/addCourse.vue
  15. 143 52
      src/components/pages/task/addCourse.vue
  16. 50 13
      src/components/tools/jsmind.vue
  17. 30 2
      src/components/tools/jsmind2.vue

+ 1 - 1
dist/index.html
Fájl Megtekintése 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.f52bf5753c3a98390e06c8465b34c311.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.db7bd40f6a6974b97747.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.1b8e037bd3fbbd358d74.js></script><script type=text/javascript src=./static/js/app.99652a1fa67b1c8516e9.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/css/app.9ad19b6c9fe98c316007abd8a1993e3e.css.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/css/app.f52bf5753c3a98390e06c8465b34c311.css


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/css/app.f52bf5753c3a98390e06c8465b34c311.css.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/js/app.99652a1fa67b1c8516e9.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/js/app.99652a1fa67b1c8516e9.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/js/app.db7bd40f6a6974b97747.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


BIN
src/assets/icon/new/icon_arrow.png
Fájl Megtekintése


BIN
src/assets/icon/new/icon_arrow_a.png
Fájl Megtekintése


+ 1 - 1
src/components/pages/CaseDesign.vue
Fájl Megtekintése 

@@ -345,7 +345,7 @@ export default {
 
                     let toolC2 = 0;
 
                     let toolC2 = 0;
 
                     let evalC2 = 0;
 
                     let evalC2 = 0;
 
                     let fontC2 = 0;
 
                     let fontC2 = 0;
 
-                    fontC2 += _chapter[k].dyName.length;
 
+                    fontC2 += _chapter[k].dyName ? _chapter[k].dyName.length : 0;
 
                     taskC2 = _chapter[k].chapterInfo[0].taskJson.length;
 
                     taskC2 = _chapter[k].chapterInfo[0].taskJson.length;
 
                     let _tasks = _chapter[k].chapterInfo[0].taskJson;
 
                     let _tasks = _chapter[k].chapterInfo[0].taskJson;
 
                     for (var task = 0; task < _tasks.length; task++) {
 
                     for (var task = 0; task < _tasks.length; task++) {

+ 196 - 37
src/components/pages/addCourse.vue
Fájl Megtekintése 

@@ -477,7 +477,7 @@
 
                 <div class="stepsBottom">
 
                 <div class="stepsBottom">
 
                   <!-- <div class="navTop">辅助导航</div> -->
 
                   <!-- <div class="navTop">辅助导航</div> -->
 
                   <div class="navBottom">
 
                   <div class="navBottom">
 
-                    <div class="navTask" v-if="unitJson[unitIndex].dyName">
 
+                    <div class="navTask noImage" v-if="unitJson[unitIndex].dyName">
 
                       <div class="nt_taskBox" style="width: 100%;">
 
                       <div class="nt_taskBox" style="width: 100%;">
 
                         <div class="nt_taskTitle"
 
                         <div class="nt_taskTitle"
 
                           style="font-size: 16px;min-width: fit-content;margin-right: 10px;font-weight: 700;">阶段 {{
 
                           style="font-size: 16px;min-width: fit-content;margin-right: 10px;font-weight: 700;">阶段 {{
 
@@ -489,26 +489,42 @@
 
                         </div>
 
                         </div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
-                    <div class="navTask" :class="{
 
-                      isNavTask: isClickColor > 0 && isClickColor == tIndex + 1,
 
-                    }" v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
-  .taskJson" :key="tIndex" @click="goToTask(tIndex)">
 
-                      <div class="nt_taskBox">
 
-                        <div class="nt_taskTitle">任务{{ tIndex + 1 }}</div>
 
-                        <div class="nt_taskName">
 
-                          <el-tooltip effect="light" :content="t.task" placement="top">
 
-                            <span>{{ t.task }}</span>
 
-                          </el-tooltip>
 
+                    <div  v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
+  .taskJson" :key="tIndex">
 
+                        <div  @click="goToTask(tIndex)" class="navTask" :class="{
 
+                        isNavTask:
 
+                          isClickColor > 0 && isClickColor == tIndex + 1,
 
+                          isNavOpen:t.toolOpen
 
+                      }">
 
+                        <div class="nt_taskBox">
 
+                          <div class="nt_taskTitle">任务{{ tIndex + 1 }}</div>
 
+                          <div class="nt_taskName">
 
+                            <el-tooltip effect="light" :content="t.task" placement="top">
 
+                              <span>{{ t.task }}</span>
 
+                            </el-tooltip>
 
+                          </div>
 
+                        </div>
 
+                        <div class="moveBtn" v-if="unitJson[unitIndex].chapterInfo[0].taskJson.length >
 
+                          1
 
+                          ">
 
+                          <div class="chapter_upload_up" style="margin: 0 5px 0 0;width: 25px;height: 25px;"
 
+                            @click.stop="taskMove(1, tIndex)"></div>
 
+                          <div class="chapter_upload_down" style="width: 25px;height: 25px;"
 
+                            @click.stop="taskMove(2, tIndex)"></div>
 
                         </div>
 
                         </div>
 
                       </div>
 
                       </div>
 
-                      <div class="moveBtn" v-if="unitJson[unitIndex].chapterInfo[0].taskJson.length > 1">
 
-                        <div class="chapter_upload_up" style="margin: 0 5px 0 0;width: 25px;height: 25px;"
 
-                          @click.stop="taskMove(1, tIndex)">
 
+                      <div class="gjBox" v-if="t.toolChoose.length && t.toolOpen">
 
+                          <div v-for="(tool, toolIndex2) in t.toolChoose" :key="toolIndex2" @click="jumpGj(tIndex,toolIndex2)">
 
+                            <div
 
+                              class="gjCss"
 
+                              :class="{isGjCss: toolIndexType == `gj${tIndex}${toolIndex2}`}"
 
+                            >
 
+                              <div>工具{{ toolIndex2 + 1 }}:</div>
 
+                              <div>{{ toolsData[tool.tool[0]] && toolsData[tool.tool[0]].name }}</div>
 
+                            </div>
 
+                          </div>
 
                         </div>
 
                         </div>
 
-                        <div class="chapter_upload_down" style="width: 25px;height: 25px;"
 
-                          @click.stop="taskMove(2, tIndex)"></div>
 
                       </div>
 
                       </div>
 
-                    </div>
 
                   </div>
 
                   </div>
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
@@ -1205,7 +1221,7 @@
 
                             justify-content: flex-start;
 
                             justify-content: flex-start;
 
                             position: relative;
 
                             position: relative;
 
                           ">
 
                           ">
 
-                                <div style="margin-right: 20px; font-weight: bold">
 
+                                <div style="margin-right: 20px; font-weight: bold" :id="'gj'+itemTaskIndex + '' + toolIndex">
 
                                   步骤 {{ toolIndex + 1 }} ：
 
                                   步骤 {{ toolIndex + 1 }} ：
 
                                 </div>
 
                                 </div>
 
                                 <div class="chooseWho">
 
                                 <div class="chooseWho">
 
@@ -2022,7 +2038,7 @@
 
                             justify-content: flex-start;
 
                             justify-content: flex-start;
 
                             position: relative;
 
                             position: relative;
 
                           ">
 
                           ">
 
-                                <div style="margin-right: 20px; font-weight: bold">
 
+                                <div style="margin-right: 20px; font-weight: bold" :id="'gj'+itemTaskIndex + '' + toolIndex">
 
                                   步骤 {{ toolIndex + 1 }} ：
 
                                   步骤 {{ toolIndex + 1 }} ：
 
                                 </div>
 
                                 </div>
 
                                 <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
                                 <div class="remove" @click="deleteTool(itemTaskIndex, toolIndex)"
 
@@ -3490,6 +3506,7 @@
 
 
 
 <script>
 
 <script>
 
 import "../../common/aws-sdk-2.235.1.min.js";
 
 import "../../common/aws-sdk-2.235.1.min.js";
 
+import { tools as toolsData } from "../../common/tools.js";
 
 // import "../../common/aws-sdk-2.99.0.min.js";
 
 // import "../../common/aws-sdk-2.99.0.min.js";
 
 import $ from "jquery";
 
 import $ from "jquery";
 
 import EditorBar from "../../components/tools/wangEnduit";
 
 import EditorBar from "../../components/tools/wangEnduit";
 
@@ -3577,6 +3594,7 @@ export default {
 
       dialogVisibleStageChange: false,
 
       dialogVisibleStageChange: false,
 
       dialogVisibleupdataVideoT: false,
 
       dialogVisibleupdataVideoT: false,
 
       isClickColor: 1,
 
       isClickColor: 1,
 
+      toolIndexType:"",
 
       publicTool: 0,
 
       publicTool: 0,
 
       searchPeople: "",
 
       searchPeople: "",
 
       searchTN: "",
 
       searchTN: "",
 
@@ -3734,6 +3752,7 @@ export default {
 
       imageloading: false,
 
       imageloading: false,
 
       searchImageValue: "",
 
       searchImageValue: "",
 
       ppage: 1,
 
       ppage: 1,
 
+      toolsData: toolsData,
 
     };
 
     };
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -4242,6 +4261,9 @@ export default {
 
           if (this.steps == 1) {
 
           if (this.steps == 1) {
 
             setTimeout(() => {
 
             setTimeout(() => {
 
               this.checkEva(this.checkId);
 
               this.checkEva(this.checkId);
 
+              setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
             }, 100);
 
             }, 100);
 
           }
 
           }
 
         } else {
 
         } else {
 
@@ -4249,6 +4271,9 @@ export default {
 
             this.steps = 1;
 
             this.steps = 1;
 
             setTimeout(() => {
 
             setTimeout(() => {
 
               this.checkEva(this.checkId);
 
               this.checkEva(this.checkId);
 
+              setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
             }, 100);
 
             }, 100);
 
           }
 
           }
 
         }
 
         }
 
@@ -4275,6 +4300,9 @@ export default {
 
           this.steps = 1;
 
           this.steps = 1;
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 100);
 
           }, 100);
 
         }
 
         }
 
         if (s == 2) {
 
         if (s == 2) {
 
@@ -4284,8 +4312,14 @@ export default {
 
           this.cTemplate = this.templateC.content;
 
           this.cTemplate = this.templateC.content;
 
           this.dialogVisible2 = false;
 
           this.dialogVisible2 = false;
 
           this.steps = 3;
 
           this.steps = 3;
 
+          this.isClickColor = 1
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
+          this.$forceUpdate();
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 1000);
 
           }, 1000);
 
         }
 
         }
 
       } else {
 
       } else {
 
@@ -4304,14 +4338,23 @@ export default {
 
           this.steps = 1;
 
           this.steps = 1;
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 100);
 
           }, 100);
 
         }
 
         }
 
         if (s == 3) {
 
         if (s == 3) {
 
           this.cTemplate = this.templateC.content;
 
           this.cTemplate = this.templateC.content;
 
           this.dialogVisible2 = false;
 
           this.dialogVisible2 = false;
 
           this.steps = 3;
 
           this.steps = 3;
 
+          this.isClickColor = 1
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
+          this.$forceUpdate();
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 1000);
 
           }, 1000);
 
         }
 
         }
 
       }
 
       }
 
@@ -4322,8 +4365,14 @@ export default {
 
         if (this.steps == 1) {
 
         if (this.steps == 1) {
 
           if (this.courseName != "") {
 
           if (this.courseName != "") {
 
             this.steps = 3;
 
             this.steps = 3;
 
+          this.isClickColor = 1
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
+            this.$forceUpdate();
 
             setTimeout(() => {
 
             setTimeout(() => {
 
               this.checkEva(this.checkId);
 
               this.checkEva(this.checkId);
 
+              setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
             }, 1000);
 
             }, 1000);
 
             if (this.cid == "" || this.cid == undefined) {
 
             if (this.cid == "" || this.cid == undefined) {
 
               this.addWork();
 
               this.addWork();
 
@@ -4386,6 +4435,9 @@ export default {
 
           this.steps++;
 
           this.steps++;
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 1000);
 
           }, 1000);
 
         } else if (this.steps == 3) {
 
         } else if (this.steps == 3) {
 
           if (this.cid == "" || this.cid == undefined) {
 
           if (this.cid == "" || this.cid == undefined) {
 
@@ -5508,6 +5560,9 @@ export default {
 
 
 
       setTimeout(() => {
 
       setTimeout(() => {
 
         this.checkEva(this.checkId);
 
         this.checkEva(this.checkId);
 
+        setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
       }, 100);
 
       }, 100);
 
     },
 
     },
 
     add(e, i) {
 
     add(e, i) {
 
@@ -6109,6 +6164,9 @@ export default {
 
           _this.steps++;
 
           _this.steps++;
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 1000);
 
           }, 1000);
 
         })
 
         })
 
         .catch(() => {
 
         .catch(() => {
 
@@ -6177,6 +6235,9 @@ export default {
 
           this.steps++;
 
           this.steps++;
 
           setTimeout(() => {
 
           setTimeout(() => {
 
             this.checkEva(this.checkId);
 
             this.checkEva(this.checkId);
 
+            setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
           }, 1000);
 
           }, 1000);
 
           this.updateWork();
 
           this.updateWork();
 
         })
 
         })
 
@@ -7659,11 +7720,15 @@ export default {
 
             this.seleteCourseUpdate();
 
             this.seleteCourseUpdate();
 
             this.setMan();
 
             this.setMan();
 
             this.selectAllType();
 
             this.selectAllType();
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
             // }, 5000);
 
             // }, 5000);
 
             this.$forceUpdate();
 
             this.$forceUpdate();
 
             setTimeout(() => {
 
             setTimeout(() => {
 
               this.checkEva(this.evalua);
 
               this.checkEva(this.evalua);
 
-            }, 0);
 
+              setTimeout(() => {
 
+                this.checkEva(this.evalua);
 
+              }, 100);
 
+            }, 100);
 
           })
 
           })
 
           .catch((err) => {
 
           .catch((err) => {
 
             console.error(err);
 
             console.error(err);
 
@@ -8088,6 +8153,9 @@ export default {
 
       this.typeMode = type;
 
       this.typeMode = type;
 
       setTimeout(() => {
 
       setTimeout(() => {
 
         this.checkEva(this.checkId);
 
         this.checkEva(this.checkId);
 
+        setTimeout(() => {
 
+                this.checkEva(this.checkId);
 
+              }, 100);
 
       }, 100);
 
       }, 100);
 
     },
 
     },
 
     openMember() {
 
     openMember() {
 
@@ -8114,7 +8182,7 @@ export default {
 
         this.$forceUpdate();
 
         this.$forceUpdate();
 
         setTimeout(() => {
 
         setTimeout(() => {
 
           this.setMindData();
 
           this.setMindData();
 
-        }, 500);
 
+        }, 1000);
 
       }
 
       }
 
     },
 
     },
 
     deleteEva() {
 
     deleteEva() {
 
@@ -8442,9 +8510,27 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     goToTask(i) {
 
     goToTask(i) {
 
-      document.querySelector(".rb_c_box_right > .basic_box").scrollTop =
 
-        document.getElementsByClassName("taskBorder")[i].offsetTop - 100;
 
+      this.toolIndexType = ''
 
+      if(this.isClickColor == (i + 1)){
 
+        if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
+        }else{
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
+        }
 
+        this.$forceUpdate();
 
+        return;
 
+      }
 
+      
+      if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
+      }else{
 
+        $(".rightBox")[0].scrollTop =
 
+        $(".taskBorder")[i + 1].offsetTop +
 
+        $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
       this.isClickColor = i + 1;
 
       this.isClickColor = i + 1;
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
+      }
 
+      this.$forceUpdate();
 
     },
 
     },
 
     taskMove(type, index) {
 
     taskMove(type, index) {
 
       this.$confirm(
 
       this.$confirm(
 
@@ -8769,7 +8855,7 @@ export default {
 
         // console.log(response.data.data);
 
         // console.log(response.data.data);
 
         var data = response.data.FunctionResponse.result;
 
         var data = response.data.FunctionResponse.result;
 
         for (var i = 0; i < data.length; i++) {
 
         for (var i = 0; i < data.length; i++) {
 
-          _this.imageList.push({ url: data[i].image })
 
+          _this.imageList.push({ url: data[i].thumbnail })
 
         }
 
         }
 
         _this.imageloading = false
 
         _this.imageloading = false
 
       }).catch(function (error) {
 
       }).catch(function (error) {
 
@@ -8784,7 +8870,21 @@ export default {
 
     resetImage() {
 
     resetImage() {
 
       this.ppage = 1
 
       this.ppage = 1
 
       this.searchImage()
 
       this.searchImage()
 
-    }
 
+    },
 
+    jumpGj(i, j) {
 
+      if((i+1) != this.isClickColor){
 
+        this.isClickColor = (i + 1)
 
+      }
 
+      var a = document.scrollingElement;
 
+      this.toolIndexType = `gj${i}${j}`
 
+      let target = document.querySelector(`#gj${i}${j}`);
 
+      if (target) {
 
+        target.scrollIntoView(true);
 
+        setTimeout(() => {
 
+          this.$refs.unitBox.scrollTop = this.$refs.unitBox.scrollTop - 100;
 
+        }, 0);
 
+      }
 
+    },
 
   },
 
   },
 
   beforeDestroy() {
 
   beforeDestroy() {
 
     clearTimeout(this.timer);
 
     clearTimeout(this.timer);
 
@@ -11925,26 +12025,49 @@ ol {
 
   cursor: pointer;
 
   cursor: pointer;
 
   background: #ffffff;
 
   background: #ffffff;
 
   width: 95%;
 
   width: 95%;
 
-  margin: 10px auto;
 
+  margin: 10px auto 0;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   border-radius: 5px;
 
   border-radius: 5px;
 
+  flex-wrap: wrap;
 
+}
 
+.navTask::before{
 
+  content: '';
 
+  display:block;
 
+  width:16px;
 
+  height:16px;
 
+  background-image: url(../../assets/icon/new/icon_arrow.png);
 
+  background-size:100%;
 
+  margin-left:10px;
 
+}
 
+.noImage::before{
 
+  display: none;
 
+  background-image: unset !important;
 
+}
 
+.isNavOpen::before{
 
+  background-image: url(../../assets/icon/new/icon_arrow_a.png) !important;
 
 }
 
 }
 
-
 
 .isNavTask {
 
 .isNavTask {
 
-  background: #3681FC;
 
+  /* background: #3681FC; */
 
+  background: #EEF3FB;
 
 }
 
 }
 
 
 
 .isNavTask .nt_taskName {
 
 .isNavTask .nt_taskName {
 
-  color: #fff !important;
 
+  /* color: #fff !important; */
 
+  font-weight: bold !important;
 
+  color: #0061FF !important;
 
 }
 
 }
 
 
 
 .isNavTask .nt_taskTitle {
 
 .isNavTask .nt_taskTitle {
 
-  color: #AECCFE !important;
 
+  /* color: #AECCFE !important; */
 
+  font-weight: bold !important;
 
+  color: #0061FF !important;
 
 }
 
 }
 
 
 
+
 
 .navTask .nt_taskBox {
 
 .navTask .nt_taskBox {
 
-  width: calc(100% - 55px);
 
-  padding: 0 10px 0 20px;
 
+  width: calc(100% - 85px);
 
+  padding: 0 10px 0 5px;
 
+  box-sizing: border-box;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   display: flex;
 
   display: flex;
 
   flex-direction: row;
 
   flex-direction: row;
 
@@ -11953,22 +12076,58 @@ ol {
 
 }
 
 }
 
 
 
 .navTask .nt_taskTitle {
 
 .navTask .nt_taskTitle {
 
-  color: #717C8D;
 
+  /* color: #717C8D; */
 
+  color: #060E17;
 
   line-height: 25px;
 
   line-height: 25px;
 
-  font-size: 14px;
 
+  font-size: 16px;
 
   min-width: 45px;
 
   min-width: 45px;
 
 }
 
 }
 
 
 
 .navTask .nt_taskName {
 
 .navTask .nt_taskName {
 
   /* color: #fff; */
 
   /* color: #fff; */
 
   /* max-width: 130px; */
 
   /* max-width: 130px; */
 
-  width: 100%;
 
-  /* max-width: calc(100% - 50px); */
 
+  /* width: 100%; */
 
+  max-width: calc(100% - 50px);
 
   white-space: nowrap;
 
   white-space: nowrap;
 
   overflow: hidden;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
   text-overflow: ellipsis;
 
+  font-size: 16px;
 
+  color: #060E17;
 
+  /* color: #0E1E33; */
 
+}
 
+
 
+.gjBox {
 
+  width: calc(100% - 25px);
 
+  padding: 0 0 0 0;
 
+  box-sizing: border-box;
 
+  border-left: 1px solid #CAD1DC;
 
+  margin-left: 25px;
 
+}
 
+.gjBox > div{
 
+  display:flex;
 
+  align-items:center;
 
+}
 
+.gjBox > div::before{
 
+  content: '';
 
+  height:1px;
 
+  width:10px;
 
+  background: #CAD1DC;
 
+  display: block;
 
+  margin-right:5px;
 
+}
 
+.gjCss {
 
+  display: flex;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: center;
 
+  padding: 15px 0;
 
+  box-sizing: border-box;
 
   font-size: 14px;
 
   font-size: 14px;
 
-  color: #0E1E33;
 
+  cursor: pointer;
 
+}
 
+
 
+.isGjCss {
 
+  color: #0061ff;
 
 }
 
 }
 
 
 
 .groupBox {}
 
 .groupBox {}

+ 96 - 26
src/components/pages/easy/addCourse.vue
Fájl Megtekintése 

@@ -163,11 +163,13 @@
 
                 <div class="course_left">
 
                 <div class="course_left">
 
                   <div class="stepsBottom2">
 
                   <div class="stepsBottom2">
 
                     <div class="navBottom" :style="{ height: heightPx }">
 
                     <div class="navBottom" :style="{ height: heightPx }">
 
-                      <div class="navTask" :class="{
 
+                      <div  v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
+  .taskJson" :key="tIndex">
 
+                        <div  @click="goToTask(tIndex)" class="navTask" :class="{
 
                         isNavTask:
 
                         isNavTask:
 
                           isClickColor > 0 && isClickColor == tIndex + 1,
 
                           isClickColor > 0 && isClickColor == tIndex + 1,
 
-                      }" v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
-  .taskJson" :key="tIndex" @click="goToTask(tIndex)">
 
+                          isNavOpen:t.toolOpen
 
+                      }">
 
                         <div class="nt_taskBox">
 
                         <div class="nt_taskBox">
 
                           <div class="nt_taskTitle">任务{{ tIndex + 1 }}</div>
 
                           <div class="nt_taskTitle">任务{{ tIndex + 1 }}</div>
 
                           <div class="nt_taskName">
 
                           <div class="nt_taskName">
 
@@ -184,16 +186,18 @@
 
                           <div class="chapter_upload_down" style="width: 25px;height: 25px;"
 
                           <div class="chapter_upload_down" style="width: 25px;height: 25px;"
 
                             @click.stop="taskMove(2, tIndex)"></div>
 
                             @click.stop="taskMove(2, tIndex)"></div>
 
                         </div>
 
                         </div>
 
-                        <!-- <div class="gjBox" v-if="t.toolChoose.length">
 
-                          <div v-for="(tool, toolIndex2) in t.toolChoose" :key="toolIndex2">
 
+                      </div>
 
+                      <div class="gjBox" v-if="t.toolChoose.length && t.toolOpen">
 
+                          <div v-for="(tool, toolIndex2) in t.toolChoose" :key="toolIndex2" @click="jumpGj(tIndex,toolIndex2)">
 
                             <div
 
                             <div
 
                               class="gjCss"
 
                               class="gjCss"
 
+                              :class="{isGjCss: toolIndexType == `gj${tIndex}${toolIndex2}`}"
 
                             >
 
                             >
 
                               <div>工具{{ toolIndex2 + 1 }}:</div>
 
                               <div>工具{{ toolIndex2 + 1 }}:</div>
 
                               <div>{{ toolsData[tool.tool[0]] && toolsData[tool.tool[0]].name }}</div>
 
                               <div>{{ toolsData[tool.tool[0]] && toolsData[tool.tool[0]].name }}</div>
 
                             </div>
 
                             </div>
 
                           </div>
 
                           </div>
 
-                        </div> -->
 
+                        </div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
                   </div>
 
                   </div>
 
@@ -506,7 +510,7 @@
 
                                 justify-content: flex-start;
 
                                 justify-content: flex-start;
 
                                 position: relative;
 
                                 position: relative;
 
                               ">
 
                               ">
 
-                              <div style="margin-right: 20px; font-weight: bold">
 
+                              <div :id="'gj'+itemTaskIndex + '' + toolIndex" style="margin-right: 20px; font-weight: bold">
 
                                 步骤 {{ toolIndex + 1 }} ：
 
                                 步骤 {{ toolIndex + 1 }} ：
 
                               </div>
 
                               </div>
 
                               <div class="chooseWho">
 
                               <div class="chooseWho">
 
@@ -4514,6 +4518,7 @@ export default {
 
       dialogVisibleVideo: false,
 
       dialogVisibleVideo: false,
 
       dialogVisibleupdataVideoT: false,
 
       dialogVisibleupdataVideoT: false,
 
       isClickColor: 1,
 
       isClickColor: 1,
 
+      toolIndexType:"",
 
       publicTool: 0,
 
       publicTool: 0,
 
       searchPeople: "",
 
       searchPeople: "",
 
       searchTN: "",
 
       searchTN: "",
 
@@ -8389,6 +8394,7 @@ export default {
 
             // this.seleteCourseUpdate();
 
             // this.seleteCourseUpdate();
 
             this.setMan();
 
             this.setMan();
 
             this.selectAllType();
 
             this.selectAllType();
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
             // }, 5000);
 
             // }, 5000);
 
             this.$forceUpdate();
 
             this.$forceUpdate();
 
             setTimeout(() => {
 
             setTimeout(() => {
 
@@ -9172,10 +9178,27 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     goToTask(i) {
 
     goToTask(i) {
 
-      $(".rightBox")[0].scrollTop =
 
+      this.toolIndexType = ''
 
+      if(this.isClickColor == (i + 1)){
 
+        if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
+        }else{
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
+        }
 
+        this.$forceUpdate();
 
+        return;
 
+      }
 
+      
+      if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
+      }else{
 
+        $(".rightBox")[0].scrollTop =
 
         $(".taskBorder")[i + 1].offsetTop +
 
         $(".taskBorder")[i + 1].offsetTop +
 
         $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
         $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
       this.isClickColor = i + 1;
 
       this.isClickColor = i + 1;
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
+      }
 
+      this.$forceUpdate();
 
     },
 
     },
 
     taskMove(type, index) {
 
     taskMove(type, index) {
 
       // this
 
       // this
 
@@ -9481,7 +9504,7 @@ export default {
 
         // console.log(response.data.data);
 
         // console.log(response.data.data);
 
         var data = response.data.FunctionResponse.result;
 
         var data = response.data.FunctionResponse.result;
 
         for (var i = 0; i < data.length; i++) {
 
         for (var i = 0; i < data.length; i++) {
 
-          _this.imageList.push({ url: data[i].image })
 
+          _this.imageList.push({ url: data[i].thumbnail })
 
         }
 
         }
 
         _this.imageloading = false
 
         _this.imageloading = false
 
       }).catch(function (error) {
 
       }).catch(function (error) {
 
@@ -9496,7 +9519,21 @@ export default {
 
     resetImage() {
 
     resetImage() {
 
       this.ppage = 1
 
       this.ppage = 1
 
       this.searchImage()
 
       this.searchImage()
 
-    }
 
+    },
 
+    jumpGj(i, j) {
 
+      if((i+1) != this.isClickColor){
 
+        this.isClickColor = (i + 1)
 
+      }
 
+      var a = document.scrollingElement;
 
+      this.toolIndexType = `gj${i}${j}`
 
+      let target = document.querySelector(`#gj${i}${j}`);
 
+      if (target) {
 
+        target.scrollIntoView(true);
 
+        // setTimeout(() => {
 
+        //   this.$refs.rightboxR.scrollTop = this.$refs.rightboxR.scrollTop - 100;
 
+        // }, 0);
 
+      }
 
+    },
 
   },
 
   },
 
   beforeDestroy() {
 
   beforeDestroy() {
 
     clearTimeout(this.timer);
 
     clearTimeout(this.timer);
 
@@ -9539,6 +9576,8 @@ export default {
 
       //监听这个dom的scroll事件
 
       //监听这个dom的scroll事件
 
       $(".rightBox")[0].addEventListener("scroll", this.scrollChange);
 
       $(".rightBox")[0].addEventListener("scroll", this.scrollChange);
 
       this.heightPx = $(".rightBox")[0].offsetHeight + 'px'
 
       this.heightPx = $(".rightBox")[0].offsetHeight + 'px'
 
+      this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
+      this.$forceUpdate();
 
     });
 
     });
 
   },
 
   },
 
 };
 
 };
 
@@ -10708,7 +10747,7 @@ export default {
 
 .chapter_upload_up {
 
 .chapter_upload_up {
 
   width: 20px;
 
   width: 20px;
 
   height: 20px;
 
   height: 20px;
 
-  background: #F0F4FA;
 
+  background: #e4eaf2;
 
   cursor: pointer;
 
   cursor: pointer;
 
   margin: 0 auto;
 
   margin: 0 auto;
 
   border-radius: 5px;
 
   border-radius: 5px;
 
@@ -12552,29 +12591,44 @@ ol {
 
   cursor: pointer;
 
   cursor: pointer;
 
   background: #ffffff;
 
   background: #ffffff;
 
   width: 95%;
 
   width: 95%;
 
-  margin: 10px auto;
 
+  margin: 10px auto 0;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   border-radius: 5px;
 
   border-radius: 5px;
 
   flex-wrap: wrap;
 
   flex-wrap: wrap;
 
 }
 
 }
 
-
 
-
 
+.navTask::before{
 
+  content: '';
 
+  display:block;
 
+  width:16px;
 
+  height:16px;
 
+  background-image: url(../../../assets/icon/new/icon_arrow.png);
 
+  background-size:100%;
 
+  margin-left:10px;
 
+}
 
+.isNavOpen::before{
 
+  background-image: url(../../../assets/icon/new/icon_arrow_a.png) !important;
 
+}
 
 .isNavTask {
 
 .isNavTask {
 
-  background: #3681FC;
 
+  /* background: #3681FC; */
 
+  background: #EEF3FB;
 
 }
 
 }
 
 
 
 .isNavTask .nt_taskName {
 
 .isNavTask .nt_taskName {
 
-  color: #fff !important;
 
+  /* color: #fff !important; */
 
+  font-weight: bold !important;
 
+  color: #0061FF !important;
 
 }
 
 }
 
 
 
 .isNavTask .nt_taskTitle {
 
 .isNavTask .nt_taskTitle {
 
-  color: #AECCFE !important;
 
+  /* color: #AECCFE !important; */
 
+  font-weight: bold !important;
 
+  color: #0061FF !important;
 
 }
 
 }
 
 
 
 
 
 .navTask .nt_taskBox {
 
 .navTask .nt_taskBox {
 
-  width: calc(100% - 55px);
 
-  padding: 0 10px 0 20px;
 
+  width: calc(100% - 85px);
 
+  padding: 0 10px 0 5px;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   display: flex;
 
   display: flex;
 
@@ -12584,9 +12638,10 @@ ol {
 
 }
 
 }
 
 
 
 .navTask .nt_taskTitle {
 
 .navTask .nt_taskTitle {
 
-  color: #717C8D;
 
+  /* color: #717C8D; */
 
+  color: #060E17;
 
   line-height: 25px;
 
   line-height: 25px;
 
-  font-size: 14px;
 
+  font-size: 16px;
 
   min-width: 45px;
 
   min-width: 45px;
 
 }
 
 }
 
 
 
@@ -12598,15 +12653,30 @@ ol {
 
   white-space: nowrap;
 
   white-space: nowrap;
 
   overflow: hidden;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
   text-overflow: ellipsis;
 
-  font-size: 14px;
 
-  color: #0E1E33;
 
+  font-size: 16px;
 
+  color: #060E17;
 
+  /* color: #0E1E33; */
 
 }
 
 }
 
 
 
 .gjBox {
 
 .gjBox {
 
-  width: 100%;
 
-  padding: 0 0 0 20px;
 
+  width: calc(100% - 25px);
 
+  padding: 0 0 0 0;
 
+  box-sizing: border-box;
 
+  border-left: 1px solid #CAD1DC;
 
+  margin-left: 25px;
 
+}
 
+.gjBox > div{
 
+  display:flex;
 
+  align-items:center;
 
+}
 
+.gjBox > div::before{
 
+  content: '';
 
+  height:1px;
 
+  width:10px;
 
+  background: #CAD1DC;
 
+  display: block;
 
+  margin-right:5px;
 
 }
 
 }
 
-
 
 .gjCss {
 
 .gjCss {
 
   display: flex;
 
   display: flex;
 
   flex-direction: row;
 
   flex-direction: row;

+ 143 - 52
src/components/pages/task/addCourse.vue
Fájl Megtekintése 

@@ -183,42 +183,40 @@
 
                   <div class="stepsBottom2">
 
                   <div class="stepsBottom2">
 
                     <!-- <div class="navTop">辅助导航</div> -->
 
                     <!-- <div class="navTop">辅助导航</div> -->
 
                     <div class="navBottom" :style="{height:heightPx}">
 
                     <div class="navBottom" :style="{height:heightPx}">
 
-                      <div
 
-                        class="navTask"
 
-                        :class="{
 
-                          isNavTask:
 
-                            isClickColor > 0 && isClickColor == tIndex + 1,
 
-                        }"
 
-                        v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
-                          .taskJson"
 
-                        :key="tIndex"
 
-                        @click="goToTask(tIndex)"
 
-                      >
 
-                      <div class="nt_taskBox">
 
-                        <div class="nt_taskTitle">任务{{ tIndex + 1 }}</div>
 
-                        <div class="nt_taskName">
 
-                          <el-tooltip effect="light" :content="t.task" placement="top">
 
-                            <span>{{ t.task }}</span>
 
-                          </el-tooltip>
 
+                      <div  v-for="(t, tIndex) in unitJson[unitIndex].chapterInfo[0]
 
+  .taskJson" :key="tIndex">
 
+                        <div  @click="goToTask(tIndex)" class="navTask" :class="{
 
+                        isNavTask:
 
+                          isClickColor > 0 && isClickColor == tIndex + 1,
 
+                          isNavOpen:t.toolOpen
 
+                      }">
 
+                        <div class="nt_taskBox">
 
+                          <div class="nt_taskTitle">任务{{ tIndex + 1 }}</div>
 
+                          <div class="nt_taskName">
 
+                            <el-tooltip effect="light" :content="t.task" placement="top">
 
+                              <span>{{ t.task }}</span>
 
+                            </el-tooltip>
 
+                          </div>
 
+                        </div>
 
+                        <div class="moveBtn" v-if="unitJson[unitIndex].chapterInfo[0].taskJson.length >
 
+                          1
 
+                          ">
 
+                          <div class="chapter_upload_up" style="margin: 0 5px 0 0;width: 25px;height: 25px;"
 
+                            @click.stop="taskMove(1, tIndex)"></div>
 
+                          <div class="chapter_upload_down" style="width: 25px;height: 25px;"
 
+                            @click.stop="taskMove(2, tIndex)"></div>
 
                         </div>
 
                         </div>
 
                       </div>
 
                       </div>
 
-                        <div
 
-                          class="moveBtn"
 
-                          v-if="
 
-                            unitJson[unitIndex].chapterInfo[0].taskJson.length >
 
-                            1
 
-                          "
 
-                        >
 
-                          <div
 
-                            class="chapter_upload_up"
 
-                            style="margin: 0 5px 0 0;width: 25px;height: 25px;"
 
-                            @click.stop="taskMove(1, tIndex)"
 
-                          ></div>
 
-                          <div
 
-                            class="chapter_upload_down"
 
-                            style="width: 25px;height: 25px;"
 
-                            @click.stop="taskMove(2, tIndex)"
 
-                          ></div>
 
+                      <div class="gjBox" v-if="t.toolChoose.length && t.toolOpen">
 
+                          <div v-for="(tool, toolIndex2) in t.toolChoose" :key="toolIndex2" @click="jumpGj(tIndex,toolIndex2)">
 
+                            <div
 
+                              class="gjCss"
 
+                              :class="{isGjCss: toolIndexType == `gj${tIndex}${toolIndex2}`}"
 
+                            >
 
+                              <div>工具{{ toolIndex2 + 1 }}:</div>
 
+                              <div>{{ toolsData[tool.tool[0]] && toolsData[tool.tool[0]].name }}</div>
 
+                            </div>
 
+                          </div>
 
                         </div>
 
                         </div>
 
                       </div>
 
                       </div>
 
                     </div>
 
                     </div>
 
@@ -627,6 +625,7 @@
 
                               "
 
                               "
 
                             >
 
                             >
 
                               <div
 
                               <div
 
+                                :id="'gj'+itemTaskIndex + '' + toolIndex"
 
                                 style="margin-right: 20px; font-weight: bold"
 
                                 style="margin-right: 20px; font-weight: bold"
 
                               >
 
                               >
 
                                 步骤 {{ toolIndex + 1 }} ：
 
                                 步骤 {{ toolIndex + 1 }} ：
 
@@ -6903,6 +6902,7 @@
 
 
 
 <script>
 
 <script>
 
 import "../../../common/aws-sdk-2.235.1.min.js";
 
 import "../../../common/aws-sdk-2.235.1.min.js";
 
+import { tools as toolsData } from "../../../common/tools.js";
 
 import $ from "jquery";
 
 import $ from "jquery";
 
 import EditorBar from "../../../components/tools/wangEnduit";
 
 import EditorBar from "../../../components/tools/wangEnduit";
 
 import Table from "../../../components/tools/table";
 
 import Table from "../../../components/tools/table";
 
@@ -6987,6 +6987,7 @@ export default {
 
       dialogVisibleVideo: false,
 
       dialogVisibleVideo: false,
 
       dialogVisibleupdataVideoT:false,
 
       dialogVisibleupdataVideoT:false,
 
       isClickColor: 1,
 
       isClickColor: 1,
 
+      toolIndexType:"",
 
       publicTool: 0,
 
       publicTool: 0,
 
       searchPeople: "",
 
       searchPeople: "",
 
       searchTN: "",
 
       searchTN: "",
 
@@ -7142,7 +7143,8 @@ export default {
 
       searchImageValue:"",
 
       searchImageValue:"",
 
       ppage:1,
 
       ppage:1,
 
       imageList: [],
 
       imageList: [],
 
-      heightPx:'100%'
 
+      heightPx:'100%',
 
+      toolsData: toolsData,
 
     };
 
     };
 
   },
 
   },
 
   directives: {
 
   directives: {
 
@@ -10845,6 +10847,7 @@ export default {
 
             // this.seleteCourseUpdate();
 
             // this.seleteCourseUpdate();
 
             this.setMan();
 
             this.setMan();
 
             this.selectAllType();
 
             this.selectAllType();
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
             // }, 5000);
 
             // }, 5000);
 
             this.$forceUpdate();
 
             this.$forceUpdate();
 
             setTimeout(() => {
 
             setTimeout(() => {
 
@@ -11628,10 +11631,27 @@ export default {
 
       }
 
       }
 
     },
 
     },
 
     goToTask(i) {
 
     goToTask(i) {
 
-      $(".rightBox")[0].scrollTop =
 
-        $(".taskBorder")[i].offsetTop +
 
-        $(".taskBorder")[i].parentElement.parentElement.offsetTop;
 
+      this.toolIndexType = ''
 
+      if(this.isClickColor == (i + 1)){
 
+        if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
+        }else{
 
+          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
+        }
 
+        this.$forceUpdate();
 
+        return;
 
+      }
 
+      
+      if(this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen){
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = false
 
+      }else{
 
+        $(".rightBox")[0].scrollTop =
 
+        $(".taskBorder")[i + 1].offsetTop +
 
+        $(".taskBorder")[i + 1].parentElement.parentElement.offsetTop;
 
       this.isClickColor = i + 1;
 
       this.isClickColor = i + 1;
 
+        this.unitJson[this.unitIndex].chapterInfo[0].taskJson[i].toolOpen = true
 
+      }
 
+      this.$forceUpdate();
 
     },
 
     },
 
     taskMove(type, index) {
 
     taskMove(type, index) {
 
       // this
 
       // this
 
@@ -11910,7 +11930,7 @@ export default {
 
         // console.log(response.data.data);
 
         // console.log(response.data.data);
 
         var data = response.data.FunctionResponse.result;
 
         var data = response.data.FunctionResponse.result;
 
         for (var i = 0; i < data.length; i++) {
 
         for (var i = 0; i < data.length; i++) {
 
-          _this.imageList.push({url:data[i].image})
 
+          _this.imageList.push({url:data[i].thumbnail})
 
         }
 
         }
 
         _this.imageloading = false
 
         _this.imageloading = false
 
       }).catch(function (error) {
 
       }).catch(function (error) {
 
@@ -11925,7 +11945,21 @@ export default {
 
     resetImage(){
 
     resetImage(){
 
       this.ppage = 1
 
       this.ppage = 1
 
       this.searchImage()
 
       this.searchImage()
 
-    }
 
+    },
 
+    jumpGj(i, j) {
 
+      if((i+1) != this.isClickColor){
 
+        this.isClickColor = (i + 1)
 
+      }
 
+      var a = document.scrollingElement;
 
+      this.toolIndexType = `gj${i}${j}`
 
+      let target = document.querySelector(`#gj${i}${j}`);
 
+      if (target) {
 
+        target.scrollIntoView(true);
 
+        // setTimeout(() => {
 
+        //   this.$refs.rightboxR.scrollTop = this.$refs.rightboxR.scrollTop - 100;
 
+        // }, 0);
 
+      }
 
+    },
 
   },
 
   },
 
   beforeDestroy() {
 
   beforeDestroy() {
 
     clearTimeout(this.timer);
 
     clearTimeout(this.timer);
 
@@ -11967,7 +12001,9 @@ export default {
 
     this.$nextTick(() => {
 
     this.$nextTick(() => {
 
       //监听这个dom的scroll事件
 
       //监听这个dom的scroll事件
 
       $(".rightBox")[0].addEventListener("scroll", this.scrollChange);
 
       $(".rightBox")[0].addEventListener("scroll", this.scrollChange);
 
-      this.heightPx = $(".rightBox")[0].offsetHeight + 'px'
 
+      this.heightPx = $(".rightBox")[0].offsetHeight + 'px';
 
+      this.unitJson[this.unitIndex].chapterInfo[0].taskJson[0].toolOpen = true
 
+      this.$forceUpdate();
 
     });
 
     });
 
   },
 
   },
 
 };
 
 };
 
@@ -13135,7 +13171,7 @@ export default {
 
 .chapter_upload_up {
 
 .chapter_upload_up {
 
   width: 20px;
 
   width: 20px;
 
   height: 20px;
 
   height: 20px;
 
-  background: #F0F4FA;
 
+  background: #e4eaf2;
 
   cursor: pointer;
 
   cursor: pointer;
 
   margin: 0 auto;
 
   margin: 0 auto;
 
   border-radius: 5px;
 
   border-radius: 5px;
 
@@ -14978,27 +15014,45 @@ ol {
 
   cursor: pointer;
 
   cursor: pointer;
 
   background: #ffffff;
 
   background: #ffffff;
 
   width: 95%;
 
   width: 95%;
 
-  margin: 10px auto;
 
+  margin: 10px auto 0;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   border-radius: 5px;
 
   border-radius: 5px;
 
+  flex-wrap: wrap;
 
+}
 
+.navTask::before{
 
+  content: '';
 
+  display:block;
 
+  width:16px;
 
+  height:16px;
 
+  background-image: url(../../../assets/icon/new/icon_arrow.png);
 
+  background-size:100%;
 
+  margin-left:10px;
 
+}
 
+.isNavOpen::before{
 
+  background-image: url(../../../assets/icon/new/icon_arrow_a.png) !important;
 
 }
 
 }
 
-
 
 .isNavTask {
 
 .isNavTask {
 
-  background: #3681FC;
 
+  /* background: #3681FC; */
 
+  background: #EEF3FB;
 
 }
 
 }
 
 
 
 .isNavTask .nt_taskName {
 
 .isNavTask .nt_taskName {
 
-  color: #fff !important;
 
+  /* color: #fff !important; */
 
+  font-weight: bold !important;
 
+  color: #0061FF !important;
 
 }
 
 }
 
 
 
 .isNavTask .nt_taskTitle {
 
 .isNavTask .nt_taskTitle {
 
-  color: #AECCFE !important;
 
+  /* color: #AECCFE !important; */
 
+  font-weight: bold !important;
 
+  color: #0061FF !important;
 
 }
 
 }
 
 
 
 
 
 .navTask .nt_taskBox {
 
 .navTask .nt_taskBox {
 
-  width: calc(100% - 55px);
 
-  padding: 0 10px 0 20px;
 
+  width: calc(100% - 85px);
 
+  padding: 0 10px 0 5px;
 
+  box-sizing: border-box;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   display: flex;
 
   display: flex;
 
   flex-direction: row;
 
   flex-direction: row;
 
@@ -15007,9 +15061,10 @@ ol {
 
 }
 
 }
 
 
 
 .navTask .nt_taskTitle {
 
 .navTask .nt_taskTitle {
 
-  color: #717C8D;
 
+  /* color: #717C8D; */
 
+  color: #060E17;
 
   line-height: 25px;
 
   line-height: 25px;
 
-  font-size: 14px;
 
+  font-size: 16px;
 
   min-width: 45px;
 
   min-width: 45px;
 
 }
 
 }
 
 
 
@@ -15021,10 +15076,46 @@ ol {
 
   white-space: nowrap;
 
   white-space: nowrap;
 
   overflow: hidden;
 
   overflow: hidden;
 
   text-overflow: ellipsis;
 
   text-overflow: ellipsis;
 
+  font-size: 16px;
 
+  color: #060E17;
 
+  /* color: #0E1E33; */
 
+}
 
+
 
+.gjBox {
 
+  width: calc(100% - 25px);
 
+  padding: 0 0 0 0;
 
+  box-sizing: border-box;
 
+  border-left: 1px solid #CAD1DC;
 
+  margin-left: 25px;
 
+}
 
+.gjBox > div{
 
+  display:flex;
 
+  align-items:center;
 
+}
 
+.gjBox > div::before{
 
+  content: '';
 
+  height:1px;
 
+  width:10px;
 
+  background: #CAD1DC;
 
+  display: block;
 
+  margin-right:5px;
 
+}
 
+.gjCss {
 
+  display: flex;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: center;
 
+  padding: 15px 0;
 
+  box-sizing: border-box;
 
   font-size: 14px;
 
   font-size: 14px;
 
-  color: #0E1E33;
 
+  cursor: pointer;
 
+}
 
+
 
+.isGjCss {
 
+  color: #0061ff;
 
 }
 
 }
 
 
 
+
 
 .groupBox {
 
 .groupBox {
 
 }
 
 }

+ 50 - 13
src/components/tools/jsmind.vue
Fájl Megtekintése 

@@ -202,7 +202,7 @@ export default {
 
       deep: true, //对象内部的属性监听，也叫深度监听
 
       deep: true, //对象内部的属性监听，也叫深度监听
 
     },
 
     },
 
   },
 
   },
 
-  created() {},
 
+  created() { },
 
   mounted() {
 
   mounted() {
 
     this.getData();
 
     this.getData();
 
     // this.mouseWheel();
 
     // this.mouseWheel();
 
@@ -225,7 +225,7 @@ export default {
 
         return false;
 
         return false;
 
       }
 
       }
 
     },
 
     },
 
-    upload() {},
 
+    upload() { },
 
     getData() {
 
     getData() {
 
       //   this.$API({
 
       //   this.$API({
 
       //     name: "getMind",
 
       //     name: "getMind",
 
@@ -482,6 +482,7 @@ export default {
 
   flex-shrink: 0;
 
   flex-shrink: 0;
 
   position: relative;
 
   position: relative;
 
 }
 
 }
 
+
 
 .jsmind_title {
 
 .jsmind_title {
 
   position: absolute;
 
   position: absolute;
 
   top: 20px;
 
   top: 20px;
 
@@ -489,6 +490,7 @@ export default {
 
   font-size: 20px;
 
   font-size: 20px;
 
   color: #8d8d8d;
 
   color: #8d8d8d;
 
 }
 
 }
 
+
 
 .noMind {
 
 .noMind {
 
   position: absolute;
 
   position: absolute;
 
   display: flex;
 
   display: flex;
 
@@ -499,6 +501,7 @@ export default {
 
   z-index: 999;
 
   z-index: 999;
 
   background: #fff;
 
   background: #fff;
 
 }
 
 }
 
+
 
 .jsmind_layout .jsmind_toolbar {
 
 .jsmind_layout .jsmind_toolbar {
 
   width: 100%;
 
   width: 100%;
 
   padding: 0 10px 10px 10px;
 
   padding: 0 10px 10px 10px;
 
@@ -510,47 +513,81 @@ export default {
 
   background-color: #f8f9fa;
 
   background-color: #f8f9fa;
 
   box-shadow: 0 0 4px #b8b8b8;
 
   box-shadow: 0 0 4px #b8b8b8;
 
 }
 
 }
 
-.jsmind_layout >>> .el-button--medium,
 
-.jsmind_layout >>> .el-input--medium {
 
+
 
+.jsmind_layout>>>.el-button--medium,
 
+.jsmind_layout>>>.el-input--medium {
 
   margin-top: 10px;
 
   margin-top: 10px;
 
 }
 
 }
 
+
 
 .jsmind_layout #jsmind_container {
 
 .jsmind_layout #jsmind_container {
 
   /* flex: 1 1 auto; */
 
   /* flex: 1 1 auto; */
 
   height: 100%;
 
   height: 100%;
 
 }
 
 }
 
-.jsmind_layout >>> .jsmind-inner {
 
+
 
+.jsmind_layout>>>.jsmind-inner {
 
   /* overflow: hidden auto !important; */
 
   /* overflow: hidden auto !important; */
 
   /* height: auto; */
 
   /* height: auto; */
 
 }
 
 }
 
-.jsmind_layout >>> .el-upload-list {
 
+
 
+.jsmind_layout>>>.el-upload-list {
 
   display: none !important;
 
   display: none !important;
 
 }
 
 }
 
+
 
 /* 隐藏滚动条 */
 
 /* 隐藏滚动条 */
 
 .jsmind_layout .jsmind-inner::-webkit-scrollbar {
 
 .jsmind_layout .jsmind-inner::-webkit-scrollbar {
 
   display: none;
 
   display: none;
 
 }
 
 }
 
+
 
 .jsmind_layout .pad {
 
 .jsmind_layout .pad {
 
   margin-right: 10px;
 
   margin-right: 10px;
 
 }
 
 }
 
+
 
 .jsmind_layout .pad-left {
 
 .jsmind_layout .pad-left {
 
   margin-left: 10px;
 
   margin-left: 10px;
 
 }
 
 }
 
-.jsmind_layout >>> jmnode{
 
-  white-space: nowrap;
 
-  max-width: unset;
 
+
 
+.jsmind_layout>>>jmnode {
 
+  white-space: inherit;
 
+  word-wrap: break-word;
 
+  max-width: 500px;
 
+  max-height: 75px;
 
+  overflow: auto;
 
+}
 
+
 
+.jsmind_layout>>>jmnode::-webkit-scrollbar {
 
+  /*滚动条整体样式*/
 
+  width: 6px;
 
+  /*高宽分别对应横竖滚动条的尺寸*/
 
+  height: 6px;
 
+}
 
+
 
+/*定义滚动条轨道 内阴影+圆角*/
 
+.jsmind_layout>>>jmnode::-webkit-scrollbar-track {
 
+  border-radius: 10px;
 
+  background-color: rgba(0, 0, 0, 0.1);
 
+}
 
+
 
+/*定义滑块 内阴影+圆角*/
 
+.jsmind_layout>>>jmnode::-webkit-scrollbar-thumb {
 
+  border-radius: 10px;
 
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
+  background-color: rgba(0, 0, 0, 0.1);
 
 }
 
 }
 
-.jsmind_layout >>> jmnode.selected {
 
+
 
+.jsmind_layout>>>jmnode.selected {
 
   background-color: #b9b9b9;
 
   background-color: #b9b9b9;
 
   color: #fff;
 
   color: #fff;
 
   box-shadow: 2px 2px 8px #777;
 
   box-shadow: 2px 2px 8px #777;
 
 }
 
 }
 
-.jsmind_layout >>> jmnode:hover {
 
+
 
+.jsmind_layout>>>jmnode:hover {
 
   box-shadow: 2px 2px 8px #777;
 
   box-shadow: 2px 2px 8px #777;
 
 }
 
 }
 
+
 
 .jsmind_layout .form-con {
 
 .jsmind_layout .form-con {
 
   padding-top: 20px;
 
   padding-top: 20px;
 
 }
 
 }
 
+
 
 .jsmind_layout .ele-width {
 
 .jsmind_layout .ele-width {
 
   width: 96%;
 
   width: 96%;
 
-}
 
-</style>
 
+}</style>

+ 30 - 2
src/components/tools/jsmind2.vue
Fájl Megtekintése 

@@ -447,8 +447,36 @@ export default {
 
   margin-left: 10px;
 
   margin-left: 10px;
 
 }
 
 }
 
 .jsmind_layout >>> jmnode{
 
 .jsmind_layout >>> jmnode{
 
-  white-space: nowrap;
 
-  max-width: unset;
 
+  white-space: inherit;
 
+    word-wrap: break-word;
 
+    max-width: 500px;
 
+    max-height: 75px;
 
+    overflow: auto;
 
+}
 
+.jsmind_layout>>>jmnode::-webkit-scrollbar {
 
+  /*滚动条整体样式*/
 
+  width: 6px;
 
+  /*高宽分别对应横竖滚动条的尺寸*/
 
+  height: 6px;
 
+}
 
+
 
+/*定义滚动条轨道 内阴影+圆角*/
 
+.jsmind_layout>>>jmnode::-webkit-scrollbar-track {
 
+  border-radius: 10px;
 
+  background-color: rgba(0, 0, 0, 0.1);
 
+}
 
+
 
+/*定义滑块 内阴影+圆角*/
 
+.jsmind_layout>>>jmnode::-webkit-scrollbar-thumb {
 
+  border-radius: 10px;
 
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
+  background-color: rgba(0, 0, 0, 0.1);
 
+}
 
+
 
+.jsmind_layout>>>jmnode.selected {
 
+  background-color: #b9b9b9;
 
+  color: #fff;
 
+  box-shadow: 2px 2px 8px #777;
 
 }
 
 }
 
 .jsmind_layout >>> jmnode.selected {
 
 .jsmind_layout >>> jmnode.selected {
 
   background-color: #b9b9b9;
 
   background-color: #b9b9b9;

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott