From 219c81e86438604b1a183da2bff350b9f0bedc81 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Mon, 29 Jul 2024 19:12:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/star_no.svg | 1 + src/assets/imgs/star_yes.svg | 1 + src/views/bpm/knows/knowledge/index.vue | 11 +++++++++++ 3 files changed, 13 insertions(+) create mode 100644 src/assets/imgs/star_no.svg create mode 100644 src/assets/imgs/star_yes.svg diff --git a/src/assets/imgs/star_no.svg b/src/assets/imgs/star_no.svg new file mode 100644 index 0000000..7c0dff3 --- /dev/null +++ b/src/assets/imgs/star_no.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/imgs/star_yes.svg b/src/assets/imgs/star_yes.svg new file mode 100644 index 0000000..78fedc7 --- /dev/null +++ b/src/assets/imgs/star_yes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/bpm/knows/knowledge/index.vue b/src/views/bpm/knows/knowledge/index.vue index 6adb172..ad67375 100644 --- a/src/views/bpm/knows/knowledge/index.vue +++ b/src/views/bpm/knows/knowledge/index.vue @@ -114,6 +114,10 @@ > 删除 +
+ + +
@@ -138,6 +142,8 @@ import { KnowledgeApi, KnowledgeVO } from '@/api/bpm/knows/knowledge' import KnowledgeForm from './KnowledgeForm.vue' import { defaultProps, handleTree } from '@/utils/tree' import * as DeptApi from "@/api/system/dept"; +import yesIcon from "../../../../assets/imgs/star_yes.svg" +import noIcon from "../../../../assets/imgs/star_no.svg" /** 知识发布 列表 */ defineOptions({ name: 'Knowledge' }) @@ -145,6 +151,7 @@ defineOptions({ name: 'Knowledge' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 +const ys = ref(false)//收藏图标切换 const loading = ref(true) // 列表的加载中 const list = ref([]) // 列表的数据 const total = ref(0) // 列表的总页数 @@ -191,6 +198,10 @@ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } +const star = (userid:number) => { + ys.value = !ys.value + console.log(userid) +} /** 添加/修改操作 */ const formRef = ref() From 77b7c714eb946c7983c512a5259319874d3c9e66 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:18:59 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/knows/knowledge/index.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/views/bpm/knows/knowledge/index.vue b/src/views/bpm/knows/knowledge/index.vue index ad67375..2673c09 100644 --- a/src/views/bpm/knows/knowledge/index.vue +++ b/src/views/bpm/knows/knowledge/index.vue @@ -114,10 +114,6 @@ > 删除 -
- - -
@@ -142,8 +138,6 @@ import { KnowledgeApi, KnowledgeVO } from '@/api/bpm/knows/knowledge' import KnowledgeForm from './KnowledgeForm.vue' import { defaultProps, handleTree } from '@/utils/tree' import * as DeptApi from "@/api/system/dept"; -import yesIcon from "../../../../assets/imgs/star_yes.svg" -import noIcon from "../../../../assets/imgs/star_no.svg" /** 知识发布 列表 */ defineOptions({ name: 'Knowledge' }) @@ -198,10 +192,6 @@ const resetQuery = () => { queryFormRef.value.resetFields() handleQuery() } -const star = (userid:number) => { - ys.value = !ys.value - console.log(userid) -} /** 添加/修改操作 */ const formRef = ref() From 603b85d31bb61023b12b923b7d4b443ecfacf3ed Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 30 Jul 2024 10:19:56 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=92=8C=E6=94=B6=E8=97=8F=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/knows/knowledge/KnowledgeForm.vue | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue index 14c4442..6405862 100644 --- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue +++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue @@ -34,17 +34,31 @@ - - - - + + +
+ + + + +
+
+ + +
+ + +
+
+
+
@@ -68,16 +82,21 @@ diff --git a/src/views/bpm/star2/index.vue b/src/views/bpm/star2/index.vue new file mode 100644 index 0000000..4fdf857 --- /dev/null +++ b/src/views/bpm/star2/index.vue @@ -0,0 +1,208 @@ + + + From 46df8d8515faea7c2df234b95435503cc55f2731 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:58:26 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/knows/knowledge/KnowledgeForm.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue index 6405862..008e6a5 100644 --- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue +++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue @@ -114,8 +114,8 @@ const formData = ref({ }) const formData2 = ref({ id: undefined, - userId: '', - kowsId: '', + userId: undefined, + kowsId: undefined, }) const formRules = reactive({ typeId: [{ required: true, message: '类型id不能为空', trigger: 'blur' }], @@ -187,7 +187,8 @@ const submitForm = async () => { formData2.value.userId = userInfo.value.id console.log("formData2",formData2.value) if (ys.value){ - await Star2Api.createStar2(formData2) + await Star2Api.createStar2(formData2.value) + // message.success(t('common.createSuccess')) } // 拼接子表的数据 data.comments = commentFormRef.value.getData() From f588538658eb2c95ed09489d64f2438bef612023 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:27:03 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=8D=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bpm/processInstance/detail/index.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/bpm/processInstance/detail/index.vue b/src/views/bpm/processInstance/detail/index.vue index ef8b829..ecef698 100644 --- a/src/views/bpm/processInstance/detail/index.vue +++ b/src/views/bpm/processInstance/detail/index.vue @@ -1,6 +1,6 @@