lex 1 år sedan
förälder
incheckning
de7babcc65

+ 25 - 2
public/roll-call/css/index.css

@@ -35,6 +35,11 @@ body {
   left: 36px;
   top: 30px;
   cursor: pointer;
+  transition: opacity 0.2s ease;
+}
+.iconBack:hover {
+  opacity: 0.9;
+  transition: opacity 0.2s ease;
 }
 
 a {
@@ -55,7 +60,7 @@ a {
 
 #menu {
   position: absolute;
-  bottom: 20px;
+  bottom: 50px;
   width: 100%;
   text-align: center;
 }
@@ -112,6 +117,19 @@ a {
   background-size: contain;
   border: none;
   cursor: pointer;
+  transition: opacity 0.2s ease;
+}
+#table:hover {
+  opacity: 0.9;
+  transition: opacity 0.2s ease;
+}
+#table.disabled {
+  background: url('../img/icon-start-btn-disabled.png') no-repeat center;
+  background-size: contain;
+  cursor: not-allowed;
+}
+#table.disabled:hover {
+  opacity: 1;
 }
 #sphere {
   width: 171px;
@@ -120,6 +138,11 @@ a {
   background-size: contain;
   border: none;
   cursor: pointer;
+  transition: opacity 0.2s ease;
+}
+#sphere:hover {
+  opacity: 0.9;
+  transition: opacity 0.2s ease;
 }
 
 .changeImgBoxs {
@@ -167,7 +190,7 @@ a {
   position: absolute;
   width: 100%;
   height: 100%;
-  background: rgba(0, 0, 0, 0.8);
+  background: rgba(0, 0, 0, 0.9);
 }
 .closeBtn {
   position: absolute;

BIN
public/roll-call/img/icon-start-btn-disabled.png


BIN
public/roll-call/img/in_top_bj.jpg


BIN
public/roll-call/img/礼包.png


+ 9 - 1
public/roll-call/index.html

@@ -31,7 +31,8 @@
       <div class="pageTitle"></div>
       <div class="iconBack" @click="onBack()"></div>
       <div id="menu">
-        <button id="table" v-show="!animationStatus" @click="start()"></button>
+        <button id="table" :class="tableIndex <= 1 ? 'disabled' : ''" v-show="!animationStatus"
+          @click="start()"></button>
         <button id="sphere" v-show="animationStatus" @click="closes()"></button>
         <!-- <button id="reset" style="margin-left:40px;" @click="resets()">照片墙</button> -->
         <!-- <button id="lists" @click="listShow = true">中奖名单</button> -->
@@ -309,8 +310,11 @@
   function renderData(data) {
     table = data
     tableLens = data.length
+    vm.tableIndex = tableLens
     init();
     animate();
+
+    console.log(vm.tableIndex, 'renderData')
   }
 
   //点击事件及部分判断
@@ -318,6 +322,7 @@
     el: '#vueBoxs',
     data: {
       animationStatus: false,
+      tableIndex: 0,
       listShow: false,
       spic: {
         img: '',
@@ -363,6 +368,9 @@
         //   alert("抽完咯~~~完咯~~~咯~~~,在中奖名单中清空,再来一次?");
         //   return;
         // }
+        if (this.tableIndex <= 1) {
+          return
+        }
         moving = true;
         this.animationStatus = true;
         objectsss.position.y = 0;

+ 7 - 1
src/views/attend-class/index.module.less

@@ -724,6 +724,10 @@
     opacity: 0.7;
     cursor: not-allowed;
   }
+
+  .itemHide {
+    display: none;
+  }
 }
 
 .rightColumnZ {
@@ -825,6 +829,8 @@
     opacity: 0.7;
     cursor: not-allowed;
   }
+
+
 }
 
 .selectMusicModal {
@@ -843,4 +849,4 @@
       }
     }
   }
-}
+}

+ 18 - 17
src/views/attend-class/index.tsx

@@ -1122,17 +1122,6 @@ export default defineComponent({
     // 右侧菜单栏
     const rightList = reactive([
       {
-        name: '结束课程',
-        name2: '结束预览',
-        icon: rightIconEnd,
-        id: 1
-      },
-      {
-        name: '布置作业',
-        icon: rightIconArrange,
-        id: 2
-      },
-      {
         name: '曲目资源',
         icon: rightIconMusic,
         id: 9
@@ -1153,21 +1142,32 @@ export default defineComponent({
         id: 5
       },
       {
-        name: '调音器',
-        icon: rightIconTuner,
-        id: 6
-      },
-      {
         name: '计时器',
         icon: rightIconTimer,
         id: 7
       },
+      // {
+      //   name: '调音器',
+      //   icon: rightIconTuner,
+      //   id: 6
+      // },
       {
         name: '点名',
         icon: rightIconCall,
         id: 10
       },
       {
+        name: '布置作业',
+        icon: rightIconArrange,
+        id: 2
+      },
+      {
+        name: '结束课程',
+        name2: '结束预览',
+        icon: rightIconEnd,
+        id: 1
+      },
+      {
         name: '收起',
         icon: rightIconPackUp,
         id: 8
@@ -1597,7 +1597,8 @@ export default defineComponent({
                 styles.rightItem,
                 item.id === 2 && data.preStudentNum <= 0
                   ? styles.itemDisabled
-                  : ''
+                  : '',
+                item.id === 10 && !data.classId ? styles.itemHide : ''
               ]}
               onClick={() => operateRightBtn(item.id)}>
               <img src={item.icon} />