调整树形选择又调用调整row span

src/components/WellSelect/index.vue

@@ -159,7 +159,7 @@ onMounted(() => {
 
 <template>
   <div
-    class="dept-aside-container relative bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-4 transition-all duration-300 ease-in-out overflow-visible"
+    class="dept-aside-container relative bg-white dark:bg-[#1d1e1f] shadow rounded-lg transition-all duration-300 ease-in-out overflow-visible"
     :class="[isCollapsed ? 'is-collapsed' : 'p-4']"
   >
     <div class="inner-content flex flex-col gap-4 h-full w-full">

src/views/oli-connection/monitoring-query/index.vue

@@ -255,6 +255,7 @@ function formatterValue(row: ListItem) {
       :init-select="false"
       :show-title="false"
       @node-click="handleNodeClick"
+      class="row-span-2"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
 

src/views/oli-connection/monitoring/index.vue

@@ -179,6 +179,7 @@ const openDetail = (
       v-model="query.deptId"
       :init-select="false"
       :show-title="false"
+      class="row-span-2"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form

src/views/pms/iotrddailyreport/fillDailyReport.vue

@@ -192,7 +192,13 @@ function realValue(type: any, value: string) {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="163" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="163"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
 
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form

src/views/pms/iotrddailyreport/index.vue

@@ -239,7 +239,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="163" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="163"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
 
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form

src/views/pms/iotrddailyreport/statistics.vue

@@ -169,7 +169,13 @@ function handleWellNameClick(taskId: number) {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="163" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="163"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
 
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form

src/views/pms/iotrddailyreport/summary.vue

@@ -60,6 +60,7 @@ const resetQuery = () => {
       :top-id="163"
       v-model="query.deptId"
       @node-click="handleDeptNodeClick"
+      class="row-span-3"
     />
     <el-form
       size="default"

src/views/pms/iotrhdailyreport/approval.vue

@@ -108,7 +108,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="157" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="157"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2">
 
     </div> -->

src/views/pms/iotrhdailyreport/fill.vue

@@ -108,7 +108,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="157" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="157"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form
       size="default"

src/views/pms/iotrhdailyreport/index.vue

@@ -253,7 +253,13 @@ const openUnfilledDialog = () => {
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-4">
       <DeptTreeSelect :top-id="157" :deptId="deptId" v-model="query.deptId" :show-title="false" />
     </div> -->
-    <DeptTreeSelect :top-id="157" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="157"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-4"
+    />
     <el-form
       size="default"
       class="bg-white dark:bg-[#1d1e1f] rounded-lg shadow px-6 gap-8 flex items-center justify-between"

src/views/pms/iotrhdailyreport/summary.vue

@@ -771,6 +771,7 @@ const { ZmTable, ZmTableColumn } = useTableComponents()
       :top-id="157"
       v-model="query.deptId"
       @node-click="handleDeptNodeClick"
+      class="row-span-3"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-3">
 

src/views/pms/iotrydailyreport/approval.vue

@@ -110,7 +110,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="158" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="158"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2">
 
     </div> -->

src/views/pms/iotrydailyreport/fill.vue

@@ -110,7 +110,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="158" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="158"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2">
 
     </div> -->

src/views/pms/iotrydailyreport/index.vue

@@ -136,7 +136,13 @@ function handleOpenForm(id: number, type: 'edit' | 'readonly') {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[48px_1fr_auto] gap-x-4 gap-y-3 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="158" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="158"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-3"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-3"> </div> -->
     <el-form
       size="default"

src/views/pms/iotrydailyreport/summary.vue

@@ -587,6 +587,7 @@ const tolist = (id: number, non: boolean = false) => {
       :top-id="158"
       v-model="query.deptId"
       @node-click="handleDeptNodeClick"
+      class="row-span-3"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-3"> </div> -->
     <el-form

src/views/pms/iotrydailyreport/xapproval.vue

@@ -110,7 +110,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="158" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="158"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form
       size="default"

src/views/pms/iotrydailyreport/xfill.vue

@@ -110,7 +110,13 @@ onMounted(() => {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="158" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="158"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-2"
+    />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <el-form
       size="default"

src/views/pms/iotrydailyreport/xjindex.vue

@@ -135,7 +135,13 @@ function handleOpenForm(id: number, type: 'edit' | 'readonly') {
   <div
     class="grid grid-cols-[auto_1fr] grid-rows-[48px_1fr_auto] gap-x-4 gap-y-3 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
-    <DeptTreeSelect :top-id="158" :deptId="deptId" v-model="query.deptId" :show-title="false" />
+    <DeptTreeSelect
+      :top-id="158"
+      :deptId="deptId"
+      v-model="query.deptId"
+      :show-title="false"
+      class="row-span-3"
+    />
 
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-3"> </div> -->
     <el-form

src/views/pms/iotrydailyreport/xsummary.vue

@@ -586,6 +586,7 @@ const tolist = (id: number, non: boolean = false) => {
       :top-id="158"
       v-model="query.deptId"
       @node-click="handleDeptNodeClick"
+      class="row-span-3"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-3"> </div> -->
     <el-form

src/views/report-statistics/costs.vue

@@ -235,6 +235,7 @@ const handleChange = () => {
       v-model="query.deptId"
       :init-select="false"
       :show-title="false"
+      class="row-span-2"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <div class="grid grid-rows-[1fr_32px] gap-4">

src/views/report-statistics/daily-report.vue

@@ -451,7 +451,7 @@ const handleExport = () => {
 
 <template>
   <div
-    class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
+    class="daily-report-page grid grid-cols-[auto_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
     <el-form
       size="default"
@@ -503,24 +503,28 @@ const handleExport = () => {
       </el-form-item>
     </el-form>
     <DeptTreeSelect
-      v-show="tab === '队伍'"
+      v-if="tab === '队伍'"
       :top-id="157"
       :deptId="deptId"
       v-model="query.deptId"
       title="队伍"
+      class="daily-report-side"
     />
     <WellSelect
-      v-show="tab === '井'"
+      v-if="tab === '井'"
       v-model:contract-name="query.contractName"
       :deptId="157"
       v-model:model-value="query.wellName"
+      class="daily-report-side"
     />
     <!-- 第二行左侧：自动落入第 2 行第 1 列 -->
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg h-full"> </div> -->
 
     <!-- 第二行右侧：自动落入第 2 行第 2 列 -->
-    <div class="bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col">
-      <div class="flex-1 relative">
+    <div
+      class="daily-report-table-card bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col min-h-0"
+    >
+      <div class="flex-1 relative min-h-0">
         <el-auto-resizer class="absolute">
           <template #default="{ width, height }">
             <el-table
@@ -555,7 +559,7 @@ const handleExport = () => {
                   </div>
                 </template>
               </el-table-column>
-              <DailyTableColumn :columns="columns" />
+              <DailyTableColumn :columns="columns" company="rh" />
               <!-- <el-table-column label="操作" width="120px" align="center" fixed="right">
                 <template #default="{ row }">
                   <el-button link type="success" v-hasPermi="['pms:iot-rh-daily-report:query']">
@@ -594,6 +598,19 @@ const handleExport = () => {
 </template>
 
 <style scoped>
+.daily-report-page {
+  grid-template-rows: 62px minmax(0, 1fr);
+}
+
+.daily-report-side {
+  height: 100% !important;
+  min-height: 0 !important;
+}
+
+.daily-report-table-card {
+  min-height: 0;
+}
+
 :deep(.el-form-item) {
   margin-bottom: 0;
 }

src/views/report-statistics/rd-daily-report.vue

@@ -390,7 +390,7 @@ const handleExport = () => {
 
 <template>
   <div
-    class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
+    class="daily-report-page grid grid-cols-[auto_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
     <el-form
       size="default"
@@ -449,18 +449,22 @@ const handleExport = () => {
       :deptId="deptId"
       v-model="query.deptId"
       title="队伍"
+      class="daily-report-side"
     />
     <WellSelect
       v-show="tab === '井'"
       :deptId="163"
       v-model="query.wellName"
       v-model:contract-name="query.contractName"
+      class="daily-report-side"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg h-full"> </div> -->
 
     <!-- 第二行右侧：自动落入第 2 行第 2 列 -->
-    <div class="bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col">
-      <div class="flex-1 relative">
+    <div
+      class="daily-report-table-card bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col min-h-0"
+    >
+      <div class="flex-1 relative min-h-0">
         <el-auto-resizer class="absolute">
           <template #default="{ width, height }">
             <el-table
@@ -535,6 +539,19 @@ const handleExport = () => {
 </template>
 
 <style scoped>
+.daily-report-page {
+  grid-template-rows: 62px minmax(0, 1fr);
+}
+
+.daily-report-side {
+  height: 100% !important;
+  min-height: 0 !important;
+}
+
+.daily-report-table-card {
+  min-height: 0;
+}
+
 :deep(.el-form-item) {
   margin-bottom: 0;
 }

src/views/report-statistics/ry-daily-report.vue

@@ -556,7 +556,7 @@ const handleExport = () => {
 
 <template>
   <div
-    class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
+    class="daily-report-page grid grid-cols-[auto_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
     <el-form
       size="default"
@@ -613,12 +613,14 @@ const handleExport = () => {
       :deptId="deptId"
       v-model="query.deptId"
       title="队伍"
+      class="daily-report-side"
     />
     <WellSelect
       v-show="tab === '井'"
       :deptId="158"
       v-model="query.wellName"
       v-model:contract-name="query.contractName"
+      class="daily-report-side"
     />
 
     <!-- 第二行左侧：自动落入第 2 行第 1 列 -->
@@ -627,8 +629,10 @@ const handleExport = () => {
     </div> -->
 
     <!-- 第二行右侧：自动落入第 2 行第 2 列 -->
-    <div class="bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col">
-      <div class="flex-1 relative">
+    <div
+      class="daily-report-table-card bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col min-h-0"
+    >
+      <div class="flex-1 relative min-h-0">
         <el-auto-resizer class="absolute">
           <template #default="{ width, height }">
             <el-table
@@ -706,6 +710,19 @@ const handleExport = () => {
 </template>
 
 <style scoped>
+.daily-report-page {
+  grid-template-rows: 62px minmax(0, 1fr);
+}
+
+.daily-report-side {
+  height: 100% !important;
+  min-height: 0 !important;
+}
+
+.daily-report-table-card {
+  min-height: 0;
+}
+
 :deep(.el-form-item) {
   margin-bottom: 0;
 }

src/views/report-statistics/ry-xj-daily-report.vue

@@ -497,7 +497,7 @@ const handleExport = () => {
 
 <template>
   <div
-    class="grid grid-cols-[auto_1fr] grid-rows-[62px_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
+    class="daily-report-page grid grid-cols-[auto_1fr] gap-4 h-[calc(100vh-20px-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))]"
   >
     <el-form
       size="default"
@@ -555,12 +555,14 @@ const handleExport = () => {
       :deptId="deptId"
       v-model="query.deptId"
       title="队伍"
+      class="daily-report-side"
     />
     <WellSelect
       v-show="tab === '井'"
       :deptId="158"
       v-model="query.wellName"
       v-model:contract-name="query.contractName"
+      class="daily-report-side"
     />
     <!-- 第二行左侧：自动落入第 2 行第 1 列 -->
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg h-full">
@@ -568,8 +570,10 @@ const handleExport = () => {
     </div> -->
 
     <!-- 第二行右侧：自动落入第 2 行第 2 列 -->
-    <div class="bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col">
-      <div class="flex-1 relative">
+    <div
+      class="daily-report-table-card bg-white dark:bg-[#1d1e1f] shadow rounded-lg p-4 flex flex-col min-h-0"
+    >
+      <div class="flex-1 relative min-h-0">
         <el-auto-resizer class="absolute">
           <template #default="{ width, height }">
             <el-table
@@ -647,6 +651,19 @@ const handleExport = () => {
 </template>
 
 <style scoped>
+.daily-report-page {
+  grid-template-rows: 62px minmax(0, 1fr);
+}
+
+.daily-report-side {
+  height: 100% !important;
+  min-height: 0 !important;
+}
+
+.daily-report-table-card {
+  min-height: 0;
+}
+
 :deep(.el-form-item) {
   margin-bottom: 0;
 }

src/views/report-statistics/work-order-completion.vue

@@ -286,6 +286,7 @@ async function handleExport() {
       v-model="query.deptId"
       :init-select="false"
       :show-title="false"
+      class="row-span-2"
     />
     <!-- <div class="p-4 bg-white dark:bg-[#1d1e1f] shadow rounded-lg row-span-2"> </div> -->
     <div class="flex flex-col gap-4 h-full">