sc

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

src/styles/index.scss

@@ -108,3 +108,12 @@
 .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;
+}

src/views/Home/Index.vue

@@ -111,8 +111,8 @@
           <div class="flex justify-between items-center">
             <span>跟进榜Top10</span>
             <el-radio-group v-model="followDate" size="small" @change="getFollowList">
-              <el-radio :label="1">本日</el-radio>
+              <el-radio :label="1" :value="1">本日</el-radio>
-              <el-radio :label="2">本月</el-radio>
+              <el-radio :label="2" :value="2">本月</el-radio>
             </el-radio-group>
           </div>
         </template>
@@ -272,10 +272,7 @@ function getSignList() {
 }
 
 function getWaitTargetCount() {
-  getWaitCount({
+  getWaitCount({}).then((res) => {
-    title: searchForm.value.title,
-    priority: searchForm.value.priority
-  }).then((res) => {
     waitCount.value = res
   })
 }

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>

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 }">
@@ -491,20 +491,20 @@ function handleSaveComment() {
     const data = {
       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 +552,21 @@ 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('评论失败')
+    message.error('创建失败')
   }
 }
 </script>

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

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">
@@ -243,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
@@ -288,10 +288,10 @@ function handleNotice(row) {
   })
 }
 
-function handleShow(row) {
+// function handleShow(row) {
-  console.log(row)
+//   console.log(row)
-  message.success('打开okr详情页')
+//   message.success('打开okr详情页')
-}
+// }
 </script>
 
 <style lang="scss" scoped></style>