zhangjie 1 年之前
父节点
当前提交
079341c9ba
共有 5 个文件被更改,包括 36 次插入43 次删除
  1. 0 13
      src/assets/styles/home.scss
  2. 1 1
      src/background.js
  3. 10 8
      src/modules/client/components/ScanTaskProcessDialog.vue
  4. 1 1
      src/views/Home.vue
  5. 24 20
      src/views/Layout.vue

+ 0 - 13
src/assets/styles/home.scss

@@ -4,19 +4,6 @@
   width: 100%;
   height: 100%;
   z-index: auto;
-
-  &::before {
-    content: "";
-    display: block;
-    position: absolute;
-    width: 100%;
-    height: 10px;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    cursor: move;
-    -webkit-app-region: drag;
-  }
 }
 
 .home-body {

+ 1 - 1
src/background.js

@@ -29,7 +29,7 @@ function createWindow() {
     height: 700,
     minWidth: 1024,
     minHeight: 600,
-    frame: isDevelopment,
+    // frame: isDevelopment,
     useContentSize: true,
     webPreferences: {
       nodeIntegration: true,

+ 10 - 8
src/modules/client/components/ScanTaskProcessDialog.vue

@@ -61,14 +61,16 @@
         >
           {{ statusDesc[scanStatus] }}
         </el-button>
-
-        <el-button
-          :disabled="!canSave"
-          :loading="saving"
-          type="primary"
-          @click="toSave"
-          >保存</el-button
-        >
+        <div>
+          <span>{{ scanStageList.length }} / {{ maxCacheCount }}</span>
+          <el-button
+            :disabled="!canSave"
+            :loading="saving"
+            type="primary"
+            @click="toSave"
+            >保存</el-button
+          >
+        </div>
       </div>
     </el-dialog>
 

+ 1 - 1
src/views/Home.vue

@@ -22,7 +22,7 @@
             <i class="icon icon-user-fill"></i>
             <span>{{ userName }}</span>
           </li>
-          <li class="hover" @click="toBack">
+          <li class="hover" @click.stop="toBack">
             <i class="icon icon-logout"></i>
             <span>退出</span>
           </li>

+ 24 - 20
src/views/Layout.vue

@@ -2,12 +2,16 @@
   <div class="home layout">
     <div class="home-head">
       <div class="head-logo"></div>
-      <div class="head-actions">
-        <span class="action-icon action-min" title="最小化" @click="minWin">
+      <!-- <div class="head-actions">
+        <span
+          class="action-icon action-min"
+          title="最小化"
+          @click.stop="minWin"
+        >
         </span>
-        <span class="action-icon action-close" title="关闭" @click="close">
+        <span class="action-icon action-close" title="关闭" @click.stop="close">
         </span>
-      </div>
+      </div> -->
     </div>
     <div class="home-body">
       <router-view />
@@ -27,7 +31,7 @@
 </template>
 
 <script>
-const { ipcRenderer } = window.nodeRequire("electron");
+// const { ipcRenderer } = window.nodeRequire("electron");
 
 export default {
   name: "layout",
@@ -59,21 +63,21 @@ export default {
         window.history.go(-1);
       }
     },
-    minWin() {
-      ipcRenderer.send("minimize-window");
-    },
-    maxWin() {
-      ipcRenderer.send("maximize-window");
-    },
-    close() {
-      this.$confirm("确认要退出系统吗?", "提示", {
-        type: "warning",
-      })
-        .then(() => {
-          ipcRenderer.send("close-window");
-        })
-        .catch(() => {});
-    },
+    // minWin() {
+    //   ipcRenderer.send("minimize-window");
+    // },
+    // maxWin() {
+    //   ipcRenderer.send("maximize-window");
+    // },
+    // close() {
+    //   this.$confirm("确认要退出系统吗?", "提示", {
+    //     type: "warning",
+    //   })
+    //     .then(() => {
+    //       ipcRenderer.send("close-window");
+    //     })
+    //     .catch(() => {});
+    // },
   },
 };
 </script>