調整 icon 文字題便利貼樣式

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

@@ -742,7 +742,7 @@ button {
   word-break: break-all;
   /*overflow: hidden !important;*/
   text-align: center;
-  background-color: #00a0c2 !important;
+  background-color: #85e9ff !important;
   -webkit-box-shadow: none !important;
   box-shadow: none !important;
   margin-left: 0.3%;
@@ -763,7 +763,7 @@ button {
   position: absolute;
   width: 24px;
   height: 16px;
-  color: #00a0c2;
+  color: #85e9ff;
   border-width: 0px 11px 0px 0px;
   border-style: solid;
   border-color: transparent currentcolor transparent transparent;
@@ -776,18 +776,19 @@ button {
 .pop-up {
   width: 100%;
   height: 11vh !important;
-  padding: 2%;
-  background-color: #00a0c2;
-  color: #fff;
+  padding: 10px;
+  background-color: #85e9ff;
+  color: rgb(0, 0, 0);
+  font-weight: bold;
   overflow: auto;
-  border-radius: 10px;
+  border-radius: 4px;
   position: relative;
   font-size: 16px;
 }
 .statementInfo {
   position: absolute;
-  bottom: 0px;
-  right: 0px;
+  bottom: 10px;
+  right: 10px;
   font-size: 10px;
 }
 .roller {

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

@@ -405,6 +405,11 @@
   position: relative;
   top: -1px;
 }
+.tools > ul li span.fontbox .ques-icon {
+  position: relative;
+  top: 0px;
+  left: 1px;
+}
 .tools > ul li span.fontbox:hover,
 .tools > ul li span.fontbox:active {
   background: #0000ff;

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

@@ -476,6 +476,11 @@
           position: relative;
           top: -1px;
         }
+        .ques-icon{
+          position: relative;
+          top: 0px;
+          left:1px;
+        }
         &:hover,
         &:active {
           background: @main-color;

HiTeachCC/ClientApp/src/assets/icons/svg/Ques.svg

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26px" height="25px" viewBox="0 0 26 26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Combined Shape</title>
+            <path d="M22.1208362,12.2210016 C22.1208362,18.0197288 17.4197288,22.7208362 11.6210016,22.7208362 C5.82161283,22.7208362 1.12083622,18.0197288 1.12083622,12.2210016 C1.12083622,6.42194363 5.82161283,1.72083621 11.6210016,1.72083621 C17.4197288,1.72083621 22.1208362,6.42194363 22.1208362,12.2210016 Z M23.1208362,22.7208362 L13.1208362,12.7208362" id="Combined-Shape" stroke-width='2'></path>
+</svg>

HiTeachCC/ClientApp/src/components/Chart/OptionView.vue

@@ -23,8 +23,8 @@
       </div>
 
       <div class="control-btngroup" :class="[statusshow ? 'thin' : '']">
+         <div class="resetAns listicon" @click="againanswer" v-show="current != 'bar'&&current != 'pie'"><svg-icon icon-class="refresh" /></div>
         <div class="listicon" v-if="(status === 'list' || status === 'default') && currentIRSModel == 'irsImmediately'" :class="AnswerShowhide" @click="showhide(AnswerShowhide)"><img :src="ShowHideanswer" /></div>
-        <div class="resetAns listicon" @click="againanswer" v-show="current != 'bar'&&current != 'pie'"><svg-icon icon-class="refresh" /></div>
         <button @click="listbtn('list')" :class="['listicon', current === 'list' ? 'clickicon' : '']"><svg-icon icon-class="switchover" /></button>
         <!-- <button @click="listbtn('text')" :class='["listicon",current ==="text"? "clickicon":""]'><svg-icon icon-class="Text-icons" /></button> -->
         <!--设定答案-->
@@ -68,7 +68,7 @@
                   <draggable class="list-group" @start="statementToimage" @end="stickupend">
                     <div class="pop-up" id="statementBox" @click="detailbtn($event)">
                       {{ item.statement }}
-                      <div class="statementInfo">--{{ item.studentName }}</div>
+                      <div class="statementInfo">{{ item.sort }}-{{ item.studentName }}</div>
                     </div>
                   </draggable>
                 </q-popup-proxy>
@@ -105,7 +105,7 @@
                   <draggable class="list-group" @start="statementToimage" @end="stickupend">
                     <div class="pop-up" id="statementBox" @click="detailbtn($event)">
                       {{ item.statement }}
-                      <div class="statementInfo">--{{ item.studentName }}</div>
+                      <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                     </div>
                   </draggable>
                 </q-popup-proxy>
@@ -143,7 +143,7 @@
                   <draggable class="list-group" @start="statementToimage" @end="stickupend">
                     <div class="pop-up" id="statementBox" @click="detailbtn($event)">
                       {{ item.statement }}
-                      <div class="statementInfo">--{{ item.studentName }}</div>
+                      <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                     </div>
                   </draggable>
                 </q-popup-proxy>
@@ -185,7 +185,7 @@
                     <draggable class="list-group" @start="statementToimage" @end="stickupend">
                       <div class="pop-up" id="statementBox" @click="detailbtn($event)">
                         {{ item.statement }}
-                        <div class="statementInfo">--{{ item.studentName }}</div>
+                        <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                       </div>
                     </draggable>
                   </q-popup-proxy>
@@ -227,7 +227,7 @@
                     <draggable class="list-group" @start="statementToimage" @end="stickupend">
                       <div class="pop-up" id="statementBox" @click="detailbtn($event)">
                         {{ item.statement }}
-                        <div class="statementInfo">--{{ item.studentName }}</div>
+                        <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                       </div>
                     </draggable>
                   </q-popup-proxy>
@@ -269,7 +269,7 @@
                     <draggable class="list-group" @start="statementToimage" @end="stickupend">
                       <div class="pop-up" id="statementBox" @click="detailbtn($event)">
                         {{ item.statement }}
-                        <div class="statementInfo">--{{ item.studentName }}</div>
+                        <div class="statementInfo">{{ item.sort }}{{ item.studentName }}</div>
                       </div>
                     </draggable>
                   </q-popup-proxy>
@@ -469,28 +469,28 @@ export default {
       this.valuestyle()
     })
     //mockstudents
-    let mockstudents = []
-    for (let i = 1; i <= 100; i++) {
-      mockstudents.push({
-        sort: i,
-        id: '711545724451'+i,
-        accountid: '1637115457243'+i,
-        studentName: 'louise'+i,
-        sendTime: 1637115468066,
-        headImg: 'https://img.zcool.cn/community/01786557e4a6fa0000018c1bf080ca.png@1280w_1l_2o_100sh.png',
-        option: 'B',
-        done: true,
-        score: 0,
-        rank: '',
-        class: 'studyboxone',
-        showcardclass: 'brand',
-        answerclass: 'studyboxone',
-        answerbrand: 'brand',
-        statement: '',
-        status: 'online'
-      })
-    }
-    this.$store.state.students=mockstudents
+    // let mockstudents = []
+    // for (let i = 1; i <= 100; i++) {
+    //   mockstudents.push({
+    //     sort: i,
+    //     id: '711545724451'+i,
+    //     accountid: '1637115457243'+i,
+    //     studentName: 'louise'+i,
+    //     sendTime: 1637115468066,
+    //     headImg: 'https://img.zcool.cn/community/01786557e4a6fa0000018c1bf080ca.png@1280w_1l_2o_100sh.png',
+    //     option: 'B',
+    //     done: true,
+    //     score: 0,
+    //     rank: '',
+    //     class: 'studyboxone',
+    //     showcardclass: 'brand',
+    //     answerclass: 'studyboxone',
+    //     answerbrand: 'brand',
+    //     statement: '',
+    //     status: 'online'
+    //   })
+    // }
+    // this.$store.state.students=mockstudents
   },
   computed: {
     watchStudents() {

HiTeachCC/ClientApp/src/components/ToolBox.vue

@@ -139,7 +139,7 @@
       </li>
       <li title="IRS即问即答" @click="irsstart('irs')" v-show="students!=''">
         <span class="fontbox">
-          <svg-icon icon-class="irs-icon" class="fill-icon irs-icon" />
+          <svg-icon icon-class="ques" class="stroke-icon ques-icon" />
         </span>
       </li>
       <li title="IRS填空" @click="irsstart('text')" v-show="students!=''">