Quellcode durchsuchen

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

lsc vor 2 Wochen
Ursprung
Commit
bcaf7376c9

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.41f4b019ef3d9c12886b843a066985fb.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.8fff3b43d76d422f461f.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.2d06dc44b9fcce2397d8e639acfb25a0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.77baa4e90eb24f8afbed.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.2d06dc44b9fcce2397d8e639acfb25a0.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.2d06dc44b9fcce2397d8e639acfb25a0.css.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.41f4b019ef3d9c12886b843a066985fb.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.77baa4e90eb24f8afbed.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.77baa4e90eb24f8afbed.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 4 - 2
src/components/components/choseWorksDetailDialog.vue

@@ -4,6 +4,7 @@
       :visible.sync="show"
       width="100%"
       height="100%"
+      style="overflow: hidden;"
       fullscreen
       :modal="true"
       :close-on-click-modal="false"
@@ -84,7 +85,7 @@
                         >
                           (多选题)
                         </div>
-                        <div style="display: flex;align-items: center;">题目:<span v-html="renderedFormula(item1.teststitle)"></span></div>
+                        <div style="display: flex;"><span style="flex-shrink: 0;">题目:</span><span v-html="renderedFormula(item1.teststitle)"></span></div>
                       </div>
                       <img
                         v-if="item1.img"
@@ -4388,9 +4389,10 @@ ol {
 }
 
 .a_add_head >>> .katex {
-  font-size: 16px;
+  font-size: 14px;
   width: 100%;
   white-space: normal;
+  font-family: '黑体' !important;
 }
 .a_add_head >>> .katex .base{
   display: inline !important;

+ 13 - 9
src/components/easy2/studyStudent.vue

@@ -506,6 +506,7 @@
                   flex-direction: column;
                   position: relative;
                 "
+                class="renderedFor"
               >
                 <div
                   style="
@@ -1567,7 +1568,7 @@
                       </div>
                     </div>
                     <div
-                      class="tooldetail"
+                      class="tooldetail renderedFor"
                       v-if="tool.toolDetail != ''"
                       :class="{
                         isUpdateToolDetailClass: toolDetailIndex == toolIndex
@@ -6205,6 +6206,7 @@
                               word-break: break-word;
                               cursor: pointer;
                             "
+                            class="renderedFor"
                           >
                             {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
@@ -13025,21 +13027,21 @@
             :key="index1"
           >
             <div class="a_add_head">
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;">
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
-                <div>题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
+                <div class="renderedFor">题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
               </div>
               <img
                 v-if="testJson.testJson[index1].img"
@@ -31101,17 +31103,19 @@ div::-webkit-scrollbar {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.pb_content >>> .katex {
-  font-size: 16px;
+
+.renderedFor >>> .katex {
+  font-size: 18px;
   width: 100%;
   white-space: normal;
+  font-family: '黑体' !important;
 }
-.pb_content >>> .katex .base{
+.renderedFor >>> .katex .base{
   display: inline !important;
   display: contents !important;
 }
 
-.pb_content >>> .katex .base .cjk_fallback{
+.renderedFor>>> .katex .base .cjk_fallback{
     white-space: normal !important;
     display: inline !important;
 }

+ 25 - 7
src/components/easy3/studyStudent.vue

@@ -522,6 +522,7 @@
                   flex-direction: column;
                   position: relative;
                 "
+                class="renderedFor"
               >
                 <div
                   style="
@@ -1556,7 +1557,7 @@
                         </div>
                       </div>
                     </div>
-                    <div class="tooldetail" v-if="tool.toolDetail != ''" :class="{isUpdateToolDetailClass:toolDetailIndex == toolIndex}">
+                    <div class="tooldetail renderedFor" v-if="tool.toolDetail != ''" :class="{isUpdateToolDetailClass:toolDetailIndex == toolIndex}">
                       <!-- <div class="toolTitle">工具描述</div> -->
                       <!-- @click.stop="updateToolDetail(toolIndex, 2)" 点击开启修改-->
                       <div style="height:100%;"
@@ -4473,6 +4474,7 @@
                               word-break: break-word;
                               cursor: pointer;
                             "
+                            class="renderedFor"
                           >
                             {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
@@ -9666,21 +9668,21 @@
             :key="index1"
           >
             <div class="a_add_head">
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;">
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
-                <div>题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
+                <div class="renderedFor">题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
               </div>
               <img
                 v-if="testJson.testJson[index1].img"
@@ -9799,13 +9801,13 @@
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
@@ -26358,4 +26360,20 @@ div::-webkit-scrollbar {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.renderedFor >>> .katex {
+  font-size: 18px;
+  width: 100%;
+  white-space: normal;
+  font-family: '黑体' !important;
+}
+
+.renderedFor >>> .katex .base{
+  display: inline !important;
+  display: contents !important;
+}
+
+.renderedFor >>> .katex .base .cjk_fallback{
+    white-space: normal !important;
+    display: inline !important;
+}
 </style>

+ 16 - 12
src/components/studyStudent.vue

@@ -484,6 +484,7 @@
                   flex-direction: column;
                   position: relative;
                 "
+                class="renderedFor"
               >
                 <div
                   style="
@@ -1507,7 +1508,7 @@
                         </div>
                       </div>
                     </div>
-                    <div class="tooldetail" v-if="tool.toolDetail != ''" :class="{isUpdateToolDetailClass:toolDetailIndex == toolIndex}">
+                    <div class="tooldetail renderedFor" v-if="tool.toolDetail != ''" :class="{isUpdateToolDetailClass:toolDetailIndex == toolIndex}">
                       <!-- <div class="toolTitle">工具描述</div> -->
                         <!-- @click.stop="updateToolDetail(toolIndex, 2)" -->
                       <div style="height:100%;"
@@ -4424,8 +4425,9 @@
                               word-break: break-word;
                               cursor: pointer;
                             "
+                            class="renderedFor"
                           >
-                              {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
+                              {{ index + 1 + "、"  }} <span  v-html="renderedFormula(item.teststitle)"></span>
                           </div>
                         </el-tooltip>
                       </div>
@@ -9593,21 +9595,21 @@
             :key="index1"
           >
             <div class="a_add_head">
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;">
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
-                  <div>题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
+                  <div class="renderedFor"><span>题目:</span> <span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
               </div>
               <img
                 v-if="testJson.testJson[index1].img"
@@ -9726,13 +9728,13 @@
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
@@ -26308,17 +26310,19 @@ div::-webkit-scrollbar {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-.pb_content >>> .katex {
-  font-size: 16px;
+
+.renderedFor >>> .katex {
+  font-size: 18px;
   width: 100%;
   white-space: normal;
+  font-family: '黑体' !important;
 }
-.pb_content >>> .katex .base{
+.renderedFor >>> .katex .base{
   display: inline !important;
   display: contents !important;
 }
 
-.pb_content >>> .katex .base .cjk_fallback{
+.renderedFor>>> .katex .base .cjk_fallback{
     white-space: normal !important;
     display: inline !important;
 }

+ 15 - 12
src/components/studySutdentClass/studyStudent.vue

@@ -521,6 +521,7 @@
                   flex-direction: column;
                   position: relative;
                 "
+                class="renderedFor"
               >
                 <div
                   style="
@@ -529,7 +530,7 @@
                     font-size: 18px;
                     color: #0e1e33;
                   "
-                  class="cont"
+                   class="cont"
                   v-if="
                     chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
                       .taskDetail != ''
@@ -1563,7 +1564,7 @@
                       </div>
                     </div>
                     <div
-                      class="tooldetail"
+                      class="tooldetail renderedFor"
                       v-if="tool.toolDetail != ''"
                       :class="{
                         isUpdateToolDetailClass: toolDetailIndex == toolIndex
@@ -6201,6 +6202,7 @@
                               word-break: break-word;
                               cursor: pointer;
                             "
+                            class="renderedFor"
                           >
                             {{ index + 1 + "、"  }} <span v-html="renderedFormula(item.teststitle)"></span>
                           </div>
@@ -12838,21 +12840,21 @@
             :key="index1"
           >
             <div class="a_add_head">
-              <div style="display: flex;align-items: center;">
+              <div style="display: flex;">
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
-                <div>题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
+                <div class="renderedFor">题目:<span v-html="renderedFormula(testJson.testJson[index1].teststitle)"></span></div>
               </div>
               <img
                 v-if="testJson.testJson[index1].img"
@@ -12971,13 +12973,13 @@
                 <span class="askIndex">{{ index1 + 1 }}</span>
                 <div
                   v-if="testJson.testJson[index1].type == '1'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (单选题)
                 </div>
                 <div
                   v-if="testJson.testJson[index1].type == '2'"
-                  style="margin-right: 5px; min-width: 70px"
+                  style="margin-right: 5px; min-width: 70px;flex-shrink: 0;"
                 >
                   (多选题)
                 </div>
@@ -30423,17 +30425,18 @@ div::-webkit-scrollbar {
 
   text-overflow: ellipsis;
 }
-.pb_content >>> .katex {
-  font-size: 16px;
+.renderedFor >>> .katex {
+  font-size: 18px;
   width: 100%;
   white-space: normal;
+  font-family: '黑体' !important;
 }
-.pb_content >>> .katex .base{
+.renderedFor >>> .katex .base{
   display: inline !important;
   display: contents !important;
 }
 
-.pb_content >>> .katex .base .cjk_fallback{
+.renderedFor>>> .katex .base .cjk_fallback{
     white-space: normal !important;
     display: inline !important;
 }

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.