Browse Source

feat: ui调整

zhangjie 1 year ago
parent
commit
c4b8f79e46

+ 8 - 1
src/App.vue

@@ -1,7 +1,14 @@
 <template>
   <a-config-provider>
+    <template #empty>
+      <div class="empty-none">
+        <ImageNone />
+      </div>
+    </template>
     <router-view />
   </a-config-provider>
 </template>
 
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+  import ImageNone from './assets/svgs/image-none.svg?component';
+</script>

+ 1 - 1
src/api/order.ts

@@ -36,7 +36,7 @@ export function agentQuery(teachingId: number): Promise<OptionItem[]> {
 export function taskListPage(
   params: TaskListPageParam
 ): Promise<TaskListPageRes> {
-  return axios.post('/api/admin/apply/task/page', {}, { params });
+  return axios.post('/api/admin/apply/task/page', params);
 }
 // 预约任务管理-详情
 export function taskDetailInfo(id: number): Promise<TaskItemDetail> {

BIN
src/assets/images/upload-icon.png


+ 8 - 16
src/assets/style/arco-custom.less

@@ -3,10 +3,6 @@
   margin-left: 10px;
 }
 .arco-btn-text {
-  &.arco-btn-status-normal {
-    color: var(--color-text-dark) !important;
-    font-weight: 400;
-  }
   &:not(.arco-btn-only-icon) .arco-btn-icon {
     margin-right: 4px;
   }
@@ -60,18 +56,14 @@
 }
 
 // arco-input
-.arco-input-wrapper,
-.arco-select-view-single {
-  border-color: #d9d9d9;
-  background-color: transparent;
-}
-.arco-input-wrapper:not(.arco-input-focus),
-.arco-select-view-single:not(.arco-select-view-focus) {
-  &:hover {
-    border-color: #bebebe;
-    background-color: transparent;
-  }
-}
+// .arco-input-wrapper,
+// .arco-select-view-single {
+//   border-color: #d9d9d9;
+//   background-color: transparent;
+//   &:hover {
+//     border-color: #bebebe;
+//   }
+// }
 
 // arco-modal
 .arco-modal-wrapper {

+ 11 - 0
src/assets/style/base.less

@@ -67,6 +67,12 @@
   margin-bottom: 16px;
   .arco-btn-text {
     padding: 5px 8px;
+    font-weight: 400;
+  }
+  .arco-space-item:not(:first-child) {
+    .arco-btn-text {
+      color: var(--color-text-dark);
+    }
   }
   .arco-divider {
     margin: 0;
@@ -107,6 +113,11 @@
   }
 }
 
+// empty-none
+.empty-none {
+  text-align: center;
+}
+
 /* table */
 .table {
   width: 100%;

+ 7 - 1
src/assets/style/home.less

@@ -75,12 +75,15 @@
     .arco-menu-inline {
       margin-bottom: 20px;
     }
+    .svg-icon {
+      margin-top: -2px;
+    }
 
     .arco-menu-inline-header {
       padding: 9px 40px !important;
       min-height: 38px;
       line-height: 20px;
-      font-weight: 400;
+      font-weight: 300;
 
       .arco-menu-icon {
         position: absolute;
@@ -234,6 +237,9 @@
     .arco-breadcrumb-item-separator {
       margin: 0;
     }
+    .arco-breadcrumb-item:last-child {
+      font-weight: normal;
+    }
   }
 }
 

+ 43 - 0
src/assets/style/var.less

@@ -10,6 +10,7 @@ body {
   --color-border: #e5e5e5;
   --color-border-bold: #d5d5d5;
   --color-background: #f2f3f5;
+  --form-color-border: #d9d9d9;
 
   /* status */
   --color-primary: #165dff;
@@ -25,6 +26,7 @@ body {
   --color-purple: #9877ff;
   --color-white: #fff;
   --color-dark: #262626;
+  --color-transparent: transparent;
 
   /* shadow */
   --shadow-light: 0 0 1px rgba(0 0 0 0.15);
@@ -45,3 +47,44 @@ body {
   --border-radius-small: 4px;
   --color-text-1: --color-text-dark-1;
 }
+
+// 自定义var
+@input-color-border: var(--form-color-border);
+@input-color-border_disabled: var(--form-color-border);
+@input-color-border_hover: var(--form-color-border);
+@input-color-border_error: var(--form-color-border);
+@input-color-border_error_hover: var(--form-color-border);
+
+@input-color-bg: var(--color-transparent);
+@input-color-bg_hover: var(--color-transparent);
+@input-color-bg_focus: var(--color-transparent);
+
+@input-color-bg_error: var(--color-transparent);
+@input-color-bg_error_hover: var(--color-transparent);
+
+@form-color-bg_error: var(--color-transparent);
+@form-color-bg_error_hover: var(--color-transparent);
+@form-color-bg_error_focus: var(--color-transparent);
+@form-color-bg_warning: var(--color-transparent);
+@form-color-bg_warning_hover: var(--color-transparent);
+@form-color-bg_warning_focus: var(--color-transparent);
+@form-color-bg_success: var(--color-transparent);
+@form-color-bg_success_hover: var(--color-transparent);
+@form-color-bg_success_focus: var(--color-transparent);
+
+@form-color-border_validating: var(--form-color-border);
+@form-color-border_validating_hover: var(--color-primary-6);
+@form-color-border_error: rgb(var(--danger-6));
+@form-color-border_error_hover: rgb(var(--danger-6));
+@form-color-border_success: rgb(var(--success-6));
+@form-color-border_success_hover: rgb(var(--success-6));
+@form-color-border_warning: rgb(var(--warning-6));
+@form-color-border_warning_hover: rgb(var(--warning-6));
+
+@picker-color-border: var(--form-color-border);
+@picker-color-border_hover: var(--form-color-border);
+@picker-color-border_disabled: var(--color-border);
+@picker-color-border_error: rgb(var(--danger-6));
+@picker-color-border_error_hover: rgb(var(--danger-6));
+@picker-color-bg: var(--color-transparent);
+@picker-color-bg_hover: var(--color-transparent);

+ 4 - 6
src/assets/svgs/icon-add.svg

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon-新增</title>
-    <g id="管理员" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02.01-项目列表" transform="translate(-40, -171)">
-            <g id="icon-新增" transform="translate(40, 171)">
-                <rect id="add-circle-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M4.5,8.5 L4.5,7.5 L7.5,7.5 L7.5,4.5 L8.5,4.5 L8.5,7.5 L11.5,7.5 L11.5,8.5 L8.5,8.5 L8.5,11.5 L7.5,11.5 L7.5,8.5 L4.5,8.5 Z M15,8 C15,4.13400674 11.8659935,1 8,1 C4.13400674,1 1,4.13400674 1,8 C1,11.8659935 4.13400674,15 8,15 C11.8659935,15 15,11.8659935 15,8 Z" id="add-circle" fill="#595959"></path>
-            </g>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-新增">
+            <rect id="add-circle-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M4.5,8.5 L4.5,7.5 L7.5,7.5 L7.5,4.5 L8.5,4.5 L8.5,7.5 L11.5,7.5 L11.5,8.5 L8.5,8.5 L8.5,11.5 L7.5,11.5 L7.5,8.5 L4.5,8.5 Z M15,8 C15,4.13400674 11.8659935,1 8,1 C4.13400674,1 1,4.13400674 1,8 C1,11.8659935 4.13400674,15 8,15 C11.8659935,15 15,11.8659935 15,8 Z" id="add-circle" ></path>
         </g>
     </g>
 </svg>

File diff suppressed because it is too large
+ 6 - 0
src/assets/svgs/icon-apply.svg


+ 10 - 0
src/assets/svgs/icon-assign.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-分配</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-分配">
+            <rect id="fork-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M6.5,2 L9.5,2 C9.77614212,2 10,2.22385764 10,2.5 L10,5.5 C10,5.77614236 9.77614212,6 9.5,6 L8.5,6 L8.5,8 L11.5,8 C12.0522852,8 12.5,8.44771528 12.5,9 L12.5,10 L13.5,10 C13.7761421,10 14,10.2238579 14,10.5 L14,13.5 C14,13.7761421 13.7761421,14 13.5,14 L10.5,14 C10.2238579,14 10,13.7761421 10,13.5 L10,10.5 C10,10.2238579 10.2238579,10 10.5,10 L11.5,10 L11.5,9 L4.5,9 L4.5,10 L5.5,10 C5.77614236,10 6,10.2238579 6,10.5 L6,13.5 C6,13.7761421 5.77614236,14 5.5,14 L2.5,14 C2.22385764,14 2,13.7761421 2,13.5 L2,10.5 C2,10.2238579 2.22385764,10 2.5,10 L3.5,10 L3.5,9 C3.5,8.44771528 3.94771528,8 4.5,8 L7.5,8 L7.5,6 L6.5,6 C6.2238574,6 6,5.77614236 6,5.5 L6,2.5 C6,2.22385764 6.2238574,2 6.5,2 Z M7,3 L9,3 L9,5 L7,5 L7,3 Z M3,13 L5,13 L5,11 L3,11 L3,13 Z M13,11 L13,13 L11,13 L11,11 L13,11 Z" id="fork"></path>
+        </g>
+    </g>
+</svg>

+ 5 - 7
src/assets/svgs/icon-delete.svg

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg  viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon-批量删除</title>
-    <g id="管理员" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="02.01-项目列表" transform="translate(-116, -171)">
-            <g id="icon-批量删除" transform="translate(116, 171)">
-                <rect id="delete-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M6,6 L7,6 L7,12 L6,12 L6,6 Z M9,12 L10,12 L10,6 L9,6 L9,12 Z M14,3 L14,4 L13,4 L13,14 C13,14.5522852 12.5522842,15 12,15 L4,15 C3.44771504,15 3,14.5522842 3,14 L3,4 L2,4 L2,3 L5.5,3 L5.5,1.80000073 C5.5,1.35817304 5.85817218,1 6.30000019,1 L9.69999981,1 C10.1418276,1 10.5,1.35817215 10.5,1.80000013 L10.5,3 L14,3 Z M6.5,2 L9.5,2 L9.5,3 L6.5,3 L6.5,2 Z M4,14 L12,14 L12,4 L4,4 L4,14 Z" id="delete" fill="#595959"></path>
-            </g>
+    <title>icon-删除</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-删除">
+            <rect id="delete-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M6,6 L7,6 L7,12 L6,12 L6,6 Z M9,12 L10,12 L10,6 L9,6 L9,12 Z M14,3 L14,4 L13,4 L13,14 C13,14.5522852 12.5522842,15 12,15 L4,15 C3.44771504,15 3,14.5522842 3,14 L3,4 L2,4 L2,3 L5.5,3 L5.5,1.80000073 C5.5,1.35817304 5.85817218,1 6.30000019,1 L9.69999981,1 C10.1418276,1 10.5,1.35817215 10.5,1.80000013 L10.5,3 L14,3 Z M6.5,2 L9.5,2 L9.5,3 L6.5,3 L6.5,2 Z M4,14 L12,14 L12,4 L4,4 L4,14 Z" id="delete" ></path>
         </g>
     </g>
 </svg>

+ 10 - 0
src/assets/svgs/icon-error.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-上传失败</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-上传失败">
+            <rect id="close-circle-filled-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M8,1 C4.13400912,1 1,4.13400483 1,8 C1,11.8659916 4.13400483,15 8,15 C11.8659916,15 15,11.8659954 15,8 C15,4.13400912 11.8659954,1 8,1 Z M8.00001192,7.29075146 L10.3291178,4.94753814 L11.0383558,5.65250731 L8.70499325,8 L11.0383472,10.3474894 L10.3291082,11.0524578 L8.00001144,8.70925426 L5.6709156,11.0524578 L4.9616766,10.3474884 L7.29503059,8 L4.96166778,5.65250683 L5.67090654,4.94753814 L8.00001192,7.29075146 Z" id="close-circle-filled"></path>
+        </g>
+    </g>
+</svg>

+ 10 - 0
src/assets/svgs/icon-file.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-导入文档图标</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-导入文档图标">
+            <rect id="file-excel-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M10.3363,8.952392 L10.3363,9.792102 C10.3363,9.822342 10.3466,9.851672 10.3656,9.875242 L11.4181,11.185122 L12.4707,9.875242 C12.4896,9.851672 12.5,9.822342 12.5,9.792102 L12.5,8.952392 L13.5,8.952392 L13.5,9.792102 C13.5,10.050122 13.4119,10.300522 13.2502,10.501622 L12.0596,11.983322 L13.2502,13.465022 C13.4119,13.666122 13.5,13.916522 13.5,14.174522 L13.5,15.014222 L12.5,15.014222 L12.5,14.174522 C12.5,14.144322 12.4896,14.114922 12.4707,14.091422 L11.4181,12.781522 L10.3656,14.091422 C10.3466,14.114922 10.3363,14.144322 10.3363,14.174522 L10.3363,15.014222 L9.3363,15.014222 L9.3363,14.174522 C9.3363,13.916522 9.42442,13.666122 9.58607,13.465022 L10.7767,11.983322 L9.58607,10.501622 C9.42442,10.300522 9.3363,10.050122 9.3363,9.792102 L9.3363,8.952392 L10.3363,8.952392 Z M8.86589,1 C9.13442,1 9.39167,1.108002 9.57972,1.299692 L13.2138,5.004002 C13.3973,5.190952 13.5,5.442412 13.5,5.704312 L13.5,7.5 L12.5,7.5 L12.5,6.012752 L8.50008,6.012752 L8.50008,2 L3.5,2 L3.5,14.000022 L8,14.000022 L8,15.000022 L3.49534,15.000022 C3.02005,15.000022 2.5,14.662722 2.5,14.078122 L2.5,1.921912 C2.5,1.337272 3.02005,1 3.49534,1 L8.86589,1 Z M9.50008,2.646452 L9.50008,5.012752 L11.8215,5.012752 L9.50008,2.646452 Z" id="形状结合"></path>
+        </g>
+    </g>
+</svg>

+ 4 - 6
src/assets/svgs/icon-import.svg

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg  viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon-导入</title>
-    <g id="超管" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="06.01-用户管理" transform="translate(-116, -171)">
-            <g id="icon-导入" transform="translate(116, 171)">
-                <rect id="download-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
-                <path d="M8.5,9.57746124 L8.49998093,0.5 L7.49998093,0.5 L7.5,9.57745647 L3.73641205,5.81387091 L3.02930534,6.5209775 L7.64644661,11.1381191 C7.84170875,11.3333813 8.15829124,11.3333813 8.35355339,11.1381192 C8.35355339,11.1381191 8.3535534,11.1381191 8.3535534,11.1381191 L12.9706955,6.52097702 L12.9706955,6.52097702 L12.2635889,5.81386995 L8.5,9.57746124 Z M2,13.0000238 C2,13.5523081 2.44771534,14.0000238 3,14.0000238 L13,14.0000238 C13.5522842,14.0000238 14,13.552309 14,13.0000238 L14,11.0000238 L13,11.0000238 L13,13.0000238 L3,13.0000238 L3,11.0000238 L2,11.0000238 L2,13.0000238 Z" id="download" ></path>
-            </g>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-导入">
+            <rect id="download-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M8.5,9.57746124 L8.49998093,0.5 L7.49998093,0.5 L7.5,9.57745647 L3.73641205,5.81387091 L3.02930534,6.5209775 L7.64644661,11.1381191 C7.84170875,11.3333813 8.15829124,11.3333813 8.35355339,11.1381192 C8.35355339,11.1381191 8.3535534,11.1381191 8.3535534,11.1381191 L12.9706955,6.52097702 L12.9706955,6.52097702 L12.2635889,5.81386995 L8.5,9.57746124 Z M2,13.0000238 C2,13.5523081 2.44771534,14.0000238 3,14.0000238 L13,14.0000238 C13.5522842,14.0000238 14,13.552309 14,13.0000238 L14,11.0000238 L13,11.0000238 L13,13.0000238 L3,13.0000238 L3,11.0000238 L2,11.0000238 L2,13.0000238 Z" id="download" ></path>
         </g>
     </g>
 </svg>

+ 10 - 0
src/assets/svgs/icon-print.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-打印</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-打印">
+            <rect id="print-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M3.99902344,3.99890137 L2.99902344,3.99890137 C2.44288105,3.99890137 1.99902344,4.44275904 1.99902344,4.99890137 L1.99902344,9.99890137 C1.99902344,10.5550442 2.44288105,10.9989014 2.99902344,10.9989014 L3.99902344,10.9989014 L3.99902344,13.9989014 L11.9990234,13.9989014 L11.9990234,10.9989014 L12.9990234,10.9989014 C13.5551662,10.9989014 13.9990234,10.5550442 13.9990234,9.99890137 L13.9990234,4.99890137 C13.9990234,4.44275904 13.5551662,3.99890137 12.9990234,3.99890137 L11.9990234,3.99890137 L11.9990234,1.99890137 L3.99902344,1.99890137 L3.99902344,3.99890137 Z M10.9990234,2.99890137 L4.99902344,2.99890137 L4.99902344,3.99890137 L10.9990234,3.99890137 L10.9990234,2.99890137 Z M2.99902344,9.99890137 L3.99902344,9.99890137 L3.99902344,7.99890137 L11.9990234,7.99890137 L11.9990234,9.99890137 L12.9990234,9.99890137 L12.9990234,4.99890137 L2.99902344,4.99890137 L2.99902344,9.99890137 Z M4.99902344,8.99890137 L10.9990234,8.99890137 L10.9990234,12.9989014 L4.99902344,12.9989014 L4.99902344,8.99890137 Z" id="print" ></path>
+        </g>
+    </g>
+</svg>

+ 10 - 0
src/assets/svgs/icon-success.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg  viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-上传成功</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon-上传成功">
+            <rect id="check-circle-filled-(Background)" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M15,8 C15,4.13400674 11.8659935,1 8,1 C4.13400674,1 1,4.13400674 1,8 C1,11.8659935 4.13400674,15 8,15 C11.8659935,15 15,11.8659935 15,8 Z M7,10.7069998 L11.5,6.20749998 L10.7924995,5.5 L7,9.29300022 L5.20650005,7.5 L4.5,8.20650005 L7,10.7069998 Z" id="check-circle-filled" ></path>
+        </g>
+    </g>
+</svg>

File diff suppressed because it is too large
+ 0 - 0
src/assets/svgs/icon-system.svg


+ 1 - 1
src/assets/svgs/icon-user.svg

@@ -5,7 +5,7 @@
         <g id="02.01-授权管理-授权管理" transform="translate(-1244, -19)">
             <g id="icon-用户" transform="translate(1244, 19)">
                 <polygon id="Rectangle-4117" opacity="0" transform="translate(9, 9) rotate(0) translate(-9, -9)" points="3.14721972e-06 3.14721974e-06 18.0000031 3.14721974e-06 18.0000031 18.0000031 3.14721972e-06 18.0000031"></polygon>
-                <path d="M9.00000629,9.5625 C6.82538495,9.5625 5.06250603,7.79962134 5.06250603,5.62499973 C5.06250603,3.45037839 6.82538495,1.6875 9.00000629,1.6875 C11.1746276,1.6875 12.9375063,3.45037839 12.9375063,5.62499973 C12.9375063,7.79962134 11.1746276,9.5625 9.00000629,9.5625 Z M16.3125063,13.190207 L16.3125063,15.75 C16.3125063,16.0606599 16.0606662,16.3125 15.7500063,16.3125 L2.25000777,16.3125 C1.93934758,16.3125 1.68750629,16.0606599 1.68750629,15.75 L1.68750629,13.190207 C1.68750629,12.7739882 1.91589921,12.3887544 2.29147854,12.2093714 C4.33058476,11.2354603 6.59982888,10.6875 9.00000683,10.6875 C11.4001843,10.6875 13.6694286,11.2354603 15.7085351,12.2093714 C16.0841141,12.3887544 16.3125063,12.7739882 16.3125063,13.190207 Z" id="Union" fill="#BFBFBF"></path>
+                <path d="M9.00000629,9.5625 C6.82538495,9.5625 5.06250603,7.79962134 5.06250603,5.62499973 C5.06250603,3.45037839 6.82538495,1.6875 9.00000629,1.6875 C11.1746276,1.6875 12.9375063,3.45037839 12.9375063,5.62499973 C12.9375063,7.79962134 11.1746276,9.5625 9.00000629,9.5625 Z M16.3125063,13.190207 L16.3125063,15.75 C16.3125063,16.0606599 16.0606662,16.3125 15.7500063,16.3125 L2.25000777,16.3125 C1.93934758,16.3125 1.68750629,16.0606599 1.68750629,15.75 L1.68750629,13.190207 C1.68750629,12.7739882 1.91589921,12.3887544 2.29147854,12.2093714 C4.33058476,11.2354603 6.59982888,10.6875 9.00000683,10.6875 C11.4001843,10.6875 13.6694286,11.2354603 15.7085351,12.2093714 C16.0841141,12.3887544 16.3125063,12.7739882 16.3125063,13.190207 Z" id="Union" ></path>
             </g>
         </g>
     </g>

+ 32 - 0
src/assets/svgs/image-none.svg

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="98px" height="74px" viewBox="0 0 98 74" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>image-暂无数据</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#3196FF" offset="0%"></stop>
+            <stop stop-color="#165DFF" offset="100%"></stop>
+        </linearGradient>
+    </defs>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="image-暂无数据">
+            <path d="M81.768585,6.83478261 L97.6,22.6872687 L97.6,69.2 C97.6,70.4150264 97.1075132,71.5150264 96.3112698,72.3112698 C95.5150264,73.1075132 94.4150264,73.6 93.2,73.6 L16.0459016,73.6 C14.8308752,73.6 13.7308752,73.1075132 12.9346318,72.3112698 C12.1383884,71.5150264 11.6459016,70.4150264 11.6459016,69.2 L11.6459016,11.2347826 C11.6459016,10.0197562 12.1383884,8.91975616 12.9346318,8.12351277 C13.7308752,7.32726938 14.8308752,6.83478261 16.0459016,6.83478261 L81.768585,6.83478261 Z" id="形状结合" stroke="#E5E5E5" stroke-width="0.8" fill="#FFFFFF"></path>
+            <rect id="矩形" fill="#E5E6EB" x="19.2786885" y="14.4782609" width="70.6885246" height="10.4565217"></rect>
+            <rect id="矩形备份-18" fill="#E5E6EB" x="19.2786885" y="14.4782609" width="17.6721311" height="51.4782609"></rect>
+            <rect id="矩形" stroke="#C9CDD4" stroke-width="0.8" x="19.6786885" y="14.8782609" width="69.8885246" height="50.6782609"></rect>
+            <rect id="矩形" fill="#C9CDD4" x="19.2786885" y="24.1304348" width="70.6885246" height="1"></rect>
+            <rect id="矩形备份-15" fill="#C9CDD4" x="36.147541" y="14.4782609" width="1" height="51.4782609"></rect>
+            <rect id="矩形备份-16" fill="#C9CDD4" x="53.8196721" y="14.4782609" width="1" height="51.4782609"></rect>
+            <rect id="矩形备份-17" fill="#C9CDD4" x="71.4918033" y="14.4782609" width="1" height="51.4782609"></rect>
+            <rect id="矩形备份-12" fill="#C9CDD4" x="19.2786885" y="34.5869565" width="70.6885246" height="1"></rect>
+            <rect id="矩形备份-13" fill="#C9CDD4" x="19.2786885" y="45.0434783" width="70.6885246" height="1"></rect>
+            <rect id="矩形备份-14" fill="#C9CDD4" x="19.2786885" y="55.5" width="70.6885246" height="1"></rect>
+            <polygon id="矩形" fill="#C9CDD4" opacity="0.752208891" points="79.5245902 6.43478261 81.9938485 6.43478261 98 22.5217391 98 24.9347826 79.5245902 24.9347826"></polygon>
+            <polygon id="矩形" fill="#FFFFFF" points="81.9344262 6.43478261 98 22.5217391 81.9344262 22.5217391"></polygon>
+            <path d="M14.4459016,6.43478261 L56.2295082,6.43478261 L56.2295082,6.43478261 L56.2295082,21.7347826 C56.2295082,23.5020938 54.7968194,24.9347826 53.0295082,24.9347826 L11.2459016,24.9347826 L11.2459016,24.9347826 L11.2459016,9.63478261 C11.2459016,7.86747141 12.6785904,6.43478261 14.4459016,6.43478261 Z" id="矩形备份-19" fill="#C9CDD4" opacity="0.75"></path>
+            <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="53.0163934" height="22.5217391" rx="3.2"></rect>
+            <text id="NO-DATA" font-family="SourceHanSansCN-Bold, Source Han Sans CN" font-size="9.6" font-weight="bold" line-spacing="16" fill="#FFFFFF">
+                <tspan x="5.54659672" y="10.2608696">NO DATA</tspan>
+            </text>
+        </g>
+    </g>
+</svg>

+ 61 - 9
src/components/import-dialog/index.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     v-model:visible="visible"
-    :width="500"
+    :width="422"
     :title="title"
     title-align="start"
     :mask-closable="false"
@@ -41,12 +41,23 @@
           :disabled="disabled"
           :on-before-upload="handleBeforeUpload"
           :file-list="customFileList"
-          :show-remove-button="false"
           :show-retry-button="false"
           @change="handleFileChange"
           @error="handleError"
           @success="handleSuccess"
         >
+          <template #file-icon>
+            <svg-icon name="icon-file"></svg-icon>
+          </template>
+          <template #success-icon>
+            <svg-icon name="icon-success"></svg-icon>
+          </template>
+          <template #error-icon>
+            <svg-icon name="icon-error"></svg-icon>
+          </template>
+          <template #remove-icon>
+            <svg-icon name="icon-delete"></svg-icon>
+          </template>
         </a-upload>
         <p
           v-if="result.message"
@@ -64,13 +75,13 @@
     </div>
 
     <template v-if="!autoUpload" #footer>
+      <a-button @click="close">取消</a-button>
       <a-button
         type="primary"
         :disabled="loading || !canUpload"
         @click="confirm"
         >确认</a-button
       >
-      <a-button @click="close">取消</a-button>
     </template>
   </a-modal>
 </template>
@@ -171,17 +182,22 @@
   }
 
   function handleFileChange(fileList: FileItem[]) {
-    customFileList.value = fileList.length ? fileList.slice(-1) : [];
-    const lastUid = customFileList.value[0]?.uid;
-    if (lastUid !== fileList[0].uid) {
+    if (fileList.length) {
+      customFileList.value = fileList.slice(-1);
+      const lastUid = customFileList.value[0]?.uid;
+      if (lastUid !== fileList[0].uid) {
+        result.value = {
+          success: true,
+          message: '',
+        };
+      }
+    } else {
+      customFileList.value = [];
       result.value = {
         success: true,
         message: '',
       };
     }
-
-    if (props.autoUpload) return;
-
     canUpload.value = customFileList.value[0]?.status === 'init';
   }
 
@@ -295,6 +311,7 @@
     headers.value = { md5: '' };
     loading.value = false;
     uploadDataDict.value = {};
+    customFileList.value = [];
   }
 </script>
 
@@ -308,6 +325,7 @@
       > span {
         flex-grow: 0;
         flex-shrink: 0;
+        height: 20px;
         line-height: 20px;
         display: block;
       }
@@ -332,6 +350,7 @@
         height: auto;
         padding: 0;
         background: transparent;
+        border: none;
 
         &:hover {
           text-decoration: underline;
@@ -339,9 +358,42 @@
         }
       }
     }
+    .arco-upload-drag {
+      padding: 40px 0;
+      > div:first-child {
+        height: 54px;
+        background-image: url(assets/images/upload-icon.png);
+        background-size: auto 100%;
+        background-repeat: no-repeat;
+        background-position: center;
+        margin-bottom: 16px;
+      }
+      svg {
+        display: none;
+      }
+    }
 
     .arco-upload-list-item {
       margin-top: 8px !important;
+      background-color: var(--color-fill-1);
+      border-radius: var(--border-radius-small);
+      .arco-upload-list-item-operation {
+        margin: 0 12px;
+      }
+
+      .svg-icon {
+        vertical-align: -2px;
+      }
+      .arco-upload-list-item-file-icon {
+        margin-right: 6px;
+        color: inherit;
+      }
+
+      &.arco-upload-list-item-error {
+        .arco-upload-list-item-file-icon {
+          color: var(--color-danger);
+        }
+      }
     }
     .arco-upload-progress {
       display: none;

+ 4 - 0
src/components/status-tag/index.vue

@@ -19,6 +19,10 @@
       themeDict: { RUNNING: 'blue', SUCCESS: 'green', FAIL: 'red' },
       valFilter: useDictOption('TASK_STATUS').getLabel,
     },
+    recordCancel: {
+      themeDict: { true: 'red', false: 'green' },
+      valFilter: (val: boolean) => (val ? '已取消' : '正常'),
+    },
   };
   type ConfigKeyType = keyof typeof configs;
 

+ 12 - 0
src/components/svg-icon/index.vue

@@ -13,6 +13,12 @@
   import IconImport from '../../assets/svgs/icon-import.svg?component';
   import IconAdd from '../../assets/svgs/icon-add.svg?component';
   import IconDelete from '../../assets/svgs/icon-delete.svg?component';
+  import IconApply from '../../assets/svgs/icon-apply.svg?component';
+  import IconAssign from '../../assets/svgs/icon-assign.svg?component';
+  import IconPrint from '../../assets/svgs/icon-print.svg?component';
+  import IconFile from '../../assets/svgs/icon-file.svg?component';
+  import IconSuccess from '../../assets/svgs/icon-success.svg?component';
+  import IconError from '../../assets/svgs/icon-error.svg?component';
 
   defineOptions({
     name: 'SvgIcon',
@@ -37,6 +43,12 @@
     IconImport,
     IconAdd,
     IconDelete,
+    IconApply,
+    IconAssign,
+    IconPrint,
+    IconFile,
+    IconSuccess,
+    IconError,
   };
 
   const iconName = snakeToHump(props.name) as keyof typeof icons;

+ 1 - 1
src/layout/default-layout.vue

@@ -37,7 +37,7 @@
             :key="submenu.url"
           >
             <template #icon>
-              <icon-bookmark />
+              <svg-icon :name="`icon-${submenu.url}`" />
             </template>
             <template #title>
               <span>{{ submenu.name }}</span>

+ 1 - 1
src/store/modules/app/menuData.ts

@@ -2,7 +2,7 @@ export const menus = [
   {
     id: 1,
     name: '考试预约管理',
-    url: 'order',
+    url: 'apply',
     type: 'MENU',
     parentId: -1,
     sequence: 1,

+ 3 - 3
src/views/order/order-record-manage/index.vue

@@ -50,11 +50,11 @@
         导入预考
       </a-button>
       <a-button type="text" :loading="assginLoading" @click="toAssgin">
-        <template #icon><icon-translate /></template>
+        <template #icon> <svg-icon name="icon-assign" /> </template>
         一键自动分配
       </a-button>
       <a-button type="text" :loading="printLoading" @click="toPrint">
-        <template #icon><icon-file /></template>
+        <template #icon> <svg-icon name="icon-print" /> </template>
         打印签到表
       </a-button>
     </a-space>
@@ -67,7 +67,7 @@
       :bordered="false"
     >
       <template #status="{ record }">
-        {{ record.cancel ? '已取消' : '正常' }}
+        <status-tag type="recordCancel" :value="record.cancel" />
       </template>
       <template #period="{ record }">
         {{ parseTimeRangeDateAndTimeContent(record.startTime, record.endTime) }}

Some files were not shown because too many files changed in this diff