Browse Source

fix style

Michael Wang 3 years ago
parent
commit
521eb8fd3b

+ 1 - 1
package.json

@@ -60,6 +60,6 @@
     "vite": "^2.9.5",
     "vitest": "^0.9.3",
     "vue-eslint-parser": "^8.3.0",
-    "vue-tsc": "^0.34.6"
+    "vue-tsc": "^0.34.7"
   }
 }

+ 31 - 31
pnpm-lock.yaml

@@ -43,7 +43,7 @@ specifiers:
   vue: ^3.2.33
   vue-eslint-parser: ^8.3.0
   vue-router: ^4.0.14
-  vue-tsc: ^0.34.6
+  vue-tsc: ^0.34.7
   vuedraggable: 4.1.0
 
 dependencies:
@@ -92,7 +92,7 @@ devDependencies:
   vite: 2.9.5
   vitest: 0.9.3_happy-dom@2.55.0
   vue-eslint-parser: 8.3.0_eslint@8.13.0
-  vue-tsc: 0.34.6_typescript@4.6.3
+  vue-tsc: 0.34.7_typescript@4.6.3
 
 packages:
 
@@ -742,7 +742,7 @@ packages:
       vite: ^2.8.0
     dependencies:
       '@babel/standalone': 7.17.9
-      core-js: 3.21.1
+      core-js: 3.22.0
       magic-string: 0.26.1
       regenerator-runtime: 0.13.9
       systemjs: 6.12.1
@@ -774,32 +774,32 @@ packages:
       vue: 3.2.33
     dev: true
 
-  /@volar/code-gen/0.34.6:
-    resolution: {integrity: sha512-sFgiaN3F+Sy93uVDtnZxfhEdy15ERSZ9qHY9wny4oQHztxS0pscrIGOQcvSoaK3pcyR8xGTouXkNf0BsOUwuXA==}
+  /@volar/code-gen/0.34.7:
+    resolution: {integrity: sha512-E1N1VGlChXd0D7WPmmjKhtcZdUKNpBFC4BRqfY+7FZGh89FZlw3uG6Nn76/DjMBLVhfCIY9vA8pwWIN1lI8nYw==}
     dependencies:
-      '@volar/source-map': 0.34.6
+      '@volar/source-map': 0.34.7
     dev: true
 
-  /@volar/source-map/0.34.6:
-    resolution: {integrity: sha512-TIAxtvFIANh0PfQFY7dT/f2MIvpNRzJ7xrvlqwl1oYt7sa8AIposBFGS873s4avOuz15AoubKU7uZnVLYJ5AWg==}
+  /@volar/source-map/0.34.7:
+    resolution: {integrity: sha512-KBNcKCWKsY2f965xuuT4dSbt8GR6nHMzb9gi7ucUHtmRQnvrB31BLBvZNQTHMqkbhRmKArDSuIrbUUG9yu0OXQ==}
     dev: true
 
-  /@volar/vue-code-gen/0.34.6:
-    resolution: {integrity: sha512-0wh5fhQsxY6GL/zrxabjY+lAsFsaUNWDl+45iVeuczGP9sU07lpHoCwHBHBqCK8kxbvAJZaa3Me66apoq5BEvw==}
+  /@volar/vue-code-gen/0.34.7:
+    resolution: {integrity: sha512-vejzO30QrDAEZKguZI8hlAnKhwNoX1INXrOMurlmwCbNft2oEloT+ikFF8QYDz3vWWrdFSsoOKp3BTHyurJ5Nw==}
     dependencies:
-      '@volar/code-gen': 0.34.6
-      '@volar/source-map': 0.34.6
+      '@volar/code-gen': 0.34.7
+      '@volar/source-map': 0.34.7
       '@vue/compiler-core': 3.2.33
       '@vue/compiler-dom': 3.2.33
       '@vue/shared': 3.2.33
     dev: true
 
-  /@volar/vue-typescript/0.34.6:
-    resolution: {integrity: sha512-vKEYnDw9BhIMR6+Rp1Ue/8TpBjYNm4+3fIom4wMxFDlEOCku7fsF169QgZuDDvyPrFlurT878qjKYf88cYFCgA==}
+  /@volar/vue-typescript/0.34.7:
+    resolution: {integrity: sha512-Ebln64LQutjuNs8nk57oFo45JMQVdZKThkNAeFrzaqB0UItazRQpSXet4vHzfV18FMCV3Cc6fEqZ14WZzQAxgQ==}
     dependencies:
-      '@volar/code-gen': 0.34.6
-      '@volar/source-map': 0.34.6
-      '@volar/vue-code-gen': 0.34.6
+      '@volar/code-gen': 0.34.7
+      '@volar/source-map': 0.34.7
+      '@volar/vue-code-gen': 0.34.7
       '@vue/compiler-sfc': 3.2.33
       '@vue/reactivity': 3.2.33
     dev: true
@@ -1107,7 +1107,7 @@ packages:
     hasBin: true
     dependencies:
       caniuse-lite: 1.0.30001332
-      electron-to-chromium: 1.4.108
+      electron-to-chromium: 1.4.111
       escalade: 3.1.1
       node-releases: 2.0.3
       picocolors: 1.0.0
@@ -1262,8 +1262,8 @@ packages:
       safe-buffer: 5.1.2
     dev: true
 
-  /core-js/3.21.1:
-    resolution: {integrity: sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==}
+  /core-js/3.22.0:
+    resolution: {integrity: sha512-8h9jBweRjMiY+ORO7bdWSeWfHhLPO7whobj7Z2Bl0IDo00C228EdGgH7FE4jGumbEjzcFfkfW8bXgdkEDhnwHQ==}
     requiresBuild: true
     dev: false
 
@@ -1441,8 +1441,8 @@ packages:
       sumchecker: 1.3.1
     dev: true
 
-  /electron-to-chromium/1.4.108:
-    resolution: {integrity: sha512-/36KkMuL6+WTrodVlOjtHhH9Ro7BgRaQrh0bfKckwDtdRSjTBuZCOddeXxzK1PkwphoeTxGUFVT9xnmvQ7xEdw==}
+  /electron-to-chromium/1.4.111:
+    resolution: {integrity: sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw==}
     dev: true
 
   /electron/1.7.16:
@@ -2516,7 +2516,7 @@ packages:
       vfonts: 0.0.3
       vooks: 0.2.12_vue@3.2.33
       vue: 3.2.33
-      vueuc: 0.4.28_vue@3.2.33
+      vueuc: 0.4.29_vue@3.2.33
     dev: false
 
   /nanoid/3.3.2:
@@ -2984,8 +2984,8 @@ packages:
       glob: 7.2.0
     dev: true
 
-  /rollup/2.70.1:
-    resolution: {integrity: sha512-CRYsI5EuzLbXdxC6RnYhOuRdtz4bhejPMSWjsFLfVM/7w/85n2szZv6yExqUXsBdz5KT8eoubeyDUDjhLHEslA==}
+  /rollup/2.70.2:
+    resolution: {integrity: sha512-EitogNZnfku65I1DD5Mxe8JYRUCy0hkK5X84IlDtUs+O6JRMpRciXTzyCUuX11b5L5pvjH+OmFXiQ3XjabcXgg==}
     engines: {node: '>=10.0.0'}
     hasBin: true
     optionalDependencies:
@@ -3504,7 +3504,7 @@ packages:
       esbuild: 0.14.36
       postcss: 8.4.12
       resolve: 1.22.0
-      rollup: 2.70.1
+      rollup: 2.70.2
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
@@ -3593,13 +3593,13 @@ packages:
       vue: 3.2.33
     dev: false
 
-  /vue-tsc/0.34.6_typescript@4.6.3:
-    resolution: {integrity: sha512-rEr8/BrpSN2QmnTw6MuT0WJA/qx54xDqSXG6EBGt37fn7jLCrKYF37GW3xZCdktO0V53l1XF2ssBtmLL+OI2ww==}
+  /vue-tsc/0.34.7_typescript@4.6.3:
+    resolution: {integrity: sha512-GcdwGuddEakVBHKw7uiZUfHqobGD4Ym2XExGuwYuxw7rT50ZnRZvYQ3IB7zyPLa7UZEmiy6HTJiTrArw7ZOu+w==}
     hasBin: true
     peerDependencies:
       typescript: '*'
     dependencies:
-      '@volar/vue-typescript': 0.34.6
+      '@volar/vue-typescript': 0.34.7
       typescript: 4.6.3
     dev: true
 
@@ -3622,8 +3622,8 @@ packages:
       vue: 3.2.33
     dev: false
 
-  /vueuc/0.4.28_vue@3.2.33:
-    resolution: {integrity: sha512-Udr1ROwJocHIThA5G+H5qN1QEFI4pskDvl+w/2Ul2XIjaAeIuQ6ygEOKHOXRJqKX5PxcTi1QQUpb7yQWsDw7ww==}
+  /vueuc/0.4.29_vue@3.2.33:
+    resolution: {integrity: sha512-OlypOEll6YoTKnZx2aPml6orygNuzv+kwIztERzYiXPhCOE7/QMGQQek8NI/mDkb25vlglvm54n91ypYPMx8UQ==}
     peerDependencies:
       vue: ^3.0.11
     dependencies:

+ 5 - 6
src/features/OnlineExam/Examing/ExamingHome.vue

@@ -197,12 +197,12 @@ addInterval(() => checkRemoteApp(), 3 * 60 * 1000);
   <div v-if="!loading" class="container">
     <div class="header">
       <RemainTime @onEndtime="shouldSubmitPaper"></RemainTime>
-      <div style="display: flex; flex-direction: column">
-        <div style="margin-bottom: 12px">{{ store.exam.courseName }}</div>
+      <div class="tw-flex tw-flex-wrap tw-justify-between">
+        <div>{{ store.exam.courseName }}</div>
         <OverallProgress></OverallProgress>
       </div>
       <div>
-        {{ store.user.displayName }} -&nbsp;
+        {{ store.user.displayName }} -
         {{ store.user.studentCodeList.join(",") }}
       </div>
       <QuestionFilters></QuestionFilters>
@@ -266,7 +266,7 @@ addInterval(() => checkRemoteApp(), 3 * 60 * 1000);
   grid-template-areas:
     "header header"
     "main side";
-  grid-template-rows: 80px minmax(0, 1fr);
+  grid-template-rows: minmax(60px, 60px) minmax(0, 1fr);
   grid-template-columns: 1fr 400px;
 
   height: 100vh;
@@ -277,9 +277,8 @@ addInterval(() => checkRemoteApp(), 3 * 60 * 1000);
   display: grid;
   align-items: center;
   justify-items: center;
-  grid-template-columns: 200px 280px 1fr 300px 100px;
+  grid-template-columns: minmax(100px, 200px) minmax(200px, 300px) 1fr 300px 100px;
   grid-area: header;
-  height: 80px;
   background-color: #f5f5f5;
 }
 

+ 8 - 3
src/features/OnlineExam/Examing/RemainTime.vue

@@ -175,7 +175,7 @@ watch(
 
 <template>
   <div class="remain-time">
-    <span style="font-size: 14px">剩余时间</span><br />
+    <span>剩余时间</span>
     <span
       class="enhanced-remain-time"
       :class="[enhancedRemainTimeStyle && 'animated infinite pulse']"
@@ -187,13 +187,18 @@ watch(
 
 <style scoped>
 .remain-time {
-  font-size: 25px;
   width: 100%;
-  text-align: center;
+  margin-left: 10px;
+
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
 }
 
 .enhanced-remain-time {
+  font-size: 25px;
   color: red;
+  margin-left: 4px;
 }
 
 .animated {

+ 1 - 1
src/features/OnlineExam/Examing/TextQuestionView.vue

@@ -267,7 +267,7 @@ watch(
   () => store.exam.currentQuestion?.order,
   async () => {
     if (!store.exam.WEIXIN_ANSWER_ENABLED) return;
-    if (store.exam.currentQuestion.questionType !== "ESSAY") return;
+    if (store.exam.currentQuestion?.questionType !== "ESSAY") return;
 
     await fetchQRCode();
   },

+ 2 - 2
src/features/OnlineExam/OnlineExamOverview/OnlineExamOverview.vue

@@ -83,7 +83,7 @@ onMounted(async () => {
       { "axios-retry": { retries: 4 }, noErrorMessage: true }
     );
 
-    // const res = { data: { examRecordDataId: 8066803, courseName: "test" } };
+    // const res = { data: { examRecordDataId: 8066868, courseName: "test" } };
 
     startInfo = res.data;
     examRecordDataId = res.data.examRecordDataId;
@@ -139,7 +139,7 @@ function goToPaper() {
       <n-button
         type="success"
         :disabled="forceTime > 0"
-        style="display: inline-block; width: 100%"
+        style="width: 100%"
         @click="gotoPaperClicked"
       >
         接受以上条款,开始考试(倒计时: