Acasă Explorează Ajutor
Înregistrare Autentificare
www
/
taais-web
1
0
Bifurcare 0
Fisiere Probleme 0 Trageți solicitările 0 Wiki
Răsfoiți Sursa

Merge branch 'dev-style' into develop

allen 3 săptămâni în urmă
părinte
476062d73d a3aff89e14
comite
c4b9c32c44
34 a modificat fișierele cu 1373 adăugiri și 766 ștergeri
Vizualizare divizată Arată Statisticile Diff
  1. 1 1
      .env
  2. 1 1
      .eslintrc.cjs
  3. 1 1
      .stylelintrc.cjs
  4. 1 1
      .vscode/settings.json
  5. 1 1
      index.html
  6. 766 95
      package-lock.json
  7. 0 1
      package.json
  8. BIN
      public/logo.png
  9. BIN
      src/assets/images/bg0.png
  10. BIN
      src/assets/images/bg1.png
  11. BIN
      src/assets/images/logo.png
  12. BIN
      src/assets/images/touxiang.png
  13. 1 1
      src/config/index.ts
  14. 25 11
      src/layouts/LayoutTransverse/index.scss
  15. 1 1
      src/layouts/LayoutTransverse/index.vue
  16. 2 1
      src/layouts/components/Footer/index.scss
  17. 1 1
      src/layouts/components/Footer/index.vue
  18. 3 0
      src/layouts/components/Header/ToolBarRight.vue
  19. 1 1
      src/layouts/components/Header/components/Avatar.vue
  20. 5 0
      src/layouts/components/Header/components/Fullscreen.vue
  21. 3 1
      src/layouts/components/Main/index.scss
  22. 12 17
      src/layouts/components/Menu/SubMenu.vue
  23. 9 4
      src/layouts/components/Tabs/index.scss
  24. 1 2
      src/main.ts
  25. 1 1
      src/stores/modules/global.ts
  26. 1 1
      src/stores/modules/user.ts
  27. 30 12
      src/styles/element-dark.scss
  28. 64 18
      src/styles/element.scss
  29. 2 2
      src/views/demo/data/index.vue
  30. 14 7
      src/views/login/index.scss
  31. 5 8
      src/views/login/index.vue
  32. 13 13
      src/views/taais/homePage/index.scss
  33. 2 2
      src/views/taais/homePage/index.vue
  34. 406 561
      yarn.lock

+ 1 - 1
.env
Vizualizați fișierul 

@@ -1,5 +1,5 @@
 
 # title
 
-VITE_GLOB_APP_TITLE = 算法任务系统
 
+VITE_GLOB_APP_TITLE = 目标捕获技术设计支撑环境
 
 
 # 本地运行端口号
 
 VITE_PORT = 8848

+ 1 - 1
.eslintrc.cjs
Vizualizați fișierul 

@@ -29,7 +29,7 @@ module.exports = {
 
   rules: {
 
     // eslint (http://eslint.cn/docs/rules)
 
     'no-var': 'warn', // 要求使用 let 或 const 而不是 var
 
-    // 'no-multiple-empty-lines': ['warn', { max: 1 }], // 不允许多个空行
 
+    'no-multiple-empty-lines': 'off', // 不允许多个空行
 
     'prefer-const': 'off', // 使用 let 关键字声明但在初始分配后从未重新分配的变量，要求使用 const
 
     'no-use-before-define': 'off', // 禁止在 函数/类/变量 定义之前使用它们
 
     'prettier/prettier': [

+ 1 - 1
.stylelintrc.cjs
Vizualizați fișierul 

@@ -20,7 +20,7 @@ module.exports = {
 
   rules: {
 
     'function-url-quotes': 'always', // URL 的引号 "always(必须加上引号)"|"never(没有引号)"
 
     'color-hex-length': 'long', // 指定 16 进制颜色的简写或扩写 "short(16进制简写)"|"long(16进制扩写)"
 
-    'rule-empty-line-before': 'never', // 要求或禁止在规则之前的空行 "always(规则之前必须始终有一个空行)"|"never(规则前绝不能有空行)"|"always-multi-line(多行规则之前必须始终有一个空行)"|"never-multi-line(多行规则之前绝不能有空行)"
 
+    'rule-empty-line-before': null, // 要求或禁止在规则之前的空行 "always(规则之前必须始终有一个空行)"|"never(规则前绝不能有空行)"|"always-multi-line(多行规则之前必须始终有一个空行)"|"never-multi-line(多行规则之前绝不能有空行)"
 
     'font-family-no-missing-generic-family-keyword': null, // 禁止在字体族名称列表中缺少通用字体族关键字
 
     'scss/at-import-partial-extension': null, // 解决不能使用 @import 引入 scss 文件
 
     'property-no-unknown': null, // 禁止未知的属性

+ 1 - 1
.vscode/settings.json
Vizualizați fișierul 

@@ -8,7 +8,7 @@
 
   "files.eol": "\n",
 
   "typescript.tsdk": "node_modules/typescript/lib",
 
   "[vue]": {
 
-    "editor.defaultFormatter": "Vue.volar"
 
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
 
   },
 
   "[typescript]": {
 
     "editor.defaultFormatter": "esbenp.prettier-vscode"

+ 1 - 1
index.html
Vizualizați fișierul 

@@ -2,7 +2,7 @@
 
 <html lang="en">
 
   <head>
 
     <meta charset="UTF-8" />
 
-    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
 
+    <link rel="icon" type="image/svg+xml" href="/logo.png" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title><%= title %></title>
 
   </head>

Fișier diff suprimat deoarece este prea mare
+ 766 - 95
package-lock.json


+ 0 - 1
package.json
Vizualizați fișierul 

@@ -27,7 +27,6 @@
 
   },
 
   "dependencies": {
 
     "@element-plus/icons-vue": "^2.3.1",
 
-    "@kjgl77/datav-vue3": "^1.7.2",
 
     "@types/file-saver": "^2.0.7",
 
     "@types/js-cookie": "^3.0.6",
 
     "@vueuse/core": "^10.6.1",

BIN
public/logo.png
Vizualizați fișierul


BIN
src/assets/images/bg0.png
Vizualizați fișierul


BIN
src/assets/images/bg1.png
Vizualizați fișierul


BIN
src/assets/images/logo.png
Vizualizați fișierul


BIN
src/assets/images/touxiang.png
Vizualizați fișierul


+ 1 - 1
src/config/index.ts
Vizualizați fișierul 

@@ -7,7 +7,7 @@ export const HOME_URL: string = '/index'
 
 export const LOGIN_URL: string = '/login'
 
 
 // 默认主题颜色
 
-export const DEFAULT_PRIMARY: string = '#009688'
 
+export const DEFAULT_PRIMARY: string = '#7FFFFF'
 
 
 // 路由白名单地址（本地存在的路由 staticRouter.ts 中）
 
 export const ROUTER_WHITE_LIST: string[] = ['/500', '/login', '/register']

+ 25 - 11
src/layouts/LayoutTransverse/index.scss
Vizualizați fișierul 

@@ -1,6 +1,9 @@
 
 .el-container {
 
   width: 100%;
 
   height: 100%;
 
+  background-image: url('@/assets/images/bg0.png');
 
+  background-repeat: repeat;
 
+  background-size: contain;
 
   :deep(.el-header) {
 
     box-sizing: border-box;
 
     display: flex;
 
@@ -8,20 +11,23 @@
 
     justify-content: space-between;
 
     height: 55px;
 
     padding: 0 15px 0 0;
 
-    background-color: var(--el-header-bg-color);
 
-    border-bottom: 1px solid var(--el-header-border-color);
 
+    background-image: url('@/assets/images/bg1.png');
 
+    background-repeat: repeat;
 
+
 
+    // background-size: contain;
 
+    border-bottom: 1px solid #4ca6ff;
 
     .logo {
 
-      width: 210px;
 
+      min-width: 210px;
 
       margin-right: 30px;
 
       .logo-img {
 
-        width: 28px;
 
-        object-fit: contain;
 
+        width: 45px;
 
         margin-right: 6px;
 
+        object-fit: contain;
 
       }
 
       .logo-text {
 
         font-size: 21.5px;
 
         font-weight: bold;
 
-        color: var(--el-header-logo-text-color);
 
+        color: #7fffff;
 
         white-space: nowrap;
 
       }
 
     }
 
@@ -29,24 +35,32 @@
 
       flex: 1;
 
       height: 100%;
 
       overflow: hidden;
 
+      background-color: transparent;
 
       border-bottom: none;
 
+      .el-menu-item {
 
+        font-size: 18px !important;
 
+        color: #7fffff !important;
 
+      }
 
       .el-sub-menu__hide-arrow {
 
         width: 65px;
 
         height: 55px;
 
       }
 
       .el-menu-item.is-active {
 
-        color: #ffffff !important;
 
+        color: #7fffff !important;
 
+      }
 
+      .el-sub-menu__title {
 
+        font-size: 18px !important;
 
       }
 
       .is-active {
 
-        background-color: var(--el-color-primary) !important;
 
-        border-bottom-color: var(--el-color-primary) !important;
 
+        background: linear-gradient(0deg, #4ca6ff 0%, #7fffff 100%) !important;
 
+        border-bottom: none;
 
         &::before {
 
           width: 0;
 
         }
 
         .el-sub-menu__title {
 
           color: #ffffff !important;
 
-          background-color: var(--el-color-primary) !important;
 
-          border-bottom-color: var(--el-color-primary) !important;
 
+          background: linear-gradient(0deg, #4ca6ff 0%, #7fffff 100%) !important;
 
+          border-bottom: none;
 
         }
 
       }
 
     }

+ 1 - 1
src/layouts/LayoutTransverse/index.vue
Vizualizați fișierul 

@@ -3,7 +3,7 @@
 
   <el-container class="layout">
 
     <el-header>
 
       <div class="logo flx-center">
 
-        <img class="logo-img" src="@/assets/images/logo.svg" alt="logo" />
 
+        <img class="logo-img" src="@/assets/images/logo.png" alt="logo" />
 
         <span class="logo-text">{{ title }}</span>
 
       </div>
 
       <el-menu mode="horizontal" :router="false" :default-active="activeMenu">

+ 2 - 1
src/layouts/components/Footer/index.scss
Vizualizați fișierul 

@@ -1,6 +1,7 @@
 
 .footer {
 
   height: 30px;
 
-  background-color: var(--el-bg-color);
 
+
 
+  // background-color: var(--el-bg-color);
 
   border-top: 1px solid var(--el-border-color-light);
 
   a {
 
     font-size: 14px;

+ 1 - 1
src/layouts/components/Footer/index.vue
Vizualizați fișierul 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div class="footer flx-center">
 
-    <a href="https://gitee.com/gaokunw/kimi-web" target="_blank"> 2023 © taais-Admin By gaokunw Technology. </a>
 
+    <a href="https://gitee.com/gaokunw/kimi-web" target="_blank"> 版本号：V1.2.0 研制单位：西安交通大学</a>
 
   </div>
 
 </template>

+ 3 - 0
src/layouts/components/Header/ToolBarRight.vue
Vizualizați fișierul 

@@ -36,9 +36,11 @@ import Avatar from './components/Avatar.vue'
 
   align-items: center;
 
   justify-content: center;
 
   padding-right: 25px;
 
+
 
   .header-icon {
 
     display: flex;
 
     align-items: center;
 
+
 
     & > * {
 
       margin-left: 21px;
 
       color: var(--el-header-text-color);
 
@@ -46,6 +48,7 @@ import Avatar from './components/Avatar.vue'
 
 
     margin-right: 12px;
 
   }
 
+
 
   .username {
 
     margin: 0 20px;
 
     font-size: 15px;

+ 1 - 1
src/layouts/components/Header/components/Avatar.vue
Vizualizați fișierul 

@@ -4,7 +4,7 @@
 
       <img :src="userStore.avatar" />
 
     </div>
 
     <div class="avatar-dft" v-else>
 
-      <img src="@/assets/icons/avatar-user.svg" alt="avatar" />
 
+      <img src="@/assets/images/touxiang.png" alt="avatar" />
 
     </div>
 
     <template #dropdown>
 
       <el-dropdown-menu>

+ 5 - 0
src/layouts/components/Header/components/Fullscreen.vue
Vizualizați fișierul 

@@ -23,3 +23,8 @@ const handleFullScreen = () => {
 
   screenfull.toggle()
 
 }
 
 </script>
 
+<style scoped lang="scss">
 
+.toolBar-icon {
 
+  color: #7fffff;
 
+}
 
+</style>

+ 3 - 1
src/layouts/components/Main/index.scss
Vizualizați fișierul 

@@ -2,7 +2,9 @@
 
   box-sizing: border-box;
 
   padding: 6px;
 
   overflow-x: hidden;
 
-  background-color: var(--el-bg-color-page);
 
+
 
+  // background-color: var(--el-bg-color-page);
 
+  background-color: transparent;
 
 }
 
 .el-footer {
 
   height: auto;

+ 12 - 17
src/layouts/components/Menu/SubMenu.vue
Vizualizați fișierul 

@@ -34,39 +34,34 @@ const handleClickMenu = (subItem: Menu.MenuOptions) => {
 
 
 <style lang="scss">
 
 .el-sub-menu .el-sub-menu__title:hover {
 
-  color: var(--el-menu-hover-text-color) !important;
 
+  color: var(--el-menu-active-color) !important;
 
   background-color: var(--el-menu-active-bg-color) !important;
 
 }
 
+.el-menu--horizontal > .el-sub-menu .el-sub-menu__title {
 
+  color: #7fffff !important;
 
+}
 
 .el-sub-menu.is-active > .el-sub-menu__title {
 
   color: var(--el-menu-active-color) !important;
 
-  background-color: var(--el-menu-bg-color) !important;
 
+  background-color: var(--el-menu-active-bg-color) !important;
 
 }
 
 .el-menu--collapse {
 
   .is-active {
 
     .el-sub-menu__title {
 
-      color: #ffffff !important;
 
-      background-color: var(--el-color-primary) !important;
 
+      color: var(--el-menu-active-color) !important;
 
+      background-color: var(--el-menu-active-bg-color) !important;
 
     }
 
   }
 
 }
 
 .el-menu-item {
 
   &:hover {
 
-    color: var(--el-menu-hover-text-color) !important;
 
-    background-color: var(--el-menu-active-bg-color) !important;
 
-  }
 
-  &.is-active {
 
     color: var(--el-menu-active-color) !important;
 
     background-color: var(--el-menu-active-bg-color) !important;
 
-    &::before {
 
-      position: absolute;
 
-      top: 0;
 
-      bottom: 0;
 
-      width: 6px;
 
-      content: '';
 
-      background-color: var(--el-color-primary);
 
-      border-radius: 6px;
 
-    }
 
   }
 
+
 
+  // &.is-active {
 
+  //   color: var(--el-menu-active-color) !important;
 
+  //   background-color: var(--el-menu-active-bg-color) !important;
 
+  // }
 
 }
 
 .vertical,
 
 .classic,

+ 9 - 4
src/layouts/components/Tabs/index.scss
Vizualizați fișierul 

@@ -1,5 +1,7 @@
 
 .tabs-box {
 
-  background-color: var(--el-bg-color);
 
+  background-color: #0088cc;
 
+
 
+  // background-color: transparent;
 
   .tabs-menu {
 
     position: relative;
 
     width: 100%;
 
@@ -8,19 +10,21 @@
 
       top: 0;
 
       right: 0;
 
       bottom: 0;
 
+      background: rgb(127 255 255 / 20%);
 
       .more-button {
 
         display: flex;
 
         align-items: center;
 
         justify-content: center;
 
         width: 43px;
 
         cursor: pointer;
 
-        border-left: 1px solid var(--el-border-color-light);
 
+        border-left: 1px solid #4ca6ff;
 
         transition: all 0.3s;
 
         &:hover {
 
-          background-color: var(--el-color-info-light-9);
 
+          background-color: rgb(127 255 255 / 20%);
 
         }
 
         .iconfont {
 
           font-size: 12.5px;
 
+          color: #7fffff;
 
         }
 
       }
 
     }
 
@@ -30,6 +34,7 @@
 
         height: 40px;
 
         padding: 0 10px;
 
         margin: 0;
 
+        border-bottom: #4ca6ff;
 
         .el-tabs__nav-wrap {
 
           position: absolute;
 
           width: calc(100% - 70px);
 
@@ -40,7 +45,7 @@
 
               display: flex;
 
               align-items: center;
 
               justify-content: center;
 
-              color: #afafaf;
 
+              color: #7fffff;
 
               border: none;
 
               .tabs-icon {
 
                 margin: 1.5px 4px 0 0;

+ 1 - 2
src/main.ts
Vizualizați fișierul 

@@ -39,7 +39,6 @@ import SvgIcon from '@/components/SvgIcon/index.vue'
 
 import DictTag from '@/components/DictTag/index.vue'
 
 
 import { useDict } from '@/utils/dict'
 
-import DataVVue3 from '@kjgl77/datav-vue3'
 
 const app = createApp(App)
 
 
 // 全局方法挂载
 
@@ -56,4 +55,4 @@ Object.keys(Icons).forEach(key => {
 
 // eslint-disable-next-line vue/component-definition-name-casing
 
 app.component('svg-icon', SvgIcon)
 
 
-app.use(ElementPlus).use(directives).use(router).use(I18n).use(pinia).use(DataVVue3).mount('#app')
 
+app.use(ElementPlus).use(directives).use(router).use(I18n).use(pinia).mount('#app')

+ 1 - 1
src/stores/modules/global.ts
Vizualizați fișierul 

@@ -39,7 +39,7 @@ export const useGlobalStore = defineStore('admin-global', {
 
     // 标签页图标
 
     tabsIcon: true,
 
     // 页脚
 
-    footer: false
 
+    footer: true
 
   }),
 
   getters: {},
 
   actions: {

+ 1 - 1
src/stores/modules/user.ts
Vizualizați fișierul 

@@ -3,7 +3,7 @@ import { UserState } from '@/stores/interface'
 
 import piniaPersistConfig from '@/stores/helper/persist'
 
 import { getToken, setToken, removeToken } from '@/utils/token'
 
 import { loginApi, getInfoApi, logoutApi } from '@/api/modules/login'
 
-import defAva from '@/assets/images/defAva.png'
 
+import defAva from '@/assets/images/touxiang.png'
 
 import { Login } from '@/api/interface/index'
 
 export const useUserStore = defineStore('admin-user', {
 
   state: (): UserState => ({

+ 30 - 12
src/styles/element-dark.scss
Vizualizați fișierul 

@@ -1,28 +1,46 @@
 
 /* 自定义 element 暗黑模式 */
 
+html {
 
+  --table-border-color: #7fffff;
 
+}
 
 html.dark {
 
+  --el-fill-color-light: transparent;
 
+  --el-border-color: #90fdfd;
 
+  --el-border-color-hover: #7fffff;
 
+  --el-text-color-placeholder: #abf2f2;
 
+
 
+  // --el-bg-color-overlay: transparent;
 
+
 
+  // --el-bg-color: transparent;
 
+
 
   /* wangEditor */
 
   --w-e-toolbar-color: #eeeeee;
 
   --w-e-toolbar-bg-color: #141414;
 
   --w-e-textarea-bg-color: #141414;
 
   --w-e-textarea-color: #eeeeee;
 
   --w-e-toolbar-active-bg-color: #464646;
 
+  --el-header-text-color: #7fffff;
 
+  --table-border-color: #7fffff;
 
   --w-e-toolbar-border-color: var(--el-border-color-darker);
 
+  --el-table-border-color: #4ca6ff;
 
   .w-e-bar-item button:hover,
 
   .w-e-menu-tooltip-v5::before {
 
     color: #eeeeee;
 
   }
 
+  .el-card {
 
+    --el-card-bg-color: transparent;
 
+  }
 
 
   /* login */
 
-  .login-container {
 
-    background-color: #191919 !important;
 
-    .login-box {
 
-      background-color: rgb(0 0 0 / 80%) !important;
 
-      .login-form {
 
-        box-shadow: rgb(255 255 255 / 12%) 0 2px 10px 2px !important;
 
-        .logo-text {
 
-          color: var(--el-text-color-primary) !important;
 
-        }
 
-      }
 
-    }
 
-  }
 
+  // .login-container {
 
+  //   background-color: #191919 !important;
 
+  //   .login-box {
 
+  //     background-color: rgb(0 0 0 / 80%) !important;
 
+  //     .login-form {
 
+  //       box-shadow: rgb(255 255 255 / 12%) 0 2px 10px 2px !important;
 
+  //       .logo-text {
 
+  //         color: var(--el-text-color-primary) !important;
 
+  //       }
 
+  //     }
 
+  //   }
 
+  // }
 
 }

+ 64 - 18
src/styles/element.scss
Vizualizați fișierul 

@@ -1,27 +1,33 @@
 
 /* 设置 notification、message 层级在 loading 之上 */
 
 .el-message,
 
 .el-notification {
 
-  z-index: 2070 !important;
 
+  z-index: 2070 !important ;
 
 }
 
+.el-pagination {
 
+  --el-pagination-button-bg-color: transparent;
 
+}
 
+
 
 label {
 
   font-weight: 700;
 
 }
 
+.el-button--primary,
 
+.el-button--primary.is-plain {
 
+  --el-button-text-color: #0a1f33;
 
 
-// .label-span {
 
-//   display: inline-block;
 
-//   overflow: hidden;
 
-//   text-overflow: ellipsis;
 
-//   white-space: nowrap;
 
-//   cursor: pointer;
 
-// }
 
+  background: linear-gradient(0deg, #4ca6ff 0%, #7fffff 100%);
 
+}
 
 .el-form-item__label {
 
-  // display: list-item;
 
-  // overflow: hidden;
 
   font-weight: 700;
 
-
 
-  // text-overflow: ellipsis;
 
-  // white-space: nowrap;
 
+  color: #7fffff;
 
 }
 
+.el-form-item__content {
 
+  border-color: #7fffff !important;
 
+}
 
+.el-form-item--default {
 
+  --font-size: 14px;
 
+  --el-form-label-font-size: var(--font-size);
 
+}
 
+
 
 .dialog-slot-c {
 
   .el-tabs__content {
 
     max-height: 52vh;
 
@@ -78,8 +84,8 @@ label {
 
   box-sizing: border-box;
 
   padding: 12px;
 
   overflow-x: hidden;
 
-  background-color: var(--el-bg-color);
 
-  border: 1px solid var(--el-border-color-light);
 
+  background-color: transparent;
 
+  border: 1px solid rgb(76 166 255 / 40%) !important;
 
   border-radius: 6px;
 
   box-shadow: 0 0 12px rgb(0 0 0 / 5%);
 
 }
 
@@ -223,9 +229,28 @@ label {
 
     }
 
   }
 
 
+  // .is-scrolling-middle {
 
+  .el-table-fixed-column--right {
 
+    --el-table-tr-bg-color: rgb(0 136 204 / 40%) !important;
 
+
 
+    background-image: url('@/assets/images/bg0.png') !important;
 
+  }
 
+
 
+  .el-table-fixed-column--left {
 
+    --el-table-tr-bg-color: rgb(0 136 204 / 40%) !important;
 
+
 
+    background-image: url('@/assets/images/bg0.png') !important;
 
+  }
 
+
 
   // el-table 表格样式
 
   .el-table {
 
     flex: 1;
 
+    color: #7fffff;
 
+
 
+    // background-color: transparent;
 
+
 
+    --el-table-border-color: rgb(76 166 255 / 40%);
 
+    --el-table-tr-bg-color: rgb(0 136 204 / 40%);
 
 
     // 修复 safari
 
     table {
 
@@ -233,14 +258,21 @@ label {
 
     }
 
     .el-table__header th {
 
       height: 45px;
 
-      font-size: 15px;
 
+      font-size: 17px;
 
       font-weight: bold;
 
-      color: var(--el-text-color-primary);
 
+
 
+      // color: var(--el-text-color-primary);
 
+      color: #7fffff;
 
       background: var(--el-fill-color-light);
 
+
 
+      // background-color: #7fffff;
 
+
 
+      // background-color: transparent;
 
     }
 
     .el-table__row {
 
       height: 45px;
 
       font-size: 14px;
 
+      background-color: transparent;
 
       .move {
 
         cursor: move;
 
         .el-icon {
 
@@ -253,6 +285,7 @@ label {
 
     .el-table__header .el-table__cell > .cell {
 
       // white-space: nowrap;
 
       white-space: wrap;
 
+      background-color: transparent;
 
     }
 
 
     // 解决表格数据为空时样式不居中问题(仅在element-plus中)
 
@@ -284,28 +317,37 @@ label {
 
 
 /* el-table 组件大小 */
 
 .el-table--small {
 
+  background-color: transparent;
 
   .el-table__header th {
 
     height: 40px !important;
 
     font-size: 14px !important;
 
+    background-color: transparent;
 
   }
 
   .el-table__row {
 
     height: 40px !important;
 
     font-size: 13px !important;
 
+    background-color: transparent;
 
   }
 
 }
 
 .el-table--large {
 
   .el-table__header th {
 
     height: 50px !important;
 
     font-size: 16px !important;
 
+    background-color: transparent;
 
   }
 
   .el-table__row {
 
     height: 50px !important;
 
     font-size: 15px !important;
 
+    background-color: transparent;
 
   }
 
 }
 
 
 /* el-drawer */
 
 .el-drawer {
 
+  background-image: url('@/assets/images/bg0.png');
 
+  background-repeat: repeat;
 
+
 
+  // background-color: transparent;
 
   .el-drawer__header {
 
     padding: 16px 20px;
 
     margin-bottom: 0;
 
@@ -341,6 +383,10 @@ label {
 
 
 /* el-dialog */
 
 .el-dialog {
 
+  background-image: url('@/assets/images/bg0.png');
 
+  background-repeat: repeat;
 
+
 
+  // background-size: contain;
 
   border-radius: 6px;
 
   .el-dialog__header {
 
     padding: 15px 20px;
 
@@ -352,7 +398,7 @@ label {
 
     // border-top-left-radius: 6px;
 
     // border-top-right-radius: 6px;
 
     .el-dialog__title {
 
-      font-size: 18px;
 
+      font-size: 20px;
 
 
       // color: var(--el-dialog-bg-color);
 
     }

+ 2 - 2
src/views/demo/data/index.vue
Vizualizați fișierul 

@@ -480,7 +480,7 @@ const openDialog = async (type: number, title: string, row?: any) => {
 
 
 // 表格配置项
 
 const columns = reactive<ColumnProps<any>[]>([
 
-  { type: 'selection', fixed: 'left', width: 70 },
 
+  { type: 'selection', width: 70 },
 
   { prop: 'yuan', label: '原图', width: 200 },
 
   {
 
     prop: 'batchNum',
 
@@ -581,7 +581,7 @@ const columns = reactive<ColumnProps<any>[]>([
 
     },
 
     width: 120
 
   },
 
-  { prop: 'operation', label: '操作', width: 230, fixed: 'right' }
 
+  { prop: 'operation', label: '操作', width: 230 }
 
 ])
 
 // 表单配置项
 
 let formItems: ProForm.ItemsOptions[] = []

+ 14 - 7
src/views/login/index.scss
Vizualizați fișierul 

@@ -1,8 +1,9 @@
 
 .login-container {
 
   height: 100%;
 
   min-height: 550px;
 
-  background-color: #eeeeee;
 
-  background-image: url('@/assets/images/login_bg.svg');
 
+
 
+  // background-color: #eeeeee;
 
+  background-image: url('@/assets/images/bg0.png');
 
   background-size: 100% 100%;
 
   background-size: cover;
 
   .login-box {
 
@@ -14,7 +15,9 @@
 
     width: 96.5%;
 
     height: 94%;
 
     padding: 0 50px;
 
-    background-color: rgb(255 255 255 / 80%);
 
+    background-color: transparent;
 
+
 
+    // background-color: rgb(255 255 255 / 80%);
 
     border-radius: 10px;
 
     .dark {
 
       position: absolute;
 
@@ -30,11 +33,14 @@
 
       }
 
     }
 
     .login-form {
 
-      width: 420px;
 
+      width: 400px;
 
       padding: 50px 40px 45px;
 
-      background-color: var(--el-bg-color);
 
+      background-color: transparent;
 
+
 
+      // background-color: var(--el-bg-color);
 
       border-radius: 10px;
 
-      box-shadow: rgb(0 0 0 / 10%) 0 2px 10px 2px;
 
+
 
+      // box-shadow: rgb(0 0 0 / 10%) 0 2px 10px 2px;
 
       .login-logo {
 
         display: flex;
 
         align-items: center;
 
@@ -42,13 +48,14 @@
 
         margin-bottom: 20px;
 
         .login-icon {
 
           width: 60px;
 
-          height: 52px;
 
+          height: 44px;
 
         }
 
         .logo-text {
 
           padding: 0 0 0 25px;
 
           margin: 0;
 
           font-size: 42px;
 
           font-weight: bold;
 
+          color: var(--el-text-color-primary) !important;
 
           color: #34495e;
 
           white-space: nowrap;
 
         }

+ 5 - 8
src/views/login/index.vue
Vizualizați fișierul 

@@ -1,24 +1,21 @@
 
 <template>
 
-  <div class="login-container flx-center">
 
+  <div class="login-container flx-center1">
 
     <div class="login-box">
 
-      <!-- <SwitchDark class="dark" /> -->
 
-      <div class="login-left">
 
-        <img class="login-left-img" src="@/assets/images/login_left.png" alt="login" />
 
-      </div>
 
       <div class="login-form">
 
         <div class="login-logo">
 
-          <img class="login-icon" src="@/assets/images/logo.svg" alt="" />
 
-          <h2 class="logo-text">算法任务系统</h2>
 
+          <img class="login-icon" src="@/assets/images/logo.png" alt="" />
 
+          <h2 class="logo-text">目标捕获技术设计支撑环境系统</h2>
 
         </div>
 
         <LoginForm />
 
       </div>
 
     </div>
 
+    <Footer style="height: 60px" />
 
   </div>
 
 </template>
 
 
 <script setup lang="ts" name="login">
 
 import LoginForm from './components/LoginForm.vue'
 
-// import SwitchDark from '@/components/SwitchDark/index.vue'
 
+import Footer from '@/layouts/components/Footer/index.vue'
 
 </script>
 
 
 <style scoped lang="scss">

+ 13 - 13
src/views/taais/homePage/index.scss
Vizualizați fișierul 

@@ -19,21 +19,21 @@
 
 
 //   // color: black;
 
 // }
 
-:deep(.el-table) {
 
-  // --el-table-border-color: transparent;
 
-  --el-table-border-color: #bdbdbe7b;
 
+// :deep(.el-table) {
 
+//   // --el-table-border-color: transparent;
 
+//   --el-table-border-color: #bdbdbe7b;
 
 
-  // --el-table-border: none;
 
-  --el-table-text-color: #bdbdbe;
 
-  --el-table-header-text-color: #bdbdbe;
 
-  --el-table-row-hover-bg-color: transparent;
 
-  --el-table-current-row-bg-color: transparent;
 
-  --el-table-header-bg-color: transparent;
 
-  --el-table-bg-color: transparent;
 
-  --el-table-tr-bg-color: transparent;
 
+//   // --el-table-border: none;
 
+//   --el-table-text-color: #bdbdbe;
 
+//   --el-table-header-text-color: #bdbdbe;
 
+//   --el-table-row-hover-bg-color: transparent;
 
+//   --el-table-current-row-bg-color: transparent;
 
+//   --el-table-header-bg-color: transparent;
 
+//   --el-table-bg-color: transparent;
 
+//   --el-table-tr-bg-color: transparent;
 
 
-  // --el-table-expanded-cell-bg-color: transparent;
 
-}
 
+//   // --el-table-expanded-cell-bg-color: transparent;
 
+// }
 
 .bigBox,
 
 .createTask-bigBox {
 
   width: 100%;

+ 2 - 2
src/views/taais/homePage/index.vue
Vizualizați fișierul 

@@ -121,7 +121,7 @@ const createTaskNew = () => {
 
 }
 
 // 表格配置项
 
 const columns = reactive<ColumnProps<User.ResUserList>[]>([
 
-  { type: 'selection', fixed: 'left', width: 70 },
 
+  { type: 'selection', width: 70 },
 
   { prop: 'name', label: '任务名称' },
 
   // {
 
   //   prop: 'status',
 
@@ -144,7 +144,7 @@ const columns = reactive<ColumnProps<User.ResUserList>[]>([
 
     //   el: 'input'
 
     // }
 
   },
 
-  { prop: 'operation', label: '操作', width: 230, fixed: 'right' }
 
+  { prop: 'operation', label: '操作', width: 230 }
 
 ])
 
 </script>
 
 <style scoped lang="scss">

Fișier diff suprimat deoarece este prea mare
+ 406 - 561
yarn.lock


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff