收藏内容

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 })
   },

src/views/bpm/knows/knowledge/KnowledgeForm.vue

@@ -33,7 +33,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-          <el-col :span="19">
+            <el-col :span="21">
               <el-form-item label="知识分类" prop="typeId">
                 <!--        <el-input v-model="formData.typeId" placeholder="请选择知识分类" />-->
                 <el-tree-select
@@ -45,13 +45,21 @@
                   placeholder="请选择上级分类"
                 />
               </el-form-item>
-          </el-col>
+            </el-col>
-          <el-col :span="5">
+            <el-col :span="3">
-            <el-form-item label="收藏知识">
+              <el-form-item label="收藏知识">
-                <el-image @click="star" style="width: 20px; height: 20px" v-show="ys" :src="yesIcon"/>
+                  <el-image
-                <el-image @click="star" style="width: 20px; height: 20px" v-show="!ys" :src="noIcon"/>
+                    @click="star"
-            </el-form-item>
+                    style="width: 25px;height: 25px"
-          </el-col>
+                    v-show="ys"
+                    :src="yesIcon"/>
+                  <el-image
+                    @click="star"
+                    style="width: 25px;height: 25px"
+                    v-show="!ys"
+                    :src="noIcon"/>
+              </el-form-item>
+            </el-col>
           <el-col :span="24">
             <el-form-item label="作者" prop="content">
               <el-input v-model="formData.userName" readonly />
@@ -110,11 +118,11 @@ const formData = ref({
   status: undefined,
   filePath: undefined
 })
-const formData2 = ref({
+const formData2 ={
-  id: undefined,
+  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["kowsmId"] = data.id
-  queryParams.kowsId = data.typeId
   const data2 = await Star2Api.getStar2Page(queryParams)
   console.log(data2)
-  if (data2.list === null){
+  console.log(data2.total)
-    console.log("no")
+  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,
+  pageSize: 2,
-  id: undefined,
+  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
+  if (ys.value && !(starId.value === 0)){
-  formData2.value.userId = userInfo.value.id
+      await Star2Api.deleteStar2(starId.value)
-  if (ys.value){
+    ys.value=false
-    console.log("formData2",formData2.value)
+  }else{
-    await Star2Api.createStar2(formData2.value)
+    formData2.kowsmId = data.id
-  }else if (!ys.value){
+    formData2.kowsId = data.typeId
+    formData2.userId = userInfo.value.id
+    await Star2Api.createStar2(formData2)
+    ys.value=true
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗

src/views/bpm/star2/Star2Form.vue

@@ -1,29 +1,32 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-<!--    <el-form-->
+    <el-form
-<!--      ref="formRef"-->
+      ref="formRef"
-<!--      :model="formData"-->
+      :model="formData"
-<!--      :rules="formRules"-->
+      :rules="formRules"
-<!--      label-width="100px"-->
+      label-width="100px"
-<!--      v-loading="formLoading"-->
+      v-loading="formLoading"
-<!--    >-->
+    >
-<!--      <el-form-item label="用户编号" prop="userId">-->
+      <el-form-item label="知识id" prop="kowsmId">
-<!--        <el-input v-model="formData.userId" placeholder="请输入用户编号" />-->
+        <el-input v-model="formData.kowsmId" placeholder="请输入知识id" />
-<!--      </el-form-item>-->
+      </el-form-item>
-<!--      <el-form-item label="知识编号" prop="kowsId">-->
+      <el-form-item label="用户id" prop="userId">
-<!--        <el-input v-model="formData.kowsId" placeholder="请输入知识编号" />-->
+        <el-input v-model="formData.userId" placeholder="请输入用户id" />
-<!--      </el-form-item>-->
+      </el-form-item>
-<!--    </el-form>-->
+      <el-form-item label="知识分类id" prop="kowsId">
-<!--    <template #footer>-->
+        <el-input v-model="formData.kowsId" placeholder="请输入知识分类id" />
-<!--      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>-->
+      </el-form-item>
-<!--      <el-button @click="dialogVisible = false">取 消</el-button>-->
+    </el-form>
-<!--    </template>-->
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
   </Dialog>
 </template>
 <script setup lang="ts">
 import { Star2Api, Star2VO } from '@/api/bpm/star2'
 
-/** 我的收藏 表单 */
+/** 收藏管理 表单 */
 defineOptions({ name: 'Star2Form' })
 
 const { t } = useI18n() // 国际化
@@ -34,13 +37,14 @@ const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  id: undefined,
+  kowsmId: undefined,
   userId: undefined,
   kowsId: undefined,
 })
 const formRules = reactive({
+  kowsmId: [{ required: true, message: '知识id不能为空', trigger: 'blur' }],
   userId: [{ required: true, message: '用户id不能为空', trigger: 'blur' }],
-  kowsId: [{ required: true, message: '知识id不能为空', trigger: 'blur' }],
+  kowsId: [{ required: true, message: '知识分类id不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
@@ -72,6 +76,7 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as Star2VO
     if (formType.value === 'create') {
+      console.log("data",data)
       await Star2Api.createStar2(data)
       message.success(t('common.createSuccess'))
     } else {
@@ -89,7 +94,7 @@ const submitForm = async () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    id: undefined,
+    kowsmId: undefined,
     userId: undefined,
     kowsId: undefined,
   }

src/views/bpm/star2/index.vue

@@ -8,15 +8,6 @@
       :inline="true"
       label-width="68px"
     >
-<!--      <el-form-item label="id" prop="id">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.id"-->
-<!--          placeholder="请输入id"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
-<!--      </el-form-item>-->
       <el-form-item label="用户编号" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -26,22 +17,31 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="知识编号" prop="kowsId">
+      <el-form-item label="知识编号" prop="kowsmId">
         <el-input
-          v-model="queryParams.kowsId"
+          v-model="queryParams.kowsmId"
           placeholder="请输入知识编号"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="收藏时间" prop="createTime">
+      <el-form-item label="分类编号" prop="kowsId">
+        <el-input
+          v-model="queryParams.kowsId"
+          placeholder="请输入分类编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
           value-format="YYYY-MM-DD HH:mm:ss"
           type="daterange"
-          start-placeholder="收藏开始日期"
+          start-placeholder="开始日期"
-          end-placeholder="收藏结束日期"
+          end-placeholder="结束日期"
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
         />
@@ -73,11 +73,12 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-<!--      <el-table-column label="id" align="center" prop="id" />-->
+      <el-table-column label="知识编号" align="center" prop="kowsmId" />
+      <el-table-column label="知识标题" align="center" prop="kowsmTitle" />
       <el-table-column label="用户编号" align="center" prop="userId" />
-      <el-table-column label="用户名字" align="center" prop="nickName" />
+      <el-table-column label="用户名称" align="center" prop="nickName" />
-      <el-table-column label="知识编号" align="center" prop="kowsId" />
+      <el-table-column label="分类编号" align="center" prop="kowsId" />
-      <el-table-column label="知识标题" align="center" prop="kowTitle" />
+      <el-table-column label="分类标题" align="center" prop="kowTitle" />
       <el-table-column
         label="收藏时间"
         align="center"
@@ -101,7 +102,7 @@
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['bpm:star2:delete']"
           >
-            删除收藏
+            删除
           </el-button>
         </template>
       </el-table-column>
@@ -121,12 +122,11 @@
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
-import {getUser} from '@/api/system/user'
 import download from '@/utils/download'
 import { Star2Api, Star2VO } from '@/api/bpm/star2'
 import Star2Form from './Star2Form.vue'
 
-/** 我的收藏 列表 */
+/** 收藏管理 列表 */
 defineOptions({ name: 'Star2' })
 
 const message = useMessage() // 消息弹窗
@@ -138,7 +138,7 @@ const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  id: undefined,
+  kowsmId: undefined,
   userId: undefined,
   kowsId: undefined,
   createTime: [],
@@ -172,9 +172,9 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
+// const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+//   formRef.value.open(type, id)
-}
+// }
 
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
@@ -197,7 +197,7 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     const data = await Star2Api.exportStar2(queryParams)
-    download.excel(data, '我的收藏.xls')
+    download.excel(data, '收藏管理.xls')
   } catch {
   } finally {
     exportLoading.value = false