yudao-team/oa-ui
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pancaihua 2024-08-02 20:22:55 +08:00
commit ec6b659a87
9 changed files with 358 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/bpm/star2/index.ts
View File

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

1
src/assets/imgs/Knowledge/Tbup_no.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722561945426" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2894" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256"><path d="M621.674667 408.021333c16.618667-74.24 28.224-127.936 34.837333-161.194666C673.152 163.093333 629.941333 85.333333 544.298667 85.333333c-77.226667 0-116.010667 38.378667-138.88 115.093334l-0.586667 2.24c-13.728 62.058667-34.72 110.165333-62.506667 144.586666a158.261333 158.261333 0 0 1-119.733333 58.965334l-21.909333 0.469333C148.437333 407.808 106.666667 450.816 106.666667 503.498667V821.333333c0 64.8 52.106667 117.333333 116.394666 117.333334h412.522667c84.736 0 160.373333-53.568 189.12-133.92l85.696-239.584c21.802667-60.96-9.536-128.202667-70.005333-150.186667a115.552 115.552 0 0 0-39.488-6.954667H621.674667z" fill="#8a8a8a" p-id="2895"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 994 B

1
src/assets/imgs/Knowledge/Tbup_yes.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1722561945426" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2894" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256"><path d="M621.674667 408.021333c16.618667-74.24 28.224-127.936 34.837333-161.194666C673.152 163.093333 629.941333 85.333333 544.298667 85.333333c-77.226667 0-116.010667 38.378667-138.88 115.093334l-0.586667 2.24c-13.728 62.058667-34.72 110.165333-62.506667 144.586666a158.261333 158.261333 0 0 1-119.733333 58.965334l-21.909333 0.469333C148.437333 407.808 106.666667 450.816 106.666667 503.498667V821.333333c0 64.8 52.106667 117.333333 116.394666 117.333334h412.522667c84.736 0 160.373333-53.568 189.12-133.92l85.696-239.584c21.802667-60.96-9.536-128.202667-70.005333-150.186667a115.552 115.552 0 0 0-39.488-6.954667H621.674667z" fill="#d81e06" p-id="2895"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 994 B

0
src/assets/imgs/star_no.svg → src/assets/imgs/Knowledge/star_no.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
src/assets/imgs/star_yes.svg → src/assets/imgs/Knowledge/star_yes.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

139
src/views/bpm/knows/knowledge/KnowledgeForm.vue
View File

@ -33,30 +33,52 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="19">
<el-form-item label="知识分类" prop="typeId">
<!-- <el-input v-model="formData.typeId" placeholder="请选择知识分类" />-->
<el-tree-select
v-model="formData.typeId"
:data="knowtypeTree"
:props="{...defaultProps, lable: 'name'}"
check-strictly
default-expand-all
placeholder="请选择上级分类"
/>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="收藏知识">
<el-image @click="star" style="width: 20px; height: 20px" v-show="ys" :src="yesIcon"/>
<el-image @click="star" style="width: 20px; height: 20px" 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 />
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="知识分类" prop="typeId">
<!-- <el-input v-model="formData.typeId" placeholder="请选择知识分类" />-->
<el-tree-select
v-model="formData.typeId"
:data="knowtypeTree"
:props="{...defaultProps, lable: 'name'}"
check-strictly
default-expand-all
placeholder="请选择上级分类"
/>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="点赞">
<el-image
@click="stb"
style="width: 25px;height: 25px"
v-show="tb"
:src="tbYesIcon"/>
<el-image
@click="stb"
style="width: 25px;height: 25px"
v-show="!tb"
:src="tbNoIcon"/>
</el-form-item>
</el-col>
<el-col :span="3">
<el-form-item label="收藏知识">
<el-image
@click="star"
style="width: 25px;height: 25px"
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 />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<el-form-item label="内容" prop="content">
<Editor v-model="formData.content" height="150px" />
@ -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()

196
src/views/bpm/mystar/index.vue Normal file
View File

@ -0,0 +1,196 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<!-- <el-form-item label="用户编号" prop="userId">-->
<!-- <el-input-->
<!-- v-model="queryParams.userId"-->
<!-- placeholder="请输入用户编号"-->
<!-- clearable-->
<!-- @keyup.enter="handleQuery"-->
<!-- class="!w-240px"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="知识编号" prop="kowsmId">
<el-input
v-model="queryParams.kowsmId"
placeholder="请输入知识编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<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="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['bpm:star2:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<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="kowsId" />
<el-table-column label="分类标题" align="center" prop="kowTitle" />
<el-table-column
label="收藏时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['bpm:star2:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<Star2Form ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { Star2Api, Star2VO } from '@/api/bpm/star2'
import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
/** 收藏管理 列表 */
defineOptions({ name: 'Star2' })
const userInfo = ref({} as ProfileVO )
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref<Star2VO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
kowsmId: undefined,
userId: 0,
kowsId: undefined,
createTime: [],
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
userInfo.value = await getUserProfile()
queryParams.userId = userInfo.value.id
const data = await Star2Api.getStar2Page(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await Star2Api.deleteStar2(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await Star2Api.exportStar2(queryParams)
download.excel(data, '收藏管理.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

49
src/views/bpm/star2/Star2Form.vue
View File

@ -1,29 +1,32 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<!-- <el-form-->
<!-- ref="formRef"-->
<!-- :model="formData"-->
<!-- :rules="formRules"-->
<!-- label-width="100px"-->
<!-- v-loading="formLoading"-->
<!-- >-->
<!-- <el-form-item label="用户编号" prop="userId">-->
<!-- <el-input v-model="formData.userId" placeholder="请输入用户编号" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="知识编号" prop="kowsId">-->
<!-- <el-input v-model="formData.kowsId" placeholder="请输入知识编号" />-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <template #footer>-->
<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>-->
<!-- <el-button @click="dialogVisible = false">取 消</el-button>-->
<!-- </template>-->
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="知识id" prop="kowsmId">
<el-input v-model="formData.kowsmId" placeholder="请输入知识id" />
</el-form-item>
<el-form-item label="用户id" prop="userId">
<el-input v-model="formData.userId" placeholder="请输入用户id" />
</el-form-item>
<el-form-item label="知识分类id" prop="kowsId">
<el-input v-model="formData.kowsId" placeholder="请输入知识分类id" />
</el-form-item>
</el-form>
<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,
}

52
src/views/bpm/star2/index.vue
View File

@ -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="收藏开始日期"
end-placeholder="收藏结束日期"
start-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="kowsId" />
<el-table-column label="知识标题" align="center" prop="kowTitle" />
<el-table-column label="用户名称" align="center" prop="nickName" />
<el-table-column label="分类编号" align="center" prop="kowsId" />
<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) => {
formRef.value.open(type, id)
}
// const openForm = (type: string, id?: number) => {
// 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