From 6d53d0ae056db5c0878df7869346542713befeb0 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:10:15 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=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 | 47 ++++++++++++++-----
1 file changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 0d6efe8..0a7c84a 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -126,9 +126,6 @@ const deptInfo = ref({} as DeptVO )
/** 子表的表单 */
const subTabsName = ref('comment')
const commentFormRef = ref()
-const star = () => {
- ys.value = !ys.value
-}
const getUserInfo = async () => {
if ( formData.value.deptId == '' ){
const users = await getUserProfile()
@@ -164,6 +161,40 @@ const open = async (type: string, id?: number) => {
}
await getUserInfo()
await getKnowtypeTree()
+ userInfo.value = await getUserProfile()
+ const data = formData.value as unknown as KnowledgeVO
+ queryParams.pageNo = 1
+ queryParams.userId = userInfo.value.id
+ queryParams.kowsId = data.typeId
+ const data2 = await Star2Api.getStar2Page(queryParams)
+ console.log(data2)
+ if (data2.list === null){
+ console.log("no")
+ ys.value=false
+ }else{
+ console.log("yes")
+ ys.value=true
+ }
+}
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 5,
+ id: undefined,
+ userId: undefined,
+ kowsId: undefined,
+})
+//收藏
+const star = async () => {
+ ys.value = !ys.value
+ userInfo.value = await getUserProfile()
+ const data = formData.value as unknown as KnowledgeVO
+ formData2.value.kowsId = data.typeId
+ formData2.value.userId = userInfo.value.id
+ if (ys.value){
+ console.log("formData2",formData2.value)
+ await Star2Api.createStar2(formData2.value)
+ }else if (!ys.value){
+ }
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
//flow begin++++++++++++++++++++
@@ -194,17 +225,7 @@ const submitForm = async () => {
// 提交请求
formLoading.value = true
try {
- userInfo.value = await getUserProfile()
const data = formData.value as unknown as KnowledgeVO
- formData2.value.kowsId = data.typeId
- formData2.value.userId = userInfo.value.id
- console.log("formData2",formData2.value)
- if (ys.value){
- console.log("formData2",formData2.value)
- await Star2Api.createStar2(formData2.value)
- // message.success(t('common.createSuccess'))
- ys.value=false
- }
// 拼接子表的数据
data.comments = commentFormRef.value.getData()
From 3e9b694730965eb7737e84ba07ab1e14dca46115 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 2 Aug 2024 09:00:08 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=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
---
src/api/bpm/star2/index.ts | 20 +++---
.../bpm/knows/knowledge/KnowledgeForm.vue | 72 +++++++++++--------
src/views/bpm/star2/Star2Form.vue | 49 +++++++------
src/views/bpm/star2/index.vue | 52 +++++++-------
4 files changed, 107 insertions(+), 86 deletions(-)
diff --git a/src/api/bpm/star2/index.ts b/src/api/bpm/star2/index.ts
index 602c74a..0002dfc 100644
--- a/src/api/bpm/star2/index.ts
+++ b/src/api/bpm/star2/index.ts
@@ -1,40 +1,40 @@
import request from '@/config/axios'
-// 我的收藏 VO
+// 收藏管理 VO
export interface Star2VO {
- id: number // id
+ kowsmId: number // 知识id
userId: number // 用户id
- kowsId: number // 知识id
+ kowsId: number // 知识分类id
}
-// 我的收藏 API
+// 收藏管理 API
export const Star2Api = {
- // 查询我的收藏分页
+ // 查询收藏管理分页
getStar2Page: async (params: any) => {
return await request.get({ url: `/bpm/star2/page`, params })
},
- // 查询我的收藏详情
+ // 查询收藏管理详情
getStar2: async (id: number) => {
return await request.get({ url: `/bpm/star2/get?id=` + id })
},
- // 新增我的收藏
+ // 新增收藏管理
createStar2: async (data: Star2VO) => {
return await request.post({ url: `/bpm/star2/create`, data })
},
- // 修改我的收藏
+ // 修改收藏管理
updateStar2: async (data: Star2VO) => {
return await request.put({ url: `/bpm/star2/update`, data })
},
- // 删除我的收藏
+ // 删除收藏管理
deleteStar2: async (id: number) => {
return await request.delete({ url: `/bpm/star2/delete?id=` + id })
},
- // 导出我的收藏 Excel
+ // 导出收藏管理 Excel
exportStar2: async (params) => {
return await request.download({ url: `/bpm/star2/export-excel`, params })
},
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 0a7c84a..66437c7 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -33,7 +33,7 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -110,11 +118,11 @@ const formData = ref({
status: undefined,
filePath: undefined
})
-const formData2 = ref({
- id: undefined,
+const formData2 ={
+ kowsmId: undefined,
userId: undefined,
kowsId: undefined,
-})
+}
const formRules = reactive({
typeId: [{ required: true, message: '类型id不能为空', trigger: 'blur' }],
knowTitle: [{ required: true, message: '知识标题不能为空', trigger: 'blur' }]
@@ -161,39 +169,47 @@ const open = async (type: string, id?: number) => {
}
await getUserInfo()
await getKnowtypeTree()
- userInfo.value = await getUserProfile()
+ await ifBook()
+}
+const ifBook = async () => {
const data = formData.value as unknown as KnowledgeVO
queryParams.pageNo = 1
- queryParams.userId = userInfo.value.id
- queryParams.kowsId = data.typeId
+ queryParams["kowsmId"] = data.id
const data2 = await Star2Api.getStar2Page(queryParams)
console.log(data2)
- if (data2.list === null){
- console.log("no")
+ console.log(data2.total)
+ if (data2.total>0){
+ console.log("11111")
+ starId.value = data2.list[0].id
+ data2.total === 0?ys.value=false:ys.value=true
+ }else if(data2.total===0){
+ console.log("22222")
ys.value=false
- }else{
- console.log("yes")
- ys.value=true
}
}
const queryParams = reactive({
pageNo: 1,
- pageSize: 5,
- id: undefined,
+ pageSize: 2,
+ kowsmId: undefined,
userId: undefined,
kowsId: undefined,
+ createTime: [],
})
//收藏
+const starId = ref(0)
const star = async () => {
- ys.value = !ys.value
+ await ifBook()
userInfo.value = await getUserProfile()
const data = formData.value as unknown as KnowledgeVO
- formData2.value.kowsId = data.typeId
- formData2.value.userId = userInfo.value.id
- if (ys.value){
- console.log("formData2",formData2.value)
- await Star2Api.createStar2(formData2.value)
- }else if (!ys.value){
+ if (ys.value && !(starId.value === 0)){
+ await Star2Api.deleteStar2(starId.value)
+ ys.value=false
+ }else{
+ formData2.kowsmId = data.id
+ formData2.kowsId = data.typeId
+ formData2.userId = userInfo.value.id
+ await Star2Api.createStar2(formData2)
+ ys.value=true
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
diff --git a/src/views/bpm/star2/Star2Form.vue b/src/views/bpm/star2/Star2Form.vue
index 64cbcab..9b65572 100644
--- a/src/views/bpm/star2/Star2Form.vue
+++ b/src/views/bpm/star2/Star2Form.vue
@@ -1,29 +1,32 @@
From d392c649bf8b1e3a0a3b0032cdabaf3b6c16999a Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 2 Aug 2024 14:54:00 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/knows/knowledge/KnowledgeForm.vue | 7 +++----
src/views/bpm/mystar/index.vue | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index ffdfb31..14b884c 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -193,11 +193,11 @@ const open = async (type: string, id?: number) => {
}
const ifBook = async () => {
const data = formData.value as unknown as KnowledgeVO
+ userInfo.value = await getUserProfile()
queryParams.pageNo = 1
- queryParams["kowsmId"] = data.id
+ queryParams.kowsmId = data.id
+ queryParams.userId = userInfo.value.id
const data2 = await Star2Api.getStar2Page(queryParams)
- console.log(data2)
- console.log(data2.total)
if (data2.total>0){
starId.value = data2.list[0].id
data2.total === 0?ys.value=false:ys.value=true
@@ -218,7 +218,6 @@ const starId = ref(0)
const star = async () => {
await ifBook()
userInfo.value = await getUserProfile()
- console.log(userInfo.value)
const data = formData.value as unknown as KnowledgeVO
if (ys.value && !(starId.value === 0)){
await Star2Api.deleteStar2(starId.value)
diff --git a/src/views/bpm/mystar/index.vue b/src/views/bpm/mystar/index.vue
index 21ed6c2..d93b5de 100644
--- a/src/views/bpm/mystar/index.vue
+++ b/src/views/bpm/mystar/index.vue
@@ -138,7 +138,6 @@ const getList = async () => {
try {
userInfo.value = await getUserProfile()
queryParams.userId = userInfo.value.id
- console.log(queryParams)
const data = await Star2Api.getStar2Page(queryParams)
list.value = data.list
total.value = data.total
From 182049d46504909ad44976bccc2b938e3430fea7 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:43:17 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/knows/knowledge/KnowledgeForm.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 14b884c..4aecefd 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -111,7 +111,7 @@ import {KnowtypeApi} from "@/api/bpm/knows/knowtype";
import yesIcon from "../../../../assets/imgs/Knowledge/star_yes.svg"
import noIcon from "../../../../assets/imgs/Knowledge/star_no.svg"
import tbYesIcon from "../../../../assets/imgs/Knowledge/Tbup_yes.svg"
-import tbNoIcon from "../../../../assets/imgs/Knowledge/star_no.svg"
+import tbNoIcon from "../../../../assets/imgs/Knowledge/Tbup_no.svg"
import {Star2Api} from "@/api/bpm/star2";
/** 知识发布 表单 */
From 1944b4ed0b1a2a7e8141dd745a72b240c8ea4738 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:45:14 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/knows/knowledge/KnowledgeForm.vue | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 4aecefd..f05ef6b 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -74,11 +74,6 @@
:src="noIcon"/>
-
-
-
-
-
From 7989b41b293cdbca60c00c9183636df108a19164 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Fri, 2 Aug 2024 15:48:08 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/bpm/knows/knowledge/KnowledgeForm.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index f05ef6b..4aecefd 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -74,6 +74,11 @@
:src="noIcon"/>
+
+
+
+
+