Browse Source

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

lsc 11 months ago
parent
commit
611f8e6588
2 changed files with 47 additions and 14 deletions
  1. 46 13
      src/components/classRoomHelper/index.vue
  2. 1 1
      src/components/studyStudent.vue

+ 46 - 13
src/components/classRoomHelper/index.vue

@@ -7,14 +7,28 @@
     </div>
     <div class="ch_nav_box">
       <div class="ch_nav_box_top">
-        <div @click="back">
-          <img :src="require('../../assets/icon/course/return.png')" alt="" />
+        <div @click="$emit('backPage')">
+          <el-tooltip class="item" effect="dark" content="返回" placement="top">
+            <img :src="require('../../assets/icon/course/return.png')" alt="" />
+          </el-tooltip>
         </div>
+
         <div @click="$emit('refresh')">
-          <img :src="require('../../assets/icon/course/refresh.png')" alt="" />
+          <el-tooltip class="item" effect="dark" content="刷新" placement="top">
+            <img
+              :src="require('../../assets/icon/course/refresh.png')"
+              alt=""
+            />
+          </el-tooltip>
         </div>
-        <div>
-          <img :src="require('../../assets/icon/course/setting.png')" alt="" />
+
+        <div @click="$emit('authority')">
+          <el-tooltip class="item" effect="dark" content="权限" placement="top">
+            <img
+              :src="require('../../assets/icon/course/setting.png')"
+              alt=""
+            />
+          </el-tooltip>
         </div>
       </div>
       <div class="ch_nav_box_middle">
@@ -75,13 +89,36 @@
       </div>
       <div class="ch_nav_box_bottom">
         <div @click.stop="$emit('goStep', 0)">
-          <img :src="require('../../assets/icon/course/last.png')" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="上一步"
+            placement="top"
+          >
+            <img :src="require('../../assets/icon/course/last.png')" />
+          </el-tooltip>
         </div>
+
         <div @click.stop="$emit('goStep', 1)">
-          <img :src="require('../../assets/icon/course/next.png')" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="下一步"
+            placement="top"
+          >
+            <img :src="require('../../assets/icon/course/next.png')" />
+          </el-tooltip>
         </div>
+
         <div @click="openSetting">
-          <img :src="require('../../assets/icon/course/menu.png')" />
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="type == 0 ? '展开' : '折叠'"
+            placement="top"
+          >
+            <img :src="require('../../assets/icon/course/menu.png')" />
+          </el-tooltip>
         </div>
       </div>
     </div>
@@ -93,7 +130,7 @@ import searchArea from "./component/searchArea.vue";
 import taskArea from "./component/taskArea.vue";
 import dialogArea from "./component/dialogArea.vue";
 export default {
-  emits: ["refresh", "goStep", "backPage"],
+  emits: ["refresh", "goStep", "backPage","authority"],
   components: {
     searchArea,
     taskArea,
@@ -114,10 +151,6 @@ export default {
       let w2 = w.offsetWidth + 30 + "px";
       this.$emit("setWidth", w2);
     },
-    //   返回
-    back() {
-      this.$emit("backPage");
-    },
     openSetting() {
       this.type = this.type == 1 ? 0 : 1;
       this.$nextTick(() => {

+ 1 - 1
src/components/studyStudent.vue

@@ -8037,7 +8037,7 @@
           </div>
         </el-dialog>
       </div>
-      <classRoomHelper ref="classRoomHelperRef" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @backPage="()=>goTo(
+      <classRoomHelper ref="classRoomHelperRef" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @backPage="goTo(
                     '/courseDetail?userid=' +
                       userid +
                       '&oid=' +