From 6a1fa6458e07fb77dfbbf494140fd49be53835f2 Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Fri, 8 Nov 2024 09:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E5=B0=BA=E5=AF=B8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/planList/components/devSelectPopup.vue  | 13 +++++++------
 .../plan/planList/components/sourcePopup.vue     | 12 ++++++------
 .../planList/components/sourceSelectPopup.vue    | 13 +++++++------
 frontend/src/views/plan/planList/index.vue       | 16 +++++++++++++++-
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/frontend/src/views/plan/planList/components/devSelectPopup.vue b/frontend/src/views/plan/planList/components/devSelectPopup.vue
index 6962841..92557ff 100644
--- a/frontend/src/views/plan/planList/components/devSelectPopup.vue
+++ b/frontend/src/views/plan/planList/components/devSelectPopup.vue
@@ -2,12 +2,12 @@
         <el-dialog class='table-box'
                v-model='dialogVisible'
                top='114px'
-               :style="{height:height,maxHeight:height,overflow:'hidden'}"
+               :style="{ height: height+'px', maxHeight: height+'px', overflow: 'hidden' }"
                :title='title'
                :width='width'
                :modal='false'>
 
-    <div class='table-box'>
+    <div class='table-box' :style="{height:(height-64)+'px',maxHeight:(height-64)+'px',overflow:'hidden'}">
       <ProTable
         ref='proTable'
         :columns='columns'
@@ -128,14 +128,15 @@
   defineExpose({ open })
   
   
+  
   const props = defineProps({
     width: {
-      type: String,
-      default: '800px',
+      type: Number,
+      default: 800,
     },
     height: {
-      type: String,
-      default: '744px',
+      type: Number,
+      default: 744,
     },
   })
   </script>
diff --git a/frontend/src/views/plan/planList/components/sourcePopup.vue b/frontend/src/views/plan/planList/components/sourcePopup.vue
index 9e54119..32d1be2 100644
--- a/frontend/src/views/plan/planList/components/sourcePopup.vue
+++ b/frontend/src/views/plan/planList/components/sourcePopup.vue
@@ -3,11 +3,11 @@
     <el-dialog class='table-box'
                v-model='dialogVisible'
                top='114px'
-               :style="{height:height,maxHeight:height,overflow:'hidden'}"
+               :style="{ height: height+'px', maxHeight: height+'px', overflow: 'hidden' }"
                :title='title'
                :width='width'
                :modal='false'>
-      <div class='table-box'>
+      <div class='table-box' :style="{height:(height-64)+'px',maxHeight:(height-64)+'px',overflow:'hidden'}">
       <ProTable
           ref='proTable'
           :columns='columns'
@@ -89,12 +89,12 @@
   
   const props = defineProps({
     width: {
-      type: String,
-      default: '800px',
+      type: Number,
+      default: 800,
     },
     height: {
-      type: String,
-      default: '744px',
+      type: Number,
+      default: 744,
     },
   })
 
diff --git a/frontend/src/views/plan/planList/components/sourceSelectPopup.vue b/frontend/src/views/plan/planList/components/sourceSelectPopup.vue
index b2db5bc..1ccafa0 100644
--- a/frontend/src/views/plan/planList/components/sourceSelectPopup.vue
+++ b/frontend/src/views/plan/planList/components/sourceSelectPopup.vue
@@ -2,12 +2,12 @@
             <el-dialog class='table-box'
                v-model='dialogVisible'
                top='114px'
-               :style="{height:height,maxHeight:height,overflow:'hidden'}"
+               :style="{ height: height+'px', maxHeight: height+'px', overflow: 'hidden' }"
                :title='title'
                :width='width'
                :modal='false'>
             
-    <div class='table-box'>
+    <div class='table-box' :style="{height:(height-64)+'px',maxHeight:(height-64)+'px',overflow:'hidden'}">
       <ProTable
         ref='proTable'
         :columns='columns'
@@ -114,13 +114,14 @@
   
   const props = defineProps({
     width: {
-      type: String,
-      default: '800px',
+      type: Number,
+      default: 800,
     },
     height: {
-      type: String,
-      default: '744px',
+      type: Number,
+      default: 744,
     },
   })
+  
   </script>
   
\ No newline at end of file
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index 56fc965..efb2da9 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -151,7 +151,21 @@ const columns = reactive<ColumnProps<Plan.PlanBO>[]>([
    enum: testFatherPlanList,
    fieldNames: { label: 'label', value: 'id' },
  },
- { prop: 'operation', label: '操作', fixed: 'right' ,width: 500, },
+  //  {
+  //   prop: 'create_Time',
+  //   label: '记录时间',
+  //   minWidth: 180,
+  //   search: {
+  //     span: 2,
+  //     render: () => {
+  //       return (
+  //         <div class='flx-flex-start'>
+  //         </div>
+  //       )
+  //     },
+  //   },
+  // },
+ { prop: 'operation', label: '操作', fixed: 'right' ,width: 450, },
 ])