調整 右上信息 排列

.gitignore

@@ -361,3 +361,4 @@ healthchecksdb
 /HiTeachCC/wwwroot
 /HiTeachCC/.vscode/launch.json
 HiTeachCC/ClientApp/package-lock.json
+HiTeachCC/ClientApp/src/assets/css/style.css

HiTeachCC/ClientApp/.gitignore

@@ -19,3 +19,5 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+
+*.css

HiTeachCC/ClientApp/src/assets/css/style.less

@@ -130,24 +130,106 @@
 @borD: 1px solid #ddd;
 @activeY: #f1ab40;
 .board {
-  .class-num {
+  .top-right-info {
     position: fixed;
-    right: 19%;
-    top: 0.7%;
-    font-weight: bold;
-    font-size: 2rem;
-    color: rgba(204, 204, 204, 0.3);
-    //transform: rotate(8deg);
-    cursor: pointer;
-    text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
-    z-index: 999;
-  }
-  .class-num span {
-    color: #dcdcdc;
-  }
-  .class-num span:hover {
-    color: #6aabef;
+    width: 100%;
+    max-width: 500px;
+    display: flex;
+    top: 5px;
+    right: 0px;
+    z-index: 10;
+
+    .class-num {
+      flex: 1.5;
+      display: inline-block;
+      font-weight: bold;
+      font-size: 2rem;
+      color: rgba(204, 204, 204, 0.3);
+      //transform: rotate(8deg);
+      cursor: pointer;
+      //text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
+      .q-icon {
+        font-size: 24px !important;
+        display: inline-block;
+      }
+      span {
+        color: #dcdcdc;
+        &:hover {
+          color: #6aabef;
+        }
+      }
+    }
+    .pdfnum {
+      flex: 1;
+      position: relative;
+
+      line-height: 32px;
+      color: rgba(204, 204, 204, 0.5);
+      font-weight: bold;
+      //text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
+      img {
+        position: absolute;
+        top: 10px;
+        left: 0px;
+        width: 24px;
+        height: 24px;
+      }
+      .pdftext {
+        position: absolute;
+        margin-left: 30px;
+        font-size: 2rem;
+        top: 5px;
+        color: #dcdcdc;
+        &:hover {
+          color: #6aabef;
+        }
+      }
+    }
+
+    .teachicon {
+      flex: 1;
+      top: 10px;
+      position: relative;
+      color: #000;
+      height: 32px;
+      .teachname {
+        position: absolute;
+        color: #dcdcdc;
+        top: 4px;
+        left: 30px;
+      }
+    }
+    .total-studentnum {
+      flex: 1.2;
+      position: relative;
+      color: rgba(204, 204, 204, 0.5);
+      z-index: 999;
+      font-weight: bold;
+      top: 8px;
+      img {
+        display: inline-block;
+        width: 32px;
+        height: 32px;
+      }
+      div {
+        display: inline-block;
+        position: absolute;
+        font-size: 1.5rem;
+        color: #dcdcdc;
+        top: 2px;  
+        &:hover {
+          color: #6aabef;
+        }
+      }
+    }
+    .percentage-studentanswer {
+      position: fixed;
+      top: 5px;
+      right: 0%;
+      z-index: 999;
+    }
   }
+
   .board-head {
     display: none;
     overflow: visible;
@@ -310,7 +392,7 @@
         width: 32px;
         height: 32px;
         line-height: 26px;
-        padding:4px;
+        padding: 4px;
         cursor: pointer;
         text-align: center;
         margin: 3px 0;
@@ -328,10 +410,10 @@
           fill: transparent !important;
           font-size: 20px;
         }
-        .irs-icon{
+        .irs-icon {
           font-size: 24px;
           position: relative;
-          top:-1px;
+          top: -1px;
         }
         &:hover,
         &:active {
@@ -347,10 +429,10 @@
             fill: transparent !important;
             font-size: 20px;
           }
-          .irs-icon{
+          .irs-icon {
             font-size: 24px;
             position: relative;
-            top:-1px;
+            top: -1px;
           }
         }
       }
@@ -557,39 +639,8 @@
     border-bottom: 0;
   }
 }
-//媒体查询
-@media screen and (min-width: 0px) and (max-width: 1024px) {
-  .pdfnum {
-    right: 13% !important;
-  }
-  .total-studentnum {
-    right: 4% !important;
-  }
-  .class-num {
-    right: 24% !important;
-  }
-}
-
-@media screen and (min-width: 1025px) and (max-width: 1366px) {
-  .pdfnum {
-    right: 9.5% !important;
-  }
-  .total-studentnum {
-    right: 2.5% !important;
-  }
-  .class-num {
-    right: 18% !important;
-  }
-}
-
-@media screen and (min-width: 1367px) and (max-width: 1920px) {
-  .pdfnum {
-    right: 8% !important;
-  }
-  .total-studentnum {
-    right: 2.5% !important;
-  }
-  .class-num {
-    right: 14% !important;
+@media screen and (max-width: 960px) {
+  .top-right-info {
+    width: 100%;
   }
 }

HiTeachCC/ClientApp/src/views/Board.vue

@@ -1,13 +1,18 @@
+<!--/* eslint-disable */-->
 <template>
     <div class="board">
         <!--<BoardHead></BoardHead>-->
 
+        
+
+        <div class="top-right-info">
+               
         <p class="class-num" @click="clickQRcode()" v-if="classNum">
             <img src="../assets/img/erweimanew.svg" class="q-icon" style="margin-top:-6px;font-weight: bold;margin-left:2px"></img>
             <span> {{classNum}}</span>
         </p>
-        <div class="teachicon"><img src="../assets/img/teacher.png" /><span class="teachname">{{teachname}}</span></div>
         <div class="pdfnum"><img :src=filetypeImage /><div class="pdftext">{{slidenum}}/{{totalpage}}</div></div>
+        <div class="teachicon"><img src="../assets/img/teacher.png" /><span class="teachname">{{teachname}}</span></div>
         <div class="total-studentnum"><img src="../assets/img/totalnumnew.png" /><div>{{students.length}}</div></div>
         <div class="percentage-studentanswer" @click="popuphd()">
             <q-circular-progress show-value
@@ -21,6 +26,8 @@
                 {{StudentPercentage}}%
             </q-circular-progress>
         </div>
+        
+        </div>
         <Card :styleObj="styleObj" :componentIndex="componentIndex" v-if="isShowCard"></Card>
         <div class="board-main">
             <!--<BoardLeft></BoardLeft>-->
@@ -59,7 +66,7 @@
             <div class="board-right">
                 <div class="boardArea">
                     <!--pdf生成的png和轮播-->
-                    <Pdf @LoadingPdf="PdfshowLoading" @LoadingPdfPage="LoadingPage" ref="Pdf"></Pdf>
+                    <Pdf @LoadingPdf="PdfshowLoading" @LoadingPdfPage="LoadingPage" ref="Pdf" style="z-index:99"></Pdf>
                     <!--konva容器-->
                     <div id="lastPagebox" v-show="lastpageShow"></div>
                     <div id="container" v-on:click="add()"></div>
@@ -3949,79 +3956,16 @@ import { locale } from 'core-js'
         margin-top: 20px;
     }
 
-    .total-studentnum {
-        position: fixed;
-        width: 100px;
-        height: 26px;
-        top: 1%;
-        right: 9%;
-        color: rgba(204,204,204,.5);
-        z-index: 999;
-        font-weight: bold;
-        text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
-    }
-
-        .total-studentnum img {
-            float: left;
-            width: 32px;
-            height: 32px;
-            text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
-        }
-
-        .total-studentnum div {
-            font-size: 1.5rem;
-            color: #dcdcdc;
-            float: left;
-            margin-left: 1%;
-            line-height: 32px;
-        }
-
-            .total-studentnum div:hover {
-                color: #6aabef;
-            }
-
-    .percentage-studentanswer {
-        position: fixed;
-        top: 0%;
-        right: 0%;
-        z-index: 999;
-    }
-
-    .pdfnum {
-        position: fixed;
-        top: 1%;
-        right: 6%;
-        width: 105px;
-        height: 32px;
-        line-height: 32px;
-        z-index: 999;
-        color: rgba(204,204,204,.5);
-        font-weight: bold;
-        text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
-    }
+   
 
-    .pdftext:hover {
-        color: #6aabef;
-    }
+  
 
-    .pdfnum img {
-        float: left;
-        width: 32px;
-        height: 32px;
-        text-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1);
-    }
 
     .q-ma-md {
         margin: 3px 12px !important;
     }
 
-    .pdftext {
-        float: left;
-        margin-left: 1%;
-        font-size: 1.5rem;
-        line-height: 32px;
-        color: #dcdcdc;
-    }
+  
 
     .ivu-upload-list {
         margin-top: 0px !important;
@@ -4299,22 +4243,5 @@ import { locale } from 'core-js'
         font-size:22px;
         color:#ccc;
     }
-    .teachicon {
-        position: fixed;
-        top:5%;
-        right:2.5%;
-        color:#000;
-        width:100px;
-        height:32px;
-        z-index:999;
-    }
-        .teachicon img {
-            float:left;
-        }
-    .teachname {
-        color: #dcdcdc;
-        float:left;
-        margin-top:2%;
-        margin-left:2%;
-    }
+   
 </style>