刘洋 2 年之前
父节点
当前提交
20f2ddd3a8
共有 3 个文件被更改,包括 5 次插入3 次删除
  1. 2 2
      server.config.ts
  2. 1 1
      src/assets/styles/element/custom.scss
  3. 2 0
      src/modules/bootstrap/login/index.vue

+ 2 - 2
server.config.ts

@@ -3,9 +3,9 @@ import type { ServerOptions } from 'vite'
 const server: ServerOptions = {
   proxy: {
     '^/?(api|file)/': {
-      target: 'http://192.168.10.41:8200',
+      // target: 'http://192.168.10.41:8200',
       // target: 'http://192.168.10.107:8200',
-      // target: 'http://cet-test.markingtool.cn',
+      target: 'http://cet-test.markingtool.cn',
       // target: 'http://cet-dev.markingtool.cn:8200',
     },
   },

+ 1 - 1
src/assets/styles/element/custom.scss

@@ -216,7 +216,7 @@ button.el-button {
     .el-table__row.current-row .el-table__cell{
       background-color:#A1D6FF;
     }
-    .el-table__row:not(.current-row,.el-table__row--striped) .el-table__cell{
+    .el-table__row:not(.current-row,.el-table__row--striped,.top-three-row,.last-three-row) .el-table__cell{
       background-color: #fff;
     }
   }

+ 2 - 0
src/modules/bootstrap/login/index.vue

@@ -145,7 +145,9 @@ function loginSuccess(loginInfo: ExtractApiResponse<'userLogin'>) {
 }
 
 function initLogin() {
+  const dialogModeBeforeSubmit = sessionStorage.get('dialogModeBeforeSubmit')
   sessionStorage.clear()
+  sessionStorage.set('dialogModeBeforeSubmit', dialogModeBeforeSubmit)
   mainStore.$reset()
 }