浏览代码

切换分组:ok按钮

Michael Wang 4 年之前
父节点
当前提交
5792433658
共有 2 个文件被更改,包括 12 次插入10 次删除
  1. 1 1
      src/features/inspect/MarkHeader.vue
  2. 11 9
      src/features/mark/MarkSwitchGroupDialog.vue

+ 1 - 1
src/features/inspect/MarkHeader.vue

@@ -58,7 +58,7 @@
 
 <script lang="ts">
 import { getInspectedHistory } from "@/api/inspectPage";
-import { computed, defineComponent, reactive, ref } from "vue";
+import { computed, defineComponent, ref } from "vue";
 import { store } from "./store";
 import {
   ZoomInOutlined,

+ 11 - 9
src/features/mark/MarkSwitchGroupDialog.vue

@@ -19,7 +19,7 @@
       >
         <td>{{ group.number }}</td>
         <td>{{ group.title }}</td>
-        <td>{{ (group.markedCount / group.totalCount).toFixed(1) }}%</td>
+        <td>{{ progress(group.totalCount, group.markedCount) }}%</td>
         <td class="tw-text-right">
           <QmButton type="primary" @click="chooseGroup(group.markerId)"
             >选择</QmButton
@@ -51,6 +51,14 @@ export default defineComponent({
       visible.value = true;
     };
 
+    const progress = (totalCount: number, markedCount: number) => {
+      if (totalCount <= 0) return 0;
+      let p = markedCount / totalCount;
+      if (p < 0.01 && markedCount >= 1) p = 0.01;
+      p = Math.floor(p * 100);
+      return p;
+    };
+
     const isCurrentGroup = (groupNumber: number) => {
       return groupNumber === store.setting.groupNumber;
     };
@@ -66,15 +74,8 @@ export default defineComponent({
     };
 
     const handleOk = () => {
-      // confirmLoading.value = true;
-      // changeUserInfo(user.name, user.password)
-      //   .then(() => doLogout())
-      //   .finally(() => {
-      //     visible.value = false;
-      //     confirmLoading.value = false;
-      //   });
+      visible.value = false;
     };
-
     const handleCancel = () => {
       // user.name = store.setting.userName;
       // user.password = "";
@@ -85,6 +86,7 @@ export default defineComponent({
       store,
       visible,
       showModal,
+      progress,
       isCurrentGroup,
       chooseGroup,
       handleOk,