Sfoglia il codice sorgente

修改样式及布局

zengyicheng 1 anno fa
parent
commit
a528788fe5

BIN
src/assets/icon/newIcon/allScreen.png


+ 35 - 226
src/components/easy2/studyStudent.vue

@@ -59,7 +59,7 @@
       <div class="pb_left" v-else>
         <!-- <div class="courseTitle">{{ courseDetail.title }}</div> -->
         <div
-          style="border-bottom: 1px solid #cad1dc; padding: 13px 0; width: 100%"
+          style="border-bottom: 1px solid #cad1dc; padding: 15px 0; width: 100%"
         >
           <div class="courseTitle">
             <div style="max-width: calc(100% - 40px); width: auto">
@@ -726,6 +726,12 @@
                       <div
                         :class="toolType == 3 ? 'isChooseActive' : ''"
                         @click="(toolType = 3), $forceUpdate()"
+                      >
+                        编程类
+                      </div>
+                      <div
+                        :class="toolType == 5 ? 'isChooseActive' : ''"
+                        @click="(toolType = 5), $forceUpdate()"
                       >
                         学科类
                       </div>
@@ -1132,6 +1138,33 @@
                           </div>
                         </div>
                       </div>
+                      
+                    </div>
+                    <div class="toolSort" v-if="toolType == 7">
+                      <div class="tool">
+                        <div class="whiteBIcon" @click="addTools2(40)">
+                          <img
+                            src="../../assets/icon/secondToolList/eval.png"
+                            alt
+                          />
+                          <div style="margin: 5px 0">个人评价</div>
+                        </div>
+                        <div class="check" @click="addTools2(40)">
+                          <img
+                            src="../../assets/icon/checkNo.png"
+                            alt
+                            v-if="checktoolArray.indexOf(40) == -1"
+                          />
+                          <div class="checkDiv" v-else>
+                            <img
+                              src="../../assets/icon/checkedIs.png"
+                              alt
+                            /><span>已选择</span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="toolSort" v-if="toolType == 5">
                       <div class="tool">
                         <div class="whiteBIcon" @click="addTools2(28)">
                           <img
@@ -1265,230 +1298,6 @@
                           </div>
                         </div>
                     </div>
-                    <div class="toolSort" v-if="toolType == 7">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(40)">
-                          <img
-                            src="../../assets/icon/secondToolList/eval.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">个人评价</div>
-                        </div>
-                        <div class="check" @click="addTools2(40)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(40) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 5">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(28)">
-                          <img
-                            src="../../assets/icon/secondToolList/translation.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">翻译</div>
-                        </div>
-                        <div class="check" @click="addTools2(28)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(28) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(37)">
-                          <img
-                            src="../../assets/icon/secondToolList/mohe.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">魔盒识字</div>
-                        </div>
-                        <div class="check" @click="addTools2(37)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(37) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(38)">
-                          <img
-                            src="../../assets/icon/secondToolList/24game.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">24点</div>
-                        </div>
-                        <div class="check" @click="addTools2(38)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(38) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(31)">
-                          <img
-                            src="../../assets/icon/secondToolList/networkPanel.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">数学画板</div>
-                        </div>
-                        <div class="check" @click="addTools2(31)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(31) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(39)">
-                          <img
-                            src="../../assets/icon/secondToolList/GeoGebra.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">GeoGebra</div>
-                        </div>
-                        <div class="check" @click="addTools2(39)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(39) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(58)">
-                          <img
-                            src="../../assets/icon/fourthToolList/car.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">模拟驾驶</div>
-                        </div>
-                        <div class="check" @click="addTools2(58)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(58) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(59)">
-                          <img
-                            src="../../assets/icon/fourthToolList/lineSearch.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">路径搜索</div>
-                        </div>
-                        <div class="check" @click="addTools2(59)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(59) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(60)">
-                          <img
-                            src="../../assets/icon/fourthToolList/deepLearning.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">深度学习</div>
-                        </div>
-                        <div class="check" @click="addTools2(60)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(60) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(61)">
-                          <img
-                            src="../../assets/icon/fourthToolList/allHistory.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">全历史</div>
-                        </div>
-                        <div class="check" @click="addTools2(61)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(61) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
                     <div class="toolSort" v-if="toolType == 4">
                       <div class="tool">
                         <div class="whiteBIcon" @click="addTools2(26)">
@@ -8664,7 +8473,7 @@
                 </div>
               </div>
             </div>
-            <div class="vedioBox" v-if="false">
+            <div class="vedioBox" style="margin-top: 10px;" v-if="false">
               <div
                 class="queTop"
                 style="

+ 35 - 226
src/components/easy3/studyStudent.vue

@@ -59,7 +59,7 @@
       <div class="pb_left" v-else>
         <!-- <div class="courseTitle">{{ courseDetail.title }}</div> -->
         <div
-          style="border-bottom: 1px solid #cad1dc; padding: 13px 0; width: 100%"
+          style="border-bottom: 1px solid #cad1dc; padding: 15px 0; width: 100%"
         >
           <div class="courseTitle">
             <div style="max-width: calc(100% - 40px); width: auto">
@@ -709,6 +709,12 @@
                       <div
                         :class="toolType == 3 ? 'isChooseActive' : ''"
                         @click="(toolType = 3), $forceUpdate()"
+                      >
+                        编程类
+                      </div>
+                      <div
+                        :class="toolType == 5 ? 'isChooseActive' : ''"
+                        @click="(toolType = 5), $forceUpdate()"
                       >
                         学科类
                       </div>
@@ -1129,6 +1135,33 @@
                           </div>
                         </div>
                       </div>
+                      
+                    </div>
+                    <div class="toolSort" v-if="toolType == 7">
+                      <div class="tool">
+                        <div class="whiteBIcon" @click="addTools2(40)">
+                          <img
+                            src="../../assets/icon/secondToolList/eval.png"
+                            alt
+                          />
+                          <div style="margin: 5px 0">个人评价</div>
+                        </div>
+                        <div class="check" @click="addTools2(40)">
+                          <img
+                            src="../../assets/icon/checkNo.png"
+                            alt
+                            v-if="checktoolArray.indexOf(40) == -1"
+                          />
+                          <div class="checkDiv" v-else>
+                            <img
+                              src="../../assets/icon/checkedIs.png"
+                              alt
+                            /><span>已选择</span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="toolSort" v-if="toolType == 5">
                       <div class="tool">
                         <div class="whiteBIcon" @click="addTools2(28)">
                           <img
@@ -1262,230 +1295,6 @@
                           </div>
                         </div>
                     </div>
-                    <div class="toolSort" v-if="toolType == 7">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(40)">
-                          <img
-                            src="../../assets/icon/secondToolList/eval.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">个人评价</div>
-                        </div>
-                        <div class="check" @click="addTools2(40)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(40) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="toolSort" v-if="toolType == 5">
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(28)">
-                          <img
-                            src="../../assets/icon/secondToolList/translation.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">翻译</div>
-                        </div>
-                        <div class="check" @click="addTools2(28)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(28) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(37)">
-                          <img
-                            src="../../assets/icon/secondToolList/mohe.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">魔盒识字</div>
-                        </div>
-                        <div class="check" @click="addTools2(37)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(37) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(38)">
-                          <img
-                            src="../../assets/icon/secondToolList/24game.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">24点</div>
-                        </div>
-                        <div class="check" @click="addTools2(38)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(38) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(31)">
-                          <img
-                            src="../../assets/icon/secondToolList/networkPanel.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">数学画板</div>
-                        </div>
-                        <div class="check" @click="addTools2(31)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(31) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(39)">
-                          <img
-                            src="../../assets/icon/secondToolList/GeoGebra.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">GeoGebra</div>
-                        </div>
-                        <div class="check" @click="addTools2(39)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(39) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(58)">
-                          <img
-                            src="../../assets/icon/fourthToolList/car.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">模拟驾驶</div>
-                        </div>
-                        <div class="check" @click="addTools2(58)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(58) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(59)">
-                          <img
-                            src="../../assets/icon/fourthToolList/lineSearch.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">路径搜索</div>
-                        </div>
-                        <div class="check" @click="addTools2(59)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(59) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(60)">
-                          <img
-                            src="../../assets/icon/fourthToolList/deepLearning.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">深度学习</div>
-                        </div>
-                        <div class="check" @click="addTools2(60)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(60) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="tool">
-                        <div class="whiteBIcon" @click="addTools2(61)">
-                          <img
-                            src="../../assets/icon/fourthToolList/allHistory.png"
-                            alt
-                          />
-                          <div style="margin: 5px 0">全历史</div>
-                        </div>
-                        <div class="check" @click="addTools2(61)">
-                          <img
-                            src="../../assets/icon/checkNo.png"
-                            alt
-                            v-if="checktoolArray.indexOf(61) == -1"
-                          />
-                          <div class="checkDiv" v-else>
-                            <img
-                              src="../../assets/icon/checkedIs.png"
-                              alt
-                            /><span>已选择</span>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
                     <div class="toolSort" v-if="toolType == 4">
                       <div class="tool">
                         <div class="whiteBIcon" @click="addTools2(26)">
@@ -8651,7 +8460,7 @@
                 </div>
               </div>
             </div>
-            <div class="vedioBox" v-if="false">
+            <div class="vedioBox" style="margin-top: 10px;" v-if="false">
               <div
                 class="queTop"
                 style="

File diff suppressed because it is too large
+ 1111 - 1139
src/components/studyStudent.vue


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