Browse Source

調整 IRS UI icon 與文字題顯示

Louise Lin 3 years ago
parent
commit
6767834e8c

+ 34 - 19
HiTeachCC/ClientApp/src/assets/css/OptionView.less

@@ -292,17 +292,16 @@ button {
   line-height: 26px !important;
   border: 1px solid white;
 }
-.ans-hide-star{
+.ans-hide-star {
   position: absolute;
   display: inline-block;
   left: 10% !important;
   top: 7%;
   width: 20px;
   height: 20px;
-  
+
   font-size: 16px;
   line-height: 19px !important;
-  
 }
 .answer-default-show {
   text-align: center;
@@ -316,6 +315,18 @@ button {
   margin: 0 auto;
   margin-top: 50px;
   overflow-y: scroll;
+  .statement {
+    max-width: 120px;
+    max-height: 39px;
+    overflow: hidden;
+    //word-break:break-all;
+    text-overflow: ellipsis;
+    position: relative;
+    top: 10px;
+    left:5px;
+    font-size: 10px;
+    color: white;
+  }
 }
 
 .studybox {
@@ -341,10 +352,9 @@ button {
   width: 30px;
   height: 30px;
   //font-size: 20px;
- 
+
   display: block;
   line-height: 30px;
-  
 }
 
 .statement-icon {
@@ -398,18 +408,18 @@ button {
   margin-top: 15px;
   /*margin-left: 70px;
     margin-top: 30px;*/
-    .ans-show-stuno {
-      position: absolute;
-      display: inline-block;
-      left: 10% !important;
-      top: 7%;
-      width: 20px;
-      height: 20px;
-      border-radius: 50%;
-      font-size: 16px;
-      line-height: 19px !important;
-      border: 1px solid white;
-    }
+  .ans-show-stuno {
+    position: absolute;
+    display: inline-block;
+    left: 10% !important;
+    top: 7%;
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    font-size: 16px;
+    line-height: 19px !important;
+    border: 1px solid white;
+  }
 }
 
 .answercorrect {
@@ -776,14 +786,19 @@ button {
 .pop-up {
   width: 100%;
   height: 11vh !important;
-  padding: 10px;
+  //padding: 10px;
   background-color: #85e9ff;
   color: rgb(0, 0, 0);
   font-weight: bold;
-  overflow: auto;
+  
   border-radius: 4px;
   position: relative;
   font-size: 16px;
+  p{
+    overflow: auto;
+    height: 55px;
+    padding:5px;
+  }
 }
 .statementInfo {
   position: absolute;

File diff suppressed because it is too large
+ 7 - 0
HiTeachCC/ClientApp/src/assets/icons/svg/exitfullscreen.svg


+ 11 - 10
HiTeachCC/ClientApp/src/components/Chart/OptionView.vue

@@ -44,7 +44,7 @@
         <div classs="sliderbox" v-if="status === 'default'"><Slider v-model="value1" :max="30" :step="5" show-stops @on-change="valuestyle()"></Slider></div>
       </div>
       <div class="righticon-group">
-        <div class="rightlisticon" @click="styleadjust(aspectRatio)"><svg-icon icon-class="full-screen" /></div>
+        <div class="rightlisticon" @click="styleadjust(aspectRatio)"><svg-icon :icon-class="aspectRatio!='screen'?'full-screen':'exitfullscreen'" /></div>
         <div class="rightlisticon" @click="hiddenShow()"><svg-icon icon-class="Close" /></div>
       </div>
       <div>
@@ -67,7 +67,7 @@
                 <q-popup-proxy @before-hide="hideangleicon()" :offset="[65, -165]">
                   <draggable class="list-group" @start="statementToimage" @end="stickupend">
                     <div class="pop-up" id="statementBox" @click="detailbtn($event)">
-                      {{ item.statement }}
+                     <p>{{ item.statement }}</p>
                       <div class="statementInfo">{{ item.sort }}-{{ item.studentName }}</div>
                     </div>
                   </draggable>
@@ -104,7 +104,7 @@
                 <q-popup-proxy @before-hide="hideangleicon()" :offset="[65, -165]">
                   <draggable class="list-group" @start="statementToimage" @end="stickupend">
                     <div class="pop-up" id="statementBox" @click="detailbtn($event)">
-                      {{ item.statement }}
+                      <p>{{ item.statement }}</p>
                       <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                     </div>
                   </draggable>
@@ -142,7 +142,7 @@
                 <q-popup-proxy @before-hide="hideangleicon()" :offset="[65, -165]">
                   <draggable class="list-group" @start="statementToimage" @end="stickupend">
                     <div class="pop-up" id="statementBox" @click="detailbtn($event)">
-                      {{ item.statement }}
+                     <p>{{ item.statement }}</p>
                       <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                     </div>
                   </draggable>
@@ -180,16 +180,17 @@
               <div class="showhide-answer" v-if="item.option === ''"></div>
               <!--名牌发言-->
               <div class="q-pa-md">
-                <q-btn push class="namebrand-pop" @click="angleshow()" v-if="item.statement !== ''">
+                <p class="statement">{{ item.statement }}</p>
+                <!-- <q-btn push class="namebrand-pop" @click="angleshow()" v-if="item.statement !== ''">
                   <q-popup-proxy @before-hide="hideangleicon()" :offset="[90, -155]">
                     <draggable class="list-group" @start="statementToimage" @end="stickupend">
                       <div class="pop-up" id="statementBox" @click="detailbtn($event)">
-                        {{ item.statement }}
+                        
                         <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                       </div>
                     </draggable>
                   </q-popup-proxy>
-                </q-btn>
+                </q-btn> -->
               </div>
               <q-dialog v-model="alert" transition-show="rotate" transition-hide="rotate">
                 <q-card>
@@ -226,7 +227,7 @@
                   <q-popup-proxy @before-hide="hideangleicon()" :offset="[90, -155]">
                     <draggable class="list-group" @start="statementToimage" @end="stickupend">
                       <div class="pop-up" id="statementBox" @click="detailbtn($event)">
-                        {{ item.statement }}
+                       <p>{{ item.statement }}</p>
                         <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                       </div>
                     </draggable>
@@ -264,11 +265,11 @@
               <div class="showhide-answer" v-if="item.option === ''"></div>
               <!--名牌发言 设定答案后-->
               <div class="q-pa-md">
-                <q-btn push class="namebrand-pops" @click="angleshow()" v-if="item.statement !== ''">
+                <q-btn push class="namebrand-pops" @click="angleshow()" v-if="item.statement !== ''">!
                   <q-popup-proxy @before-hide="hideangleicon()" :offset="[80, -155]">
                     <draggable class="list-group" @start="statementToimage" @end="stickupend">
                       <div class="pop-up" id="statementBox" @click="detailbtn($event)">
-                        {{ item.statement }}
+                       <p>{{ item.statement }}</p>
                         <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                       </div>
                     </draggable>