From 7abfc3ac9610c27d1b8d1804bcaf25c5fd527472 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 18 Sep 2024 19:02:43 +0800
Subject: [PATCH] md

---
 src/views/system/dept/index.vue         | 155 +++++++++++++-----------
 src/views/system/sysTransText/index.vue |  14 ++-
 2 files changed, 93 insertions(+), 76 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index c881eff1..d8e59d1c 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,6 +1,7 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+    <div class="app-container">
+  <XdPageContainer>
+    <el-form slot="pageHeader" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -37,77 +38,84 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
 
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <!-- <el-table-column prop="domainName" label="所属域" align="center" width="90"></el-table-column> -->
-      <el-table-column prop="orderNum" label="排序" width="80"></el-table-column>
-      <el-table-column prop="status" label="状态" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div slot="pageContent"
+          slot-scope="slotProps"
+        >
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:dept:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-sort"
+              size="mini"
+              @click="toggleExpandAll"
+            >展开/折叠</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-if="refreshTable"
+          v-loading="loading"
+          :data="deptList"
+          row-key="deptId"
+          :default-expand-all="isExpandAll"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        >
+          <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+          <!-- <el-table-column prop="domainName" label="所属域" align="center" width="90"></el-table-column> -->
+          <el-table-column prop="orderNum" label="排序" width="80"></el-table-column>
+          <el-table-column prop="status" label="状态" width="100">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:dept:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-plus"
+                @click="handleAdd(scope.row)"
+                v-hasPermi="['system:dept:add']"
+              >新增</el-button>
+              <el-button
+                v-if="scope.row.parentId != 0"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:dept:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+    </div>
 
     <!-- 添加或修改部门对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -179,7 +187,8 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-  </div>
+  </XdPageContainer>
+</div>
 </template>
 
 <script>
diff --git a/src/views/system/sysTransText/index.vue b/src/views/system/sysTransText/index.vue
index 0f19b4ce..95ea2698 100644
--- a/src/views/system/sysTransText/index.vue
+++ b/src/views/system/sysTransText/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
-    <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <XdPageContainer>
+
+    <search-form slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="" prop="content">
         <el-input
@@ -49,7 +51,13 @@
     </search-form>
 
 
-    <xd-table v-loading="loading"
+    <xd-table
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          v-loading="loading"
            border
            size="small"
            :data="sysTransTextList"
@@ -261,7 +269,7 @@
         <sysTransTextView :id="id" ></SysTransTextView>
     </el-dialog>
     -->
-
+  </XdPageContainer>
   </div>
 </template>