From b15e0d0f8f92a13f3f2e665b6595040946941a3f Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 29 May 2025 16:18:18 +0800
Subject: [PATCH 01/13] sc

---
 src/api/okr/okr.js                            |   9 +
 src/router/modules/static.ts                  |  26 ++
 src/styles/index.scss                         |   9 +
 src/utils/tableObjectSpanMethod.js            |  80 ----
 src/views/Home/Index.vue                      |  95 ++++-
 src/views/OKR/Analysis/index.vue              | 381 +++++++++++++++++-
 .../OKR/Management/Components/DialogOkr.vue   |  19 +-
 .../Management/Components/DialogOkrInfo.vue   |   9 +-
 src/views/OKR/Wait/index.vue                  |  20 +-
 9 files changed, 542 insertions(+), 106 deletions(-)
 delete mode 100644 src/utils/tableObjectSpanMethod.js

diff --git a/src/api/okr/okr.js b/src/api/okr/okr.js
index 09edcd4..46b2619 100644
--- a/src/api/okr/okr.js
+++ b/src/api/okr/okr.js
@@ -143,3 +143,12 @@ export const getChannelOptions = () => {
     // headers: { 'instance-id': 1016 }
   })
 }
+
+// 获取统计表中的合计信息
+export const getOkrStatisticsTotal = (params) => {
+  return request.get({
+    url: '/admin-api/okr/node/data/count',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
diff --git a/src/router/modules/static.ts b/src/router/modules/static.ts
index e33943f..0faa34c 100644
--- a/src/router/modules/static.ts
+++ b/src/router/modules/static.ts
@@ -35,7 +35,33 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
         visible: true,
         alwaysShow: true,
         redirect: ''
+      },
+      {
+        icon: 'ep:data-line',
+        path: 'okr-analysis',
+        name: 'Okr统计',
+        componentName: 'OkrAnalysis',
+        component: 'OKR/Analysis/index',
+        meta: {
+          title: 'Okr统计'
+        },
+        visible: true,
+        alwaysShow: true,
+        redirect: ''
       }
+      // {
+      //   icon: 'ep:data-board',
+      //   path: 'okr-metting',
+      //   name: '会议管理',
+      //   componentName: 'OkrMetting',
+      //   component: 'OKR/Meeting/index',
+      //   meta: {
+      //     title: '会议管理'
+      //   },
+      //   visible: true,
+      //   alwaysShow: true,
+      //   redirect: ''
+      // }
     ],
     meta: {
       title: 'OKR',
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f4e9f17..318e27f 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -97,4 +97,13 @@
 /* 去除 Firefox 中的指示器 */
 .el-input__inner[type='number'] {
   -moz-appearance: textfield;
+}
+.el-drawer__header {
+  padding: 16px 16px 8px 16px !important;
+  margin: 0 !important;
+  line-height: 24px !important;
+  font-size: 18px !important;
+  color: #303133 !important;
+  box-sizing: border-box !important;
+  // border-bottom: 1px solid #e8e8e8 !important;
 }
\ No newline at end of file
diff --git a/src/utils/tableObjectSpanMethod.js b/src/utils/tableObjectSpanMethod.js
deleted file mode 100644
index 2dabd28..0000000
--- a/src/utils/tableObjectSpanMethod.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * @Author: River_qiu
- * @Date: 2021/11/18
- */
-// 表格单元格合并多列
-let [spanObj, pos] = [{}, {}]
-//spanObj 存储每个key 对应的合并值
-//pos  存储的是 key合并值得索引 大概吧
-export const dataMethod = (data, isH, allColumns = []) => {
-  //循环数据(行)
-  for (let i in data) {
-    let dataI = data[i]
-    //循环数据内对象，查看有多少key
-    if (allColumns.length > 0) {
-      let preProp = undefined
-      // dataI.historyValue =
-      // 循环列数据
-      for (let index = 0; index < allColumns.length; index++) {
-        let j = allColumns[index]
-        if (i == 0) {
-          // 第一行，每列至少展示1行
-          spanObj[j] = [1]
-          pos[j] = 0
-        } else {
-          if (index == 0) {
-            data[i].historyValue = ''
-            data[i - 1].historyValue = ''
-          } else {
-            data[i].historyValue += data[i][preProp]
-            data[i - 1].historyValue += data[i - 1][preProp]
-          }
-          // e: 当前行数据，k：上一行数据
-          let [e, k] = [dataI, data[i - 1]]
-          // 判断上一行数据是否存在
-          // 空数据不合并
-          // 前一列值相同并且不为空或者为第一列
-          // 存在当前的列的值与上一行是否一样
-          // 判断是否有数组规定只允许那几列需要合并单元格的
-          if (
-            k &&
-            e[j] &&
-            (!preProp || (e.historyValue && e.historyValue == k.historyValue)) &&
-            e[j] == k[j] &&
-            (!isH || isH.length == 0 || isH.includes(j))
-          ) {
-            //如果上一级和当前一级相当，数组就加1 数组后面就添加一个0
-            spanObj[j][pos[j]] += 1
-            spanObj[j].push(0)
-          } else {
-            spanObj[j].push(1)
-            pos[j] = i
-          }
-          preProp = j
-        }
-      }
-    } else {
-      for (let j in dataI) {
-        //如果只有一条数据时默认为1即可，无需合并
-        if (i == 0) {
-          spanObj[j] = [1]
-          pos[j] = 0
-        } else {
-          let [e, k] = [dataI, data[i - 1]]
-          //判断上一级别是否存在 ，
-          //存在当前的key是否和上级别的key是否一样
-          //判断是否有数组规定只允许那几列需要合并单元格的
-          if (k && e[j] && k[j] && e[j] == k[j] && (!isH || isH.length == 0 || isH.includes(j))) {
-            //如果上一级和当前一级相当，数组就加1 数组后面就添加一个0
-            spanObj[j][pos[j]] += 1
-            spanObj[j].push(0)
-          } else {
-            spanObj[j].push(1)
-            pos[j] = i
-          }
-        }
-      }
-    }
-  }
-  return spanObj
-}
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index 7beecf8..65b9205 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -1,7 +1,96 @@
 <template>
-  <div> 首页 </div>
+  <div>
+    <el-card shadow="never">
+      <el-skeleton :loading="loading" animated>
+        <el-row :gutter="20" justify="space-between">
+          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            <div class="flex items-center">
+              <img :src="avatar" alt="" class="w-40px h-40px rounded-[50%] mr-20px" />
+              <div class="text-20px text-700">
+                {{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
+              </div>
+            </div>
+          </el-col>
+          <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+            <div class="flex h-40px items-center justify-end <sm:mt-10px">
+              <div
+                class="px-8px text-right"
+                @click="router.push({ path: '/Okr/okr-wait', query: { type: 1 } })"
+              >
+                <div class="text-14px text-red-600 mb-20px">今日待办</div>
+                <CountTo
+                  class="text-20px number-font"
+                  :start-val="0"
+                  :end-val="waitCount.dayEndAgentWorkNum"
+                  :duration="2600"
+                />
+              </div>
+              <el-divider direction="vertical" border-style="dashed" />
+              <div
+                class="px-8px text-right"
+                @click="router.push({ path: '/Okr/okr-wait', query: { type: 2 } })"
+              >
+                <div class="text-14px text-gray-400 mb-20px">我的待办</div>
+                <CountTo
+                  class="text-20px number-font"
+                  :start-val="0"
+                  :end-val="waitCount.myAgentWorkNum"
+                  :duration="2600"
+                />
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-skeleton>
+    </el-card>
+  </div>
 </template>
+<script setup lang="ts" name="Home">
+import { useUserStore } from '@/store/modules/user'
+import avatarImg from '@/assets/imgs/avatar.gif'
+import { getWaitCount } from '@/api/okr/wait'
 
-<script setup name="Home"></script>
+const { t } = useI18n()
+const userStore = useUserStore()
+const router = useRouter() // 路由对象
+const loading = ref(false)
+const avatar = userStore.getUser.avatar ? userStore.getUser.avatar : avatarImg
+const username = userStore.getUser.nickname
 
-<style lang="scss" scoped></style>
+function getWaitTargetCount() {
+  getWaitCount({}).then((res) => {
+    waitCount.value = res
+  })
+}
+
+const waitCount = ref({
+  dayEndAgentWorkNum: 0,
+  myAgentWorkNum: 0,
+  urgeAgentWorkNum: 0,
+  notifyNum: 0
+})
+
+const getAllApi = async () => {
+  await getWaitTargetCount()
+  loading.value = false
+}
+
+onMounted(() => {
+  getAllApi()
+})
+</script>
+
+<style lang="scss" scoped>
+@font-face {
+  font-family: numberFont;
+  src: url('@/assets/fonts/DISPLAY FREE TFB.ttf');
+}
+
+.number-font {
+  font-family: numberFont !important;
+}
+
+:deep(.el-card__header) {
+  padding: 10px;
+}
+</style>
diff --git a/src/views/OKR/Analysis/index.vue b/src/views/OKR/Analysis/index.vue
index 3b8d285..3bed8cf 100644
--- a/src/views/OKR/Analysis/index.vue
+++ b/src/views/OKR/Analysis/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-row class="mb-10px">
+    <el-row class="mb-10px flex justify-between items-start">
       <el-tree-select
         v-model="searchForm.nodeId"
         :data="peroidList"
@@ -8,12 +8,45 @@
         :render-after-expand="false"
         :default-expand-all="false"
         check-strictly
-        style="width: 400px"
+        style="width: 300px"
         @change="nodeChange"
       />
+      <div class="flex justify-end flex-1">
+        <el-popover
+          ref="countRef"
+          placement="left"
+          :title="`${currentNode?.nodeName} 数据汇总`"
+          trigger="click"
+          width="500px"
+          v-model:visible="showCountPop"
+        >
+          <template #reference><el-button>数据汇总</el-button></template>
+          <el-table :data="countInfo" stripe>
+            <el-table-column prop="keyResultShowName" label="项目名称" />
+            <el-table-column prop="currentValue" label="当前值" width="90" />
+            <el-table-column prop="targetValue" label="预期值" width="90" />
+            <el-table-column label="完成度" width="150">
+              <template #default="{ row }">
+                <el-progress
+                  :percentage="parseInt((row.currentValue / row.targetValue) * 100) || 0"
+                  :color="customColors"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-popover>
+        <el-button type="primary" @click="openDrawer(1, currentNode.nodeId, currentNode.nodeName)">
+          节点笔谈
+        </el-button>
+      </div>
     </el-row>
 
-    <el-table :data="originList" border :span-method="objectSpanMethod">
+    <el-table
+      :data="originList"
+      border
+      :span-method="objectSpanMethod"
+      @cell-click="handleClickCell"
+    >
       <el-table-column prop="objectInfo.objectiveName" label="目标">
         <template #default="{ row }">
           {{ row.objectInfo.objectiveName }}
@@ -69,13 +102,178 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <el-drawer
+      v-if="showDrawer"
+      v-model="showDrawer"
+      :title="drawerTitle"
+      size="60vw"
+      direction="rtl"
+      append-to-body
+      destroy-on-close
+    >
+      <el-tabs v-model="currentType" @tab-click="searchCommentList()">
+        <el-tab-pane
+          v-for="item in commentTypeOptions"
+          :key="item.id"
+          :label="item.label"
+          :name="item.id"
+        >
+          <div v-if="item.id == currentType">
+            <div v-if="addNewComment">
+              <div class="flex justify-between items-center">
+                <div>
+                  <el-button size="small" @click="addNewComment = false"> 取消 </el-button>
+                  <el-button type="primary" size="small" @click="handleSaveComment">
+                    发布
+                  </el-button>
+                </div>
+              </div>
+              <div class="mt-10px" v-if="addNewComment">
+                <Editor
+                  v-model:modelValue="form.commentValue"
+                  height="300px"
+                  :toolbarConfig="toolbarConfig"
+                />
+              </div>
+            </div>
+            <el-button v-else type="primary" size="small" @click="handleInsertComment">
+              新增
+            </el-button>
+            <div
+              v-for="(it, index) in commentList"
+              :key="it.commentId"
+              class="border-b-1"
+              style="padding: 10px 5px"
+            >
+              <div
+                class="flex items-center justify-between overflow-hidden text-16px"
+                style="line-height: 30px"
+              >
+                <div class="flex items-center">
+                  <el-avatar
+                    shape="circle"
+                    style="
+                      background-color: var(--el-color-primary-light-3);
+                      width: 30px;
+                      height: 30px;
+                    "
+                    fit="fill"
+                  >
+                    <span class="text-12px">{{ it.creatorName.slice(-2) }}</span>
+                  </el-avatar>
+                  <div class="ml-10px text-16px">{{ it.creatorName }}</div>
+                </div>
+              </div>
+              <div class="ml-10px" v-dompurify-html="it.content"></div>
+              <div
+                class="ml-10px mt-10px flex items-center justify-between text-12px"
+                style="line-height: 20px; color: #aaa"
+              >
+                <div class="flex items-center">
+                  <div class="flex items-center mr-50px">
+                    <el-button link @click="good(it)">
+                      <Icon
+                        icon="fa:thumbs-o-up"
+                        :size="16"
+                        :color="it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'"
+                      />
+                    </el-button>
+                    <span
+                      class="ml-5px"
+                      :style="{
+                        color: it.currentUserIsLike ? 'var(--el-color-primary)' : '#333'
+                      }"
+                      >{{ it.likeCount }}</span
+                    >
+                  </div>
+                  <div class="flex items-center mr-50px">
+                    <el-button link @click="showChildComment(index)">
+                      <Icon icon="ep:chat-dot-square" :size="16" color="#333" />
+                    </el-button>
+                    <span class="ml-5px" style="color: #333">{{ it.commentCount }}</span>
+                  </div>
+                </div>
+                <div class="ml-10px text-13px text-gray-400">
+                  {{ formatDate(it.createTime, 'YYYY-MM-DD HH:mm') }}
+                </div>
+              </div>
+              <!-- 评论 -->
+              <div
+                v-if="showCommentIndex == index"
+                class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
+                style="margin: 10px 10px 0 10px; border-radius: 4px"
+                label="笔谈"
+              >
+                <div
+                  v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
+                  :key="subComment.commentId"
+                  class="text-14px"
+                  style="line-height: 24px"
+                >
+                  <span class="font-bold">{{ subComment.creatorName }}：</span>
+                  <span>
+                    {{ subComment.content }}
+                  </span>
+                </div>
+                <div class="mt-10px relative">
+                  <!-- <el-input
+                        v-model="form.commentValue"
+                        placeholder="请输入评论"
+                        type="textarea"
+                        :autosize="{ minRows: 4 }"
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                      /> -->
+                  <el-mention
+                    v-model="form.commentValue"
+                    type="textarea"
+                    :autosize="{ minRows: 4 }"
+                    :options="employeeOptions"
+                    style="width: 100%"
+                    size="small"
+                    whole
+                    placeholder="请输入内容"
+                    @select="handleMention"
+                  >
+                    <template #label="scope">
+                      <div class="flex items-center justify-between h-full">
+                        <span class="text-14px text-dark-700">{{ scope.item.name }}</span>
+                        <span class="text-12px text-gray-400">{{ scope.item.dept }}</span>
+                      </div>
+                    </template>
+                  </el-mention>
+                  <el-button
+                    type="primary"
+                    size="small"
+                    style="position: absolute; right: 2px; bottom: 2px"
+                    @click="handleSendCommnet(index)"
+                  >
+                    发布
+                  </el-button>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-drawer>
   </div>
 </template>
 
 <script setup name="Analysis">
 import { listToTree, findNode } from '@/utils/tree'
-import { getAllNodeTree, getAllOkrPage } from '@/api/okr/okr'
+import { formatDate } from '@/utils/formatTime'
+import { getAllNodeTree, getAllOkrPage, getOkrStatisticsTotal } from '@/api/okr/okr'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
 import { cloneDeep } from 'lodash-es'
+import {
+  getCommentTypeOptions,
+  createComment,
+  getCommentPage,
+  likeComment
+} from '@/api/okr/comment'
 
 const message = useMessage()
 const defaultProps = {
@@ -88,6 +286,8 @@ const searchForm = ref({
 })
 
 const currentNode = ref(undefined)
+const showDrawer = ref(false)
+const drawerTitle = ref('详情')
 
 const customColors = [
   { color: 'rgb(196, 86.4, 86.4)', percentage: 20 },
@@ -100,6 +300,7 @@ const customColors = [
 const peroidList = ref([])
 
 handleSearchPeroid()
+getOptions()
 
 // 当前是否是叶子节点
 // 如果不是叶子节点，则表格数据不可修改
@@ -120,11 +321,12 @@ function handleSearchPeroid() {
     }
   })
 }
-
+const showCountPop = ref(false)
 function nodeChange(nodeId) {
   if (nodeId) {
     searchForm.value.nodeId = nodeId
     getOkrList()
+    getCountInfo()
     currentNode.value = findNode(peroidList.value, (node) => {
       return node.nodeId == nodeId
     })
@@ -162,6 +364,15 @@ function getOkrList() {
   })
 }
 
+const countInfo = ref([])
+function getCountInfo() {
+  getOkrStatisticsTotal({ nodeId: searchForm.value.nodeId }).then(async (resp) => {
+    countInfo.value = resp || []
+    // await nextTick(() =)
+    showCountPop.value = true
+  })
+}
+
 function objectSpanMethod({ column, rowIndex }) {
   if (['目标', '目标完成度'].includes(column.label)) {
     let _row = spanObj.value[rowIndex]
@@ -172,6 +383,164 @@ function objectSpanMethod({ column, rowIndex }) {
     }
   }
 }
+
+function handleClickCell(row, column) {
+  if (column.property === 'keyResultShowName') {
+    openDrawer(2, row.keyResultId, `${row.sourceName} ${row.keyResultShowName}`)
+  } else if (column.property === 'objectInfo.objectiveName') {
+    openDrawer(3, row.objectInfo.objectiveId, row.objectInfo.objectiveName)
+  }
+}
+
+const commentTypeOptions = ref([])
+const currentType = ref(1) // 默认评论类型为1
+function getOptions() {
+  getCommentTypeOptions().then((resp) => {
+    commentTypeOptions.value = (resp || []).sort((pre, cur) => pre.sort - cur.sort)
+    currentType.value = resp[0].id
+  })
+  getEmployeeSimpleList({ status: 0 }).then((resp) => {
+    employeeOptions.value = resp.map((item) => ({
+      ...item,
+      label: item.name,
+      value: item.name
+    }))
+  })
+}
+
+const commentList = ref([])
+const commentInfo = ref({
+  businessType: undefined,
+  businessId: undefined,
+  commentType: undefined,
+  pageSize: -1
+})
+function openDrawer(type, id, name) {
+  showDrawer.value = true
+  drawerTitle.value = `【${name}】笔谈`
+  commentInfo.value = {
+    businessType: type,
+    businessId: id,
+    commentType: currentType.value,
+    pageSize: -1
+  }
+  searchCommentList()
+}
+
+function searchCommentList() {
+  commentInfo.value.commentType = currentType.value
+  getCommentPage(commentInfo.value).then((resp) => {
+    // commentList.value = resp.list
+    commentList.value = listToTree(resp.list, {
+      id: 'commentId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+}
+
+const showCommentIndex = ref(-1)
+function showChildComment(index) {
+  showCommentIndex.value = showCommentIndex.value == index ? -1 : index
+}
+
+function good(item) {
+  likeComment(item.commentId).then(() => {
+    message.success('点赞成功')
+    searchCommentList()
+  })
+}
+
+const form = ref({
+  commentValue: '',
+  mentionedUserIdList: []
+})
+const employeeOptions = ref([])
+
+function handleMention(item) {
+  form.value.mentionedUserIdList.push(item.id)
+}
+
+function handleSendCommnet(idx) {
+  try {
+    // 过滤掉删除的用户，方式为遍历mentionedUserIdList，查找评论中是否有对应的用户名
+    const userList = [...form.value.mentionedUserIdList]
+    const arr = []
+    userList.map((item) => {
+      if (form.value.commentValue.indexOf(`@${item.name}`) != -1) {
+        arr.push(item.id)
+        // 然后移除对应的用户名，防止有多个
+        form.value.commentValue = form.value.commentValue.replace(`@${item.name}`, '')
+      }
+    })
+    const data = {
+      businessType: commentInfo.value.businessType,
+      businessId: commentInfo.value.businessId,
+      commentType: currentType.value,
+      content: form.value.commentValue,
+      mentionedUserIdList: arr,
+      parentId: commentList.value[idx].commentId
+    }
+    createComment(data)
+      .then(() => {
+        message.success('创建成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    console.log(error)
+    message.error('创建失败')
+  }
+}
+
+const addNewComment = ref(false)
+function handleInsertComment() {
+  addNewComment.value = true
+  form.value.commentValue = commentTypeOptions.value.find(
+    (item) => item.id == currentType.value
+  ).remark
+}
+
+const toolbarConfig = {
+  toolbarKeys: [
+    'bold', // 加粗
+    'underline', // 下划线
+    'italic', // 斜体
+    'color', // 文字颜色
+    'bgColor', // 背景色
+    'fontSize', // 字号
+    'bulletedList', // 无序列表
+    'numberedList', // 有序列表
+    'insertTable', // 插入表格
+    'insertLink', // 插入链接
+    'undo' // 撤销
+  ]
+}
+
+function handleSaveComment() {
+  addNewComment.value = false
+  try {
+    const data = {
+      businessType: commentInfo.value.businessType,
+      businessId: commentInfo.value.businessId,
+      commentType: currentType.value,
+      content: form.value.commentValue,
+      mentionedUserIdList: form.value.mentionedUserIdList
+    }
+    createComment(data)
+      .then(() => {
+        message.success('创建成功')
+        searchCommentList()
+      })
+      .finally(() => {
+        form.value.commentValue = ''
+      })
+  } catch (error) {
+    message.error('创建失败')
+  }
+}
 </script>
 
-<style scoped></style>
+<style lang="scss" scoped></style>
diff --git a/src/views/OKR/Management/Components/DialogOkr.vue b/src/views/OKR/Management/Components/DialogOkr.vue
index cabb65c..05a9d0a 100644
--- a/src/views/OKR/Management/Components/DialogOkr.vue
+++ b/src/views/OKR/Management/Components/DialogOkr.vue
@@ -143,7 +143,7 @@
                 </div>
               </div>
             </el-tab-pane>
-            <el-tab-pane label="评论" name="conclusion" key="conclusion">
+            <el-tab-pane label="笔谈" name="conclusion" key="conclusion">
               <div class="relative overflow-y-auto" style="height: calc(100% - 50px)">
                 <div v-if="addNewComment">
                   <div class="flex justify-between items-center">
@@ -178,7 +178,7 @@
                   </div>
                 </div>
                 <el-button v-else type="primary" size="small" @click="handleInsertComment">
-                  新增评论
+                  新增笔谈
                 </el-button>
                 <div
                   v-for="(it, index) in commentList"
@@ -243,7 +243,7 @@
                     v-if="showCommentIndex == index"
                     class="bg-gray-100 pl-10px pr-10px pt-5px pb-5px"
                     style="margin: 10px 10px 0 10px; border-radius: 4px"
-                    label="评论"
+                    label="笔谈"
                   >
                     <div
                       v-for="subComment in it.children.sort((a, b) => a.createTime - b.createTime)"
@@ -274,7 +274,7 @@
                         style="width: 100%"
                         size="small"
                         whole
-                        placeholder="请输入评论"
+                        placeholder="请输入笔谈"
                         @select="handleMention"
                       >
                         <template #label="{ item }">
@@ -492,19 +492,20 @@ function handleSaveComment() {
       businessType: 1,
       businessId: nodeInfo.value.nodeId,
       contentType: 1,
+      commentType: form.value.commentType,
       content: form.value.commentValue,
       mentionedUserIdList: form.value.mentionedUserIdList
     }
     createComment(data)
       .then(() => {
-        message.success('评论成功')
+        message.success('笔谈成功')
         searchCommentList()
       })
       .finally(() => {
         form.value.commentValue = ''
       })
   } catch (error) {
-    message.error('评论失败')
+    message.error('笔谈失败')
   }
 }
 const commentList = ref([])
@@ -552,20 +553,22 @@ function handleSendCommnet(idx) {
       businessType: 1,
       businessId: nodeInfo.value.nodeId,
       contentType: 1,
+      commentType: form.value.commentType,
       content: form.value.commentValue,
       mentionedUserIdList: arr,
       parentId: commentList.value[idx].commentId
     }
     createComment(data)
       .then(() => {
-        message.success('评论成功')
+        message.success('创建成功')
         searchCommentList()
       })
       .finally(() => {
         form.value.commentValue = ''
       })
   } catch (error) {
-    message.error('评论失败')
+    console.log(error)
+    message.error('创建失败')
   }
 }
 </script>
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 2dc6422..e999d29 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-model="show"
-    width="900px"
+    width="88vw"
     class="dialog-okr"
     :show-close="false"
     :close-on-click-modal="false"
@@ -255,6 +255,10 @@
                             <el-option label="公开" :value="1" />
                             <el-option label="仅上级可见" :value="2" />
                           </el-select>
+                          <el-radio-group v-model="kr.isCount" class="ml-10px">
+                            <el-radio :label="true" :value="true">参与统计</el-radio>
+                            <el-radio :label="false" :value="false">不参与统计</el-radio>
+                          </el-radio-group>
                         </div>
                       </div>
                     </div>
@@ -477,7 +481,8 @@ function AddKR(idx) {
     process: undefined,
     currentValue: undefined,
     executor: obj.executor,
-    dataScope: obj.dataScope
+    dataScope: obj.dataScope,
+    isCount: false
   })
 }
 
diff --git a/src/views/OKR/Wait/index.vue b/src/views/OKR/Wait/index.vue
index 44e1545..188fe12 100644
--- a/src/views/OKR/Wait/index.vue
+++ b/src/views/OKR/Wait/index.vue
@@ -63,7 +63,7 @@
           </el-badge>
         </template>
       </el-tab-pane>
-      <el-tab-pane :name="4">
+      <!-- <el-tab-pane :name="4">
         <template #label>
           <el-badge :value="tabCount.notifyNum" :max="99" :show-zero="false">
             <el-tooltip content="特指OKR中@我的消息" placement="top" effect="dark">
@@ -85,7 +85,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
 
     <el-table v-if="tabIndex != 4" :data="tableList">
@@ -169,6 +169,7 @@ import DialogWait from './Components/DialogWait.vue'
 
 import { getWaitPage, deleteWait, getWaitCount, urgeWait } from '@/api/okr/wait'
 
+const route = useRoute()
 const userStore = useUserStore()
 const currentUserId = userStore.getUser.id
 
@@ -212,6 +213,11 @@ const priorityNameFilter = (priority) => {
 const tabIndex = ref(1)
 
 onMounted(() => {
+  if (route?.query?.type) {
+    tabIndex.value = Number(route.query.type)
+  } else {
+    tabIndex.value = 1
+  }
   searchList()
 })
 
@@ -237,7 +243,7 @@ function getTabCount() {
 
 const loading = ref(false)
 const tableList = ref([])
-const mentionedList = ref([])
+// const mentionedList = ref([])
 const total = ref(0)
 function getList() {
   loading.value = true
@@ -282,10 +288,10 @@ function handleNotice(row) {
   })
 }
 
-function handleShow(row) {
-  console.log(row)
-  message.success('打开okr详情页')
-}
+// function handleShow(row) {
+//   console.log(row)
+//   message.success('打开okr详情页')
+// }
 </script>
 
 <style lang="scss" scoped></style>

From 26ff7cd4342c324687d8650985153037fa447d22 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 3 Jun 2025 12:16:54 +0800
Subject: [PATCH 02/13] sc

---
 src/utils/index.ts               | 27 +++++++++++++++++++++++++++
 src/views/OKR/Analysis/index.vue |  7 +++++++
 2 files changed, 34 insertions(+)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index 9b02f25..9636493 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -220,3 +220,30 @@ export const removeNullField = (obj: Object) => {
   }
   return obj
 }
+
+import * as XLSX from 'xlsx'
+import * as FileSaver from 'file-saver'
+export const exportTableWithVue = (domId: any, fileName: String) => {
+  // const XLSX = require('xlsx')
+  // 使用 this.$nextTick 是在dom元素都渲染完成之后再执行
+  // this.$nextTick(function () {
+  // 设置导出的内容是否只做解析，不进行格式转换     false：要解析， true:不解析
+  const xlsxParam = { raw: true }
+  const wb = XLSX.utils.table_to_book(document.querySelector(domId), xlsxParam)
+
+  const wbout = XLSX.write(wb, {
+    bookType: 'xlsx',
+    bookSST: true,
+    type: 'array'
+  })
+  try {
+    // 下载保存文件
+    FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), `${fileName}.xlsx`)
+  } catch (e) {
+    if (typeof console !== 'undefined') {
+      console.log(e, wbout)
+    }
+  }
+  return wbout
+  // });
+}
diff --git a/src/views/OKR/Analysis/index.vue b/src/views/OKR/Analysis/index.vue
index 3bed8cf..527a952 100644
--- a/src/views/OKR/Analysis/index.vue
+++ b/src/views/OKR/Analysis/index.vue
@@ -12,6 +12,7 @@
         @change="nodeChange"
       />
       <div class="flex justify-end flex-1">
+        <el-button type="info" @click="handleExport">导出</el-button>
         <el-popover
           ref="countRef"
           placement="left"
@@ -42,6 +43,7 @@
     </el-row>
 
     <el-table
+      id="okrAnalysisTable"
       :data="originList"
       border
       :span-method="objectSpanMethod"
@@ -274,6 +276,7 @@ import {
   getCommentPage,
   likeComment
 } from '@/api/okr/comment'
+import { exportTableWithVue } from '@/utils'
 
 const message = useMessage()
 const defaultProps = {
@@ -541,6 +544,10 @@ function handleSaveComment() {
     message.error('创建失败')
   }
 }
+
+function handleExport() {
+  exportTableWithVue('#okrAnalysisTable', `OKR分析报表-${currentNode.value.nodeName}`)
+}
 </script>
 
 <style lang="scss" scoped></style>

From f3293ef14d8af93bf1816f72aeae3ad2ce24fd6d Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 3 Jun 2025 14:49:59 +0800
Subject: [PATCH 03/13] sc

---
 src/views/OKR/Management/Components/DialogOkrInfo.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index e999d29..102e920 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -449,7 +449,7 @@ function resetForm() {
     startTime: undefined,
     endTime: undefined,
     executor: [],
-    dataScope: 1
+    dataScope: 2
   }
 }
 
@@ -464,7 +464,7 @@ function addObjective() {
     objectiveName: '',
     executor: [],
     keyResults: [],
-    dataScope: 1
+    dataScope: 2
   })
 }
 
@@ -495,7 +495,7 @@ function removeKR(oIdx, krIdx) {
 }
 
 function addChildNode() {
-  childNodeList.value.push({ dataScope: 1 })
+  childNodeList.value.push({ dataScope: 2 })
 }
 
 function removeChildNode(idx) {

From 0409e9ef113e44d09343938ef41eb04713cea3a2 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 3 Jun 2025 18:12:32 +0800
Subject: [PATCH 04/13] sc

---
 src/router/modules/static.ts          |  39 +++--
 src/views/OKR/Meeting/MeetingInfo.vue | 206 ++++++++++++++++++++++++++
 src/views/OKR/Meeting/index.vue       | 164 ++++++++++++++++++++
 3 files changed, 396 insertions(+), 13 deletions(-)
 create mode 100644 src/views/OKR/Meeting/MeetingInfo.vue
 create mode 100644 src/views/OKR/Meeting/index.vue

diff --git a/src/router/modules/static.ts b/src/router/modules/static.ts
index 0faa34c..1e1c73a 100644
--- a/src/router/modules/static.ts
+++ b/src/router/modules/static.ts
@@ -48,20 +48,33 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
         visible: true,
         alwaysShow: true,
         redirect: ''
+      },
+      {
+        icon: 'ep:data-board',
+        path: 'okr-meeting',
+        name: '会议管理',
+        componentName: 'OkrMeeting',
+        component: 'OKR/Meeting/index',
+        meta: {
+          title: '会议管理'
+        },
+        visible: true,
+        alwaysShow: true,
+        redirect: ''
+      },
+      {
+        icon: 'ep:data-board',
+        path: 'okr-meeting-info/:id',
+        name: '会议详情',
+        componentName: 'MeetingInfo',
+        component: 'OKR/Meeting/MeetingInfo',
+        meta: {
+          title: '会议详情'
+        },
+        visible: false,
+        alwaysShow: true,
+        redirect: ''
       }
-      // {
-      //   icon: 'ep:data-board',
-      //   path: 'okr-metting',
-      //   name: '会议管理',
-      //   componentName: 'OkrMetting',
-      //   component: 'OKR/Meeting/index',
-      //   meta: {
-      //     title: '会议管理'
-      //   },
-      //   visible: true,
-      //   alwaysShow: true,
-      //   redirect: ''
-      // }
     ],
     meta: {
       title: 'OKR',
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
new file mode 100644
index 0000000..820ea27
--- /dev/null
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -0,0 +1,206 @@
+<template>
+  <div>
+    <el-affix postion="top" :offset="95">
+      <div class="flex justify-between mb-4 bg-white">
+        <b class="text-20px">{{ form.id ? '修改会议' : '新增会议' }}</b>
+        <el-button v-if="form.status == '未开始'" type="success" @click="submit()">保存</el-button>
+      </div>
+    </el-affix>
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="120px">
+      <el-row :gutter="20">
+        <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <el-form-item label="会议主题" prop="subject">
+            <el-input v-model="form.subject" placeholder="请输入会议主题" />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <el-form-item label="OKR节点" prop="okrNodeName">
+            <el-input v-model="form.okrNodeName" placeholder="请输入OKR节点" />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议时间" prop="startDate">
+            <el-date-picker
+              v-model="form.startDate"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              placeholder="请选择会议开始时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="预计结束时间" prop="expectEndDate">
+            <el-date-picker
+              v-model="form.expectEndDate"
+              type="datetime"
+              format="YYYY-MM-DD HH:mm"
+              value-format="YYYY-MM-DD HH:mm"
+              placeholder="请选择预计结束时间"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议地点" prop="address">
+            <el-input v-model="form.address" placeholder="请输入会议地点" />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
+          <el-form-item label="会议状态" prop="status">
+            <el-select v-model="form.status" placeholder="请选择会议状态" style="width: 100%">
+              <el-option label="未开始" value="未开始" />
+              <el-option label="已结束" value="已结束" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="预约参会人员" prop="expectUsers">
+            <!-- <el-input v-model="form.expectUsers" placeholder="请输入预约参会人员" /> -->
+            <el-select
+              v-model="form.expectUsers"
+              placeholder="选择参会人员"
+              clearable
+              filterable
+              style="width: 100%"
+              multiple
+              @change="handleUserChange"
+            >
+              <el-option
+                v-for="item in userOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="实际参会人员" prop="actualUsers">
+            <!-- <el-input v-model="form.actualUsers" placeholder="请输入实际参会人员" /> -->
+            <el-checkbox-group v-model="form.actualUsers">
+              <el-checkbox
+                v-for="item in expectUserOptions"
+                :key="item.key"
+                :label="item.value"
+                :value="item.value"
+              >
+                {{ item.label }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0" v-if="!isAllActived">
+          <el-form-item label="缺席原因" prop="absenceReason">
+            <el-input v-model="form.absenceReason" placeholder="请输入缺席原因" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
+          <el-form-item label="会议内容" prop="content">
+            <Editor v-model="form.content" height="500px" />
+          </el-form-item>
+        </el-col>
+        <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
+          <el-form-item label="会议纪要" prop="minutes">
+            <Editor v-model="form.minutes" height="500px" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </div>
+</template>
+
+<script setup name="MeetingInfo">
+const route = useRoute()
+
+onMounted(() => {
+  if (route.params.id && route.params.id != 0) {
+    // 模拟获取会议详情
+    // 这里可以调用API获取会议详情数据
+    getMeetingInfo()
+  } else {
+    console.error('会议ID不存在')
+  }
+})
+const form = ref({
+  id: 0,
+  subject: '',
+  startDate: '',
+  address: '',
+  expectEndDate: '',
+  expectUsers: [],
+  actualUsers: [],
+  okrNodeName: '',
+  status: '未开始',
+  content: '',
+  minutes: '',
+  absenceReason: ''
+})
+const rules = {
+  subject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
+  startDate: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
+  expectEndDate: [{ required: true, message: '请选择预计结束时间', trigger: 'change' }],
+  address: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
+  status: [{ required: true, message: '请选择会议状态', trigger: 'change' }],
+  expectUsers: [{ required: true, message: '请输入预约参会人员', trigger: 'blur' }],
+  actualUsers: [{ required: true, message: '请输入实际参会人员', trigger: 'blur' }]
+}
+
+const formRef = ref(null)
+const userOptions = ref([
+  { value: '张三', label: '张三' },
+  { value: '李四', label: '李四' },
+  { value: '王五', label: '王五' },
+  { value: '赵六', label: '赵六' }
+])
+const expectUserOptions = ref([])
+
+const isAllActived = computed(() => {
+  // 判断实际参会人员是否包含所有预约参会人员
+  return form.value.expectUsers.every((item) => form.value.actualUsers.includes(item))
+})
+
+// 获取详情
+const getMeetingInfo = () => {
+  // 模拟异步请求
+  setTimeout(() => {
+    // 假设请求成功，模拟数据
+    form.value = {
+      id: route.params.id,
+      subject: 'OKR会议',
+      startDate: '2023-10-01 10:00',
+      address: '会议室A',
+      expectEndDate: '2023-10-01 11:00',
+      expectUsers: ['张三', '李四', '王五'],
+      actualUsers: ['张三', '李四'],
+      okrNodeName: 'OKR节点1',
+      status: '未开始'
+    }
+    handleUserChange()
+  }, 1000)
+}
+
+function handleUserChange() {
+  // 当预约参会人员变化时，更新实际参会人员选项
+  expectUserOptions.value = userOptions.value.filter((user) =>
+    form.value.expectUsers.includes(user.value)
+  )
+  form.value.actualUsers = [...form.value.expectUsers]
+}
+
+function submit() {
+  formRef.value.validate((valid) => {
+    if (valid) {
+      // 提交表单数据
+      console.log('提交的会议数据:', form.value)
+      // 这里可以调用API保存会议数据
+    } else {
+      console.error('表单验证失败')
+      return false
+    }
+  })
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/OKR/Meeting/index.vue b/src/views/OKR/Meeting/index.vue
new file mode 100644
index 0000000..a7b2168
--- /dev/null
+++ b/src/views/OKR/Meeting/index.vue
@@ -0,0 +1,164 @@
+<template>
+  <div>
+    <!-- 搜索条件：主题、会议状态、会议时间（时间段）、选择OKR节点 -->
+    <el-form :model="searchForm" inline label-width="0">
+      <el-form-item>
+        <el-input v-model="searchForm.subject" placeholder="会议主题" />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.status" placeholder="会议状态" style="width: 120px">
+          <el-option label="未开始" :value="1" />
+          <el-option label="已结束" :value="2" />
+          <el-option label="已取消" :value="3" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dateRange"
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="会议时间"
+          end-placeholder="会议时间"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.nodeId" placeholder="选择OKR节点" style="width: 220px">
+          <el-option label="OKR节点1" :value="1" />
+          <el-option label="OKR节点2" :value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button type="primary" @click="handleAdd">预约会议</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table :data="tableList" v-loading="loading" border stripe>
+      <el-table-column prop="subject" label="会议主题" />
+      <el-table-column prop="startDate" label="会议时间" />
+      <el-table-column prop="address" label="会议地点" />
+      <el-table-column prop="expectEndDate" label="预计结束时间" />
+      <el-table-column prop="expectUsers" label="预约参会人员" />
+      <el-table-column prop="actualUsers" label="实际参会人员" />
+      <el-table-column prop="okrNodeName" label="关联OKR节点" />
+      <el-table-column prop="status" label="会议状态">
+        <template #default="{ row }">
+          <el-tag v-if="row.status === '未开始'" type="info" size="small">
+            {{ row.status }}
+          </el-tag>
+          <el-tag v-else-if="row.status === '已结束'" type="success" size="small">
+            {{ row.status }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="140">
+        <template #default="{ row }">
+          <el-button type="primary" style="padding: 0" text @click="handleEdit(row.id)">
+            修改
+          </el-button>
+          <el-button type="danger" text style="padding: 0" @click="handleCancel(row)">
+            取消
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="Meeting">
+const message = useMessage()
+
+const searchForm = ref({
+  subject: '',
+  status: 1,
+  dateRange: [],
+  pageNo: 1,
+  pageSize: 50
+})
+const total = ref(0)
+
+onMounted(() => {
+  handleSearch()
+})
+
+const loading = ref(false)
+const tableList = ref([])
+const handleSearch = () => {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function getList() {
+  loading.value = true
+  // 模拟异步请求
+  setTimeout(() => {
+    // 假设请求成功，更新数据
+    tableList.value = [
+      {
+        id: 1,
+        subject: 'OKR会议',
+        startDate: '2023-10-01 10:00',
+        address: '会议室A',
+        expectEndDate: '2023-10-01 11:00',
+        expectUsers: '张三, 李四',
+        actualUsers: '张三, 李四, 王五',
+        okrNodeName: 'OKR节点1',
+        status: '未开始'
+      },
+      {
+        id: 2,
+        subject: '项目复盘会议',
+        startDate: '2023-10-02 14:00',
+        address: '会议室B',
+        expectEndDate: '2023-10-02 15:00',
+        expectUsers: '赵六, 钱七',
+        actualUsers: '赵六, 钱七, 孙八',
+        okrNodeName: 'OKR节点2',
+        status: '已结束'
+      }
+    ]
+    total.value = tableList.value.length
+    loading.value = false
+  }, 1000)
+}
+
+const router = useRouter()
+
+const handleAdd = () => {
+  router.push({ name: 'MeetingInfo', params: { id: 0 } })
+}
+
+const handleEdit = (id) => {
+  router.push({
+    name: `MeetingInfo`,
+    params: {
+      id
+    }
+  })
+}
+
+const handleCancel = async (row) => {
+  try {
+    await message.confirm('是否确认取消该会议？')
+    // 模拟取消会议操作
+    setTimeout(() => {
+      console.log(row)
+
+      message.success('会议已取消')
+      // 重新获取列表
+      getList()
+    }, 500)
+  } catch (error) {
+    console.log('取消操作被用户拒绝', error)
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

From ec34235cc25a96d6d5a232b2808891f99871f8ef Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 4 Jun 2025 18:05:16 +0800
Subject: [PATCH 05/13] sc

---
 src/router/modules/static.ts          |  4 +-
 src/views/OKR/Meeting/MeetingInfo.vue | 53 ++++++++++++++++----
 src/views/OKR/Meeting/index.vue       | 69 ++++++++++++++++++++++-----
 3 files changed, 104 insertions(+), 22 deletions(-)

diff --git a/src/router/modules/static.ts b/src/router/modules/static.ts
index 1e1c73a..1f8a4f9 100644
--- a/src/router/modules/static.ts
+++ b/src/router/modules/static.ts
@@ -39,11 +39,11 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
       {
         icon: 'ep:data-line',
         path: 'okr-analysis',
-        name: 'Okr统计',
+        name: 'OKR统计',
         componentName: 'OkrAnalysis',
         component: 'OKR/Analysis/index',
         meta: {
-          title: 'Okr统计'
+          title: 'OKR统计'
         },
         visible: true,
         alwaysShow: true,
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index 820ea27..78083ba 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -3,7 +3,7 @@
     <el-affix postion="top" :offset="95">
       <div class="flex justify-between mb-4 bg-white">
         <b class="text-20px">{{ form.id ? '修改会议' : '新增会议' }}</b>
-        <el-button v-if="form.status == '未开始'" type="success" @click="submit()">保存</el-button>
+        <el-button type="success" @click="submit()">保存</el-button>
       </div>
     </el-affix>
     <el-form :model="form" ref="formRef" :rules="rules" label-width="120px">
@@ -14,9 +14,16 @@
           </el-form-item>
         </el-col>
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-          <el-form-item label="OKR节点" prop="okrNodeName">
-            <el-input v-model="form.okrNodeName" placeholder="请输入OKR节点" />
-          </el-form-item>
+          <el-tree-select
+            v-model="form.nodeId"
+            :data="peroidList"
+            :props="defaultProps"
+            :render-after-expand="false"
+            :default-expand-all="false"
+            check-strictly
+            placeholder="选择OKR节点"
+            style="width: 100%"
+          />
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
           <el-form-item label="会议时间" prop="startDate">
@@ -97,13 +104,15 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-          <el-form-item label="会议内容" prop="content">
-            <Editor v-model="form.content" height="500px" />
+          <el-form-item label="会议内容:" prop="content">
+            <div v-if="isDetail" v-dompurify-html="form.content" class="w-full"></div>
+            <Editor v-else v-model="form.content" height="500px" />
           </el-form-item>
         </el-col>
         <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-          <el-form-item label="会议纪要" prop="minutes">
-            <Editor v-model="form.minutes" height="500px" />
+          <el-form-item label="会议纪要:" prop="minutes">
+            <div v-if="isDetail" v-dompurify-html="form.minutes" class="w-full"></div>
+            <Editor v-else v-model="form.minutes" height="500px" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -112,9 +121,20 @@
 </template>
 
 <script setup name="MeetingInfo">
+import { listToTree } from '@/utils/tree'
+import { getAllNodeTree } from '@/api/okr/okr'
+
 const route = useRoute()
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
+
+const isDetail = route.query.isDetail
 
 onMounted(() => {
+  getOptions()
   if (route.params.id && route.params.id != 0) {
     // 模拟获取会议详情
     // 这里可以调用API获取会议详情数据
@@ -123,6 +143,19 @@ onMounted(() => {
     console.error('会议ID不存在')
   }
 })
+
+const peroidList = ref([])
+function getOptions() {
+  // 模拟获取OKR节点数据
+  getAllNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp?.tree || [], {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+}
+
 const form = ref({
   id: 0,
   subject: '',
@@ -175,7 +208,9 @@ const getMeetingInfo = () => {
       expectUsers: ['张三', '李四', '王五'],
       actualUsers: ['张三', '李四'],
       okrNodeName: 'OKR节点1',
-      status: '未开始'
+      status: '未开始',
+      content: '<p>会议内容示例</p> <p><img src="https://picsum.photos/200/300" alt=""></p>',
+      minutes: '<p>会议纪要示例</p>'
     }
     handleUserChange()
   }, 1000)
diff --git a/src/views/OKR/Meeting/index.vue b/src/views/OKR/Meeting/index.vue
index a7b2168..e956673 100644
--- a/src/views/OKR/Meeting/index.vue
+++ b/src/views/OKR/Meeting/index.vue
@@ -3,10 +3,10 @@
     <!-- 搜索条件：主题、会议状态、会议时间（时间段）、选择OKR节点 -->
     <el-form :model="searchForm" inline label-width="0">
       <el-form-item>
-        <el-input v-model="searchForm.subject" placeholder="会议主题" />
+        <el-input v-model="searchForm.subject" placeholder="会议主题" style="width: 200px" />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.status" placeholder="会议状态" style="width: 120px">
+        <el-select v-model="searchForm.status" placeholder="会议状态" style="width: 150px">
           <el-option label="未开始" :value="1" />
           <el-option label="已结束" :value="2" />
           <el-option label="已取消" :value="3" />
@@ -23,10 +23,17 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.nodeId" placeholder="选择OKR节点" style="width: 220px">
-          <el-option label="OKR节点1" :value="1" />
-          <el-option label="OKR节点2" :value="2" />
-        </el-select>
+        <el-tree-select
+          v-model="searchForm.nodeId"
+          :data="peroidList"
+          :props="defaultProps"
+          :render-after-expand="false"
+          :default-expand-all="false"
+          check-strictly
+          placeholder="选择OKR节点"
+          style="width: 300px"
+          @change="handleSearch"
+        />
       </el-form-item>
       <el-form-item>
         <el-button @click="handleSearch">查询</el-button>
@@ -54,11 +61,16 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="140">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleEdit(row.id)">
-            修改
-          </el-button>
-          <el-button type="danger" text style="padding: 0" @click="handleCancel(row)">
-            取消
+          <template v-if="row.status == '未开始'">
+            <el-button type="primary" style="padding: 0" text @click="handleEdit(row.id)">
+              修改
+            </el-button>
+            <el-button type="danger" text style="padding: 0" @click="handleCancel(row)">
+              取消
+            </el-button>
+          </template>
+          <el-button v-else type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+            详情
           </el-button>
         </template>
       </el-table-column>
@@ -73,21 +85,44 @@
 </template>
 
 <script setup name="Meeting">
+import { listToTree } from '@/utils/tree'
+// import { formatDate } from '@/utils/formatTime'
+import { getAllNodeTree } from '@/api/okr/okr'
+
+const defaultProps = {
+  value: 'nodeId',
+  label: 'nodeName',
+  children: 'children'
+}
 const message = useMessage()
 
 const searchForm = ref({
   subject: '',
   status: 1,
   dateRange: [],
+  nodeId: undefined,
   pageNo: 1,
   pageSize: 50
 })
 const total = ref(0)
 
 onMounted(() => {
+  getOptions()
   handleSearch()
 })
 
+const peroidList = ref([])
+function getOptions() {
+  // 模拟获取OKR节点数据
+  getAllNodeTree().then((resp) => {
+    peroidList.value = listToTree(resp?.tree || [], {
+      id: 'nodeId',
+      pid: 'parentId',
+      children: 'children'
+    })
+  })
+}
+
 const loading = ref(false)
 const tableList = ref([])
 const handleSearch = () => {
@@ -144,6 +179,18 @@ const handleEdit = (id) => {
   })
 }
 
+const handleDetail = (id) => {
+  router.push({
+    name: `MeetingInfo`,
+    params: {
+      id
+    },
+    query: {
+      isDetail: 1
+    }
+  })
+}
+
 const handleCancel = async (row) => {
   try {
     await message.confirm('是否确认取消该会议？')

From 80d9e93e4660dbcf54478aebb17e12a85c4b03c5 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 5 Jun 2025 18:25:04 +0800
Subject: [PATCH 06/13] sc

---
 .env.base                             |   4 +-
 src/api/okr/meeting.js                |  45 ++++++
 src/router/modules/remaining.ts       |  20 +--
 src/views/OKR/Meeting/MeetingInfo.vue | 206 +++++++++++++++-----------
 src/views/OKR/Meeting/index.vue       | 111 +++++++-------
 5 files changed, 229 insertions(+), 157 deletions(-)
 create mode 100644 src/api/okr/meeting.js

diff --git a/.env.base b/.env.base
index 4bc8726..978fb4c 100644
--- a/.env.base
+++ b/.env.base
@@ -6,9 +6,9 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://localhost:48080'
 
-# VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
-VITE_BASE_URL='http://114.215.207.150:48080'
+# VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
diff --git a/src/api/okr/meeting.js b/src/api/okr/meeting.js
new file mode 100644
index 0000000..6cdaad4
--- /dev/null
+++ b/src/api/okr/meeting.js
@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+export const createMeeting = (data) => {
+  return request.post({
+    url: '/admin-api/okr/meeting/add',
+    data,
+    isSubmitForm: true
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 修改
+export const updateMeeting = (data) => {
+  return request.put({
+    url: '/admin-api/okr/meeting/update',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+// 查询详情
+export const getMeetingDetail = (params) => {
+  return request.get({
+    url: '/admin-api/okr/meeting/get',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 取消会议
+export const cancelMeeting = (data) => {
+  return request.put({
+    url: '/admin-api/okr/meeting/cancel',
+    data
+    // headers: { 'instance-id': 1016 }
+  })
+}
+
+// 分页查询
+export const getMeetingPage = (params) => {
+  return request.get({
+    url: '/admin-api/okr/meeting/page',
+    params
+    // headers: { 'instance-id': 1016 }
+  })
+}
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index b563980..337d2f9 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -50,16 +50,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  {
-    path: '',
-    component: Layout,
-    redirect: '/Home/index',
-    name: '',
-    meta: {
-      title: '首页',
-      hidden: true
-    }
-  },
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   redirect: '/Home/index',
+  //   name: '',
+  //   meta: {
+  //     title: '首页',
+  //     hidden: true
+  //   }
+  // },
   {
     path: '/swagger',
     component: () => import('@/views/Basic/Swagger/index.vue'),
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index 78083ba..30c441f 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -1,16 +1,23 @@
 <template>
   <div>
-    <el-affix postion="top" :offset="95">
+    <el-affix postion="top" :offset="95" v-if="!isDetail">
       <div class="flex justify-between mb-4 bg-white">
-        <b class="text-20px">{{ form.id ? '修改会议' : '新增会议' }}</b>
+        <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
         <el-button type="success" @click="submit()">保存</el-button>
       </div>
     </el-affix>
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="120px">
+    <el-form
+      :model="form"
+      ref="formRef"
+      :rules="rules"
+      label-width="120px"
+      v-loading="loading"
+      :disabled="!!isDetail"
+    >
       <el-row :gutter="20">
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-          <el-form-item label="会议主题" prop="subject">
-            <el-input v-model="form.subject" placeholder="请输入会议主题" />
+          <el-form-item label="会议主题" prop="meetingSubject">
+            <el-input v-model="form.meetingSubject" placeholder="请输入会议主题" />
           </el-form-item>
         </el-col>
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
@@ -26,9 +33,9 @@
           />
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
-          <el-form-item label="会议时间" prop="startDate">
+          <el-form-item label="会议时间" prop="startTime">
             <el-date-picker
-              v-model="form.startDate"
+              v-model="form.startTime"
               type="datetime"
               format="YYYY-MM-DD HH:mm"
               value-format="YYYY-MM-DD HH:mm"
@@ -37,9 +44,9 @@
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
-          <el-form-item label="预计结束时间" prop="expectEndDate">
+          <el-form-item label="预计结束时间" prop="expectEndTime">
             <el-date-picker
-              v-model="form.expectEndDate"
+              v-model="form.expectEndTime"
               type="datetime"
               format="YYYY-MM-DD HH:mm"
               value-format="YYYY-MM-DD HH:mm"
@@ -48,21 +55,20 @@
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
-          <el-form-item label="会议地点" prop="address">
-            <el-input v-model="form.address" placeholder="请输入会议地点" />
+          <el-form-item label="会议地点" prop="meetingRoom">
+            <el-input v-model="form.meetingRoom" placeholder="请输入会议地点" />
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
           <el-form-item label="会议状态" prop="status">
             <el-select v-model="form.status" placeholder="请选择会议状态" style="width: 100%">
-              <el-option label="未开始" value="未开始" />
-              <el-option label="已结束" value="已结束" />
+              <el-option label="未开始" value="1" />
+              <el-option label="已结束" value="2" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="24" :offset="0">
           <el-form-item label="预约参会人员" prop="expectUsers">
-            <!-- <el-input v-model="form.expectUsers" placeholder="请输入预约参会人员" /> -->
             <el-select
               v-model="form.expectUsers"
               placeholder="选择参会人员"
@@ -74,45 +80,45 @@
             >
               <el-option
                 v-for="item in userOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :disabled="item.status == 1"
               />
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24" :offset="0">
+        <el-col :span="24" :offset="0" v-if="form.meetingId">
           <el-form-item label="实际参会人员" prop="actualUsers">
-            <!-- <el-input v-model="form.actualUsers" placeholder="请输入实际参会人员" /> -->
             <el-checkbox-group v-model="form.actualUsers">
               <el-checkbox
                 v-for="item in expectUserOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.value"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               >
-                {{ item.label }}
+                {{ item.name }}
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
         </el-col>
         <el-col :span="24" :offset="0" v-if="!isAllActived">
-          <el-form-item label="缺席原因" prop="absenceReason">
-            <el-input v-model="form.absenceReason" placeholder="请输入缺席原因" />
+          <el-form-item label="缺席原因" prop="absentReason">
+            <el-input v-model="form.absentReason" placeholder="请输入缺席原因" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-          <el-form-item label="会议内容:" prop="content">
-            <div v-if="isDetail" v-dompurify-html="form.content" class="w-full"></div>
-            <Editor v-else v-model="form.content" height="500px" />
+          <el-form-item label="会议内容:" prop="meetingContent">
+            <div v-if="!!isDetail" v-dompurify-html="form.meetingContent" class="w-full"></div>
+            <Editor v-else v-model="form.meetingContent" height="500px" />
           </el-form-item>
         </el-col>
-        <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-          <el-form-item label="会议纪要:" prop="minutes">
-            <div v-if="isDetail" v-dompurify-html="form.minutes" class="w-full"></div>
-            <Editor v-else v-model="form.minutes" height="500px" />
+        <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
+          <el-form-item label="会议纪要:" prop="meetingSummary">
+            <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
+            <Editor v-else v-model="form.meetingSummary" height="500px" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -123,8 +129,15 @@
 <script setup name="MeetingInfo">
 import { listToTree } from '@/utils/tree'
 import { getAllNodeTree } from '@/api/okr/okr'
+import * as MeetingApi from '@/api/okr/meeting'
+import { formatDate } from '@/utils/formatTime'
+import { getEmployeeSimpleList } from '@/api/pers/employee'
+import { useTagsViewStore } from '@/store/modules/tagsView'
 
 const route = useRoute()
+const message = useMessage()
+const tagsViewStore = useTagsViewStore()
+
 const defaultProps = {
   value: 'nodeId',
   label: 'nodeName',
@@ -136,17 +149,16 @@ const isDetail = route.query.isDetail
 onMounted(() => {
   getOptions()
   if (route.params.id && route.params.id != 0) {
-    // 模拟获取会议详情
     // 这里可以调用API获取会议详情数据
-    getMeetingInfo()
+    getMeetingInfo(route.params.id)
   } else {
-    console.error('会议ID不存在')
+    console.error('会议不存在')
   }
 })
 
 const peroidList = ref([])
 function getOptions() {
-  // 模拟获取OKR节点数据
+  // 获取OKR节点数据
   getAllNodeTree().then((resp) => {
     peroidList.value = listToTree(resp?.tree || [], {
       id: 'nodeId',
@@ -154,39 +166,36 @@ function getOptions() {
       children: 'children'
     })
   })
+  // 获取人员数据
+  getEmployeeSimpleList().then((data) => {
+    userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
+  })
 }
 
 const form = ref({
-  id: 0,
-  subject: '',
-  startDate: '',
-  address: '',
-  expectEndDate: '',
+  meetingId: undefined,
+  meetingSubject: '',
+  startTime: '',
+  meetingRoom: '',
+  expectEndTime: '',
   expectUsers: [],
   actualUsers: [],
   okrNodeName: '',
-  status: '未开始',
-  content: '',
-  minutes: '',
-  absenceReason: ''
+  status: '1',
+  meetingContent: '',
+  meetingSummary: '',
+  absentReason: ''
 })
 const rules = {
-  subject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
-  startDate: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
-  expectEndDate: [{ required: true, message: '请选择预计结束时间', trigger: 'change' }],
-  address: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
-  status: [{ required: true, message: '请选择会议状态', trigger: 'change' }],
-  expectUsers: [{ required: true, message: '请输入预约参会人员', trigger: 'blur' }],
-  actualUsers: [{ required: true, message: '请输入实际参会人员', trigger: 'blur' }]
+  meetingSubject: [{ required: true, message: '请输入会议主题', trigger: 'blur' }],
+  startTime: [{ required: true, message: '请选择会议开始时间', trigger: 'change' }],
+  expectEndTime: [{ required: true, message: '请选择预计结束时间', trigger: 'change' }],
+  meetingRoom: [{ required: true, message: '请输入会议地点', trigger: 'blur' }],
+  expectUsers: [{ required: true, message: '请选择参会人员', trigger: 'change' }]
 }
 
 const formRef = ref(null)
-const userOptions = ref([
-  { value: '张三', label: '张三' },
-  { value: '李四', label: '李四' },
-  { value: '王五', label: '王五' },
-  { value: '赵六', label: '赵六' }
-])
+const userOptions = ref([])
 const expectUserOptions = ref([])
 
 const isAllActived = computed(() => {
@@ -194,47 +203,72 @@ const isAllActived = computed(() => {
   return form.value.expectUsers.every((item) => form.value.actualUsers.includes(item))
 })
 
+const loading = ref(false)
 // 获取详情
-const getMeetingInfo = () => {
-  // 模拟异步请求
-  setTimeout(() => {
-    // 假设请求成功，模拟数据
-    form.value = {
-      id: route.params.id,
-      subject: 'OKR会议',
-      startDate: '2023-10-01 10:00',
-      address: '会议室A',
-      expectEndDate: '2023-10-01 11:00',
-      expectUsers: ['张三', '李四', '王五'],
-      actualUsers: ['张三', '李四'],
-      okrNodeName: 'OKR节点1',
-      status: '未开始',
-      content: '<p>会议内容示例</p> <p><img src="https://picsum.photos/200/300" alt=""></p>',
-      minutes: '<p>会议纪要示例</p>'
+const getMeetingInfo = async (meetingId) => {
+  try {
+    loading.value = true
+    // 调用API获取会议详情
+    const resp = await MeetingApi.getMeetingDetail({ meetingId })
+    loading.value = false
+    if (resp) {
+      form.value = {
+        ...form.value,
+        ...resp,
+        startTime: formatDate(resp.startTime, 'YYYY-MM-DD HH:mm'),
+        expectEndTime: formatDate(resp.expectEndTime, 'YYYY-MM-DD HH:mm'),
+        expectUsers: resp.expectUsers || [],
+        actualUsers: resp.actualUsers || []
+      }
+      handleUserChange()
     }
-    handleUserChange()
-  }, 1000)
+  } catch (error) {
+    loading.value = false
+    console.error('获取会议详情失败:', error)
+  }
 }
 
 function handleUserChange() {
   // 当预约参会人员变化时，更新实际参会人员选项
   expectUserOptions.value = userOptions.value.filter((user) =>
-    form.value.expectUsers.includes(user.value)
+    form.value.expectUsers.some((it) => it == user.id)
   )
   form.value.actualUsers = [...form.value.expectUsers]
 }
 
-function submit() {
-  formRef.value.validate((valid) => {
-    if (valid) {
-      // 提交表单数据
-      console.log('提交的会议数据:', form.value)
-      // 这里可以调用API保存会议数据
+const router = useRouter()
+async function submit() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  try {
+    // 提交表单数据
+    if (form.value.meetingId) {
+      if (form.value.status == 2 && !form.value.meetingSummary) {
+        message.error('会议结束时，会议纪要不能为空')
+        return
+      }
+      // 更新会议
+      await MeetingApi.updateMeeting(form.value)
+      message.success('会议更新成功')
     } else {
-      console.error('表单验证失败')
-      return false
+      if (form.value.status == 1 && !form.value.meetingContent) {
+        message.error('预约会议时，会议内容不能为空')
+        return
+      }
+      // 新增会议
+      await MeetingApi.createMeeting(form.value)
+      message.success('会议创建成功')
     }
-  })
+    tagsViewStore.delView(route)
+    const visitedViews = tagsViewStore.getVisitedViews
+    const latestView = visitedViews.slice(-1)[0]
+    router.push(latestView)
+  } catch (error) {
+    console.error('保存会议数据失败:', error)
+  }
 }
 </script>
 
diff --git a/src/views/OKR/Meeting/index.vue b/src/views/OKR/Meeting/index.vue
index e956673..81bebf6 100644
--- a/src/views/OKR/Meeting/index.vue
+++ b/src/views/OKR/Meeting/index.vue
@@ -3,13 +3,13 @@
     <!-- 搜索条件：主题、会议状态、会议时间（时间段）、选择OKR节点 -->
     <el-form :model="searchForm" inline label-width="0">
       <el-form-item>
-        <el-input v-model="searchForm.subject" placeholder="会议主题" style="width: 200px" />
+        <el-input v-model="searchForm.meetingSubject" placeholder="会议主题" style="width: 200px" />
       </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.status" placeholder="会议状态" style="width: 150px">
-          <el-option label="未开始" :value="1" />
-          <el-option label="已结束" :value="2" />
-          <el-option label="已取消" :value="3" />
+          <el-option label="未开始" value="1" />
+          <el-option label="已结束" value="2" />
+          <el-option label="已取消" value="3" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -42,34 +42,37 @@
     </el-form>
 
     <el-table :data="tableList" v-loading="loading" border stripe>
-      <el-table-column prop="subject" label="会议主题" />
-      <el-table-column prop="startDate" label="会议时间" />
-      <el-table-column prop="address" label="会议地点" />
-      <el-table-column prop="expectEndDate" label="预计结束时间" />
-      <el-table-column prop="expectUsers" label="预约参会人员" />
-      <el-table-column prop="actualUsers" label="实际参会人员" />
-      <el-table-column prop="okrNodeName" label="关联OKR节点" />
+      <el-table-column prop="meetingSubject" label="会议主题" />
+      <el-table-column prop="startTime" label="会议时间" />
+      <el-table-column prop="meetingRoom" label="会议地点" />
+      <el-table-column prop="expectEndTime" label="预计结束时间" />
+      <el-table-column prop="expectUserName" label="预约参会人员" />
+      <el-table-column prop="actualUserName" label="实际参会人员" />
+      <el-table-column prop="nodeName" label="关联OKR节点" />
       <el-table-column prop="status" label="会议状态">
         <template #default="{ row }">
-          <el-tag v-if="row.status === '未开始'" type="info" size="small">
-            {{ row.status }}
-          </el-tag>
-          <el-tag v-else-if="row.status === '已结束'" type="success" size="small">
-            {{ row.status }}
+          <el-tag :type="['', 'info', 'success', 'warning'][row.status]" size="small">
+            {{ ['', '未开始', '已结束', '已取消'][row.status] }}
           </el-tag>
         </template>
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="140">
         <template #default="{ row }">
-          <template v-if="row.status == '未开始'">
-            <el-button type="primary" style="padding: 0" text @click="handleEdit(row.id)">
+          <template v-if="row.status == 1">
+            <el-button type="primary" style="padding: 0" text @click="handleEdit(row.meetingId)">
               修改
             </el-button>
             <el-button type="danger" text style="padding: 0" @click="handleCancel(row)">
               取消
             </el-button>
           </template>
-          <el-button v-else type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+          <el-button
+            v-else
+            type="primary"
+            style="padding: 0"
+            text
+            @click="handleDetail(row.meetingId)"
+          >
             详情
           </el-button>
         </template>
@@ -88,6 +91,7 @@
 import { listToTree } from '@/utils/tree'
 // import { formatDate } from '@/utils/formatTime'
 import { getAllNodeTree } from '@/api/okr/okr'
+import * as MeetingApi from '@/api/okr/meeting'
 
 const defaultProps = {
   value: 'nodeId',
@@ -97,8 +101,8 @@ const defaultProps = {
 const message = useMessage()
 
 const searchForm = ref({
-  subject: '',
-  status: 1,
+  meetingSubject: undefined,
+  status: '1',
   dateRange: [],
   nodeId: undefined,
   pageNo: 1,
@@ -113,7 +117,7 @@ onMounted(() => {
 
 const peroidList = ref([])
 function getOptions() {
-  // 模拟获取OKR节点数据
+  // 获取OKR节点数据
   getAllNodeTree().then((resp) => {
     peroidList.value = listToTree(resp?.tree || [], {
       id: 'nodeId',
@@ -132,36 +136,29 @@ const handleSearch = () => {
 
 function getList() {
   loading.value = true
-  // 模拟异步请求
-  setTimeout(() => {
-    // 假设请求成功，更新数据
-    tableList.value = [
-      {
-        id: 1,
-        subject: 'OKR会议',
-        startDate: '2023-10-01 10:00',
-        address: '会议室A',
-        expectEndDate: '2023-10-01 11:00',
-        expectUsers: '张三, 李四',
-        actualUsers: '张三, 李四, 王五',
-        okrNodeName: 'OKR节点1',
-        status: '未开始'
-      },
-      {
-        id: 2,
-        subject: '项目复盘会议',
-        startDate: '2023-10-02 14:00',
-        address: '会议室B',
-        expectEndDate: '2023-10-02 15:00',
-        expectUsers: '赵六, 钱七',
-        actualUsers: '赵六, 钱七, 孙八',
-        okrNodeName: 'OKR节点2',
-        status: '已结束'
-      }
-    ]
-    total.value = tableList.value.length
+  // 获取会议列表
+  try {
+    const params = { ...searchForm.value }
+    if (params.dateRange && params.dateRange.length) {
+      params.startTime = params.dateRange[0] + ' 00:00:00'
+      params.endDate = params.dateRange[1] + ' 23:59:59'
+      delete params.dateRange
+    } else {
+      delete params.startTime
+      delete params.endDate
+    }
+    MeetingApi.getMeetingPage(params)
+      .then((resp) => {
+        tableList.value = resp.list || []
+        total.value = resp.total || 0
+      })
+      .finally(() => {
+        loading.value = false
+      })
+  } catch (error) {
+    console.error('获取会议列表失败:', error)
     loading.value = false
-  }, 1000)
+  }
 }
 
 const router = useRouter()
@@ -194,14 +191,10 @@ const handleDetail = (id) => {
 const handleCancel = async (row) => {
   try {
     await message.confirm('是否确认取消该会议？')
-    // 模拟取消会议操作
-    setTimeout(() => {
-      console.log(row)
-
-      message.success('会议已取消')
-      // 重新获取列表
-      getList()
-    }, 500)
+    // 取消会议操作
+    await MeetingApi.cancelMeeting({ meetingId: row.meetingId })
+    message.success('会议取消成功')
+    getList() // 刷新列表
   } catch (error) {
     console.log('取消操作被用户拒绝', error)
   }

From e45cf7db0c9b1633d54c291769683b535e56b2cf Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 6 Jun 2025 11:15:05 +0800
Subject: [PATCH 07/13] sc

---
 src/permission.js                     |  4 +-
 src/views/OKR/Meeting/MeetingInfo.vue | 68 +++++++++++++++++----------
 src/views/OKR/Meeting/index.vue       | 37 ++++++++++-----
 3 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 2eac4ef..5ded0f7 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -64,7 +64,9 @@ router.beforeEach(async (to, from, next) => {
       if (tenantId && appId) {
         next(`/login?tenantId=${tenantId}&appId=${appId}&redirect=${to.fullPath}`) // 否则全部重定向到登录页
       } else {
-        next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+        // next(`/login?redirect=${to.fullPath}`)
+        // 否则全部重定向到平台登陆页
+        window.location.href = 'https://cloud.ahduima.com/ss/login'
       }
     }
   }
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index 30c441f..d9f58c7 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -17,20 +17,23 @@
       <el-row :gutter="20">
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
           <el-form-item label="会议主题" prop="meetingSubject">
-            <el-input v-model="form.meetingSubject" placeholder="请输入会议主题" />
+            <el-input v-model="form.meetingSubject" placeholder="请输入会议主题" clearable />
           </el-form-item>
         </el-col>
         <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
-          <el-tree-select
-            v-model="form.nodeId"
-            :data="peroidList"
-            :props="defaultProps"
-            :render-after-expand="false"
-            :default-expand-all="false"
-            check-strictly
-            placeholder="选择OKR节点"
-            style="width: 100%"
-          />
+          <el-form-item label="okr节点" prop="nodeId">
+            <el-tree-select
+              v-model="form.nodeId"
+              :data="peroidList"
+              :props="defaultProps"
+              :render-after-expand="false"
+              :default-expand-all="false"
+              check-strictly
+              clearable
+              placeholder="选择OKR节点"
+              style="width: 100%"
+            />
+          </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
           <el-form-item label="会议时间" prop="startTime">
@@ -56,7 +59,7 @@
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
           <el-form-item label="会议地点" prop="meetingRoom">
-            <el-input v-model="form.meetingRoom" placeholder="请输入会议地点" />
+            <el-input v-model="form.meetingRoom" placeholder="请输入会议地点" clearable />
           </el-form-item>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24">
@@ -64,6 +67,7 @@
             <el-select v-model="form.status" placeholder="请选择会议状态" style="width: 100%">
               <el-option label="未开始" value="1" />
               <el-option label="已结束" value="2" />
+              <el-option label="已取消" value="3" disabled />
             </el-select>
           </el-form-item>
         </el-col>
@@ -146,8 +150,8 @@ const defaultProps = {
 
 const isDetail = route.query.isDetail
 
-onMounted(() => {
-  getOptions()
+onMounted(async () => {
+  await getOptions()
   if (route.params.id && route.params.id != 0) {
     // 这里可以调用API获取会议详情数据
     getMeetingInfo(route.params.id)
@@ -158,18 +162,31 @@ onMounted(() => {
 
 const peroidList = ref([])
 function getOptions() {
-  // 获取OKR节点数据
-  getAllNodeTree().then((resp) => {
-    peroidList.value = listToTree(resp?.tree || [], {
-      id: 'nodeId',
-      pid: 'parentId',
-      children: 'children'
+  return Promise.all([getAllNodeTree(), getEmployeeSimpleList()])
+    .then(([okrResp, employeeResp]) => {
+      peroidList.value = listToTree(okrResp?.tree || [], {
+        id: 'nodeId',
+        pid: 'parentId',
+        children: 'children'
+      })
+      userOptions.value = employeeResp.map((it) => ({ ...it, id: it.id + '' }))
+      // handleUserChange()
+    })
+    .catch((error) => {
+      console.error('获取数据失败:', error)
     })
-  })
-  // 获取人员数据
-  getEmployeeSimpleList().then((data) => {
-    userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
-  })
+  // // 获取OKR节点数据
+  // getAllNodeTree().then((resp) => {
+  //   peroidList.value = listToTree(resp?.tree || [], {
+  //     id: 'nodeId',
+  //     pid: 'parentId',
+  //     children: 'children'
+  //   })
+  // })
+  // // 获取人员数据
+  // getEmployeeSimpleList().then((data) => {
+  //   userOptions.value = data.map((it) => ({ ...it, id: it.id + '' }))
+  // })
 }
 
 const form = ref({
@@ -258,6 +275,7 @@ async function submit() {
         message.error('预约会议时，会议内容不能为空')
         return
       }
+      form.value.actualUsers = []
       // 新增会议
       await MeetingApi.createMeeting(form.value)
       message.success('会议创建成功')
diff --git a/src/views/OKR/Meeting/index.vue b/src/views/OKR/Meeting/index.vue
index 81bebf6..9034ba5 100644
--- a/src/views/OKR/Meeting/index.vue
+++ b/src/views/OKR/Meeting/index.vue
@@ -3,10 +3,21 @@
     <!-- 搜索条件：主题、会议状态、会议时间（时间段）、选择OKR节点 -->
     <el-form :model="searchForm" inline label-width="0">
       <el-form-item>
-        <el-input v-model="searchForm.meetingSubject" placeholder="会议主题" style="width: 200px" />
+        <el-input
+          v-model="searchForm.meetingSubject"
+          placeholder="会议主题"
+          style="width: 200px"
+          clearable
+          @keyup.enter="handleSearch"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.status" placeholder="会议状态" style="width: 150px">
+        <el-select
+          v-model="searchForm.status"
+          placeholder="会议状态"
+          style="width: 150px"
+          @change="handleSearch"
+        >
           <el-option label="未开始" value="1" />
           <el-option label="已结束" value="2" />
           <el-option label="已取消" value="3" />
@@ -20,6 +31,7 @@
           value-format="YYYY-MM-DD"
           start-placeholder="会议时间"
           end-placeholder="会议时间"
+          @change="handleSearch"
         />
       </el-form-item>
       <el-form-item>
@@ -32,6 +44,7 @@
           check-strictly
           placeholder="选择OKR节点"
           style="width: 300px"
+          clearable
           @change="handleSearch"
         />
       </el-form-item>
@@ -43,13 +56,13 @@
 
     <el-table :data="tableList" v-loading="loading" border stripe>
       <el-table-column prop="meetingSubject" label="会议主题" />
-      <el-table-column prop="startTime" label="会议时间" />
-      <el-table-column prop="meetingRoom" label="会议地点" />
-      <el-table-column prop="expectEndTime" label="预计结束时间" />
+      <el-table-column prop="startTime" label="会议时间" width="170px" />
+      <el-table-column prop="meetingRoom" label="会议地点" width="140px" />
+      <el-table-column prop="expectEndTime" label="预计结束时间" width="170px" />
       <el-table-column prop="expectUserName" label="预约参会人员" />
       <el-table-column prop="actualUserName" label="实际参会人员" />
-      <el-table-column prop="nodeName" label="关联OKR节点" />
-      <el-table-column prop="status" label="会议状态">
+      <el-table-column prop="nodeName" label="关联OKR节点" width="150px" />
+      <el-table-column prop="status" label="会议状态" width="100px">
         <template #default="{ row }">
           <el-tag :type="['', 'info', 'success', 'warning'][row.status]" size="small">
             {{ ['', '未开始', '已结束', '已取消'][row.status] }}
@@ -58,7 +71,7 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" width="140">
         <template #default="{ row }">
-          <template v-if="row.status == 1">
+          <template v-if="row.status == 1 && row.creator == currentUserId">
             <el-button type="primary" style="padding: 0" text @click="handleEdit(row.meetingId)">
               修改
             </el-button>
@@ -89,10 +102,12 @@
 
 <script setup name="Meeting">
 import { listToTree } from '@/utils/tree'
-// import { formatDate } from '@/utils/formatTime'
+import { useUserStore } from '@/store/modules/user'
 import { getAllNodeTree } from '@/api/okr/okr'
 import * as MeetingApi from '@/api/okr/meeting'
 
+const currentUserId = useUserStore().getUser.id
+
 const defaultProps = {
   value: 'nodeId',
   label: 'nodeName',
@@ -141,11 +156,11 @@ function getList() {
     const params = { ...searchForm.value }
     if (params.dateRange && params.dateRange.length) {
       params.startTime = params.dateRange[0] + ' 00:00:00'
-      params.endDate = params.dateRange[1] + ' 23:59:59'
+      params.endTime = params.dateRange[1] + ' 23:59:59'
       delete params.dateRange
     } else {
       delete params.startTime
-      delete params.endDate
+      delete params.endTime
     }
     MeetingApi.getMeetingPage(params)
       .then((resp) => {

From 15f83f71937b0dacf2e04c902beccf06d9116058 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 9 Jun 2025 18:15:36 +0800
Subject: [PATCH 08/13] sc

---
 .env.base                             |  4 +--
 src/router/modules/remaining.ts       | 20 +++++------
 src/views/OKR/Analysis/index.vue      | 51 ++++++++++++++++++++++++++-
 src/views/OKR/Meeting/MeetingInfo.vue | 27 +++++++++-----
 4 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/.env.base b/.env.base
index 978fb4c..4bc8726 100644
--- a/.env.base
+++ b/.env.base
@@ -6,9 +6,9 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://localhost:48080'
 
-VITE_BASE_URL='http://47.98.161.246:48080'
+# VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
-# VITE_BASE_URL='http://114.215.207.150:48080'
+VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 337d2f9..b563980 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -50,16 +50,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
-  // {
-  //   path: '',
-  //   component: Layout,
-  //   redirect: '/Home/index',
-  //   name: '',
-  //   meta: {
-  //     title: '首页',
-  //     hidden: true
-  //   }
-  // },
+  {
+    path: '',
+    component: Layout,
+    redirect: '/Home/index',
+    name: '',
+    meta: {
+      title: '首页',
+      hidden: true
+    }
+  },
   {
     path: '/swagger',
     component: () => import('@/views/Basic/Swagger/index.vue'),
diff --git a/src/views/OKR/Analysis/index.vue b/src/views/OKR/Analysis/index.vue
index 527a952..1eda3da 100644
--- a/src/views/OKR/Analysis/index.vue
+++ b/src/views/OKR/Analysis/index.vue
@@ -47,6 +47,7 @@
       :data="originList"
       border
       :span-method="objectSpanMethod"
+      :show-summary="!!tableKeywords"
       @cell-click="handleClickCell"
     >
       <el-table-column prop="objectInfo.objectiveName" label="目标">
@@ -57,7 +58,26 @@
       <!-- <el-table-column prop="objectiveId" label="占比" width="100px">
         <template #default> 0 </template>
       </el-table-column> -->
-      <el-table-column prop="keyResultShowName" label="关键成果">
+      <el-table-column prop="keyResultShowName">
+        <template #header>
+          <div class="flex items-center justify-center">
+            <div class="flex-1 mr-10px">
+              <el-input
+                v-if="showTableSearch"
+                v-model="tableKeywords"
+                placeholder="请输入关键字"
+                size="small"
+                style="width: 100%"
+                clearable
+                @change="handleTableFilter"
+              />
+              <div v-else>关键成果</div>
+            </div>
+            <el-button type="primary" size="small" @click="handleFilterTableClick">
+              {{ showTableSearch ? '取消' : '筛选' }}
+            </el-button>
+          </div>
+        </template>
         <template #default="{ row }">
           {{ row.sourceName ? `【${row.sourceName}】` : '' }} {{ row.keyResultShowName }}
         </template>
@@ -302,6 +322,9 @@ const customColors = [
 
 const peroidList = ref([])
 
+const showTableSearch = ref(false)
+const tableKeywords = ref('')
+
 handleSearchPeroid()
 getOptions()
 
@@ -327,6 +350,8 @@ function handleSearchPeroid() {
 const showCountPop = ref(false)
 function nodeChange(nodeId) {
   if (nodeId) {
+    showTableSearch.value = false
+    tableKeywords.value = ''
     searchForm.value.nodeId = nodeId
     getOkrList()
     getCountInfo()
@@ -343,6 +368,7 @@ function nodeChange(nodeId) {
 }
 
 const originList = ref([])
+const defaultTableList = ref([])
 const spanObj = ref([])
 function getOkrList() {
   getAllOkrPage(searchForm.value).then((resp) => {
@@ -363,6 +389,7 @@ function getOkrList() {
           originList.value = [...originList.value, ...arr]
         }
       })
+      defaultTableList.value = [...originList.value]
     }
   })
 }
@@ -548,6 +575,28 @@ function handleSaveComment() {
 function handleExport() {
   exportTableWithVue('#okrAnalysisTable', `OKR分析报表-${currentNode.value.nodeName}`)
 }
+
+function handleTableFilter() {
+  console.log('tableKeywords', tableKeywords.value)
+
+  if (tableKeywords.value) {
+    originList.value = defaultTableList.value.filter(
+      (item) =>
+        item.keyResultName.includes(tableKeywords.value) ||
+        item.sourceName.includes(tableKeywords.value)
+    )
+  } else {
+    originList.value = [...defaultTableList.value]
+  }
+}
+
+function handleFilterTableClick() {
+  showTableSearch.value = !showTableSearch.value
+  if (!showTableSearch.value) {
+    tableKeywords.value = ''
+    originList.value = [...defaultTableList.value]
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index d9f58c7..37ee06f 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -113,16 +113,25 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-          <el-form-item label="会议内容:" prop="meetingContent">
+        <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24">
+          <el-form-item label="会议内容" prop="meetingContent">
             <div v-if="!!isDetail" v-dompurify-html="form.meetingContent" class="w-full"></div>
-            <Editor v-else v-model="form.meetingContent" height="500px" />
+            <Editor v-else v-model="form.meetingContent" height="500px" style="width: 100%" />
           </el-form-item>
         </el-col>
-        <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
-          <el-form-item label="会议纪要:" prop="meetingSummary">
-            <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
-            <Editor v-else v-model="form.meetingSummary" height="500px" />
+        <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" v-if="!!form.meetingId">
+          <el-form-item label="会议纪要" prop="meetingSummary" label-width="80px">
+            <!-- <div v-if="!!isDetail" v-dompurify-html="form.meetingSummary" class="w-full"></div>
+            <Editor v-else v-model="form.meetingSummary" height="500px" /> -->
+            <div v-if="!!isDetail" class="w-full">{{ form.meetingSummary }}</div>
+            <el-input
+              v-else
+              type="textarea"
+              placeholder="请输入会议纪要"
+              :maxlength="-1"
+              :show-word-limit="false"
+              :autosize="{ minRows: 20 }"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -250,7 +259,9 @@ function handleUserChange() {
   expectUserOptions.value = userOptions.value.filter((user) =>
     form.value.expectUsers.some((it) => it == user.id)
   )
-  form.value.actualUsers = [...form.value.expectUsers]
+  if (!isDetail) {
+    form.value.actualUsers = [...form.value.expectUsers]
+  }
 }
 
 const router = useRouter()

From 03467e1d6eaafe5daff24419892453eedceda263 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 9 Jun 2025 18:26:44 +0800
Subject: [PATCH 09/13] sc

---
 src/views/OKR/Analysis/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/OKR/Analysis/index.vue b/src/views/OKR/Analysis/index.vue
index 1eda3da..037e300 100644
--- a/src/views/OKR/Analysis/index.vue
+++ b/src/views/OKR/Analysis/index.vue
@@ -582,7 +582,7 @@ function handleTableFilter() {
   if (tableKeywords.value) {
     originList.value = defaultTableList.value.filter(
       (item) =>
-        item.keyResultName.includes(tableKeywords.value) ||
+        item.keyResultShowName.includes(tableKeywords.value) ||
         item.sourceName.includes(tableKeywords.value)
     )
   } else {

From f0020d5c8257a1ef119ee4bc8cae15c6437f82dd Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 13 Jun 2025 10:40:03 +0800
Subject: [PATCH 10/13] sc

---
 .env.base                                      |  4 ++--
 .../Management/Components/DialogOkrInfo.vue    | 18 ++++++++++++++----
 src/views/OKR/Meeting/MeetingInfo.vue          |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.env.base b/.env.base
index 4bc8726..978fb4c 100644
--- a/.env.base
+++ b/.env.base
@@ -6,9 +6,9 @@ VITE_DEV=true
 # 请求路径
 # VITE_BASE_URL='http://localhost:48080'
 
-# VITE_BASE_URL='http://47.98.161.246:48080'
+VITE_BASE_URL='http://47.98.161.246:48080'
 # VITE_BASE_URL='http://114.55.169.15:48080'
-VITE_BASE_URL='http://114.215.207.150:48080'
+# VITE_BASE_URL='http://114.215.207.150:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://47.98.161.246:48080/admin-api/system/file/upload'
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 102e920..50134bb 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -462,9 +462,9 @@ const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于
 function addObjective() {
   objectList.value.push({
     objectiveName: '',
-    executor: [],
+    executor: form.value.executor || [],
     keyResults: [],
-    dataScope: 2
+    dataScope: form.value.dataScope || 2
   })
 }
 
@@ -543,8 +543,8 @@ async function handleSave() {
       .confirm('是否按照当前节点所选的多个执行人自动新增对应的员工节点？', {
         type: 'warning',
         showCancelButton: true,
-        cancelButtonText: '取消',
-        confirmButtonText: '确定'
+        cancelButtonText: '不新增员工节点',
+        confirmButtonText: '新增员工节点'
       })
       .then(() => {
         saveOkrData(true)
@@ -577,21 +577,31 @@ async function saveOkrData(isAutoAddChild = false) {
                 2,
                 '0'
               )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
+              dataScope: form.value.dataScope,
+              executor: form.value.executor,
               children: [
                 {
                   nodeName: `${month + 1}月第1周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 },
                 {
                   nodeName: `${month + 1}月第2周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 },
                 {
                   nodeName: `${month + 1}月第3周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 },
                 {
                   nodeName: `${month + 1}月第4周`,
+                  dataScope: form.value.dataScope,
+                  executor: form.value.executor,
                   children: []
                 }
               ]
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index 37ee06f..f657caf 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -126,6 +126,7 @@
             <div v-if="!!isDetail" class="w-full">{{ form.meetingSummary }}</div>
             <el-input
               v-else
+              v-model="form.meetingSummary"
               type="textarea"
               placeholder="请输入会议纪要"
               :maxlength="-1"

From c4c4e49b3936f2615c26f013ed57c03de2fd4001 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 13 Jun 2025 15:18:00 +0800
Subject: [PATCH 11/13] sc

---
 .../Management/Components/DialogOkrInfo.vue   | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 50134bb..acc4ecc 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -578,33 +578,33 @@ async function saveOkrData(isAutoAddChild = false) {
                 '0'
               )}-${getLastDayOfMonth(defaultTime.getFullYear(), month)}`,
               dataScope: form.value.dataScope,
-              executor: form.value.executor,
-              children: [
-                {
-                  nodeName: `${month + 1}月第1周`,
-                  dataScope: form.value.dataScope,
-                  executor: form.value.executor,
-                  children: []
-                },
-                {
-                  nodeName: `${month + 1}月第2周`,
-                  dataScope: form.value.dataScope,
-                  executor: form.value.executor,
-                  children: []
-                },
-                {
-                  nodeName: `${month + 1}月第3周`,
-                  dataScope: form.value.dataScope,
-                  executor: form.value.executor,
-                  children: []
-                },
-                {
-                  nodeName: `${month + 1}月第4周`,
-                  dataScope: form.value.dataScope,
-                  executor: form.value.executor,
-                  children: []
-                }
-              ]
+              executor: form.value.executor
+              // children: [
+              //   {
+              //     nodeName: `${month + 1}月第1周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第2周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第3周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   },
+              //   {
+              //     nodeName: `${month + 1}月第4周`,
+              //     dataScope: form.value.dataScope,
+              //     executor: form.value.executor,
+              //     children: []
+              //   }
+              // ]
             })
           }
         }

From e620cc5cd64057d4f19ebdc4d9ecdf2fa0911947 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 17 Jun 2025 10:35:05 +0800
Subject: [PATCH 12/13] sc

---
 src/router/modules/static.ts          |  3 ++-
 src/views/OKR/Meeting/MeetingInfo.vue | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/router/modules/static.ts b/src/router/modules/static.ts
index 1f8a4f9..4e897c7 100644
--- a/src/router/modules/static.ts
+++ b/src/router/modules/static.ts
@@ -73,7 +73,8 @@ const staticRouter: AppCustomRouteRecordRaw[] = [
         },
         visible: false,
         alwaysShow: true,
-        redirect: ''
+        redirect: '',
+        keepAlive: true
       }
     ],
     meta: {
diff --git a/src/views/OKR/Meeting/MeetingInfo.vue b/src/views/OKR/Meeting/MeetingInfo.vue
index f657caf..e98b981 100644
--- a/src/views/OKR/Meeting/MeetingInfo.vue
+++ b/src/views/OKR/Meeting/MeetingInfo.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-affix postion="top" :offset="95" v-if="!isDetail">
-      <div class="flex justify-between mb-4 bg-white">
-        <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
-        <el-button type="success" @click="submit()">保存</el-button>
-      </div>
-    </el-affix>
+    <!-- <el-affix postion="top" :offset="95" v-if="!isDetail"> -->
+    <div class="flex justify-between mb-4 bg-white" v-if="!isDetail">
+      <b class="text-20px">{{ form.meetingId ? '修改会议' : '新增会议' }}</b>
+      <el-button type="success" @click="submit()">保存</el-button>
+    </div>
+    <!-- </el-affix> -->
     <el-form
       :model="form"
       ref="formRef"

From 9b68a06bae987e9a0e1b564082cb9e9c8dca8f5b Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 17 Jul 2025 14:42:31 +0800
Subject: [PATCH 13/13] sc

---
 package.json                         |  1 +
 src/components/Editor/src/Editor.vue | 58 +++++++++++++++++++++++++++-
 src/main.js                          |  5 +++
 yarn.lock                            | 19 +++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eac52df..493bb7d 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "@vueuse/core": "^10.1.2",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",
+    "@wangeditor/plugin-upload-attachment": "^1.1.0",
     "@zxcvbn-ts/core": "^3.0.1",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue
index 33affc4..22df80b 100644
--- a/src/components/Editor/src/Editor.vue
+++ b/src/components/Editor/src/Editor.vue
@@ -42,7 +42,11 @@ const props = defineProps({
         'undo', // 撤销
         'redo', // 重做
         'fullScreen'
-      ]
+      ],
+      insertKeys: {
+        index: 20, // 自定义插入的位置
+        keys: ['uploadAttachment'] // “上传附件”菜单
+      }
     })
   }
 })
@@ -104,6 +108,12 @@ const editorConfig = computed((): IEditorConfig => {
       },
       autoFocus: false,
       scroll: true,
+      // 在编辑器中，点击选中“附件”节点时，要弹出的菜单
+      hoverbarKeys: {
+        attachment: {
+          menuKeys: ['downloadAttachment'] // “下载附件”菜单
+        }
+      },
       MENU_CONF: {
         ['uploadImage']: {
           server: import.meta.env.VITE_UPLOAD_URL,
@@ -218,6 +228,52 @@ const editorConfig = computed((): IEditorConfig => {
           customInsert(res: any, insertFn: InsertFnType) {
             insertFn(res.data, 'video', res.data)
           }
+        },
+        uploadAttachment: {
+          server: import.meta.env.VITE_UPLOAD_URL,
+          timeout: 20 * 1000, // 2s
+
+          fieldName: 'file',
+          // meta: { token: 'xxx', a: 100 }, // 请求时附加的数据
+          // metaWithUrl: true, // meta 拼接到 url 上
+          // headers: { Accept: 'text/x-json' },
+          // 自定义增加 http  header
+          headers: {
+            Accept: '*',
+            Authorization: 'Bearer ' + getAccessToken(),
+            'tenant-id': getTenantId(),
+            'instance-id': getAppId()
+          },
+
+          maxFileSize: 20 * 1024 * 1024, // 20M
+
+          onBeforeUpload(file: File) {
+            console.log('onBeforeUpload', file)
+            return file // 上传 file 文件
+            // return false // 会阻止上传
+          },
+          onProgress(progress: number) {
+            console.log('onProgress', progress)
+          },
+          onSuccess(file: File, res: any) {
+            console.log('onSuccess', file, res)
+          },
+          onFailed(file: File, res: any) {
+            alert(res.message)
+            console.log('onFailed', file, res)
+          },
+          onError(file: File, err: Error, res: any) {
+            alert(err.message)
+            console.error('onError', file, err, res)
+          },
+          // 上传成功后，用户自定义插入文件
+          customInsert(res: any, file: File, insertFn: Function) {
+            console.log('customInsert', res)
+
+            // 插入附件到编辑器
+            insertFn(file.name, res.data)
+            // insertFn(res.data, `customInsert-${file.name}`, res.data)
+          }
         }
       },
       uploadImgShowBase64: true
diff --git a/src/main.js b/src/main.js
index bb6458c..438270f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -41,9 +41,14 @@ import '@/plugins/tongji' // 百度统计
 
 import Logger from '@/utils/Logger'
 import VueDOMPurifyHTML from 'vue-dompurify-html'
+import { Boot } from '@wangeditor/editor'
+import attachmentModule from '@wangeditor/plugin-upload-attachment'
 
 // 创建实例
 const setupAll = async () => {
+  // 注册。要在创建编辑器之前注册，且只能注册一次，不可重复注册。
+  Boot.registerModule(attachmentModule)
+
   const app = createApp(App)
 
   await setupI18n(app)
diff --git a/yarn.lock b/yarn.lock
index 4402301..2834158 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2502,6 +2502,13 @@
   resolved "https://registry.yarnpkg.com/@wangeditor/list-module/-/list-module-1.0.5.tgz#3fc0b167acddf885536b45fa0c127f9c6adaea33"
   integrity sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==
 
+"@wangeditor/plugin-upload-attachment@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@wangeditor/plugin-upload-attachment/-/plugin-upload-attachment-1.1.0.tgz#a014de72703a9f3d5ae44a428ac01406640ac80a"
+  integrity sha512-K6SsV3Cv1g+Ob1xjRRQ13Sh3lcj3yAa/aXMaKKbaPI76rNZiOpyAGH/iVv5i9enmwbZql01IXpvhK+HtrikVyQ==
+  dependencies:
+    dom7 "^4.0.4"
+
 "@wangeditor/table-module@^1.1.4":
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/@wangeditor/table-module/-/table-module-1.1.4.tgz#757d4a5868b2b658041cd323854a4d707c8347e9"
@@ -3733,6 +3740,13 @@ dom7@^3.0.0:
   dependencies:
     ssr-window "^3.0.0-alpha.1"
 
+dom7@^4.0.4:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/dom7/-/dom7-4.0.6.tgz#091a51621d7a19ce0fb86045cafb3c10035e97ed"
+  integrity sha512-emjdpPLhpNubapLFdjNL9tP06Sr+GZkrIHEXLWvOGsytACUrkbeIdjO5g77m00BrHTznnlcNqgmn7pCN192TBA==
+  dependencies:
+    ssr-window "^4.0.0"
+
 domelementtype@1, domelementtype@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
@@ -7245,6 +7259,11 @@ ssr-window@^3.0.0-alpha.1:
   resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-3.0.0.tgz#fd5b82801638943e0cc704c4691801435af7ac37"
   integrity sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==
 
+ssr-window@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/ssr-window/-/ssr-window-4.0.2.tgz#dc6b3ee37be86ac0e3ddc60030f7b3bc9b8553be"
+  integrity sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==
+
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"