diff --git a/src/api/bpm/knows/public/index.ts b/src/api/bpm/knows/public/index.ts
new file mode 100644
index 0000000..0f099e6
--- /dev/null
+++ b/src/api/bpm/knows/public/index.ts
@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+// 公共知识 VO
+export interface KnowledgePublicVO {
+  id: number // id
+  userName: string // 作者
+  typeId: number // 类型id
+  deptId: number // 部门id
+  knowTitle: string // 知识标题
+  content: string // 内容
+  status: string // 知识状态
+  filePath: string // 文件路径
+  processInstanceId: string // 流程实例的编号
+  userId: number // 申请人的用户编号
+  flowStatus: number // 审批状态
+}
+
+// 公共知识 API
+export const KnowledgePublicApi = {
+  // 查询公共知识分页
+  getKnowledgePublicPage: async (params: any) => {
+    return await request.get({ url: `/bpm/knowledge-public/page`, params })
+  },
+
+  // 查询公共知识详情
+  getKnowledgePublic: async (id: number) => {
+    return await request.get({ url: `/bpm/knowledge-public/get?id=` + id })
+  },
+
+  // 新增公共知识
+  createKnowledgePublic: async (data: KnowledgePublicVO) => {
+    return await request.post({ url: `/bpm/knowledge-public/create`, data })
+  },
+
+  // 修改公共知识
+  updateKnowledgePublic: async (data: KnowledgePublicVO) => {
+    return await request.put({ url: `/bpm/knowledge-public/update`, data })
+  },
+
+  // 删除公共知识
+  deleteKnowledgePublic: async (id: number) => {
+    return await request.delete({ url: `/bpm/knowledge-public/delete?id=` + id })
+  },
+
+  // 导出公共知识 Excel
+  exportKnowledgePublic: async (params) => {
+    return await request.download({ url: `/bpm/knowledge-public/export-excel`, params })
+  },
+
+// ==================== 子表（公告知识评论） ====================
+
+  // 获得公告知识评论列表
+  getCommentPublicListByKnowId: async (knowId) => {
+    return await request.get({ url: `/bpm/knowledge-public/comment-public/list-by-know-id?knowId=` + knowId })
+  }
+}
diff --git a/src/views/bpm/knows/knowledge/index.vue b/src/views/bpm/knows/knowledge/index.vue
index 9a2cbb9..8811450 100644
--- a/src/views/bpm/knows/knowledge/index.vue
+++ b/src/views/bpm/knows/knowledge/index.vue
@@ -178,6 +178,7 @@ const getList = async () => {
     const data = await KnowledgeApi.getKnowledgePage(queryParams)
     list.value = data.list
     total.value = data.total
+
     // 加载部门树
     deptList.value = handleTree(await DeptApi.getSimpleDeptList())
   } finally {
diff --git a/src/views/bpm/knows/public/KnowledgePublicForm.vue b/src/views/bpm/knows/public/KnowledgePublicForm.vue
new file mode 100644
index 0000000..55f2fb1
--- /dev/null
+++ b/src/views/bpm/knows/public/KnowledgePublicForm.vue
@@ -0,0 +1,231 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="知识标题" prop="knowTitle">
+            <el-input v-model="formData.knowTitle" placeholder="请输入知识标题" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="部门" prop="deptId">
+            <el-input v-model="formData.deptId" v-show="false" />
+            <div class="pull-left" v-show="true" v-if="userInfo?.dept">{{ userInfo?.dept.name }} </div>
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="知识状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                  v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
+                  :key="dict.value"
+                  :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <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-row>
+
+<!--      <el-form-item label="作者" prop="userName">-->
+<!--        <el-input v-model="formData.userName" placeholder="请输入作者" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="类型id" prop="typeId">-->
+<!--        <el-input v-model="formData.typeId" placeholder="请输入类型id" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="部门id" prop="deptId">-->
+<!--        <el-input v-model="formData.deptId" placeholder="请输入部门id" />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="知识标题" prop="knowTitle">-->
+<!--        <el-input v-model="formData.knowTitle" placeholder="请输入知识标题" />-->
+<!--      </el-form-item>-->
+      <el-col :span="24">
+        <el-form-item label="内容" prop="content">
+          <Editor v-model="formData.content" height="150px" />
+        </el-form-item>
+      </el-col>
+<!--      <el-form-item label="知识状态" prop="status">-->
+<!--        <el-radio-group v-model="formData.status">-->
+<!--          <el-radio-->
+<!--            v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.value"-->
+<!--          >-->
+<!--            {{ dict.label }}-->
+<!--          </el-radio>-->
+<!--        </el-radio-group>-->
+<!--      </el-form-item>-->
+      <el-form-item label="文件路径" prop="filePath">
+        <UploadFile v-model="formData.filePath" />
+      </el-form-item>
+    </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="公告知识评论" name="commentPublic">
+        <CommentPublicForm ref="commentPublicFormRef" :know-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
+    <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 { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { KnowledgePublicApi, KnowledgePublicVO } from '@/api/bpm/knows/public'
+import CommentPublicForm from './components/CommentPublicForm.vue'
+// import {defaultProps} from "@/utils/tree";
+// import {ProfileVO} from "@/api/system/user/profile";
+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";
+/** 公共知识 表单 */
+defineOptions({ name: 'KnowledgePublicForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  userName: undefined,
+  typeId: undefined,
+  deptId: undefined,
+  knowTitle: undefined,
+  content: undefined,
+  status: undefined,
+  filePath: undefined,
+  processInstanceId: undefined,
+  userId: undefined,
+  flowStatus: undefined
+})
+const formRules = reactive({
+  knowTitle: [{ required: true, message: '知识标题不能为空', trigger: 'blur' }],
+  typeId: [{ required: true, message: '类型id不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const knowtypeTree = ref() // 树形结构
+const userInfo = ref({} as ProfileVO )
+const deptInfo = ref({} as DeptVO )
+/** 子表的表单 */
+const subTabsName = ref('commentPublic')
+const commentPublicFormRef = ref()
+const getUserInfo = async () => {
+  if ( formData.value.deptId == '' ){
+    const users = await getUserProfile()
+    userInfo.value = users
+    formData.value.deptId= users.dept.id
+
+    deptInfo.value = {} as DeptVO
+  }else{
+    const dept = await getDept(formData.value.deptId)
+    deptInfo.value = dept
+    userInfo.value = {} as ProfileVO
+  }
+  if (formData.value.userName == ''){
+    const users = await getUserProfile()
+    formData.value.userName= users.nickname
+  }
+
+}
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await KnowledgePublicApi.getKnowledgePublic(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  await getUserInfo()
+  await getKnowtypeTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 校验子表单
+  try {
+    await commentPublicFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'commentPublic'
+    return
+  }
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as KnowledgePublicVO
+    // 拼接子表的数据
+    data.commentPublics = commentPublicFormRef.value.getData()
+    if (formType.value === 'create') {
+      await KnowledgePublicApi.createKnowledgePublic(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await KnowledgePublicApi.updateKnowledgePublic(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    typeId: undefined,
+    deptId: '',
+    knowTitle: undefined,
+    userName:'',
+    content: '',
+    status: '0',
+    filePath: undefined
+  }
+  formRef.value?.resetFields()
+}
+const getKnowtypeTree = async () => {
+  knowtypeTree.value = []
+  const data = await KnowtypeApi.getKnowtypeList()
+  const root: Tree = { id: 0, name: 'ESG', children: [] }
+  root.children = handleTree(data, 'id', 'parentId')
+  knowtypeTree.value.push(root)
+}
+</script>
diff --git a/src/views/bpm/knows/public/components/CommentPublicForm.vue b/src/views/bpm/knows/public/components/CommentPublicForm.vue
new file mode 100644
index 0000000..c22ae45
--- /dev/null
+++ b/src/views/bpm/knows/public/components/CommentPublicForm.vue
@@ -0,0 +1,90 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="内容" min-width="400">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.content`" :rules="formRules.content" class="mb-0px!">
+<!--            <Editor v-model="row.content" height="150px" />-->
+            <el-input v-model="row.content" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加公告知识评论</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { KnowledgePublicApi } from '@/api/bpm/knows/public'
+
+const props = defineProps<{
+  knowId: undefined // 类型id（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.knowId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await KnowledgePublicApi.getCommentPublicListByKnowId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    knowId: undefined,
+    content: undefined
+  }
+  row.knowId = props.knowId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>
diff --git a/src/views/bpm/knows/public/index.vue b/src/views/bpm/knows/public/index.vue
new file mode 100644
index 0000000..e4569ba
--- /dev/null
+++ b/src/views/bpm/knows/public/index.vue
@@ -0,0 +1,243 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+      <el-form
+              class="-mb-15px"
+              :model="queryParams"
+              ref="queryFormRef"
+              :inline="true"
+              label-width="68px"
+      >
+          <el-form-item label="归属部门" prop="deptId">
+              <el-tree-select
+                      v-model="queryParams.deptId"
+                      :data="deptList"
+                      :props="defaultProps"
+                      check-strictly
+                      node-key="id"
+                      class="!w-240px"
+                      placeholder="请选择归属部门"
+              />
+          </el-form-item>
+          <el-form-item label="知识标题" prop="knowTitle">
+              <el-input
+                      v-model="queryParams.knowTitle"
+                      placeholder="请输入知识标题"
+                      clearable
+                      @keyup.enter="handleQuery"
+                      class="!w-240px"
+              />
+          </el-form-item>
+          <el-form-item label="知识状态" prop="status">
+              <el-select
+                      v-model="queryParams.status"
+                      placeholder="请选择知识状态"
+                      clearable
+                      class="!w-240px"
+              >
+                  <el-option
+                          v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                  />
+              </el-select>
+          </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="primary"
+                      plain
+                      @click="openForm('create')"
+                      v-hasPermi="['bpm:knowledge:create']"
+              >
+                  <Icon icon="ep:plus" class="mr-5px" /> 新增
+              </el-button>
+              <!--        <el-button plain type="primary" @click="handleCreate()">-->
+              <!--          <Icon class="mr-5px" icon="ep:plus" />-->
+              <!--          发起知识流程-->
+              <!--        </el-button>-->
+              <el-button
+                      type="success"
+                      plain
+                      @click="handleExport"
+                      :loading="exportLoading"
+                      v-hasPermi="['bpm:knowledge: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="typeName" />
+        <el-table-column label="知识标题" align="center" prop="knowTitle" />
+        <el-table-column label="作者" align="center" prop="userName" />
+        <el-table-column label="归属部门" align="center" prop="deptName" />
+      <el-table-column label="知识状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <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="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['bpm:knowledge-public:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['bpm:knowledge-public: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <KnowledgePublicForm ref="formRef"  :width="formWidth" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { KnowledgePublicApi, KnowledgePublicVO } from '@/api/bpm/knows/public'
+import KnowledgePublicForm from './KnowledgePublicForm.vue'
+import {defaultProps, handleTree} from "@/utils/tree";
+import KnowledgeForm from "@/views/bpm/knows/knowledge/KnowledgeForm.vue";
+import * as DeptApi from "@/api/system/dept";
+
+/** 公共知识 列表 */
+defineOptions({ name: 'KnowledgePublic' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<KnowledgePublicVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userName: undefined,
+  typeId: undefined,
+  deptId: undefined,
+  knowTitle: undefined,
+  content: undefined,
+  status: undefined,
+  filePath: undefined,
+  createTime: [],
+  processInstanceId: undefined,
+  userId: undefined,
+  flowStatus: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const deptList = ref<Tree[]>([]) // 树形结构
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await KnowledgePublicApi.getKnowledgePublicPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+
+    // 加载部门树
+    deptList.value = handleTree(await DeptApi.getSimpleDeptList())
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const formWidth = ref('80%'); // 你想要的宽度
+const openForm = (type: string, id?: number) => {
+  formRef.value.width = formWidth.value; // 设置宽度
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await KnowledgePublicApi.deleteKnowledgePublic(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await KnowledgePublicApi.exportKnowledgePublic(queryParams)
+    download.excel(data, '公共知识.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>