From 7ceafb9a2ece1b872699574fe7a967f7b53572ec Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Mon, 9 May 2022 10:12:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E6=B0=B4=E8=B4=A6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  1 +
 src/components/tall/plugin/Plugin.vue         |  2 +-
 .../p-daily-account-detail.vue                | 24 +++++++++++++------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 582c542..21fe25d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -86,6 +86,7 @@ body,
 #app,
 #app > section {
   height: 100%;
+  font-size: 14px;
 }
 
 .ant-layout-header {
diff --git a/src/components/tall/plugin/Plugin.vue b/src/components/tall/plugin/Plugin.vue
index e969622..495f401 100644
--- a/src/components/tall/plugin/Plugin.vue
+++ b/src/components/tall/plugin/Plugin.vue
@@ -16,7 +16,7 @@
 
   <!-- 个人和终端按钮-->
   <!-- <p-account-management v-else-if="pluginId === '19'" class="p-2" /> -->
-  <!-- 与资源管理 -->
+  <!-- 域资源管理 -->
   <!-- <p-domain-source-manage v-else-if="pluginId === '20'" class="p-2" /> -->
   <!-- 项目版本管理 -->
   <!-- <p-project-version-management v-else-if="pluginId === '21'" class="p-2" /> -->
diff --git a/src/plugins/p-daily-account/p-daily-account-detail.vue b/src/plugins/p-daily-account/p-daily-account-detail.vue
index f6c1819..a833f3a 100644
--- a/src/plugins/p-daily-account/p-daily-account-detail.vue
+++ b/src/plugins/p-daily-account/p-daily-account-detail.vue
@@ -59,7 +59,7 @@
       bordered
       :pagination="false"
       :rowClassName="rowClassName"
-      :scroll="{ x: 1000, y: 580 }"
+      :scroll="{ x: 1000, y: 660 }"
     >
       <template #bodyCell="{ column, text, record }">
         <div
@@ -105,16 +105,21 @@
     centered
     :footer="null"
     width="800px"
-    style="padding: 0; max-height: 800px; overflow-y: auto"
+    style="padding: 0; overflow-y: auto"
+    :body-style="bodystyle"
   >
     <div style="padding: 0 96px">
-      <div class="mb-4">当前操作项目：{{ currProName }}，当前操作成员：{{ currEmpName }}</div>
+      <div class="mb-4">
+        当前操作项目：
+        <span class="text-red-500">{{ currProName }} </span>， 当前操作成员：
+        <span class="text-red-500"> {{ currEmpName }} </span>
+      </div>
 
       <a-form :model="modalFormState">
         <div v-for="(item, index) in modalFormState" :key="index">
           <div class="flex justify-between items-center text-gray-400">
             <div class="mb-5 text-right" style="width: 120px">计划结果{{ index + 1 }}：</div>
-            <DeleteOutlined v-if="modalFormState.length > 1" @click="delFormItem(index)" />
+            <DeleteOutlined v-if="modalFormState.length > 1 && !isDisabled" @click="delFormItem(index)" />
           </div>
 
           <a-form-item name="taskName" style="margin-bottom: 20px">
@@ -267,6 +272,11 @@ const dataTotal = ref(0); // 数据总量
 // 表格数据
 const columnDatas = ref([]);
 
+const bodystyle = {
+  height: '650px',
+  overflow: 'hidden',
+  overflowY: 'scroll',
+};
 // 今日计划表单
 const modalFormState = ref([]);
 // 工作时长
@@ -324,7 +334,7 @@ async function getQueryTasks() {
     columns.value = [
       {
         title: '时间',
-        width: 70,
+        width: 80,
         dataIndex: 'time',
         key: 'time',
         fixed: 'left',
@@ -667,12 +677,12 @@ async function punch(clockType) {
   height: 32px;
 }
 
-.select-box /deep/ .ant-select-selector {
+.select-box :deep(.ant-select-selector) {
   position: absolute;
   left: 0;
 }
 
-.select-box /deep/ .ant-select-selection-overflow {
+.select-box :deep(.ant-select-selection-overflow) {
   width: 225px;
   flex-wrap: nowrap;
   overflow: hidden;