more style

package.json

@@ -22,7 +22,7 @@
     "tailwindcss": "^2.2.7",
     "ua-parser-js": "^0.7.28",
     "viewerjs": "^1.10.1",
-    "vue": "^3.2.1",
+    "vue": "^3.2.2",
     "vue-router": "4.0.10"
   },
   "devDependencies": {
@@ -30,7 +30,7 @@
     "@types/node": "^16.4.4",
     "@types/ua-parser-js": "^0.7.36",
     "@vitejs/plugin-vue": "^1.4.0",
-    "@vue/compiler-sfc": "^3.2.1",
+    "@vue/compiler-sfc": "^3.2.2",
     "autoprefixer": "^10.3.1",
     "postcss": "^8.3.6",
     "typescript": "^4.3.5",

src/features/mark/MarkBoardKeyBoard.vue

@@ -27,8 +27,10 @@
       "
     >
       <div class="tw-flex tw-flex-col">
-        <div>总分</div>
-        <div class="total-score">
+        <div class="tw-flex tw-items-center tw-gap-2">
+          <img src="./images/总分.png" style="width: 13px; height: 16px" /> 总分
+        </div>
+        <div class="total-score tw-ml-5">
           {{ store.currentMarkResult?.markerScore }}
         </div>
       </div>
@@ -44,13 +46,30 @@
           ok-text="确定"
           cancel-text="取消"
           @confirm="$emit('allZeroSubmit')"
+          :overlayStyle="{ width: '200px' }"
         >
-          <a-button type="primary" shape="round" size="middle">
-            全零分
+          <a-button
+            type="primary"
+            size="middle"
+            style="
+              height: 76px;
+              border-radius: 10px;
+              padding: 7px;
+              background-color: #4db9ff;
+              border: none;
+            "
+          >
+            <span>全零分</span>
           </a-button>
         </a-popconfirm>
 
-        <qm-button type="primary" shape="round" size="middle" @click="submit">
+        <qm-button
+          type="primary"
+          shape="round"
+          size="middle"
+          style="height: 76px; border-radius: 10px; padding: 12px"
+          @click="submit"
+        >
           提交
         </qm-button>
       </div>

src/features/mark/MarkBoardMouse.vue

@@ -27,8 +27,10 @@
       "
     >
       <div class="tw-flex tw-flex-col">
-        <div>总分</div>
-        <div class="total-score">
+        <div class="tw-flex tw-items-center tw-gap-2">
+          <img src="./images/总分.png" style="width: 13px; height: 16px" /> 总分
+        </div>
+        <div class="total-score tw-ml-5">
           {{ store.currentMarkResult?.markerScore }}
         </div>
       </div>
@@ -44,13 +46,30 @@
           ok-text="确定"
           cancel-text="取消"
           @confirm="$emit('allZeroSubmit')"
+          :overlayStyle="{ width: '200px' }"
         >
-          <a-button type="primary" shape="round" size="middle">
-            全零分
+          <a-button
+            type="primary"
+            size="middle"
+            style="
+              height: 76px;
+              border-radius: 10px;
+              padding: 7px;
+              background-color: #4db9ff;
+              border: none;
+            "
+          >
+            <span>全零分</span>
           </a-button>
         </a-popconfirm>
 
-        <qm-button type="primary" shape="round" size="middle" @click="submit">
+        <qm-button
+          type="primary"
+          shape="round"
+          size="middle"
+          style="height: 76px; border-radius: 10px; padding: 12px"
+          @click="submit"
+        >
           提交
         </qm-button>
       </div>

src/features/mark/MarkBoardTrack.vue

@@ -12,30 +12,45 @@
       "
     >
       <div class="tw-flex tw-flex-col">
-        <div>总分</div>
-        <div class="total-score">
+        <div class="tw-flex tw-items-center tw-gap-2">
+          <img src="./images/总分.png" style="width: 13px; height: 16px" /> 总分
+        </div>
+        <div class="total-score tw-ml-5">
           {{ store.currentMarkResult?.markerScore }}
         </div>
       </div>
 
-      <div
-        class="
-          tw-flex tw-flex-col tw-place-content-center tw-items-center tw-gap-1
-        "
-      >
+      <div class="tw-flex tw-place-content-center tw-items-center tw-gap-1">
         <a-popconfirm
           v-if="store.setting.enableAllZero && !store.setting.forceSpecialTag"
           title="确定给全零分？"
           ok-text="确定"
           cancel-text="取消"
           @confirm="$emit('allZeroSubmit')"
+          :overlayStyle="{ width: '200px' }"
         >
-          <a-button type="primary" shape="round" size="middle">
-            全零分
+          <a-button
+            type="primary"
+            size="middle"
+            style="
+              height: 76px;
+              border-radius: 10px;
+              padding: 7px;
+              background-color: #4db9ff;
+              border: none;
+            "
+          >
+            <span>全零分</span>
           </a-button>
         </a-popconfirm>
 
-        <qm-button type="primary" shape="round" size="middle" @click="submit">
+        <qm-button
+          type="primary"
+          shape="round"
+          size="middle"
+          style="height: 76px; border-radius: 10px; padding: 12px"
+          @click="submit"
+        >
           提交
         </qm-button>
       </div>

src/features/mark/MarkHeader.vue

@@ -122,9 +122,10 @@
             "
           />
           {{ modeName }}
-          <DownOutlined
+          <img
             v-if="!store.setting.forceMode"
-            style="display: inline-flex"
+            src="./images/下拉.png"
+            style="width: 7px; height: 4px; margin-left: 2px"
           />
         </a-button>
       </a-dropdown>
@@ -229,9 +230,9 @@
           style="width: 10px; height: 12px; margin-right: 2px"
         />
         <span style="font-size: 14px">小助手</span>
-        <DownOutlined
-          style="font-size: 12px; display: inline-block"
-          class="tw-self-center tw-ml-1"
+        <img
+          src="./images/下拉.png"
+          style="width: 7px; height: 4px; margin-left: 2px"
         />
       </div>
     </a-popover>
@@ -253,10 +254,10 @@
       >
         {{ "分组:" + store.setting.groupNumber }}
       </div>
-      <DownOutlined
+      <img
         v-if="store.groups.length > 1"
-        style="font-size: 12px; display: inline-block"
-        class="tw-self-center"
+        src="./images/下拉.png"
+        style="width: 7px; height: 4px; margin-left: 2px"
       />
     </div>
     <div
@@ -493,6 +494,7 @@ watch(
   border-collapse: separate;
   border-spacing: 0 1em;
   color: #435488;
+  width: 240px;
 }
 .assistant-table tr td:nth-child(2) {
   text-align: right;

src/types/global.d.ts

@@ -42,5 +42,6 @@ declare module "vue" {
     AFormItem: typeof import("ant-design-vue")["FormItem"];
     AInput: typeof import("ant-design-vue")["Input"];
     APopover: typeof import("ant-design-vue")["Popover"];
+    APopconfirm: typeof import("ant-design-vue")["Popconfirm"];
   }
 }

yarn.lock

@@ -229,14 +229,14 @@
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-core@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.2.1.tgz#8e13232f7aef8e308fb2d4a10571a5640257064b"
-  integrity sha1-jhMjL3rvjjCPstShBXGlZAJXBks=
+"@vue/compiler-core@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.2.2.tgz#8d3e29f129579ed9b14f48af735fd8d95f248504"
+  integrity sha1-jT4p8SlXntmxT0ivc1/Y2V8khQQ=
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/shared" "3.2.1"
+    "@vue/shared" "3.2.2"
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
@@ -248,13 +248,13 @@
     "@vue/compiler-core" "3.2.0-beta.7"
     "@vue/shared" "3.2.0-beta.7"
 
-"@vue/compiler-dom@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.2.1.tgz#5cc68873f1928c7b9aee8c8a2846f7f362cb1ab9"
-  integrity sha1-XMaIc/GSjHua7oyKKEb382LLGrk=
+"@vue/compiler-dom@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.2.2.tgz#26e198498746c53047c3744d26fc95e670692ab7"
+  integrity sha1-JuGYSYdGxTBHw3RNJvyV5nBpKrc=
   dependencies:
-    "@vue/compiler-core" "3.2.1"
-    "@vue/shared" "3.2.1"
+    "@vue/compiler-core" "3.2.2"
+    "@vue/shared" "3.2.2"
 
 "@vue/compiler-sfc@^3.2.0-beta.5":
   version "3.2.0-beta.7"
@@ -279,18 +279,18 @@
     postcss-selector-parser "^6.0.4"
     source-map "^0.6.1"
 
-"@vue/compiler-sfc@^3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/compiler-sfc/download/@vue/compiler-sfc-3.2.1.tgz?cache=0&sync_timestamp=1628541026134&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fcompiler-sfc%2Fdownload%2F%40vue%2Fcompiler-sfc-3.2.1.tgz#7809b298cf0fbce62a2c628b7dfc1e82dd9a3a9b"
-  integrity sha1-eAmymM8PvOYqLGKLffwegt2aOps=
+"@vue/compiler-sfc@^3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/compiler-sfc/download/@vue/compiler-sfc-3.2.2.tgz#5b7b13b07689be8e4880d856f72d1be500785be9"
+  integrity sha1-W3sTsHaJvo5IgNhW9y0b5QB4W+k=
   dependencies:
     "@babel/parser" "^7.13.9"
     "@babel/types" "^7.13.0"
     "@types/estree" "^0.0.48"
-    "@vue/compiler-core" "3.2.1"
-    "@vue/compiler-dom" "3.2.1"
-    "@vue/compiler-ssr" "3.2.1"
-    "@vue/shared" "3.2.1"
+    "@vue/compiler-core" "3.2.2"
+    "@vue/compiler-dom" "3.2.2"
+    "@vue/compiler-ssr" "3.2.2"
+    "@vue/shared" "3.2.2"
     consolidate "^0.16.0"
     estree-walker "^2.0.1"
     hash-sum "^2.0.0"
@@ -310,25 +310,25 @@
     "@vue/compiler-dom" "3.2.0-beta.7"
     "@vue/shared" "3.2.0-beta.7"
 
-"@vue/compiler-ssr@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/compiler-ssr/download/@vue/compiler-ssr-3.2.1.tgz#f900762f83482e44e9260c2322e3d332c711826c"
-  integrity sha1-+QB2L4NILkTpJgwjIuPTMscRgmw=
+"@vue/compiler-ssr@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/compiler-ssr/download/@vue/compiler-ssr-3.2.2.tgz#633bb8e01f00a969c35ca12db32be7fe4c7185a9"
+  integrity sha1-Yzu44B8AqWnDXKEtsyvn/kxxhak=
   dependencies:
-    "@vue/compiler-dom" "3.2.1"
-    "@vue/shared" "3.2.1"
+    "@vue/compiler-dom" "3.2.2"
+    "@vue/shared" "3.2.2"
 
 "@vue/devtools-api@^6.0.0-beta.14":
   version "6.0.0-beta.15"
   resolved "https://registry.nlark.com/@vue/devtools-api/download/@vue/devtools-api-6.0.0-beta.15.tgz?cache=0&sync_timestamp=1624900514906&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fdevtools-api%2Fdownload%2F%40vue%2Fdevtools-api-6.0.0-beta.15.tgz#ad7cb384e062f165bcf9c83732125bffbc2ad83d"
   integrity sha1-rXyzhOBi8WW8+cg3MhJb/7wq2D0=
 
-"@vue/reactivity@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/reactivity/download/@vue/reactivity-3.2.1.tgz?cache=0&sync_timestamp=1628541039296&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Freactivity%2Fdownload%2F%40vue%2Freactivity-3.2.1.tgz#0e71d4ee00b0d0ca6a6141966c30b68b3f685002"
-  integrity sha1-DnHU7gCw0MpqYUGWbDC2iz9oUAI=
+"@vue/reactivity@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/reactivity/download/@vue/reactivity-3.2.2.tgz#d37011a68395e038a3cf5256af52d48c591b06b6"
+  integrity sha1-03ARpoOV4Dijz1JWr1LUjFkbBrY=
   dependencies:
-    "@vue/shared" "3.2.1"
+    "@vue/shared" "3.2.2"
 
 "@vue/reactivity@^3.2.0-beta.5":
   version "3.2.0-beta.7"
@@ -337,21 +337,21 @@
   dependencies:
     "@vue/shared" "3.2.0-beta.7"
 
-"@vue/runtime-core@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/runtime-core/download/@vue/runtime-core-3.2.1.tgz?cache=0&sync_timestamp=1628541039614&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fruntime-core%2Fdownload%2F%40vue%2Fruntime-core-3.2.1.tgz#39641110b2f84fdda3b80b86830827b7b5ef041a"
-  integrity sha1-OWQRELL4T92juAuGgwgnt7XvBBo=
+"@vue/runtime-core@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/runtime-core/download/@vue/runtime-core-3.2.2.tgz#b9a7250783de19dd8dd6febf008084b0f9144586"
+  integrity sha1-uaclB4PeGd2N1v6/AICEsPkURYY=
   dependencies:
-    "@vue/reactivity" "3.2.1"
-    "@vue/shared" "3.2.1"
+    "@vue/reactivity" "3.2.2"
+    "@vue/shared" "3.2.2"
 
-"@vue/runtime-dom@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/runtime-dom/download/@vue/runtime-dom-3.2.1.tgz#087cf36f40ad0869712c4154693c620e478061a8"
-  integrity sha1-CHzzb0CtCGlxLEFUaTxiDkeAYag=
+"@vue/runtime-dom@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/runtime-dom/download/@vue/runtime-dom-3.2.2.tgz#6d0da23ed1cfc702477f4b8c5dc4f9335c94e119"
+  integrity sha1-bQ2iPtHPxwJHf0uMXcT5M1yU4Rk=
   dependencies:
-    "@vue/runtime-core" "3.2.1"
-    "@vue/shared" "3.2.1"
+    "@vue/runtime-core" "3.2.2"
+    "@vue/shared" "3.2.2"
     csstype "^2.6.8"
 
 "@vue/shared@3.2.0-beta.7":
@@ -359,10 +359,10 @@
   resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.2.0-beta.7.tgz?cache=0&sync_timestamp=1627579339188&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fshared%2Fdownload%2F%40vue%2Fshared-3.2.0-beta.7.tgz#0bce776271f329e6582fcda00d61d4bcf1c60b52"
   integrity sha1-C853YnHzKeZYL82gDWHUvPHGC1I=
 
-"@vue/shared@3.2.1":
-  version "3.2.1"
-  resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.2.1.tgz?cache=0&sync_timestamp=1628541040228&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fshared%2Fdownload%2F%40vue%2Fshared-3.2.1.tgz#1f1fe26fe0334404cce10740b5ffb2654f1281aa"
-  integrity sha1-Hx/ib+AzRATM4QdAtf+yZU8Sgao=
+"@vue/shared@3.2.2":
+  version "3.2.2"
+  resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.2.2.tgz#6104185ebd57af5a14ac51c1f491b2205fc24054"
+  integrity sha1-YQQYXr1Xr1oUrFHB9JGyIF/CQFQ=
 
 "@vue/shared@^3.2.0-beta.5":
   version "3.2.0-beta.5"
@@ -2011,14 +2011,14 @@ vue-types@^3.0.0:
   dependencies:
     is-plain-object "3.0.1"
 
-vue@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.nlark.com/vue/download/vue-3.2.1.tgz#30dde152f2fdad0669ea9854d5a90a00ef96974b"
-  integrity sha1-MN3hUvL9rQZp6phU1akKAO+Wl0s=
+vue@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.nlark.com/vue/download/vue-3.2.2.tgz#11715cb71a02baefd0f6e6552dc623680eb1bf32"
+  integrity sha1-EXFctxoCuu/Q9uZVLcYjaA6xvzI=
   dependencies:
-    "@vue/compiler-dom" "3.2.1"
-    "@vue/runtime-dom" "3.2.1"
-    "@vue/shared" "3.2.1"
+    "@vue/compiler-dom" "3.2.2"
+    "@vue/runtime-dom" "3.2.2"
+    "@vue/shared" "3.2.2"
 
 warning@^4.0.0:
   version "4.0.3"