feat: 关闭按钮逻辑调整

electron/main/main.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, clipboard } from 'electron'
+import { app, BrowserWindow, clipboard, screen } from 'electron'
 import { resolve } from 'path'
 import installDevTool, { VUEJS_DEVTOOLS } from 'electron-devtools-installer'
 import path from 'path'
@@ -9,6 +9,7 @@ if (!app.requestSingleInstanceLock()) {
 }
 
 async function createWindow() {
+  // console.log(screen.getPrimaryDisplay())
   const loadingView = new BrowserWindow({
     width: 520,
     height: 150,

src/layout/main/MainHeader.vue

@@ -13,7 +13,7 @@
       <div class="m-r-base">
         <user-info></user-info>
       </div>
-      <div class="grid fill-light-gray pointer close-icon" @click="closeApp">
+      <div class="grid fill-light-gray pointer close-icon" @click="logout">
         <el-icon><close /></el-icon>
       </div>
     </div>
@@ -21,10 +21,9 @@
 </template>
 
 <script setup lang="ts" name="MainLayoutHeader">
-import { reactive, ref } from 'vue'
 import { ElIcon } from 'element-plus'
 import { Fold, Expand, Close } from '@element-plus/icons-vue'
-import { closeApp } from '@/utils/shared'
+import { logout } from '@/utils/shared'
 import useMainLayoutStore from '@/store/layout'
 import Message from '@/components/shared/Message.vue'
 import UserInfo from '@/components/shared/UserInfo.vue'

src/modules/quality/self-check/index.vue

@@ -96,17 +96,22 @@ const items = computed<EpFormItem[]>(() => {
   ]
 })
 
+const { fetch: selfCheckAnalysis, result: data1 } = useFetch('selfCheckAnalysis')
+
 const columns1: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'selfCheckAnalysis'>>>[] = [
   { label: '序号', type: 'index', width: 100 },
   { label: '评卷员', prop: 'markerName' },
   { label: '自查份数', prop: 'checkCount' },
   { label: '平均离差', prop: 'avgDiff' },
 ]
-const columns2: EpTableColumn[] = [{}]
+const columns2 = computed<EpTableColumn[]>(() => {
+  return [
+    { label: '离差值', prop: '' },
+    { label: '离差个数', prop: '' },
+  ]
+})
 const columns3: EpTableColumn[] = []
 
-const { fetch: selfCheckAnalysis, result: data1 } = useFetch('selfCheckAnalysis')
-
 function onSearch() {
   selfCheckAnalysis({ ...omit(model, 'time'), startTime: model.time[0], endTime: model.time[1] })
 }

src/utils/shared.ts

@@ -1,5 +1,6 @@
 import router from '@/router'
 import { sessionStorage } from '@/plugins/storage'
+
 /** 退出登录 */
 export const logout = () => {
   sessionStorage.remove('LOGIN_RESULT')