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/assets/imgs/Knowledge/Tbup_no.svg b/src/assets/imgs/Knowledge/Tbup_no.svg
new file mode 100644
index 0000000..70d4a4f
--- /dev/null
+++ b/src/assets/imgs/Knowledge/Tbup_no.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/imgs/Knowledge/Tbup_yes.svg b/src/assets/imgs/Knowledge/Tbup_yes.svg
new file mode 100644
index 0000000..e247b10
--- /dev/null
+++ b/src/assets/imgs/Knowledge/Tbup_yes.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/imgs/star_no.svg b/src/assets/imgs/Knowledge/star_no.svg
similarity index 100%
rename from src/assets/imgs/star_no.svg
rename to src/assets/imgs/Knowledge/star_no.svg
diff --git a/src/assets/imgs/star_yes.svg b/src/assets/imgs/Knowledge/star_yes.svg
similarity index 100%
rename from src/assets/imgs/star_yes.svg
rename to src/assets/imgs/Knowledge/star_yes.svg
diff --git a/src/views/bpm/knows/knowledge/KnowledgeForm.vue b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
index 9737479..bfec251 100644
--- a/src/views/bpm/knows/knowledge/KnowledgeForm.vue
+++ b/src/views/bpm/knows/knowledge/KnowledgeForm.vue
@@ -33,30 +33,52 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86,14 +108,17 @@ import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
import {DeptVO, getDept} from "@/api/system/dept";
import {defaultProps, handleTree} from "@/utils/tree";
import {KnowtypeApi} from "@/api/bpm/knows/knowtype";
-import yesIcon from "../../../../assets/imgs/star_yes.svg"
-import noIcon from "../../../../assets/imgs/star_no.svg"
+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/Tbup_no.svg"
import {Star2Api} from "@/api/bpm/star2";
/** 知识发布 表单 */
defineOptions({ name: 'KnowledgeForm' })
const ys = ref(false)//收藏图标切换
+const tb = ref(false)//点赞图标切换
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
@@ -110,11 +135,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' }]
@@ -126,9 +151,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()
@@ -147,6 +169,9 @@ const getUserInfo = async () => {
}
}
+const stb = async () => {
+ tb.value = !tb.value;
+}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
@@ -164,6 +189,46 @@ const open = async (type: string, id?: number) => {
}
await getUserInfo()
await getKnowtypeTree()
+ await ifBook()
+}
+const ifBook = async () => {
+ const data = formData.value as unknown as KnowledgeVO
+ userInfo.value = await getUserProfile()
+ queryParams.pageNo = 1
+ queryParams.kowsmId = data.id
+ queryParams.userId = userInfo.value.id
+ const data2 = await Star2Api.getStar2Page(queryParams)
+ if (data2.total>0){
+ starId.value = data2.list[0].id
+ data2.total === 0?ys.value=false:ys.value=true
+ }else if(data2.total===0){
+ ys.value=false
+ }
+}
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 2,
+ kowsmId: undefined,
+ userId: undefined,
+ kowsId: undefined,
+ createTime: [],
+})
+//收藏
+const starId = ref(0)
+const star = async () => {
+ await ifBook()
+ userInfo.value = await getUserProfile()
+ const data = formData.value as unknown as KnowledgeVO
+ 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 方法，用于打开弹窗
//flow begin++++++++++++++++++++
@@ -194,17 +259,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()
diff --git a/src/views/bpm/mystar/index.vue b/src/views/bpm/mystar/index.vue
new file mode 100644
index 0000000..d93b5de
--- /dev/null
+++ b/src/views/bpm/mystar/index.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@