zhangjie 1 жил өмнө
parent
commit
bf91133390

+ 4 - 52
src/assets/style/home.less

@@ -1,62 +1,14 @@
 /* home */
-.home {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  z-index: auto;
-}
-
 .home-body {
-  position: absolute;
-  left: 0;
-  top: 50px;
-  right: 0;
-  bottom: 0;
-  overflow: auto;
   background: var(--color-background);
-  z-index: 98;
-}
-
-.home-body-content {
+  padding: 76px 20px 50px 240px;
+  min-height: 100vh;
   position: relative;
-  padding: 20px 20px 50px 240px;
-  min-height: 100%;
-}
-
-.home-page-main {
-  .home-navs {
-    bottom: auto;
-    height: 50px;
-    border-radius: 0;
-    background-color: transparent;
-
-    &::before {
-      display: none;
-    }
-
-    .head-logo-content {
-      display: none;
-      padding: 5px 0;
-      border: none;
-    }
-
-    .arco-menu {
-      display: none;
-    }
-  }
-
-  .home-breadcrumb {
-    display: none;
-  }
-
-  .home-body-content {
-    padding-left: 30px;
-  }
 }
 
 /* navs */
 .home-navs {
-  position: absolute;
+  position: fixed;
   width: 220px;
   top: 56px;
   left: 0;
@@ -119,7 +71,7 @@
 
 /* head */
 .home-header {
-  position: absolute;
+  position: fixed;
   width: 100%;
   height: 56px;
   top: 0;

+ 5 - 5
src/assets/svgs/icon-error.svg

@@ -1,10 +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>
+<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>warning-circle-filled@3x</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 id="warning-circle-filled">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+            <path d="M8,1 C4.134375,1 1,4.134375 1,8 C1,11.865625 4.134375,15 8,15 C11.865625,15 15,11.865625 15,8 C15,4.134375 11.865625,1 8,1 Z M7.5,4.625 C7.5,4.55625 7.55625,4.5 7.625,4.5 L8.375,4.5 C8.44375,4.5 8.5,4.55625 8.5,4.625 L8.5,8.875 C8.5,8.94375 8.44375,9 8.375,9 L7.625,9 C7.55625,9 7.5,8.94375 7.5,8.875 L7.5,4.625 Z M8,11.5 C7.5859375,11.5 7.25,11.1640625 7.25,10.75 C7.25,10.3359375 7.5859375,10 8,10 C8.4140625,10 8.75,10.3359375 8.75,10.75 C8.75,11.1640625 8.4140625,11.5 8,11.5 Z" id="形状" fill="#F53F3F"></path>
         </g>
     </g>
 </svg>

+ 6 - 13
src/components/import-dialog/index.vue

@@ -59,18 +59,6 @@
             <svg-icon name="icon-delete"></svg-icon>
           </template>
         </a-upload>
-        <p
-          v-if="result.message"
-          :class="[
-            `tips-info`,
-            {
-              'tips-success': result.success,
-              'tips-error': !result.success,
-            },
-          ]"
-        >
-          {{ result.message }}
-        </p>
       </div>
     </div>
 
@@ -414,7 +402,12 @@
       }
     }
     .arco-upload-progress {
-      display: none;
+      > * {
+        display: none;
+      }
+      .arco-upload-icon-success {
+        display: block;
+      }
     }
 
     .tips-info {

+ 19 - 21
src/layout/default-layout.vue

@@ -55,30 +55,28 @@
     </div>
 
     <div class="home-body">
-      <div class="home-body-content">
-        <div v-if="appStore.breadcrumbs.length" class="home-breadcrumb">
-          <span class="breadcrumb-tips">
-            <svg-icon name="icon-home" />
-            <span>当前所在位置:</span>
-          </span>
-          <a-breadcrumb>
-            <a-breadcrumb-item
-              v-for="(bread, index) in appStore.breadcrumbs"
-              :key="index"
-            >
-              {{ bread }}
-            </a-breadcrumb-item>
-          </a-breadcrumb>
-        </div>
+      <div v-if="appStore.breadcrumbs.length" class="home-breadcrumb">
+        <span class="breadcrumb-tips">
+          <svg-icon name="icon-home" />
+          <span>当前所在位置:</span>
+        </span>
+        <a-breadcrumb>
+          <a-breadcrumb-item
+            v-for="(bread, index) in appStore.breadcrumbs"
+            :key="index"
+          >
+            {{ bread }}
+          </a-breadcrumb-item>
+        </a-breadcrumb>
+      </div>
 
-        <!-- home-view: page detail -->
-        <div class="home-view">
-          <router-view />
-        </div>
+      <!-- home-view: page detail -->
+      <div class="home-view">
+        <router-view />
       </div>
-    </div>
 
-    <Footer />
+      <Footer class="home-footer" />
+    </div>
   </div>
 
   <!-- ResetPwd -->

+ 3 - 0
src/views/order/student-import/index.vue

@@ -85,6 +85,9 @@
     {
       title: '异常',
       dataIndex: 'message',
+      ellipsis: true,
+      tooltip: true,
+      width: 300,
     },
     {
       title: '上传时间',

+ 1 - 1
src/views/order/task-manage/timeForm.vue

@@ -7,7 +7,7 @@
       <a-list
         class="time-box"
         :virtual-list-props="{
-          height: 400,
+          height: 300,
           fixedSize: true,
           threshold: 20,
           buffer: 5,