zhangjie 3 vuotta sitten
vanhempi
commit
7e097580f2

+ 0 - 1
card/assets/styles/card-design.scss

@@ -203,7 +203,6 @@
     &-title {
       .el-input__inner {
         font-size: 24px;
-        font-family: "楷体";
         font-weight: bold;
         line-height: 33px;
         height: 33px;

+ 0 - 1
card/assets/styles/card-preview.scss

@@ -432,7 +432,6 @@
   }
   &-title {
     font-size: 24px;
-    font-family: "楷体";
     font-weight: bold;
     overflow: hidden;
 

+ 0 - 1
card/assets/styles/card-temp.css

@@ -369,7 +369,6 @@
 }
 .card-head-title {
   font-size: 24px;
-  font-family: "楷体";
   font-weight: bold;
   overflow: hidden;
 }

+ 1 - 1
card/components/common/FontFamilySelect.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-const PREDEFINE_OPTIONS = ["宋体", "楷体", "黑体"];
+const PREDEFINE_OPTIONS = ["宋体", "黑体"];
 
 export default {
   name: "font-family-select",

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
card/previewTemp.js


+ 1 - 4
src/modules/base/components/ModifyFlowDetail.vue

@@ -285,10 +285,7 @@
               </el-form>
             </div>
             <!-- 抄送人 -->
-            <div
-              v-if="curNode.property.approveUserType === 'USER'"
-              class="property-part"
-            >
+            <div class="property-part">
               <h4 class="property-part-title">设置抄送人</h4>
               <div class="flow-users">
                 <el-button

+ 25 - 20
src/modules/exam/components/ModifyTaskApply.vue

@@ -68,26 +68,31 @@
         </el-row>
       </el-form>
 
-      <table
-        class="table task-exam-room"
-        v-if="examRoomInfoList.length && !IS_MODEL2"
-      >
-        <colgroup>
-          <col width="400" />
-          <col width="100" />
-          <col width="100" />
-        </colgroup>
-        <tr>
-          <th v-if="hasClassInfo">使用班级</th>
-          <th>人数</th>
-          <th>总印份数</th>
-        </tr>
-        <tr v-for="(item, index) in examRoomInfoList" :key="index">
-          <td v-if="hasClassInfo">{{ item.clazzNames }}</td>
-          <td>{{ item.studentCount }}</td>
-          <td>{{ item.printCount }}</td>
-        </tr>
-      </table>
+      <div v-if="examRoomInfoList.length && !IS_MODEL2" class="task-exam-room">
+        <el-table
+          :data="examRoomInfoList"
+          border
+          style="width: 100%"
+          max-height="300"
+        >
+          <el-table-column
+            v-if="hasClassInfo"
+            prop="clazzNames"
+            label="使用班级"
+            min-width="400"
+          ></el-table-column>
+          <el-table-column
+            prop="studentCount"
+            label="人数"
+            min-width="100"
+          ></el-table-column>
+          <el-table-column
+            prop="printCount"
+            label="总印份数"
+            min-width="100"
+          ></el-table-column>
+        </el-table>
+      </div>
 
       <div
         class="part-box part-box-pad task-exam-room"

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä