Merge branch 'dev_2.0.0' of http://git.qmth.com.cn/scan-central/client-admin into dev_2.0.0

package.json

@@ -11,7 +11,8 @@
     "build:main": "node build/build.js",
     "dev:vite": "vite --mode development",
     "build:vite": "vue-tsc --noEmit --skipLibCheck && vite build",
-    "check": "vue-tsc --noEmit --skipLibCheck"
+    "check": "vue-tsc --noEmit --skipLibCheck",
+    "build": "vite build"
   },
   "main": "dist/main.js",
   "dependencies": {

src/render/components.d.ts

@@ -7,7 +7,6 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    AAlert: typeof import('@qmth/ui')['Alert']
     AButton: typeof import('@qmth/ui')['Button']
     ACard: typeof import('@qmth/ui')['Card']
     ACol: typeof import('@qmth/ui')['Col']
@@ -21,7 +20,6 @@ declare module 'vue' {
     AInputPassword: typeof import('@qmth/ui')['InputPassword']
     AModal: typeof import('@qmth/ui')['Modal']
     APagination: typeof import('@qmth/ui')['Pagination']
-    APopconfirm: typeof import('@qmth/ui')['Popconfirm']
     AProgress: typeof import('@qmth/ui')['Progress']
     ARadio: typeof import('@qmth/ui')['Radio']
     ARadioGroup: typeof import('@qmth/ui')['RadioGroup']

src/render/views/ScanManage/ScanCheckMiss.vue

@@ -0,0 +1,72 @@
+<template>
+  <div class="scan-process h-full">
+    <qm-low-form :params="searchParams" :fields="searchFields"></qm-low-form>
+    <a-table :data-source="tableData" :columns="columns" size="middle" bordered>
+    </a-table>
+  </div>
+</template>
+<script name="ScanProcess" lang="ts" setup>
+import { ref, computed } from "vue";
+import type { TableColumnsType } from "@qmth/ui";
+//todo 入参名
+const searchParams = ref({
+  a: "",
+});
+const searchFields = ref([
+  {
+    prop: "a",
+    type: "select",
+    colSpan: 4,
+    label: "选择科目",
+  },
+  {
+    type: "buttons",
+    colSpan: 5,
+    children: [
+      {
+        text: "查询",
+      },
+    ],
+  },
+]);
+
+const tableData = ref([{ a: 1, b: 2, c: 3 }]);
+const columns: TableColumnsType = [
+  {
+    title: "科目",
+    dataIndex: "a",
+  },
+  {
+    title: "进度",
+    dataIndex: "b",
+  },
+  {
+    title: "考生总数",
+    dataIndex: "c",
+  },
+  {
+    title: "已扫描",
+    dataIndex: "d",
+  },
+  {
+    title: "未扫描",
+    dataIndex: "e",
+  },
+  {
+    title: "预计剩余时间",
+    dataIndex: "f",
+  },
+];
+</script>
+<style lang="less" scoped>
+.image-view {
+  .image-wrap {
+    height: 100%;
+    border-left: 1px solid #e5e6eb;
+    border-right: 1px solid #e5e6eb;
+    background: #eceef1;
+    margin-left: 284px;
+    margin-right: 400px;
+  }
+}
+</style>

src/render/views/ScanManage/ScanProcess.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="scan-process h-full">
+    <qm-low-form :params="searchParams" :fields="searchFields"></qm-low-form>
+    <a-table :data-source="tableData" :columns="columns" size="middle" bordered>
+    </a-table>
+  </div>
+</template>
+<script name="ScanProcess" lang="ts" setup>
+import { ref, computed } from "vue";
+import type { TableColumnsType } from "@qmth/ui";
+//todo 入参名
+const searchParams = ref({
+  a: "",
+});
+const searchFields = ref([
+  {
+    prop: "a",
+    type: "select",
+    colSpan: 4,
+    label: "选择科目",
+  },
+  {
+    type: "buttons",
+    colSpan: 5,
+    children: [
+      {
+        text: "查询",
+      },
+    ],
+  },
+]);
+
+const tableData = ref([{ a: 1, b: 2, c: 3 }]);
+const columns: TableColumnsType = [
+  {
+    title: "科目",
+    dataIndex: "a",
+  },
+  {
+    title: "进度",
+    dataIndex: "b",
+  },
+  {
+    title: "考生总数",
+    dataIndex: "c",
+  },
+  {
+    title: "已扫描",
+    dataIndex: "d",
+  },
+  {
+    title: "未扫描",
+    dataIndex: "e",
+  },
+  {
+    title: "预计剩余时间",
+    dataIndex: "f",
+  },
+];
+</script>
+<style lang="less" scoped>
+.image-view {
+  padding: 20px;
+}
+</style>

src/render/views/ScanManage/index.vue

@@ -1,10 +1,12 @@
 <template>
   <div class="scan-manage h-full">
     <a-tabs v-model:activeKey="activeKey">
-      <a-tab-pane key="1" tab="图片查看">
+      <a-tab-pane key="1" tab="图片查找">
         <ImageView></ImageView>
       </a-tab-pane>
-      <a-tab-pane key="2" tab="扫描进度"> </a-tab-pane>
+      <a-tab-pane key="2" tab="扫描进度"
+        ><ScanProcess></ScanProcess>
+      </a-tab-pane>
       <a-tab-pane key="3" tab="工作量统计"> </a-tab-pane>
       <a-tab-pane key="4" tab="扫描查漏"> </a-tab-pane>
       <a-tab-pane key="5" tab="考生信息"> </a-tab-pane>
@@ -14,22 +16,7 @@
 <script name="ScanManage" lang="ts" setup>
 import { ref } from "vue";
 import ImageView from "./ImageView.vue";
+import ScanProcess from "./ScanProcess.vue";
 const activeKey = ref("1");
 </script>
-<style lang="less" scoped>
-.scan-manage {
-  :deep(.ant-tabs) {
-    height: 100%;
-    .ant-tabs-nav {
-      padding: 8px 15px 0 15px;
-      margin-bottom: 0;
-    }
-    .ant-tabs-content-holder {
-      overflow: auto;
-      .ant-tabs-content {
-        height: 100%;
-      }
-    }
-  }
-}
-</style>
+<style lang="less" scoped></style>