From 8f2ac77fd15e10e7066c11aa4561b3d098b8dcdd Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sun, 27 Apr 2025 16:47:47 +0800
Subject: [PATCH] sc

---
 .env.base                                       |  4 ++--
 .../OKR/Management/Components/AllTarget.vue     |  3 +--
 .../OKR/Management/Components/DialogOkr.vue     |  5 +++--
 .../OKR/Management/Components/DialogOkrInfo.vue | 14 ++++++++++++--
 .../OKR/Management/Components/OkrTable.vue      | 17 +++++++++++++----
 5 files changed, 31 insertions(+), 12 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/views/OKR/Management/Components/AllTarget.vue b/src/views/OKR/Management/Components/AllTarget.vue
index bbaf08e..ea757e1 100644
--- a/src/views/OKR/Management/Components/AllTarget.vue
+++ b/src/views/OKR/Management/Components/AllTarget.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="flex flex-col w-full h-full p-4 bg-white rounded-lg shadow-md overflow-hidden">
     <div class="flex items-center justify-between">
       <el-row>
         <el-tree-select
@@ -31,7 +31,6 @@
         >
       </el-row>
     </div>
-
     <OkrTable ref="okrTableRef" :canEdit="isCurrentLeafNode" />
     <DialogOkr ref="dialogOkr" @edit="handleEditOkr" />
     <DialogOkrInfo ref="dialogOkrInfo" @success="handleSearchPeroid" />
diff --git a/src/views/OKR/Management/Components/DialogOkr.vue b/src/views/OKR/Management/Components/DialogOkr.vue
index 59d92ae..ab86975 100644
--- a/src/views/OKR/Management/Components/DialogOkr.vue
+++ b/src/views/OKR/Management/Components/DialogOkr.vue
@@ -649,8 +649,9 @@ function handleSendCommnet(idx) {
         }
       }
       .content-wrap {
-        overflow-y: auto;
-        max-height: calc(100% - 70px);
+        display: flex;
+        flex-direction: column;
+        height: calc(100% - 15px);
       }
     }
     .dialog-okr-side {
diff --git a/src/views/OKR/Management/Components/DialogOkrInfo.vue b/src/views/OKR/Management/Components/DialogOkrInfo.vue
index 9783c9a..b43923b 100644
--- a/src/views/OKR/Management/Components/DialogOkrInfo.vue
+++ b/src/views/OKR/Management/Components/DialogOkrInfo.vue
@@ -120,10 +120,20 @@
                   class="flex items-center w-full"
                   v-for="(item, i) in objectList"
                   :key="item.objectiveId"
+                  style="padding-bottom: 5px"
                 >
                   <div class="flex-1 w-100px">
                     <div class="flex items-center">
-                      <el-tag type="success" class="mr-10px">O{{ i + 1 }}</el-tag>
+                      <el-tooltip content="点击可折叠/展开目标" placement="top" effect="dark">
+                        <el-tag
+                          type="success"
+                          class="mr-10px"
+                          @click="item.hideChild = !item.hideChild"
+                        >
+                          O{{ i + 1 }}
+                        </el-tag>
+                      </el-tooltip>
+
                       <el-input
                         v-model="item.objectiveName"
                         placeholder="目标名称"
@@ -161,7 +171,7 @@
                         <el-button type="danger" text @click="removeObj(i)">删除目标</el-button>
                       </div>
                     </div>
-                    <div style="background: #f0f3fa; padding-bottom: 15px">
+                    <div v-if="!item.hideChild" style="background: #f0f3fa; padding-bottom: 10px">
                       <div
                         class="ml-50px"
                         v-for="(kr, index) in item.keyResults"
diff --git a/src/views/OKR/Management/Components/OkrTable.vue b/src/views/OKR/Management/Components/OkrTable.vue
index e404372..ea6e0f4 100644
--- a/src/views/OKR/Management/Components/OkrTable.vue
+++ b/src/views/OKR/Management/Components/OkrTable.vue
@@ -1,11 +1,12 @@
 <template>
-  <div>
+  <div class="flex-1 h-200px overflow-hidden">
     <el-table
       ref="tableRef"
       :data="okrList"
       default-expand-all
       row-key="id"
       size="large"
+      height="100%"
       @row-click="handleRowClick"
       @expand-change="handleExpand"
     >
@@ -19,11 +20,18 @@
               height: getHeight(row, $index)
             }"
           ></span>
-          <span v-if="row.type == '目标'">【目标】{{ row.name }}</span>
+          <span v-if="row.type == '目标'">
+            <el-tag type="success" size="small">目标</el-tag>
+            {{ row.name }}
+          </span>
           <template v-else>
             <span class="line2"></span>
             <span>
-              【关键成果】{{ row.sourceName }} {{ row.name }}
+              <el-tag type="primary" size="small">关键成果</el-tag>
+              <span class="font-bold text-black" v-if="row.sourceName">
+                【{{ row.sourceName }}】
+              </span>
+              <span>{{ row.name }}</span>
               <span v-if="row.resultType == 1">达 {{ row.targetValue }}</span>
             </span>
             <div class="flex items-center mt-10px ml-50px">
@@ -100,7 +108,8 @@ function prepareData(list) {
           type: '关键成果',
           resultType: child.resultType,
           targetValue: child.targetValue,
-          currentValue: Number(child.currentValue)
+          currentValue: Number(child.currentValue),
+          sourceName: child.sourceName
         }
         helpList.value.push(kr)
         return kr