diff --git a/components.d.ts b/components.d.ts index 896d6e9..d6fb45b 100644 --- a/components.d.ts +++ b/components.d.ts @@ -21,21 +21,23 @@ declare module 'vue' { NDialogProvider: typeof import('naive-ui')['NDialogProvider'] NDivider: typeof import('naive-ui')['NDivider'] NDropdown: typeof import('naive-ui')['NDropdown'] + NEllipsis: typeof import('naive-ui')['NEllipsis'] NEmpty: typeof import('naive-ui')['NEmpty'] NForm: typeof import('naive-ui')['NForm'] NFormItem: typeof import('naive-ui')['NFormItem'] NGi: typeof import('naive-ui')['NGi'] NGrid: typeof import('naive-ui')['NGrid'] NGridItem: typeof import('naive-ui')['NGridItem'] - NIcon: typeof import('naive-ui')['NIcon'] NImage: typeof import('naive-ui')['NImage'] NInput: typeof import('naive-ui')['NInput'] NMessageProvider: typeof import('naive-ui')['NMessageProvider'] NModal: typeof import('naive-ui')['NModal'] NNotificationProvider: typeof import('naive-ui')['NNotificationProvider'] NotPassed: typeof import('./src/components/NotPassed.vue')['default'] + NPopconfirm: typeof import('naive-ui')['NPopconfirm'] NPopover: typeof import('naive-ui')['NPopover'] NPopselect: typeof import('naive-ui')['NPopselect'] + NProgress: typeof import('naive-ui')['NProgress'] NScrollbar: typeof import('naive-ui')['NScrollbar'] NSelect: typeof import('naive-ui')['NSelect'] NSlider: typeof import('naive-ui')['NSlider'] diff --git a/mock/user/user.ts b/mock/user/user.ts index 22854ed..ff5816e 100644 --- a/mock/user/user.ts +++ b/mock/user/user.ts @@ -23,7 +23,7 @@ const adminInfo = { value: 'task-main', }, { - label: 'AI工单', + label: '图审审批管理', value: 'worksheet-main', }, ], diff --git a/package.json b/package.json index 36a4b15..6ed43e6 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,9 @@ "postinstall": "patch-package" }, "dependencies": { + "@vicons/ionicons5": "^0.12.0", + "@vicons/tabler": "^0.12.0", + "@vicons/utils": "^0.1.4", "@vueup/vue-quill": "^1.2.0", "@vueuse/core": "10.9.0", "axios": "^1.4.0", diff --git a/patches/naive-ui+2.38.1.patch b/patches/naive-ui+2.38.1.patch index 8748dc4..83ce776 100644 --- a/patches/naive-ui+2.38.1.patch +++ b/patches/naive-ui+2.38.1.patch @@ -27,6 +27,29 @@ index 3aacec9..a63ab54 100644 key: "controlled-success", class: `${mergedClsPrefix}-form-item-feedback ${mergedClsPrefix}-form-item-feedback--success` }, feedbackNodes) : h("div", { +diff --git a/node_modules/naive-ui/es/modal/src/Modal.mjs b/node_modules/naive-ui/es/modal/src/Modal.mjs +index 9508b72..63f417b 100644 +--- a/node_modules/naive-ui/es/modal/src/Modal.mjs ++++ b/node_modules/naive-ui/es/modal/src/Modal.mjs +@@ -13,6 +13,10 @@ import { modalInjectionKey, modalProviderInjectionKey } from "./interface.mjs"; + import style from "./styles/index.cssr.mjs"; + export const modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, useTheme.props), { + show: Boolean, ++ showMask: { ++ type: Boolean, ++ default: true ++ }, + unstableShowMask: { + type: Boolean, + default: true +@@ -309,6 +313,7 @@ export default defineComponent({ + "aria-hidden": true, + ref: "containerRef", + class: `${mergedClsPrefix}-modal-mask`, ++ style: this.showMask ? '' : {background:'none'}, + onClick: this.handleClickoutside + }) : null; + } diff --git a/node_modules/naive-ui/es/pagination/src/Pagination.mjs b/node_modules/naive-ui/es/pagination/src/Pagination.mjs index 5bd975b..e1c6ebc 100644 --- a/node_modules/naive-ui/es/pagination/src/Pagination.mjs @@ -161,3 +184,71 @@ index 4f47aad..6dae078 100644 }); } }))) : null)); +diff --git a/node_modules/naive-ui/lib/modal/src/Modal.js b/node_modules/naive-ui/lib/modal/src/Modal.js +index 47f6ac2..801e8e7 100644 +--- a/node_modules/naive-ui/lib/modal/src/Modal.js ++++ b/node_modules/naive-ui/lib/modal/src/Modal.js +@@ -17,7 +17,11 @@ const presetProps_1 = require("./presetProps"); + const BodyWrapper_1 = __importDefault(require("./BodyWrapper")); + const interface_1 = require("./interface"); + const index_cssr_1 = __importDefault(require("./styles/index.cssr")); +-exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _mixins_1.useTheme.props), { show: Boolean, unstableShowMask: { ++exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, _mixins_1.useTheme.props), { ++ show: Boolean, showMask: { ++ type: Boolean, ++ default: true, ++ }, unstableShowMask: { + type: Boolean, + default: true + }, maskClosable: { +@@ -38,7 +42,8 @@ exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, + }, closeOnEsc: { + type: Boolean, + default: true +- }, blockScroll: { type: Boolean, default: true } }), presetProps_1.presetProps), { ++ }, blockScroll: { type: Boolean, default: true } ++}), presetProps_1.presetProps), { + // events + onEsc: Function, 'onUpdate:show': [Function, Array], onUpdateShow: [Function, Array], onAfterEnter: Function, onBeforeLeave: Function, onAfterLeave: Function, onClose: Function, onPositiveClick: Function, onNegativeClick: Function, onMaskClick: Function, + // private +@@ -47,7 +52,8 @@ exports.modalProps = Object.assign(Object.assign(Object.assign(Object.assign({}, + default: undefined + }, + // deprecated +- overlayStyle: [String, Object], onBeforeHide: Function, onAfterHide: Function, onHide: Function }); ++ overlayStyle: [String, Object], onBeforeHide: Function, onAfterHide: Function, onHide: Function ++}); + exports.default = (0, vue_1.defineComponent)({ + name: 'Modal', + inheritAttrs: false, +@@ -226,21 +232,25 @@ exports.default = (0, vue_1.defineComponent)({ + var _a; + (_a = this.onRender) === null || _a === void 0 ? void 0 : _a.call(this); + const { unstableShowMask } = this; +- return (0, vue_1.withDirectives)((0, vue_1.h)("div", { role: "none", ref: "containerRef", class: [ ++ return (0, vue_1.withDirectives)((0, vue_1.h)("div", { ++ role: "none", ref: "containerRef", class: [ + `${mergedClsPrefix}-modal-container`, + this.themeClass, + this.namespace +- ], style: this.cssVars }, +- (0, vue_1.h)(BodyWrapper_1.default, Object.assign({ style: this.overlayStyle }, this.$attrs, { ref: "bodyWrapper", displayDirective: this.displayDirective, show: this.show, preset: this.preset, autoFocus: this.autoFocus, trapFocus: this.trapFocus, blockScroll: this.blockScroll }, this.presetProps, { onEsc: this.handleEsc, onClose: this.handleCloseClick, onNegativeClick: this.handleNegativeClick, onPositiveClick: this.handlePositiveClick, onBeforeLeave: this.handleBeforeLeave, onAfterEnter: this.onAfterEnter, onAfterLeave: this.handleAfterLeave, onClickoutside: unstableShowMask ? undefined : this.handleClickoutside, renderMask: unstableShowMask ++ ], style: this.cssVars ++ }, ++ (0, vue_1.h)(BodyWrapper_1.default, Object.assign({ style: this.overlayStyle }, this.$attrs, { ref: "bodyWrapper", displayDirective: this.displayDirective, show: this.show, preset: this.preset, autoFocus: this.autoFocus, trapFocus: this.trapFocus, blockScroll: this.blockScroll }, this.presetProps, { ++ onEsc: this.handleEsc, onClose: this.handleCloseClick, onNegativeClick: this.handleNegativeClick, onPositiveClick: this.handlePositiveClick, onBeforeLeave: this.handleBeforeLeave, onAfterEnter: this.onAfterEnter, onAfterLeave: this.handleAfterLeave, onClickoutside: unstableShowMask ? undefined : this.handleClickoutside, renderMask: unstableShowMask + ? () => { + var _a; + return ((0, vue_1.h)(vue_1.Transition, { name: "fade-in-transition", key: "mask", appear: (_a = this.internalAppear) !== null && _a !== void 0 ? _a : this.isMounted }, { + default: () => { +- return this.show ? ((0, vue_1.h)("div", { "aria-hidden": true, ref: "containerRef", class: `${mergedClsPrefix}-modal-mask`, onClick: this.handleClickoutside })) : null; ++ return this.show ? ((0, vue_1.h)("div", { "aria-hidden": true, ref: "containerRef", class: `${mergedClsPrefix}-modal-mask` ,style:this.showMask ? '' : {background:'none'}, onClick: this.handleClickoutside })) : null; + } + })); + } +- : undefined }), this.$slots)), [ ++ : undefined ++ }), this.$slots)), [ + [ + vdirs_1.zindexable, + { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d92ef5c..3dde4d4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,15 @@ settings: excludeLinksFromLockfile: false dependencies: + '@vicons/ionicons5': + specifier: ^0.12.0 + version: 0.12.0 + '@vicons/tabler': + specifier: ^0.12.0 + version: 0.12.0 + '@vicons/utils': + specifier: ^0.1.4 + version: 0.1.4(vue@3.3.10) '@vueup/vue-quill': specifier: ^1.2.0 version: 1.2.0(vue@3.3.10) @@ -17,6 +26,9 @@ dependencies: date-fns: specifier: ^2.30.0 version: 2.30.0 + dayjs: + specifier: ^1.11.10 + version: 1.11.10 esno: specifier: ^0.16.3 version: 0.16.3 @@ -41,6 +53,9 @@ dependencies: naive-ui: specifier: ^2.38.1 version: 2.38.1(vue@3.3.10) + patch-package: + specifier: ^8.0.0 + version: 8.0.0 pinia: specifier: ^2.0.33 version: 2.1.7(typescript@4.9.5)(vue@3.3.10) @@ -1333,6 +1348,10 @@ packages: resolution: {integrity: sha512-SXgrhajHG7boLv6oU93CcmdDm0HYRiceuz6b+7z+/2lCJPTWDv0V5YiwFHT2ejE4bQqgSXQiVPQYPWv7LGsK1g==} dev: true + /@types/node@14.14.45: + resolution: {integrity: sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==} + dev: false + /@types/node@18.19.2: resolution: {integrity: sha512-6wzfBdbWpe8QykUkXBjtmO3zITA0A3FIjoy+in0Y2K4KrCiRhNYJIdwAPDffZ3G6GnaKaSLSEa9ZuORLfEoiwg==} dependencies: @@ -1503,6 +1522,23 @@ packages: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} dev: true + /@vicons/ionicons5@0.12.0: + resolution: {integrity: sha512-Iy1EUVRpX0WWxeu1VIReR1zsZLMc4fqpt223czR+Rpnrwu7pt46nbnC2ycO7ItI/uqDLJxnbcMC7FujKs9IfFA==} + dev: false + + /@vicons/tabler@0.12.0: + resolution: {integrity: sha512-3+wUFuxb7e8OzZ8Wryct1pzfA2vyoF4lwW98O9s27ZrfCGaJGNmqG+q8A7vQ92Mf+COCgxpK+rhNPTtTvaU6qw==} + dev: false + + /@vicons/utils@0.1.4(vue@3.3.10): + resolution: {integrity: sha512-OHI19qVNN6i+uPQ+Y3f2s0dUxwsYnOCcKBW7XOU4yXXO1aU3ZoKpblCc3+4N0qmgoJs5rWKRAaMisipqEXJwAg==} + peerDependencies: + vue: ^3.0.6 + dependencies: + '@xicons/utils': 0.1.4 + vue: 3.3.10(typescript@4.9.5) + dev: false + /@vitejs/plugin-vue@4.5.1(vite@5.0.5)(vue@3.3.10): resolution: {integrity: sha512-DaUzYFr+2UGDG7VSSdShKa9sIWYBa1LL8KC0MNOf2H5LjcTPjob0x8LbkqXWmAtbANJCkpiQTj66UVcQkN2s3g==} engines: {node: ^14.18.0 || >=16.0.0} @@ -1771,6 +1807,12 @@ packages: '@xtuc/long': 4.2.2 dev: true + /@xicons/utils@0.1.4: + resolution: {integrity: sha512-uXxKDLz9abr80yJC05XSTq6wlyFcdW+N/1IYJkeHjzzXVc4VQ0sEYMoMMTjAH7HQBOyOkzOB4pf5NGF72lwa8Q==} + dependencies: + css-render: 0.13.9 + dev: false + /@xtuc/ieee754@1.2.0: resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} dev: true @@ -1779,6 +1821,10 @@ packages: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} dev: true + /@yarnpkg/lockfile@1.1.0: + resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} + dev: false + /JSONStream@1.3.5: resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==} hasBin: true @@ -1987,6 +2033,11 @@ packages: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} dev: false + /at-least-node@1.0.0: + resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==} + engines: {node: '>= 4.0.0'} + dev: false + /atob@2.1.2: resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==} engines: {node: '>= 4.5.0'} @@ -2087,7 +2138,6 @@ packages: engines: {node: '>=8'} dependencies: fill-range: 7.0.1 - dev: true /browserslist@4.22.2: resolution: {integrity: sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==} @@ -2270,7 +2320,6 @@ packages: /ci-info@3.9.0: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} - dev: true /class-utils@0.3.6: resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==} @@ -2537,6 +2586,14 @@ packages: shebang-command: 2.0.0 which: 2.0.2 + /css-render@0.13.9: + resolution: {integrity: sha512-n3C4ZH59rveBrUlAD7n0Ze9/gUMKa4dlH1C9CWKpGcIHR/xRcIVXzBGy1iw8WWq2ySmn2/ZqOpySQNAK5Pb6sw==} + dependencies: + '@emotion/hash': 0.8.0 + '@types/node': 14.14.45 + csstype: 3.0.11 + dev: false + /css-render@0.15.12: resolution: {integrity: sha512-eWzS66patiGkTTik+ipO9qNGZ+uNuGyTmnz6/+EJIiFg8+3yZRpnMwgFo8YdXhQRsiePzehnusrxVvugNjXzbw==} dependencies: @@ -2611,6 +2668,10 @@ packages: '@babel/runtime': 7.23.5 dev: false + /dayjs@1.11.10: + resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==} + dev: false + /de-indent@1.0.2: resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} dev: true @@ -3887,7 +3948,6 @@ packages: engines: {node: '>=8'} dependencies: to-regex-range: 5.0.1 - dev: true /finalhandler@1.1.2: resolution: {integrity: sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==} @@ -3920,6 +3980,12 @@ packages: path-exists: 4.0.0 dev: true + /find-yarn-workspace-root@2.0.0: + resolution: {integrity: sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==} + dependencies: + micromatch: 4.0.5 + dev: false + /fizzy-ui-utils@2.0.7: resolution: {integrity: sha512-CZXDVXQ1If3/r8s0T+v+qVeMshhfcuq0rqIFgJnrtd+Bu8GmDmqMjntjUePypVtjHXKJ6V4sw9zeyox34n9aCg==} dependencies: @@ -3995,6 +4061,16 @@ packages: universalify: 2.0.1 dev: true + /fs-extra@9.1.0: + resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==} + engines: {node: '>=10'} + dependencies: + at-least-node: 1.0.0 + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.1 + dev: false + /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -4147,7 +4223,6 @@ packages: /graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - dev: true /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} @@ -4465,6 +4540,12 @@ packages: is-data-descriptor: 1.0.1 dev: true + /is-docker@2.2.1: + resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==} + engines: {node: '>=8'} + hasBin: true + dev: false + /is-extendable@0.1.1: resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==} engines: {node: '>=0.10.0'} @@ -4510,7 +4591,6 @@ packages: /is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - dev: true /is-obj@2.0.0: resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==} @@ -4573,10 +4653,21 @@ packages: engines: {node: '>=0.10.0'} dev: true + /is-wsl@2.2.0: + resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==} + engines: {node: '>=8'} + dependencies: + is-docker: 2.2.1 + dev: false + /isarray@1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} dev: true + /isarray@2.0.5: + resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} + dev: false + /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -4671,6 +4762,16 @@ packages: /json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} + /json-stable-stringify@1.1.1: + resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.5 + isarray: 2.0.5 + jsonify: 0.0.1 + object-keys: 1.1.1 + dev: false + /json5@1.0.2: resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==} hasBin: true @@ -4698,7 +4799,10 @@ packages: universalify: 2.0.1 optionalDependencies: graceful-fs: 4.2.11 - dev: true + + /jsonify@0.0.1: + resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} + dev: false /jsonparse@1.3.1: resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==} @@ -4734,6 +4838,12 @@ packages: engines: {node: '>=0.10.0'} dev: true + /klaw-sync@6.0.0: + resolution: {integrity: sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==} + dependencies: + graceful-fs: 4.2.11 + dev: false + /kleur@3.0.3: resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} engines: {node: '>=6'} @@ -5100,7 +5210,6 @@ packages: dependencies: braces: 3.0.2 picomatch: 2.3.1 - dev: true /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} @@ -5172,7 +5281,6 @@ packages: /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - dev: true /minipass@4.2.8: resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==} @@ -5453,6 +5561,14 @@ packages: mimic-fn: 4.0.0 dev: true + /open@7.4.2: + resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==} + engines: {node: '>=8'} + dependencies: + is-docker: 2.2.1 + is-wsl: 2.2.0 + dev: false + /optionator@0.9.3: resolution: {integrity: sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==} engines: {node: '>= 0.8.0'} @@ -5464,6 +5580,11 @@ packages: prelude-ls: 1.2.1 type-check: 0.4.0 + /os-tmpdir@1.0.2: + resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} + engines: {node: '>=0.10.0'} + dev: false + /outlayer@2.1.1: resolution: {integrity: sha512-+GplXsCQ3VrbGujAeHEzP9SXsBmJxzn/YdDSQZL0xqBmAWBmortu2Y9Gwdp9J0bgDQ8/YNIPMoBM13nTwZfAhw==} dependencies: @@ -5570,6 +5691,28 @@ packages: engines: {node: '>=0.10.0'} dev: true + /patch-package@8.0.0: + resolution: {integrity: sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==} + engines: {node: '>=14', npm: '>5'} + hasBin: true + dependencies: + '@yarnpkg/lockfile': 1.1.0 + chalk: 4.1.2 + ci-info: 3.9.0 + cross-spawn: 7.0.3 + find-yarn-workspace-root: 2.0.0 + fs-extra: 9.1.0 + json-stable-stringify: 1.1.1 + klaw-sync: 6.0.0 + minimist: 1.2.8 + open: 7.4.2 + rimraf: 2.7.1 + semver: 7.5.4 + slash: 2.0.0 + tmp: 0.0.33 + yaml: 2.3.4 + dev: false + /path-browserify@1.0.1: resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} dev: true @@ -5634,7 +5777,6 @@ packages: /picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - dev: true /pidtree@0.6.0: resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} @@ -6072,6 +6214,13 @@ packages: resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==} dev: true + /rimraf@2.7.1: + resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} + hasBin: true + dependencies: + glob: 7.2.3 + dev: false + /rimraf@3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} hasBin: true @@ -6243,6 +6392,11 @@ packages: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} dev: true + /slash@2.0.0: + resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==} + engines: {node: '>=6'} + dev: false + /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} @@ -6688,6 +6842,13 @@ packages: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} dev: true + /tmp@0.0.33: + resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} + engines: {node: '>=0.6.0'} + dependencies: + os-tmpdir: 1.0.2 + dev: false + /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -6712,7 +6873,6 @@ packages: engines: {node: '>=8.0'} dependencies: is-number: 7.0.0 - dev: true /to-regex@3.0.2: resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==} @@ -6827,7 +6987,6 @@ packages: /universalify@2.0.1: resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} engines: {node: '>= 10.0.0'} - dev: true /unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} @@ -7377,7 +7536,6 @@ packages: /yaml@2.3.4: resolution: {integrity: sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==} engines: {node: '>= 14'} - dev: true /yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} diff --git a/src/api/dictionary/index.ts b/src/api/dictionary/index.ts index 23ca588..6968f53 100644 --- a/src/api/dictionary/index.ts +++ b/src/api/dictionary/index.ts @@ -377,6 +377,17 @@ export async function getizstatusList() { url: `/static/admin/web/distionary/bytypecode/izstatus`, method: 'get', }) + return res.data[0].distionaryList +} +/** + * 获取审核状态字典(任务审核) + * @returns + */ +export async function getizApprovalStatusList() { + const res = await http.request({ + url: `/static/admin/web/distionary/bytypecode/izApprovalStatus`, + method: 'get', + }) return res.data[0].distionaryList } diff --git a/src/api/final/index.ts b/src/api/final/index.ts index e7249f8..d5eae04 100644 --- a/src/api/final/index.ts +++ b/src/api/final/index.ts @@ -30,11 +30,11 @@ export async function getFinalList(params: FinalParam) { params: notEmptyParams, }) - const { data: { list, totalPage,totalCount } } = res + const { data: { list, totalPage, totalCount } } = res return { pageCount: totalPage, data: list, - totalCount + totalCount, } } @@ -62,3 +62,22 @@ export async function repetitionTask() { method: 'get', }) } + +/** + * 获取小结重复列表 + * @returns + */ +export async function getRepeatList(params: FinalParam) { + const res = await http.request({ + url: `/flow/task/repetitionTaskList`, + method: 'get', + params, + }) + + const { data: { records, total, pages } } = res + return { + pageCount: pages, + data: records, + totalCount: total, + } +} diff --git a/src/api/home/main.ts b/src/api/home/main.ts index bd661e2..2b8bfc3 100644 --- a/src/api/home/main.ts +++ b/src/api/home/main.ts @@ -180,6 +180,19 @@ export async function oneClickCheck(params: Partial = { search_histo params }) } +/** + * 解散任务包 + * @param + * @returns + */ + export async function deletePackage(params) { + + return http.request({ + url: `/ocr/ocrTaskPackage/deletePackage`, + method: 'get', + params + }) +} /** * 任务完成——创建任务包前——获取图片列表 * @param @@ -250,3 +263,17 @@ export async function getPictureList(params: any): Promise { total, } } + +/** + * 获取需要过滤的搜索条件框列表 + * @param + * @returns + */ +export async function getFilterList(params) { + + return http.request({ + url: `/ocr/ocrUsersearch/querySearchCondition`, + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/api/task/task.ts b/src/api/task/task.ts index 8692465..572e5f7 100644 --- a/src/api/task/task.ts +++ b/src/api/task/task.ts @@ -7,11 +7,15 @@ import { ContentTypeEnum } from '@/enums/httpEnum' * 获取审核列表 * @returns */ -export async function getApprovalList(page: PageParam) { +export async function getApprovalList(page: any) { const res = await http.request({ url: `/flow/task/listalldata`, method: 'get', - params: { pageSize: page.pageSize, currPage: page.pageNo }, + params: { + pageSize: page.pageSize, + currPage: page.pageNo, + keyword: page.keyword, + }, }) const { data: { list, totalCount } } = res @@ -25,12 +29,11 @@ export async function getApprovalList(page: PageParam) { * 审核 * @param param */ -export async function audit(params: ApprovalParam) { +export async function audit(params) { return http.request({ url: `/flow/task/completeBatchFlow?`, method: 'post', - params: qs.stringify(params, { indices: false }), - headers: { 'Content-Type': ContentTypeEnum.FORM_DATA }, + params, }) } diff --git a/src/api/work/work.ts b/src/api/work/work.ts index a9dc373..f7e1259 100644 --- a/src/api/work/work.ts +++ b/src/api/work/work.ts @@ -7,11 +7,11 @@ import { ContentTypeEnum } from '@/enums/httpEnum' * 获取任务包列表 * @returns */ -export async function getPackageList(params: PageParam, packagename: string) { +export async function getPackageList(params: PageParam, packageName: string) { const res = await http.request({ url: `/ocr/ocrTaskPackage/getPackageList`, method: 'get', - params: { ...params, packagename }, + params: { ...params, packageName }, }) const { data: { records, pages } } = res @@ -83,7 +83,7 @@ export async function getTaskDetailInfo(checkDuplicateId: string) { * @param params * @returns */ -export async function getTaskDetailPictureList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) { +export async function getPictureSimilarityList(params: PageParam & PictureSortParam & SimilarityPictureSortParam) { const res = await http.request({ url: `/backstage/jifen/ocrtaskchildpicture/getPictureSimilarityList`, @@ -95,11 +95,11 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa // 精简一下数据 const list = records.map((item,index) => { - return { id: item.id, + checkDuplicateId: item.checkDuplicateId, taskId: item.taskId, - taskname: item.fromtaskname, + taskname: item.fromTaskName, assignee: item.assignee, pictureid: item.pictureid, imgurl: item.serverThumbnailUrl, @@ -113,7 +113,6 @@ export async function getTaskDetailPictureList(params: PageParam & PictureSortPa photoDateTimestamp:item.photoDateTimestamp, } }) - return { pageCount: pages, data: list, diff --git a/src/assets/icons/ai-approve.svg b/src/assets/icons/ai-approve.svg new file mode 100644 index 0000000..8ac61c6 --- /dev/null +++ b/src/assets/icons/ai-approve.svg @@ -0,0 +1,19 @@ + + + 编组 11 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/ai-order.svg b/src/assets/icons/ai-order.svg new file mode 100644 index 0000000..649ce4a --- /dev/null +++ b/src/assets/icons/ai-order.svg @@ -0,0 +1,20 @@ + + + 编组 33 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/column.svg b/src/assets/icons/column.svg new file mode 100644 index 0000000..954e360 --- /dev/null +++ b/src/assets/icons/column.svg @@ -0,0 +1,18 @@ + + + 自定义列 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/down-line.svg b/src/assets/icons/down-line.svg new file mode 100644 index 0000000..7a1b4e2 --- /dev/null +++ b/src/assets/icons/down-line.svg @@ -0,0 +1,32 @@ + + + 编组 13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/error_icon.svg b/src/assets/icons/error_icon.svg new file mode 100644 index 0000000..d772a90 --- /dev/null +++ b/src/assets/icons/error_icon.svg @@ -0,0 +1,17 @@ + + + 形状 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/exclamation-solid.svg b/src/assets/icons/exclamation-solid.svg new file mode 100644 index 0000000..26d03f5 --- /dev/null +++ b/src/assets/icons/exclamation-solid.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/import.svg b/src/assets/icons/import.svg new file mode 100644 index 0000000..08b665d --- /dev/null +++ b/src/assets/icons/import.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/list-mode.svg b/src/assets/icons/list-mode.svg new file mode 100644 index 0000000..bd22c1f --- /dev/null +++ b/src/assets/icons/list-mode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/look.svg b/src/assets/icons/look.svg new file mode 100644 index 0000000..fc64bd6 --- /dev/null +++ b/src/assets/icons/look.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/power-off.svg b/src/assets/icons/power-off.svg new file mode 100644 index 0000000..9ec7596 --- /dev/null +++ b/src/assets/icons/power-off.svg @@ -0,0 +1,17 @@ + + + 沉浸模式-开启 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/right_arrow.svg b/src/assets/icons/right_arrow.svg new file mode 100644 index 0000000..c3da58b --- /dev/null +++ b/src/assets/icons/right_arrow.svg @@ -0,0 +1,18 @@ + + + 右箭头 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/robot-two.svg b/src/assets/icons/robot-two.svg new file mode 100644 index 0000000..33ee42c --- /dev/null +++ b/src/assets/icons/robot-two.svg @@ -0,0 +1,13 @@ + + + 开心 2 + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/summary.svg b/src/assets/icons/summary.svg new file mode 100644 index 0000000..075c554 --- /dev/null +++ b/src/assets/icons/summary.svg @@ -0,0 +1,26 @@ + + + chazhongjiansuo + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/top-line.svg b/src/assets/icons/top-line.svg new file mode 100644 index 0000000..aa3653a --- /dev/null +++ b/src/assets/icons/top-line.svg @@ -0,0 +1,32 @@ + + + 编组 13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/task/btn-not-pass.png b/src/assets/images/task/btn-not-pass.png new file mode 100644 index 0000000..ef7ad59 Binary files /dev/null and b/src/assets/images/task/btn-not-pass.png differ diff --git a/src/assets/images/task/btn-pass.png b/src/assets/images/task/btn-pass.png new file mode 100644 index 0000000..31b38c1 Binary files /dev/null and b/src/assets/images/task/btn-pass.png differ diff --git a/src/components/Approval/NotPassed.vue b/src/components/Approval/NotPassed.vue index baef5f7..7d3ea14 100644 --- a/src/components/Approval/NotPassed.vue +++ b/src/components/Approval/NotPassed.vue @@ -1,19 +1,18 @@ @@ -98,34 +126,40 @@ async function selectChange(id) {
选择不通过原因 -
-
-
-
-
+
-
- 处理方式 - -
-
- 不通过原因 - - -
- - + +
+ + + + + + + + + + +
+