From 49a7e5c0535fbf2f9194875fba9e2ce033048c0a Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Wed, 10 Apr 2024 11:42:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=B3=E4=B8=8B=E8=A7=92=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components.d.ts | 1 + src/assets/icons/modal_reImg.svg | 61 +++++++++++++++++++ src/components/Robot/index.vue | 29 +++++++++ src/views/final/content/ListContent.vue | 50 +++++++++++---- src/views/final/index.vue | 4 ++ src/views/home/content/Content.vue | 9 ++- .../home/content/modal/LoginSuccessModal.vue | 6 ++ src/views/home/index.vue | 13 +++- src/views/task/index.vue | 2 + src/views/worksheet/index.vue | 4 ++ 10 files changed, 163 insertions(+), 16 deletions(-) create mode 100644 src/assets/icons/modal_reImg.svg create mode 100644 src/components/Robot/index.vue diff --git a/components.d.ts b/components.d.ts index d6fb45b..9398d24 100644 --- a/components.d.ts +++ b/components.d.ts @@ -53,6 +53,7 @@ declare module 'vue' { NUpload: typeof import('naive-ui')['NUpload'] NUploadDragger: typeof import('naive-ui')['NUploadDragger'] Quill: typeof import('./src/components/RichEditor/Quill.vue')['default'] + Robot: typeof import('./src/components/Robot/index.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] Search: typeof import('./src/components/Search/Search.vue')['default'] diff --git a/src/assets/icons/modal_reImg.svg b/src/assets/icons/modal_reImg.svg new file mode 100644 index 0000000..56273c1 --- /dev/null +++ b/src/assets/icons/modal_reImg.svg @@ -0,0 +1,61 @@ + + + 编组 33 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/Robot/index.vue b/src/components/Robot/index.vue new file mode 100644 index 0000000..aef8ee2 --- /dev/null +++ b/src/components/Robot/index.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/views/final/content/ListContent.vue b/src/views/final/content/ListContent.vue index c9e0ee5..ee0cc20 100644 --- a/src/views/final/content/ListContent.vue +++ b/src/views/final/content/ListContent.vue @@ -1,14 +1,24 @@ @@ -40,14 +51,14 @@ onMounted(() => { -
-
+
+
-
+
任务ID：{{ item.title }}
@@ -164,22 +175,26 @@ onMounted(() => { display: flex; flex-flow: row wrap; align-items: center; - justify-content: flex-start; + // justify-content: flex-start; + justify-content: space-between; flex: 1; .item { - width: 23%; + min-width: 14.125rem; border: 1px solid #ededed; border-radius: 3px; padding: 8px 10px; - margin-right: 10px; + margin-right: 20px; + margin-bottom: 16px; .top { display: flex; flex-flow: row nowrap; align-items: center; justify-content: flex-start; .img { - width: 50%; - height: 70px; + width: 84px; + height: 55px; + // height: auto; + object-fit: cover; border-radius: 3px; .check_box { margin-left: 8px; @@ -202,15 +217,21 @@ onMounted(() => { align-items: center; justify-content: flex-start; .tag_item { - width: 31px; - height: 14px; + min-width: 31px; + min-height: 14px; font-size: 10px; + padding: 1px 3px; font-weight: bolder; text-align: left; // color: #507afd; line-height: 14px; letter-spacing: 0.1px; margin-right: 8px; + // opacity: 0.1; + background: #c0f7e4; + border-radius: 2px; + text-align: center; + white-space: nowrap } } } @@ -219,6 +240,9 @@ onMounted(() => { flex-flow: row nowrap; align-items: center; justify-content: flex-end; + div { + cursor: pointer; + } .resovle_action { font-size: 12px; font-weight: bolder; @@ -230,7 +254,7 @@ onMounted(() => { font-size: 12px; font-weight: bolder; text-align: left; - color: #ff4e4f; + color: #FF4E4F; line-height: 17px; margin-left: 15px; } diff --git a/src/views/final/index.vue b/src/views/final/index.vue index 102a011..20d020f 100644 --- a/src/views/final/index.vue +++ b/src/views/final/index.vue @@ -3,6 +3,8 @@ import { ref } from 'vue' import Aside from './aside/Aside.vue' import Content from './content/Content.vue' import ListContent from './content/ListContent.vue' +import Robot from '@/components/Robot/index.vue' + defineOptions({ name: 'FinalMain', @@ -24,6 +26,8 @@ function inputChange(keyword) { + +
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index fdc5e9b..87c3a39 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -378,7 +378,7 @@ async function tasksLoadingCloseCallback() { async function showLoginSuccessModal() { const modal = LoginSuccessModalRef.value as any; - // modal.showModal() + modal.showModal() } // 包id @@ -621,6 +621,11 @@ const loadImgOver = (item) => { console.log("loadImgOver", item); setTimeout(() => (item.loadOver = true), 2000); }; + +defineExpose({ + showLoginSuccessModal +}) + diff --git a/src/views/task/index.vue b/src/views/task/index.vue index e4451c0..20a4d52 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -3,6 +3,7 @@ import { ref } from "vue"; import Aside from "./aside/Aside.vue"; import Content from "./content/Content.vue"; import DataHeader from "@/components/DataHeader/index.vue"; +import Robot from '@/components/Robot/index.vue' const asideRef: any = ref(null); @@ -23,6 +24,7 @@ function setAsideItemName(text) {
+
diff --git a/src/views/worksheet/index.vue b/src/views/worksheet/index.vue index a183336..2c6ccfd 100644 --- a/src/views/worksheet/index.vue +++ b/src/views/worksheet/index.vue @@ -4,6 +4,9 @@ import { ref } from "vue"; import Aside from "./aside/Aside.vue"; import Content from "./content/Content.vue"; import { useWorkOrder } from "@/store/modules/workOrder"; +import Robot from '@/components/Robot/index.vue' + + const workStore = useWorkOrder(); const contentRef: any = ref(null); const ApprovalOver = (packageId) => { @@ -24,6 +27,7 @@ const ApprovalOver = (packageId) => {
+