diff --git a/.env.production b/.env.production
index f08ed82..201f756 100644
--- a/.env.production
+++ b/.env.production
@@ -7,10 +7,10 @@ ENV = 'production'
 # 苏州工业园区工业上楼管理系统/生产环境
 
 
-# VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = ''
 
-# 测试环境
+# 公司测试环境
 # VUE_APP_BASE_API = 'http://39.101.188.84:7071'
 
 # 正式环境
-VUE_APP_BASE_API = '/api'
+# VUE_APP_BASE_API = '/api'
diff --git a/src/api/login/index.js b/src/api/login/index.js
index 2949bda..27117e2 100644
--- a/src/api/login/index.js
+++ b/src/api/login/index.js
@@ -8,3 +8,11 @@ export function governmentGetInfo(params) {
     params
   })
 }
+
+export function getSingleLoginHtml() {
+  return request({
+    url: '/system/singlelogin/login',
+    method: 'get',
+    responseType: 'text' // 确保以文本形式接收响应
+  }).then(res => res)
+}
\ No newline at end of file
diff --git a/src/components/ImageUpload2/index.vue b/src/components/ImageUpload2/index.vue
index 7fa2c0b..b75685f 100644
--- a/src/components/ImageUpload2/index.vue
+++ b/src/components/ImageUpload2/index.vue
@@ -52,7 +52,7 @@
       // 图片数量限制
       limit: {
         type: Number,
-        default: 1,
+        default: 3,
       },
       // 大小限制(MB)
       fileSize: {
diff --git a/src/permission.js b/src/permission.js
index 032f2ef..9ef8339 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -13,7 +13,7 @@ import { governmentGetInfo } from "@/api/login/index";
 
 NProgress.configure({ showSpinner: false });
 
-const whiteList = ["/login", "/register"];
+const whiteList = ["/login", "/register","/system/singlelogin/login"];
 
 const isWhiteList = (path) => {
   return whiteList.some((pattern) => isPathMatch(pattern, path));
@@ -25,7 +25,7 @@ router.beforeEach((to, from, next) => {
   }
   NProgress.start();
 
-  // 提取所有 URL 参数（包括 hash 后面的部分）
+
   const search =
     window.location.search || window.location.hash.split("?")[1] || "";
   const params = new URLSearchParams(search);
@@ -33,7 +33,6 @@ router.beforeEach((to, from, next) => {
   const signature = params.get("signature");
   const timespan = params.get("timespan");
 
-  console.log(userToken, signature, timespan, "参数");
 
   // 如果已经处理过一次登录逻辑，不再重复执行
   if (from.path === to.path && store.getters.token) {
@@ -73,7 +72,7 @@ router.beforeEach((to, from, next) => {
 
         // 如果已有角色信息，直接跳转
         if (store.getters.roles.length > 0) {
-          next("/"); // 或者 next(to.query.redirect || "/")
+          next("/"); 
           return;
         }
 
diff --git a/src/router/index.js b/src/router/index.js
index d1452f2..0777c10 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,7 +17,7 @@ import Layout from "@/layout";
  * redirect: noRedirect             // 当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
  * name:'router-name'               // 设定路由的名字，一定要填写不然使用<keep-alive>时会出现各种问题
  * query: '{"id": 1, "name": "ry"}' // 访问路由的默认传递参数
- * roles: ['admin', 'common','gov']       // 访问路由的角色权限
+ * roles: ['admin', 'common','gov'] // 访问路由的角色权限
  * permissions: ['a:a:a', 'b:b:b']  // 访问路由的菜单权限
  * meta : {
     noCache: true                   // 如果设置为true，则不会被 <keep-alive> 缓存(默认 false)
@@ -44,9 +44,9 @@ export const constantRoutes = [
   {
     path: "/login",
     // 正式环境登录页
-    component: () => import("@/views/login"),
+    // component: () => import("@/views/login"),
     // 测试
-    // component: () => import("@/views/login_v1"),
+    component: () => import("@/views/login_v1"),
     hidden: true,
   },
   {
diff --git a/src/views/compilation/handbook/index.vue b/src/views/compilation/handbook/index.vue
index 5cf5443..3234361 100644
--- a/src/views/compilation/handbook/index.vue
+++ b/src/views/compilation/handbook/index.vue
@@ -1,31 +1,43 @@
 <template>
-  <div style="height: 100%">
+  <div class="container">
     <!-- 项目手册管理 -->
     <!-- 表单查询项 -->
     <div v-if="!previewMode" class="headerbox">
       <el-form size="small" :inline="true" label-width="200">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="手册名称" style="width: 100%;">
-              <el-input v-model="queryParams.name" placeholder="请输入手册名称" clearable />
+            <el-form-item label="手册名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入手册名称"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="创建时间">
-              <el-date-picker 
-                v-model="queryParams.startTime" 
-                type="date" 
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="date"
                 placeholder="选择日期"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 100%;">
+                style="width: 100%"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search"  @click="handleQuery">查询</el-button>
-              <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -33,7 +45,7 @@
     </div>
 
     <!-- 表格内容区 -->
-    <div v-if="!previewMode" class="tablebox">
+    <div v-if="!previewMode" class="tablebox table-container">
       <div class="tablebtntwo">
         <!-- <el-button
           type="primary"
@@ -51,44 +63,46 @@
           >新增</el-button
         >
       </div>
-      <el-table v-loading="loading" :data="postList">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="手册名称" align="center" prop="name" />
-        <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-             style="color: #409eff"
-              @click="handlePreview(scope.row)"
-              >预览</el-button
-            >
-            <el-button
-              type="text"
-              style="color: #67c23a"
-              @click="handleEdit(scope.row)"
-              >编辑</el-button
-            >
-            <el-button
-              type="text"
-              style="color: #409eff"
-              @click="handleExport(scope.row.id)"
-              >项目手册导出</el-button
-            >
-            <el-button
-              type="text"
-              style="color: #f56c6c"
-              @click="handleDelete(scope.row)"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+      <div class="table-wrapper">
+        <el-table v-loading="loading" :data="postList" height="100%">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="手册名称" align="center" prop="name" />
+          <el-table-column label="创建时间" align="center" prop="createTime" />
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                style="color: #409eff"
+                @click="handlePreview(scope.row)"
+                >预览</el-button
+              >
+              <el-button
+                type="text"
+                style="color: #67c23a"
+                @click="handleEdit(scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                type="text"
+                style="color: #409eff"
+                @click="handleExport(scope.row.id)"
+                >项目手册导出</el-button
+              >
+              <el-button
+                type="text"
+                style="color: #f56c6c"
+                @click="handleDelete(scope.row)"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
       <pagination
         v-show="total > 0"
         :total="total"
@@ -110,7 +124,6 @@
           </div>
           <el-button-group class="navigation-buttons">
             <el-button
-              
               type="primary"
               icon="el-icon-arrow-left"
               :disabled="currentPage <= 1"
@@ -118,7 +131,6 @@
               >上一页</el-button
             >
             <el-button
-              
               type="primary"
               icon="el-icon-arrow-right"
               :disabled="currentPage >= pageCount"
@@ -127,7 +139,6 @@
             >
           </el-button-group>
           <el-button
-            
             type="info"
             icon="el-icon-back"
             @click="previewMode = false"
@@ -247,13 +258,12 @@
                   label="项目名称"
                   align="center"
                 ></el-table-column>
-                <el-table-column
-                  prop="xzfl"
-                  label="现状分类"
-                  align="center"
-                >
+                <el-table-column prop="xzfl" label="现状分类" align="center">
                   <template slot-scope="scope">
-                    <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl"/>
+                    <dict-tag
+                      :options="dict.type.xzfl"
+                      :value="scope.row.xzfl"
+                    />
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -399,12 +409,12 @@ export default {
     FileUpload,
   },
   // 声明需要使用的字典
-  dicts: ['xzfl'],
+  dicts: ["xzfl"],
   data() {
     return {
       queryParams: {
         current: 1,
-        size: 10,
+        size: 20,
         name: "",
         startTime: "",
       },
@@ -554,7 +564,7 @@ export default {
       this.editingHandbook = null;
       this.selectedProjectIds = [];
       this.selectedProjects = [];
-      this.projectParams.pageNum = 1 ;
+      this.projectParams.pageNum = 1;
       this.getProjectList();
     },
     handleAddDialogClose(done) {
@@ -618,7 +628,7 @@ export default {
     handleRowClick(row) {
       this.$refs.projectTable.toggleRowSelection(row);
       const selectedRows = this.$refs.projectTable.selection;
-      const isSelected = selectedRows.some(item => item.id === row.id);
+      const isSelected = selectedRows.some((item) => item.id === row.id);
       if (isSelected) {
         // 如果是选中状态，添加到已选项目中
         if (!this.selectedProjectIds.includes(row.id)) {
@@ -627,8 +637,12 @@ export default {
         }
       } else {
         // 如果是取消选中，从已选项目中移除
-        this.selectedProjectIds = this.selectedProjectIds.filter(id => id !== row.id);
-        this.selectedProjects = this.selectedProjects.filter(item => item.id !== row.id);
+        this.selectedProjectIds = this.selectedProjectIds.filter(
+          (id) => id !== row.id
+        );
+        this.selectedProjects = this.selectedProjects.filter(
+          (item) => item.id !== row.id
+        );
       }
     },
 
@@ -662,7 +676,7 @@ export default {
       if (!this.$refs.projectTable) return;
       this.$refs.projectTable.clearSelection();
       if (!this.selectedProjectIds.length) return;
-      
+
       this.projectList.forEach((row) => {
         if (this.selectedProjectIds.includes(row.id)) {
           this.$refs.projectTable.toggleRowSelection(row, true);
@@ -684,7 +698,9 @@ export default {
       if (this.endForm.imageUrl) data.tailingImg = this.endForm.imageUrl;
       if (this.endForm.subtitle) data.tail = this.endForm.subtitle;
       if (this.selectedProjects && this.selectedProjects.length > 0) {
-        data.xmId = this.selectedProjects.map((project) => project.id).join(",");
+        data.xmId = this.selectedProjects
+          .map((project) => project.id)
+          .join(",");
       }
 
       if (this.editingHandbook) {
@@ -715,10 +731,9 @@ export default {
     },
     // 处理单个项目选择事件
     handleSelect(selection, row) {
-      
       // 检查是选中还是取消选中
-      const isSelected = selection.some(item => item.id === row.id);
-      
+      const isSelected = selection.some((item) => item.id === row.id);
+
       if (isSelected) {
         // 如果是选中，添加到已选列表中
         if (!this.selectedProjectIds.includes(row.id)) {
@@ -727,39 +742,48 @@ export default {
         }
       } else {
         // 如果是取消选中，从已选列表中移除
-        this.selectedProjectIds = this.selectedProjectIds.filter(id => id !== row.id);
-        this.selectedProjects = this.selectedProjects.filter(item => item.id !== row.id);
+        this.selectedProjectIds = this.selectedProjectIds.filter(
+          (id) => id !== row.id
+        );
+        this.selectedProjects = this.selectedProjects.filter(
+          (item) => item.id !== row.id
+        );
       }
     },
-    
+
     // 处理全选/取消全选事件
     handleSelectAll(selection) {
-      
       // 获取当前页面所有项目ID
-      const currentPageIds = this.projectList.map(item => item.id);
-      
+      const currentPageIds = this.projectList.map((item) => item.id);
+
       // 检查是全选还是取消全选
       if (selection.length === 0) {
         // 取消全选 - 从已选列表中移除当前页所有项目
         this.selectedProjectIds = this.selectedProjectIds.filter(
-          id => !currentPageIds.includes(id)
+          (id) => !currentPageIds.includes(id)
         );
         this.selectedProjects = this.selectedProjects.filter(
-          project => !currentPageIds.includes(project.id)
+          (project) => !currentPageIds.includes(project.id)
         );
       } else {
         // 全选 - 将当前页所有项目添加到已选列表
         // 先移除当前页已有的选择，避免重复
         const projectIdsNotInCurrentPage = this.selectedProjectIds.filter(
-          id => !currentPageIds.includes(id)
+          (id) => !currentPageIds.includes(id)
         );
         const projectsNotInCurrentPage = this.selectedProjects.filter(
-          project => !currentPageIds.includes(project.id)
+          (project) => !currentPageIds.includes(project.id)
         );
-        
+
         // 合并不在当前页的选择和当前页所有项目
-        this.selectedProjectIds = [...projectIdsNotInCurrentPage, ...currentPageIds];
-        this.selectedProjects = [...projectsNotInCurrentPage, ...this.projectList];
+        this.selectedProjectIds = [
+          ...projectIdsNotInCurrentPage,
+          ...currentPageIds,
+        ];
+        this.selectedProjects = [
+          ...projectsNotInCurrentPage,
+          ...this.projectList,
+        ];
       }
     },
     // 编辑按钮操作
@@ -778,11 +802,11 @@ export default {
             imageUrl: detail.tailingImg,
             subtitle: detail.tail,
           };
-          
+
           // 先清空选中状态
           this.selectedProjectIds = [];
           this.selectedProjects = [];
-          
+
           if (detail.xmId) {
             const projectIds = detail.xmId.split(",");
             this.selectedProjectIds = projectIds.map((id) => Number(id));
@@ -790,7 +814,7 @@ export default {
             if (detail.projectName && Array.isArray(detail.projectName)) {
               this.selectedProjects = detail.projectName;
             }
-            this.projectParams.pageNum = 1 ;
+            this.projectParams.pageNum = 1;
             this.getProjectList();
           }
 
@@ -1122,12 +1146,11 @@ export default {
   transition: all 0.3s;
   margin-right: 30px;
   ::v-deep .el-input {
-    flex: 1!important;
-    max-width: 100%!important;
-    
+    flex: 1 !important;
+    max-width: 100% !important;
   }
   ::v-deep .el-input__inner {
-    width: 100%!important;
+    width: 100% !important;
   }
   &:hover {
     box-shadow: 0 0 0 1px #409eff;
@@ -1192,22 +1215,22 @@ export default {
   overflow-y: auto;
   padding-right: 10px;
   flex: 1;
-  
+
   /* 自定义滚动条样式 */
   &::-webkit-scrollbar {
     width: 6px;
   }
-  
+
   &::-webkit-scrollbar-track {
     background: #f1f1f1;
     border-radius: 4px;
   }
-  
+
   &::-webkit-scrollbar-thumb {
     background: #c0c4cc;
     border-radius: 4px;
   }
-  
+
   &::-webkit-scrollbar-thumb:hover {
     background: #909399;
   }
@@ -1221,10 +1244,10 @@ export default {
   border-radius: 4px;
   position: relative;
   transition: all 0.2s;
-  
+
   &:hover {
     background-color: #f0f0f0;
-    
+
     .remove-btn {
       opacity: 1;
     }
@@ -1250,9 +1273,9 @@ export default {
   color: #909399;
   padding: 2px;
   margin-left: 8px;
-  
+
   &:hover {
-    color: #F56C6C;
+    color: #f56c6c;
     opacity: 1;
     transform: scale(1.1);
   }
@@ -1267,4 +1290,60 @@ export default {
 ::v-deep .el-dialog__body {
   padding: 20px 15px !important;
 }
+
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+.headerbox {
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
+}
+
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.el-table {
+  height: 100% !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
+}
 </style>
diff --git a/src/views/compilation/knowledge/index.vue b/src/views/compilation/knowledge/index.vue
index 8ee590d..0428b1a 100644
--- a/src/views/compilation/knowledge/index.vue
+++ b/src/views/compilation/knowledge/index.vue
@@ -1,77 +1,153 @@
 <template>
-  <div>
+  <div class="container">
     <!-- 表单查询项 -->
     <div class="headerbox">
-      <el-form ref="queryForm" :model="queryParams" size="small" label-width="100px">
+      <el-form
+        ref="queryForm"
+        :model="queryParams"
+        size="small"
+        label-width="100px"
+        align="left"
+      >
         <el-row>
           <el-col :span="5">
-            <el-form-item label="文件名称" prop="name" style="width: 100%;">
-              <el-input v-model="queryParams.name" placeholder="请输入文件名称" :fetch-suggestions="querySearchAsync"
-                @keyup.enter.native="handleQuery" />
+            <el-form-item label="文件名称" prop="name" style="width: 100%;margin-left: -30px;">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入文件名称"
+                :fetch-suggestions="querySearchAsync"
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="文件类型" prop="lx">
               <el-select v-model="queryParams.lx" placeholder="请选择文件类型">
-                <el-option v-for="dict in dict.type.wjlx" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+                <el-option
+                  v-for="dict in dict.type.wjlx"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" size="medium" @click="handleQuery">查询</el-button>
-              <el-button icon="el-icon-refresh" size="medium" @click="resetQuery">重置</el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="medium"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button
+                icon="el-icon-refresh"
+                size="medium"
+                @click="resetQuery"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <!-- 表格内容区 -->
-    <div class="tablebox">
+    <div class="table-container">
       <!-- 导出行 -->
-      <div class="tablebtntwo">
-        <el-row :gutter="10" class="mb8">
+      <div class="table-header">
+        <el-row :gutter="4" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="medium" @click="handleAdd">新增</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="medium"
+              @click="handleAdd"
+              >新增</el-button
+            >
           </el-col>
         </el-row>
-        <el-row :gutter="10" class="mb8">
+        <el-row :gutter="4" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-download" size="medium" @click="handleImport">导入</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-download"
+              size="medium"
+              @click="handleImport"
+              >导入</el-button
+            >
           </el-col>
         </el-row>
       </div>
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-        <el-table-column label="文件名称" align="center" prop="name" />
-        <el-table-column label="类型" align="center">
-          <template slot-scope="scope">
-            <a v-if="scope.row.lx === '3'" :href="scope.row.wz" target="_blank"
-              style="color: #409EFF; text-decoration: underline;">
-              <dict-tag :options="dict.type.wjlx" :value="scope.row.lx" />
-            </a>
-            <span v-else>
-              <dict-tag :options="dict.type.wjlx" :value="scope.row.lx" />
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="附件" align="center" prop="fj">
-          <template slot-scope="scope">
-            {{ getFileName(scope.row.fj) || "未上传" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="上传用户" align="center" prop="scyh" />
-        <el-table-column label="上传时间" align="center" prop="scsj" :formatter="dateFormat" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button size="medium" type="text" @click="getInfo(scope.row)">详情</el-button>
-            <el-button size="medium" type="text" @click="handleUpdate(scope.row)" style="color: #67c23a">编辑</el-button>
-            <el-button size="medium" type="text" @click="handleDelete(scope.row)" style="color: red;">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current" :limit.sync="queryParams.size"
-        @pagination="getList" />
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          height="100%"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column label="文件名称" align="center" prop="name" />
+          <el-table-column label="类型" align="center">
+            <template slot-scope="scope">
+              <a
+                v-if="scope.row.lx === '3'"
+                :href="scope.row.wz"
+                target="_blank"
+                style="color: #409eff; text-decoration: underline"
+              >
+                <dict-tag :options="dict.type.wjlx" :value="scope.row.lx" />
+              </a>
+              <span v-else>
+                <dict-tag :options="dict.type.wjlx" :value="scope.row.lx" />
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="附件" align="center" prop="fj">
+            <template slot-scope="scope">
+              {{ getFileName(scope.row.fj) || "未上传" }}
+            </template>
+          </el-table-column>
+          <el-table-column label="上传用户" align="center" prop="scyh" />
+          <el-table-column
+            label="上传时间"
+            align="center"
+            prop="scsj"
+            :formatter="dateFormat"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button size="medium" type="text" @click="getInfo(scope.row)"
+                >详情</el-button
+              >
+              <el-button
+                size="medium"
+                type="text"
+                @click="handleUpdate(scope.row)"
+                style="color: #67c23a"
+                >编辑</el-button
+              >
+              <el-button
+                size="medium"
+                type="text"
+                @click="handleDelete(scope.row)"
+                style="color: red"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
+        @pagination="getList"
+      />
     </div>
 
     <!-- 添加或修改项目对话框 -->
@@ -81,16 +157,33 @@
           <el-input v-model="form.name" placeholder="请输入文件名称" />
         </el-form-item>
         <el-form-item label="类型" prop="lx">
-          <el-select v-model="form.lx" placeholder="请选择文件类型" style="width: 100%;" @change="handleTypeChange">
-            <el-option v-for="dict in dict.type.wjlx" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select
+            v-model="form.lx"
+            placeholder="请选择文件类型"
+            style="width: 100%"
+            @change="handleTypeChange"
+          >
+            <el-option
+              v-for="dict in dict.type.wjlx"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <!-- 文件类型是网络信息 -->
         <el-form-item v-if="form.lx === '3'" label="网址" prop="wz">
-          <el-input v-model="form.wz" placeholder="请输入网址" class="input-with-select">
+          <el-input
+            v-model="form.wz"
+            placeholder="请输入网址"
+            class="input-with-select"
+          >
             <template slot="prepend">
-              <el-select v-model="select" style="width: 5.7rem;" @change="handleProtocolChange">
+              <el-select
+                v-model="select"
+                style="width: 5.7rem"
+                @change="handleProtocolChange"
+              >
                 <el-option label="http" value="http"></el-option>
                 <el-option label="https" value="https"></el-option>
               </el-select>
@@ -102,8 +195,13 @@
           <el-input v-model="form.scyh" placeholder="请输入上传用户" />
         </el-form-item>
         <el-form-item label="上传时间" prop="scsj">
-          <el-date-picker v-model="form.scsj" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
-            style="width: 100%;" />
+          <el-date-picker
+            v-model="form.scsj"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          />
         </el-form-item>
         <el-form-item v-if="form.lx !== '3'" label="附件" prop="fj">
           <fileload v-model="form.fj"></fileload>
@@ -119,15 +217,33 @@
     </el-dialog>
 
     <!-- 详情项目对话框 -->
-    <el-dialog :title="title" :visible.sync="detailOpen" width="40rem" append-to-body>
-      <el-form ref="detailForm" :model="detailForm" label-width="7rem" :disabled="true">
+    <el-dialog
+      :title="title"
+      :visible.sync="detailOpen"
+      width="40rem"
+      append-to-body
+    >
+      <el-form
+        ref="detailForm"
+        :model="detailForm"
+        label-width="7rem"
+        :disabled="true"
+      >
         <el-form-item label="文件名称" prop="name">
           <el-input v-model="detailForm.name" placeholder="请输入文件名称" />
         </el-form-item>
         <el-form-item label="类型" prop="lx">
-          <el-select v-model="detailForm.lx" placeholder="请选择文件类型" style="width: 100%;">
-            <el-option v-for="dict in dict.type.wjlx" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+          <el-select
+            v-model="detailForm.lx"
+            placeholder="请选择文件类型"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in dict.type.wjlx"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-if="detailForm.lx === '3'" label="网址" prop="wz">
@@ -137,8 +253,13 @@
           <el-input v-model="detailForm.scyh" placeholder="请输入上传用户" />
         </el-form-item>
         <el-form-item label="上传时间" prop="scsj">
-          <el-date-picker v-model="detailForm.scsj" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
-            style="width: 100%;" />
+          <el-date-picker
+            v-model="detailForm.scsj"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          />
         </el-form-item>
         <el-form-item label="附件" prop="fj">
           <el-input v-model="detailForm.fj" />
@@ -151,16 +272,35 @@
     </el-dialog>
 
     <!-- 导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-            @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -173,14 +313,20 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { getXmzskPage, addXmzsk, updateXmzsk, deleteXmzsk, getXmzskById } from "@/api/ManageApi/index";
-import fileload from "@/components/FileUpload/index.vue"
+import {
+  getXmzskPage,
+  addXmzsk,
+  updateXmzsk,
+  deleteXmzsk,
+  getXmzskById,
+} from "@/api/ManageApi/index";
+import fileload from "@/components/FileUpload/index.vue";
 
 export default {
-  dicts: ['wjlx'],
+  dicts: ["wjlx"],
   name: "Xmzsk",
   components: {
-    fileload
+    fileload,
   },
   data() {
     return {
@@ -209,7 +355,7 @@ export default {
         current: 1,
         size: 10,
         name: undefined,
-        lx: undefined
+        lx: undefined,
       },
       // 表单参数
       form: {
@@ -225,7 +371,7 @@ export default {
         createTime: undefined,
         updateBy: undefined,
         updateId: undefined,
-        updateTime: undefined
+        updateTime: undefined,
       },
       // 详情表单参数
       detailForm: {
@@ -241,28 +387,24 @@ export default {
         createTime: undefined,
         updateBy: undefined,
         updateId: undefined,
-        updateTime: undefined
+        updateTime: undefined,
       },
       // 表单校验
       rules: {
         name: [
-          { required: true, message: "文件名称不能为空", trigger: "blur" }
+          { required: true, message: "文件名称不能为空", trigger: "blur" },
         ],
         lx: [
-          { required: true, message: "文件类型不能为空", trigger: "change" }
-        ],
-        wz: [
-          { required: true, message: "网址不能为空", trigger: "change" }
+          { required: true, message: "文件类型不能为空", trigger: "change" },
         ],
+        wz: [{ required: true, message: "网址不能为空", trigger: "change" }],
         scyh: [
-          { required: true, message: "上传用户不能为空", trigger: "blur" }
+          { required: true, message: "上传用户不能为空", trigger: "blur" },
         ],
         scsj: [
-          { required: true, message: "上传时间不能为空", trigger: "change" }
+          { required: true, message: "上传时间不能为空", trigger: "change" },
         ],
-        fj: [
-          { required: true, message: "附件不能为空", trigger: "blur" }
-        ]
+        fj: [{ required: true, message: "附件不能为空", trigger: "blur" }],
       },
       // 文件类型映射
       // fileTypeMap: {
@@ -271,7 +413,7 @@ export default {
       //   3: "网络信息",
       //   4: "其他",
       // },
-      select: 'http', // 默认协议类型
+      select: "http", // 默认协议类型
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -298,24 +440,24 @@ export default {
       if (cellValue) {
         const date = new Date(cellValue);
         const year = date.getFullYear();
-        const month = String(date.getMonth() + 1).padStart(2, '0');
-        const day = String(date.getDate()).padStart(2, '0');
+        const month = String(date.getMonth() + 1).padStart(2, "0");
+        const day = String(date.getDate()).padStart(2, "0");
         return `${year}-${month}-${day}`;
       }
-      return '';
+      return "";
     },
     // 获取文件名字
     getFileName(filePath) {
       if (filePath) {
-        return filePath.split('/').pop();
+        return filePath.split("/").pop();
       }
-      return '';
+      return "";
     },
 
     querySearchAsync(queryString, cb) {
       let results = [];
-      getXmzskPage({ name: queryString }).then(res => {
-        res.data.records.forEach(item => {
+      getXmzskPage({ name: queryString }).then((res) => {
+        res.data.records.forEach((item) => {
           results.push({
             value: item.name,
             id: item.id,
@@ -327,14 +469,16 @@ export default {
     // 查询目录列表
     getList() {
       this.loading = true;
-      getXmzskPage(this.queryParams).then(response => {
-        this.postList = response.data.records;
-        this.total = response.data.total;
-        this.loading = false;
-      }).catch(error => {
-        console.error('API Request Error:', error);
-        this.loading = false;
-      });
+      getXmzskPage(this.queryParams)
+        .then((response) => {
+          this.postList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("API Request Error:", error);
+          this.loading = false;
+        });
     },
     // 取消按钮
     cancel() {
@@ -356,9 +500,9 @@ export default {
         createTime: undefined,
         updateBy: undefined,
         updateId: undefined,
-        updateTime: undefined
+        updateTime: undefined,
       };
-      this.select = 'https'; // 重置协议类型
+      this.select = "https"; // 重置协议类型
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -373,7 +517,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -388,7 +532,7 @@ export default {
       this.reset();
       const catalogId = row.id;
       this.form = { ...row };
-      this.setProtocolType(this.form.wz); 
+      this.setProtocolType(this.form.wz);
       this.$nextTick(() => {
         this.handleTypeChange(); // 确保在 DOM 更新后调用
       });
@@ -397,20 +541,24 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id !== undefined) {
-            updateXmzsk(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).catch();
+            updateXmzsk(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              })
+              .catch();
           } else {
-            addXmzsk(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).catch(error => { });
+            addXmzsk(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .catch((error) => {});
           }
         }
       });
@@ -419,50 +567,57 @@ export default {
     handleDelete(row) {
       const catalogIds = row.id || this.ids;
       const getFileName = row.name; // 获取 pjys 字段的内容
-      this.$modal.confirm(`是否确认删除"${getFileName}"的数据项？`).then(() => {
-        return deleteXmzsk([catalogIds]);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+      this.$modal
+        .confirm(`是否确认删除"${getFileName}"的数据项？`)
+        .then(() => {
+          return deleteXmzsk([catalogIds]);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 详情按钮操作 */
     getInfo(row) {
       const catalogId = row.id;
-      getXmzskById(catalogId).then(response => {
-        this.detailForm = { ...response.data };
-        this.detailOpen = true;
-        this.title = "项目知识库详情";
-      }).catch(error => {
-        console.error('API Request Error:', error);
-      });
+      getXmzskById(catalogId)
+        .then((response) => {
+          this.detailForm = { ...response.data };
+          this.detailOpen = true;
+          this.title = "项目知识库详情";
+        })
+        .catch((error) => {
+          console.error("API Request Error:", error);
+        });
     },
     // 设置协议类型
     setProtocolType(url) {
       if (url) {
-        if (url.startsWith('https://')) {
-          this.select = 'https';
-        } else if (url.startsWith('http://')) {
-          this.select = 'http';
+        if (url.startsWith("https://")) {
+          this.select = "https";
+        } else if (url.startsWith("http://")) {
+          this.select = "http";
         } else {
-          this.select = 'http';
-          this.form.wz = 'http://' + url;
+          this.select = "http";
+          this.form.wz = "http://" + url;
         }
       } else {
-        this.select = 'http';
+        this.select = "http";
       }
     },
     // 协议类型改变时更新网址
     handleProtocolChange() {
-      if (this.form.wz && !this.form.wz.startsWith(this.select + '://')) {
-        this.form.wz = this.select + '://' + this.form.wz.replace(/(http|https):\/\//, '');
+      if (this.form.wz && !this.form.wz.startsWith(this.select + "://")) {
+        this.form.wz =
+          this.select + "://" + this.form.wz.replace(/(http|https):\/\//, "");
       }
     },
     // 文件类型改变时重置网址
     handleTypeChange() {
-      if (this.form.lx !== '3') {
+      if (this.form.lx !== "3") {
         this.form.wz = undefined;
-        this.select = 'http';
+        this.select = "http";
         // 更新 fj 的校验规则
         this.rules.fj[0].required = true;
       } else {
@@ -471,7 +626,7 @@ export default {
         this.rules.fj[0].required = false;
       }
       // 手动触发表单校验
-      this.$refs.form.clearValidate('fj');
+      this.$refs.form.clearValidate("fj");
     },
 
     /**导出 */
@@ -507,8 +662,8 @@ export default {
       this.$refs.upload.clearFiles();
       this.$alert(
         "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-        response.msg +
-        "</div>",
+          response.msg +
+          "</div>",
         "导入结果",
         { dangerouslyUseHTMLString: true }
       );
@@ -518,42 +673,64 @@ export default {
     submitFileForm() {
       this.$refs.upload.submit();
     },
-  }
+  },
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
   background-color: #fff;
-  border-radius: .5rem;
-  padding: 1rem;
-  margin: .5rem;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
   border: 1px solid #eee;
 }
 
-.tablebox {
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
   background-color: #fff;
-  border-radius: .5rem;
+  border-radius: 0.5rem;
   padding: 1rem;
-  margin: .5rem;
   border: 1px solid #eee;
+  overflow: hidden;
 }
 
-.tablehead {
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
   display: flex;
   justify-content: space-between;
-  align-items: center;
 }
 
-.headbtn {
-  display: flex;
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
 }
 
-.tablebtntwo {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
+.el-table {
+  height: 100% !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/compilation/onecailiao/index.vue b/src/views/compilation/onecailiao/index.vue
index dd2706b..76d988d 100644
--- a/src/views/compilation/onecailiao/index.vue
+++ b/src/views/compilation/onecailiao/index.vue
@@ -1,203 +1,281 @@
 <template>
-    <div>
-        <!-- 单片材料管理 -->
-        <!-- 表单查询项 -->
-        <div v-if="!previewMode" class="headerbox">
-            <el-form size="small" :inline="true" label-width="200">
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="文件标题" style="width: 100%;">
-                            <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="发布时间">
-                            <el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择日期"
-                                style="width: 100%;"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search"
-                                @click="handleQuery">查询</el-button>
-                            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
+  <div class="container">
+    <!-- 单片材料管理 -->
+    <!-- 表单查询项 -->
+    <div v-if="!previewMode" class="headerbox">
+      <el-form size="small" :inline="true" label-width="200">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="文件标题" style="width: 100%">
+              <el-input
+                v-model="queryParams.title"
+                placeholder="请输入模板标题"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="发布时间">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="date"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
 
-        <!-- 表格内容区 -->
-        <div v-if="!previewMode" class="tablebox">
-            <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-                <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                <el-table-column label="序号" align="center" prop="id" />
-                <el-table-column label="文件标题" align="center" prop="title" />
-                <el-table-column label="发布单位" align="center" prop="unit" />
-                <!-- <el-table-column label="发布人" align="center" prop="author" /> -->
-                <el-table-column label="发布时间" align="center" prop="createTime" />
-                <el-table-column label="操作" align="center">
-                    <template slot-scope="scope">
-                        <el-button type="text"
-                            @click="handlePreview(scope.row)">预览</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current"
-                :limit.sync="queryParams.size" @pagination="getList" />
-        </div>
+    <!-- 表格内容区 -->
+    <div v-if="!previewMode" class="table-container">
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          height="100%"
+        >
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column label="文件标题" align="center" prop="title" />
+          <el-table-column label="发布单位" align="center" prop="unit" />
+          <!-- <el-table-column label="发布人" align="center" prop="author" /> -->
+          <el-table-column label="发布时间" align="center" prop="createTime" />
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="handlePreview(scope.row)"
+                >预览</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
+        @pagination="getList"
+      />
+    </div>
 
-        <!-- DOCX预览区域 -->
-        <div v-if="previewMode" class="previewbox">
-            <div class="previewhead">
-                <h3>{{ previewData.title }}</h3>
-                <div class="headtwo">
-                    <el-button @click="previewMode = false">返回</el-button>
-                </div>
-            </div>
-            <div class="previewcontent">
-                <vue-office-docx :src="docxFileData"
-                    style="width: 100%; height: calc(100vh - 250px); border: 1px solid #eee;"
-                    @rendered="renderedHandler" />
-            </div>
+    <!-- DOCX预览区域 -->
+    <div v-if="previewMode" class="previewbox">
+      <div class="previewhead">
+        <h3>{{ previewData.title }}</h3>
+        <div class="headtwo">
+          <el-button @click="previewMode = false">返回</el-button>
         </div>
+      </div>
+      <div class="previewcontent">
+        <vue-office-docx
+          :src="docxFileData"
+          style="
+            width: 100%;
+            height: calc(100vh - 250px);
+            border: 1px solid #eee;
+          "
+          @rendered="renderedHandler"
+        />
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-import VueOfficeDocx from '@vue-office/docx'
-import axios from 'axios'
+import VueOfficeDocx from "@vue-office/docx";
+import axios from "axios";
 
 export default {
-    components: {
-        'vue-office-docx': VueOfficeDocx
-    },
-    data() {
-        return {
-            // 查询参数
-            queryParams: {
-                current: 1,
-                size: 10,
-                title: undefined,
-                startTime: undefined
-            },
-            // 所有数据（模拟从后端获取）
-            allPostList: [
-                { id: 1, title: 'xxxx项目单体材料模板', unit: '经发委', author: '', createTime: '2024-08-20', fileUrl: 'docx/单体材料模板.docx' },
-            ],
-            // 表格显示的数据
-            postList: [],
-            // 加载状态
-            loading: false,
-            // 总条数
-            total: 0,
-            // 预览模式
-            previewMode: false,
-            // 预览数据
-            previewData: {},
-            // DOCX文件数据
-            docxFileData: null
+  components: {
+    "vue-office-docx": VueOfficeDocx,
+  },
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        title: undefined,
+        startTime: undefined,
+      },
+      // 所有数据（模拟从后端获取）
+      allPostList: [
+        {
+          id: 1,
+          title: "xxxx项目单体材料模板",
+          unit: "经发委",
+          author: "",
+          createTime: "2024-08-20",
+          fileUrl: "docx/单体材料模板.docx",
+        },
+      ],
+      // 表格显示的数据
+      postList: [],
+      // 加载状态
+      loading: false,
+      // 总条数
+      total: 0,
+      // 预览模式
+      previewMode: false,
+      // 预览数据
+      previewData: {},
+      // DOCX文件数据
+      docxFileData: null,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 获取表格数据
+    getList() {
+      this.loading = true;
+
+      // 根据查询条件过滤数据
+      let filteredData = this.allPostList.filter((item) => {
+        if (
+          this.queryParams.title &&
+          !item.title.includes(this.queryParams.title)
+        ) {
+          return false;
+        }
+        if (
+          this.queryParams.startTime &&
+          new Date(item.createTime) < new Date(this.queryParams.startTime)
+        ) {
+          return false;
         }
+        return true;
+      });
+
+      // 分页处理
+      const start = (this.queryParams.current - 1) * this.queryParams.size;
+      const end = start + this.queryParams.size;
+      this.postList = filteredData.slice(start, end);
+      this.total = filteredData.length;
+
+      this.loading = false;
     },
-    created() {
-        this.getList()
+    // 查询
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
     },
-    methods: {
-        // 获取表格数据
-        getList() {
-            this.loading = true;
-
-            // 根据查询条件过滤数据
-            let filteredData = this.allPostList.filter(item => {
-                if (this.queryParams.title && !item.title.includes(this.queryParams.title)) {
-                    return false;
-                }
-                if (this.queryParams.startTime && new Date(item.createTime) < new Date(this.queryParams.startTime)) {
-                    return false;
-                }
-                return true;
-            });
-
-            // 分页处理
-            const start = (this.queryParams.current - 1) * this.queryParams.size;
-            const end = start + this.queryParams.size;
-            this.postList = filteredData.slice(start, end);
-            this.total = filteredData.length;
-
-            this.loading = false;
-        },
-        // 查询
-        handleQuery() {
-            this.queryParams.current = 1;
-            this.getList();
-        },
-        // 重置查询
-        resetQuery() {
-            this.queryParams = {
-                current: 1,
-                size: 10,
-                title: undefined,
-                startTime: undefined
-            };
-            this.handleQuery();
-        },
-        // 表格选择变化
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-            this.single = selection.length !== 1
-            this.multiple = !selection.length
-        },
-        // 预览文档
-        handlePreview(row) {
-            this.previewMode = true
-            this.previewData = row
-            this.loadDocxFile(row.fileUrl)
-        },
-        // 加载DOCX文件
-        loadDocxFile(url) {
-            this.docxFileData = null
-            axios.get(url, { responseType: 'arraybuffer' })
-                .then(response => {
-                    this.docxFileData = response.data
-                })
-                .catch(error => {
-                    console.error('加载文档失败:', error)
-                    this.$message.error('文档加载失败')
-                })
-        },
-        // 文档渲染完成回调
-        renderedHandler() {
-            console.log('文档渲染完成')
-        }
-    }
-}
+    // 重置查询
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        title: undefined,
+        startTime: undefined,
+      };
+      this.handleQuery();
+    },
+    // 表格选择变化
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    // 预览文档
+    handlePreview(row) {
+      this.previewMode = true;
+      this.previewData = row;
+      this.loadDocxFile(row.fileUrl);
+    },
+    // 加载DOCX文件
+    loadDocxFile(url) {
+      this.docxFileData = null;
+      axios
+        .get(url, { responseType: "arraybuffer" })
+        .then((response) => {
+          this.docxFileData = response.data;
+        })
+        .catch((error) => {
+          console.error("加载文档失败:", error);
+          this.$message.error("文档加载失败");
+        });
+    },
+    // 文档渲染完成回调
+    renderedHandler() {
+      console.log("文档渲染完成");
+    },
+  },
+};
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
 }
 
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
 }
 
-.tablebtntwo {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    margin-top: 1rem;
-    margin-bottom: 1rem;
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
 }
 
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.el-table {
+  height: 100% !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
+}
 .previewbox {
     width: 99%;
     margin-left: 0.5%;
@@ -233,5 +311,7 @@ export default {
 .previewcontent {
     margin-top: 1rem;
     width: 100%;
+    height:100%;
+    overflow-y:auto
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/compilation/reporting/index.vue b/src/views/compilation/reporting/index.vue
index 0bd595b..0c1fc38 100644
--- a/src/views/compilation/reporting/index.vue
+++ b/src/views/compilation/reporting/index.vue
@@ -1,201 +1,279 @@
 <template>
-    <div>
-        <!-- 报告管理 -->
-        <!-- 表单查询项 -->
-        <div v-if="!previewMode" class="headerbox">
-            <el-form size="small" :inline="true" label-width="200">
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="文件标题" style="width: 100%;">
-                            <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="发布时间">
-                            <el-date-picker v-model="queryParams.startTime" type="date" placeholder="选择日期"
-                                style="width: 100%;"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search"
-                                @click="handleQuery">查询</el-button>
-                            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
+  <div class="container">
+    <!-- 报告管理 -->
+    <!-- 表单查询项 -->
+    <div v-if="!previewMode" class="headerbox">
+      <el-form size="small" :inline="true" label-width="200">
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="文件标题" style="width: 100%">
+              <el-input
+                v-model="queryParams.title"
+                placeholder="请输入模板标题"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="发布时间">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="date"
+                placeholder="选择日期"
+                style="width: 100%"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
 
-        <!-- 表格内容区 -->
-        <div v-if="!previewMode" class="tablebox">
-            <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-                <el-table-column label="序号" align="center" prop="id" />
-                <el-table-column label="文件标题" align="center" prop="title" />
-                <el-table-column label="发布单位" align="center" prop="unit" />
-                <el-table-column label="发布时间" align="center" prop="createTime" />
-                <el-table-column label="操作" align="center">
-                    <template slot-scope="scope">
-                        <el-button type="text"
-                            @click="handlePreview(scope.row)">预览</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current"
-                :limit.sync="queryParams.size" @pagination="getList" />
-        </div>
+    <!-- 表格内容区 -->
+    <div v-if="!previewMode" class="table-container">
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          height="100%"
+        >
+          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column label="文件标题" align="center" prop="title" />
+          <el-table-column label="发布单位" align="center" prop="unit" />
+          <el-table-column label="发布时间" align="center" prop="createTime" />
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <el-button type="text" @click="handlePreview(scope.row)"
+                >预览</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
+        @pagination="getList"
+      />
+    </div>
 
-        <!-- DOCX预览区域 -->
-        <div v-if="previewMode" class="previewbox">
-            <div class="previewhead">
-                <h3>{{ previewData.title }}</h3>
-                <div class="headtwo">
-                    <el-button @click="previewMode = false">返回</el-button>
-                </div>
-            </div>
-            <div class="previewcontent">
-                <vue-office-docx :src="docxFileData"
-                    style="width: 100%; height: calc(100vh - 250px); border: 1px solid #eee;"
-                    @rendered="renderedHandler" />
-            </div>
+    <!-- DOCX预览区域 -->
+    <div v-if="previewMode" class="previewbox">
+      <div class="previewhead">
+        <h3>{{ previewData.title }}</h3>
+        <div class="headtwo">
+          <el-button @click="previewMode = false">返回</el-button>
         </div>
+      </div>
+      <div class="previewcontent">
+        <vue-office-docx
+          :src="docxFileData"
+          style="
+            width: 100%;
+            height: calc(100vh - 250px);
+            border: 1px solid #eee;
+          "
+          @rendered="renderedHandler"
+        />
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-import VueOfficeDocx from '@vue-office/docx'
-import axios from 'axios'
+import VueOfficeDocx from "@vue-office/docx";
+import axios from "axios";
 
 export default {
-    components: {
-        'vue-office-docx': VueOfficeDocx
-    },
-    data() {
-        return {
-            // 查询参数
-            queryParams: {
-                current: 1,
-                size: 10,
-                title: undefined,
-                startTime: undefined
-            },
-            // 所有数据（模拟从后端获取）
-            allPostList: [
-                { id: 1, title: '苏州工业园区总体报告模板', unit: '经发委', author: '', createTime: '2024-08-20', fileUrl: 'docx/苏州工业园区总体报告模板.docx' },
-            ],
-            // 表格显示的数据
-            postList: [],
-            // 加载状态
-            loading: false,
-            // 总条数
-            total: 0,
-            // 预览模式
-            previewMode: false,
-            // 预览数据
-            previewData: {},
-            // DOCX文件数据
-            docxFileData: null
+  components: {
+    "vue-office-docx": VueOfficeDocx,
+  },
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        title: undefined,
+        startTime: undefined,
+      },
+      // 所有数据（模拟从后端获取）
+      allPostList: [
+        {
+          id: 1,
+          title: "苏州工业园区总体报告模板",
+          unit: "经发委",
+          author: "",
+          createTime: "2024-08-20",
+          fileUrl: "docx/苏州工业园区总体报告模板.docx",
+        },
+      ],
+      // 表格显示的数据
+      postList: [],
+      // 加载状态
+      loading: false,
+      // 总条数
+      total: 0,
+      // 预览模式
+      previewMode: false,
+      // 预览数据
+      previewData: {},
+      // DOCX文件数据
+      docxFileData: null,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    // 获取表格数据
+    getList() {
+      this.loading = true;
+
+      // 根据查询条件过滤数据
+      let filteredData = this.allPostList.filter((item) => {
+        if (
+          this.queryParams.title &&
+          !item.title.includes(this.queryParams.title)
+        ) {
+          return false;
+        }
+        if (
+          this.queryParams.startTime &&
+          new Date(item.createTime) < new Date(this.queryParams.startTime)
+        ) {
+          return false;
         }
+        return true;
+      });
+
+      // 分页处理
+      const start = (this.queryParams.current - 1) * this.queryParams.size;
+      const end = start + this.queryParams.size;
+      this.postList = filteredData.slice(start, end);
+      this.total = filteredData.length;
+
+      this.loading = false;
     },
-    created() {
-        this.getList()
+    // 查询
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
     },
-    methods: {
-        // 获取表格数据
-        getList() {
-            this.loading = true;
-
-            // 根据查询条件过滤数据
-            let filteredData = this.allPostList.filter(item => {
-                if (this.queryParams.title && !item.title.includes(this.queryParams.title)) {
-                    return false;
-                }
-                if (this.queryParams.startTime && new Date(item.createTime) < new Date(this.queryParams.startTime)) {
-                    return false;
-                }
-                return true;
-            });
-
-            // 分页处理
-            const start = (this.queryParams.current - 1) * this.queryParams.size;
-            const end = start + this.queryParams.size;
-            this.postList = filteredData.slice(start, end);
-            this.total = filteredData.length;
-
-            this.loading = false;
-        },
-        // 查询
-        handleQuery() {
-            this.queryParams.current = 1;
-            this.getList();
-        },
-        // 重置查询
-        resetQuery() {
-            this.queryParams = {
-                current: 1,
-                size: 10,
-                title: undefined,
-                startTime: undefined
-            };
-            this.handleQuery();
-        },
-        // 表格选择变化
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-            this.single = selection.length !== 1
-            this.multiple = !selection.length
-        },
-        // 预览文档
-        handlePreview(row) {
-            this.previewMode = true
-            this.previewData = row
-            this.loadDocxFile(row.fileUrl)
-        },
-        // 加载DOCX文件
-        loadDocxFile(url) {
-            this.docxFileData = null
-            axios.get(url, { responseType: 'arraybuffer' })
-                .then(response => {
-                    this.docxFileData = response.data
-                })
-                .catch(error => {
-                    console.error('加载文档失败:', error)
-                    this.$message.error('文档加载失败')
-                })
-        },
-        // 文档渲染完成回调
-        renderedHandler() {
-            console.log('文档渲染完成')
-        }
-    }
-}
+    // 重置查询
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        title: undefined,
+        startTime: undefined,
+      };
+      this.handleQuery();
+    },
+    // 表格选择变化
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    // 预览文档
+    handlePreview(row) {
+      this.previewMode = true;
+      this.previewData = row;
+      this.loadDocxFile(row.fileUrl);
+    },
+    // 加载DOCX文件
+    loadDocxFile(url) {
+      this.docxFileData = null;
+      axios
+        .get(url, { responseType: "arraybuffer" })
+        .then((response) => {
+          this.docxFileData = response.data;
+        })
+        .catch((error) => {
+          console.error("加载文档失败:", error);
+          this.$message.error("文档加载失败");
+        });
+    },
+    // 文档渲染完成回调
+    renderedHandler() {
+      console.log("文档渲染完成");
+    },
+  },
+};
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
 }
 
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
 }
 
-.tablebtntwo {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    margin-top: 1rem;
-    margin-bottom: 1rem;
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
 }
 
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.el-table {
+  height: 100% !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
+}
 .previewbox {
     width: 99%;
     margin-left: 0.5%;
@@ -231,5 +309,7 @@ export default {
 .previewcontent {
     margin-top: 1rem;
     width: 100%;
+    height:100%;
+    overflow-y:auto
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue
index af746a7..38b028c 100644
--- a/src/views/components/ProjectDetails/Basic.vue
+++ b/src/views/components/ProjectDetails/Basic.vue
@@ -1,630 +1,877 @@
 <template>
-    <div class="container">
-        <!-- 顶部信息 -->
-        <div class="containertop">
-            <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
-                <span>基本信息</span>
-            </div>
-            <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
-                <el-button type="primary" size="medium" plain v-if="action === 'fill' || !action || action === 'okay'"
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="edit">
-                    <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
-                        style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-                    编辑
-                </el-button>
-                <el-button type="primary" size="medium" plain v-if="checkRole(['admin', 'common','gov'])"
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleExport">
-                    <img src="../../../assets/images/detailsicon/icon-dc@2x.png" alt="编辑"
-                        style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-                    导出
-                </el-button>
-            </div>
-        </div>
-        <!-- 内容展示区 -->
-        <div class="content">
-            <div class="picturediv">
-                <!-- 图片展示 -->
-                <img v-if="basicInfo.fj" :src="baseUrl + basicInfo.fj" alt="项目代表性照片">
-            </div>
-            <div class="descriptionsdiv">
-                <el-descriptions class="margin-top" :column="3" border>
-                    <el-descriptions-item v-for="(item, index) in descriptions" :key="index"
-                        :span="item.label === '项目法人单位简介' || item.label === '所属细分产业' ? 3 : 1">
-                        <template slot="label">
-                            {{ item.label }}
-                        </template>
-                        {{ item.value }}
-                    </el-descriptions-item>
-                </el-descriptions>
-            </div>
-        </div>
-        <!-- 添加或编辑项目对话框 -->
-        <el-dialog :title="title" :visible.sync="dialogVisible" width="70rem" append-to-body>
-            <el-form :model="form" :rules="rules" ref="form" label-width="180px">
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="项目名称" prop="name">
-                            <el-input v-model="form.name" maxlength="50" placeholder="请输入项目名称"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="建设地点" prop="jsdd">
-                            <el-row :gutter="10">
-                                <el-col :span="20">
-                                    <el-input v-model="form.jsdd" maxlength="50" placeholder="请点击右侧落图" readonly></el-input>
-                                </el-col>
-                                <el-col :span="3">
-                                    <span @click="showMap" style="color: #2B62F1;cursor: pointer;">落图</span>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="项目法人单位" prop="xmfrdwxz">
-                            <el-input v-model="form.xmfrdwxz" maxlength="50" placeholder="请输入项目法人单位"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="重点发展产业" prop="prioritize">
-                            <el-input v-model="form.prioritize" maxlength="50" placeholder="请输入重点发展产业"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="项目法人单位性质" prop="nature">
-                            <el-select v-model="form.nature" placeholder="请选择" value-key="value"
-                                style="width: 100%;">
-                                <el-option v-for="dict in dict.type.xmfrdwxz" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="建设模式" prop="jsms">
-                            <el-select v-model="form.jsms" placeholder="请选择" value-key="value" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.jsms" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="施工单位" prop="sgdw">
-                            <el-input v-model="form.sgdw" maxlength="50" placeholder="请输入施工单位"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="项目标签" prop="label">
-                            <el-input v-model="form.label" maxlength="50"  placeholder="请输入项目标签"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="设计单位" prop="sjdw">
-                            <el-input v-model="form.sjdw" maxlength="50" placeholder="请输入设计单位"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="项目负责人" prop="projectLeader">
-                            <el-input v-model="form.projectLeader" maxlength="50" placeholder="请输入项目负责人"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="总投资额（万元）" prop="ztze">
-                            <el-input v-model.number="form.ztze" maxlength="50" placeholder="请输入总投资额"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="联系方式" prop="phone">
-                            <el-input v-model="form.phone" maxlength="50" placeholder="请输入联系方式" ></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="所属功能区" prop="ssgnq">
-                            <el-select v-model="form.ssgnq" placeholder="请选择" value-key="value" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.ssgnq" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="施工许可证发放时间" prop="issuingTime">
-                            <el-input v-model="form.issuingTime" maxlength="50" placeholder="请输入施工许可证发放时间"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="建设起止时间" required>
-                            <el-date-picker v-model="form.begainTime" type="month" value-format="yyyy-MM"  placeholder="开始日期"
-                                style="width: 11rem;"></el-date-picker>
-                            ~
-                            <el-date-picker v-model="form.endTime" type="month"  value-format="yyyy-MM" placeholder="结束日期"
-                                style="width: 10.5rem;"></el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="竣工验收时间" prop="acceptanceTime">
-                            <el-input v-model="form.acceptanceTime" maxlength="50" placeholder="请输入竣工验收时间"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="现状分类" prop="xzfl">
-                            <el-select v-model="form.xzfl" placeholder="请选择" value-key="value" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.xzfl" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="建设进度" prop="jsjd">
-                            <el-input v-model="form.jsjd" maxlength="50" placeholder="请输入建设进度"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="统一社会信用代码" prop="tyshxydm">
-                            <el-input v-model="form.tyshxydm" maxlength="50" placeholder="请输入统一社会信用代码"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="计划投资额(亿元)" prop="jhtze">
-                            <el-input v-model="form.jhtze" maxlength="50" placeholder="请输入计划投资额(亿元)"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="所属产业目录" prop="ml">
-                            <el-select v-model="form.ml" placeholder="请选择产业目录" value-key="value" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.shangloumulu" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="所属细分产业" prop="xfcy">
-                            <el-select v-model="form.xfcy" placeholder="请选择所属细分产业" value-key="value" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.bqlx" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row style="display: none;">
-                    <el-col :span="12">
-                        <el-form-item label="经度" prop="longitude">
-                            <el-input v-model="form.longitude" maxlength="50"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="纬度" prop="latitude">
-                            <el-input v-model="form.latitude" maxlength="50"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-form-item label="项目法人单位简介" prop="unitIntroduction">
-                    <el-input v-model="form.unitIntroduction" type="textarea" rows="4" maxlength="1000" placeholder="请输入项目法人单位简介"></el-input>
-                </el-form-item>
-                <el-form-item label="项目简介" prop="introduction">
-                    <el-input v-model="form.introduction" type="textarea" rows="4" maxlength="1000" placeholder="请输入项目简介"></el-input>
-                </el-form-item>
-                <el-form-item label="项目代表性照片">
-                    <ImageUpload v-model="form.fj" />
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveForm">确 定</el-button>
-            </span>
-        </el-dialog>
-        <!-- 地图弹窗 -->
-        <el-dialog :title="mapDialogTitle" :visible.sync="mapDialogVisible" width="1000px" append-to-body>
-            <luotu v-if="mapDialogVisible" @confirm-selection="handleMapConfirm" />
-        </el-dialog>
+  <div class="container">
+    <!-- 顶部信息 -->
+    <div class="containertop">
+      <div class="topleft">
+        <img src="@/assets/images/detailsicon/1.png" alt="" />
+        <span>基本信息</span>
+      </div>
+      <div
+        class="topright"
+        v-if="action === 'fill' || !action || action === 'okay'"
+      >
+        <el-button
+          type="primary"
+          size="medium"
+          plain
+          v-if="action === 'fill' || !action || action === 'okay'"
+          style="
+            border: none;
+            background-color: rgba(43, 98, 241, 0.1);
+            color: #2b62f1;
+          "
+          @click="edit"
+        >
+          <img
+            src="@/assets/images/detailsicon/icon-bj@2x.png"
+            alt="编辑"
+            style="width: 0.6rem; height: 0.6rem; margin-right: 4px"
+          />
+          编辑
+        </el-button>
+        <el-button
+          type="primary"
+          size="medium"
+          plain
+          v-if="checkRole(['admin', 'common', 'gov'])"
+          style="
+            border: none;
+            background-color: rgba(43, 98, 241, 0.1);
+            color: #2b62f1;
+          "
+          @click="handleExport"
+        >
+          <img
+            src="@/assets/images/detailsicon/icon-dc@2x.png"
+            alt="编辑"
+            style="width: 0.6rem; height: 0.6rem; margin-right: 4px"
+          />
+          导出
+        </el-button>
+      </div>
     </div>
-</template>
+    <!-- 内容展示区 -->
+    <div class="content">
+      <div class="picturediv">
+        <!-- 图片展示 -->
+        <img
+          v-if="basicInfo.fj"
+          :src="baseUrl + basicInfo.fj"
+          alt="项目代表性照片"
+        />
+      </div>
+      <div class="descriptionsdiv">
+        <el-descriptions class="margin-top" :column="3" border>
+          <el-descriptions-item
+            v-for="(item, index) in descriptions"
+            :key="index"
+            :span="
+              item.label === '项目法人单位简介' || item.label === '所属细分产业'
+                ? 3
+                : 1
+            "
+          >
+            <template slot="label">
+              <span v-if="item.required" style="color: red; margin-right: 4px"
+                >*</span
+              >
+              {{ item.label }}
+            </template>
 
+            {{ item.value }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </div>
+    <!-- 添加或编辑项目对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="70rem"
+      append-to-body
+    >
+      <el-form :model="form" :rules="rules" ref="form" label-width="180px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目名称" prop="name">
+              <el-input
+                v-model="form.name"
+                maxlength="50"
+                placeholder="请输入项目名称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建设地点" prop="jsdd">
+              <el-row :gutter="10">
+                <el-col :span="20">
+                  <el-input
+                    v-model="form.jsdd"
+                    maxlength="50"
+                    placeholder="请点击右侧落图"
+                    readonly
+                  ></el-input>
+                </el-col>
+                <el-col :span="3">
+                  <span @click="showMap" style="color: #2b62f1; cursor: pointer"
+                    >落图</span
+                  >
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目法人单位" prop="xmfrdwxz">
+              <el-input
+                v-model="form.xmfrdwxz"
+                maxlength="50"
+                placeholder="请输入项目法人单位"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="重点发展产业" prop="prioritize">
+              <el-input
+                v-model="form.prioritize"
+                maxlength="50"
+                placeholder="请输入重点发展产业"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="项目法人单位性质" prop="nature">
+              <el-select
+                v-model="form.nature"
+                placeholder="请选择"
+                value-key="value"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.xmfrdwxz"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建设模式" prop="jsms">
+              <el-select
+                v-model="form.jsms"
+                placeholder="请选择"
+                value-key="value"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.jsms"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="施工单位" prop="sgdw">
+              <el-input
+                v-model="form.sgdw"
+                maxlength="50"
+                placeholder="请输入施工单位"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目标签" prop="label">
+              <el-input
+                v-model="form.label"
+                maxlength="50"
+                placeholder="请输入项目标签"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设计单位" prop="sjdw">
+              <el-input
+                v-model="form.sjdw"
+                maxlength="50"
+                placeholder="请输入设计单位"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="项目负责人" prop="projectLeader">
+              <el-input
+                v-model="form.projectLeader"
+                maxlength="50"
+                placeholder="请输入项目负责人"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="总投资额（万元）" prop="ztze">
+              <el-input
+                v-model.number="form.ztze"
+                maxlength="50"
+                placeholder="请输入总投资额"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式" prop="phone">
+              <el-input
+                v-model="form.phone"
+                maxlength="50"
+                placeholder="请输入联系方式"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属功能区" prop="ssgnq">
+              <el-select
+                v-model="form.ssgnq"
+                placeholder="请选择"
+                value-key="value"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.ssgnq"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="施工许可证发放时间" prop="issuingTime">
+              <el-input
+                v-model="form.issuingTime"
+                maxlength="50"
+                placeholder="请输入施工许可证发放时间"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="建设起止时间" required>
+              <el-date-picker
+                v-model="form.begainTime"
+                type="month"
+                value-format="yyyy-MM"
+                placeholder="开始日期"
+                style="width: 11rem"
+              ></el-date-picker>
+              ~
+              <el-date-picker
+                v-model="form.endTime"
+                type="month"
+                value-format="yyyy-MM"
+                placeholder="结束日期"
+                style="width: 10.5rem"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="竣工验收时间" prop="acceptanceTime">
+              <el-input
+                v-model="form.acceptanceTime"
+                maxlength="50"
+                placeholder="请输入竣工验收时间"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="现状分类" prop="xzfl">
+              <el-select
+                v-model="form.xzfl"
+                placeholder="请选择"
+                value-key="value"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.xzfl"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建设进度" prop="jsjd">
+              <el-input
+                v-model="form.jsjd"
+                maxlength="50"
+                placeholder="请输入建设进度"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="统一社会信用代码" prop="tyshxydm">
+              <el-input
+                v-model="form.tyshxydm"
+                maxlength="50"
+                placeholder="请输入统一社会信用代码"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计划投资额(亿元)" prop="jhtze">
+              <el-input
+                v-model="form.jhtze"
+                maxlength="50"
+                placeholder="请输入计划投资额(亿元)"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="所属产业目录" prop="ml">
+              <el-select
+                v-model="form.ml"
+                placeholder="请选择产业目录"
+                value-key="value"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.shangloumulu"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所属细分产业" prop="xfcy">
+              <el-select
+                v-model="form.xfcy"
+                placeholder="请选择所属细分产业"
+                value-key="value"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.bqlx"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row style="display: none">
+          <el-col :span="12">
+            <el-form-item label="经度" prop="longitude">
+              <el-input v-model="form.longitude" maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="纬度" prop="latitude">
+              <el-input v-model="form.latitude" maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="项目法人单位简介" prop="unitIntroduction">
+          <el-input
+            v-model="form.unitIntroduction"
+            type="textarea"
+            rows="4"
+            maxlength="1000"
+            placeholder="请输入项目法人单位简介"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="项目简介" prop="introduction">
+          <el-input
+            v-model="form.introduction"
+            type="textarea"
+            rows="4"
+            maxlength="1000"
+            placeholder="请输入项目简介"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="项目代表性照片">
+          <ImageUpload v-model="form.fj" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveForm">确 定</el-button>
+      </span>
+    </el-dialog>
+    <!-- 地图弹窗 -->
+    <el-dialog
+      :title="mapDialogTitle"
+      :visible.sync="mapDialogVisible"
+      width="1000px"
+      append-to-body
+    >
+      <luotu v-if="mapDialogVisible" @confirm-selection="handleMapConfirm" />
+    </el-dialog>
+  </div>
+</template>
 
 <script>
-import ImageUpload from '@/components/ImageUpload2/index.vue';
-import luotu from '@/views/components/ProjectDetails/luotu.vue'
+import ImageUpload from "@/components/ImageUpload2/index.vue";
+import luotu from "@/views/components/ProjectDetails/luotu.vue";
 import { checkPermi, checkRole } from "@/utils/permission";
 
 export default {
-    components: {
-        ImageUpload, luotu
+  components: {
+    ImageUpload,
+    luotu,
+  },
+  dicts: [
+    "ssgnq",
+    "xmfrdwxz",
+    "xzfl",
+    "jsms",
+    "shangloumulu",
+    "bqlxbqlx",
+    "bqlx",
+  ],
+  props: {
+    size: {
+      type: String,
+      default: "",
     },
-    dicts: [
-        'ssgnq', 'xmfrdwxz', 'xzfl', 'jsms','shangloumulu',"bqlxbqlx",'bqlx'
-    ],
-    props: {
-        size: {
-            type: String,
-            default: ''
-        },
-        basicInfo: {
-            type: Object,
-            required: true
-        },
-        action: {
-            type: String,
-            required: true
-        }
+    basicInfo: {
+      type: Object,
+      required: true,
+    },
+    action: {
+      type: String,
+      required: true,
     },
-    data() {
-        return {
-            baseUrl: process.env.VUE_APP_BASE_API,
-            descriptions: [],
-            dialogImageUrl: '',
-            dialogVisibletwo: false,
-            dialogVisible: false,
-            mapDialogVisible: false,
-            mapDialogTitle: '地图',
-            title: '编辑基本信息',
-            form: {
-                name: '',
-                xmfrdwxz: '',
-                nature: 0,
-                sgdw: '',
-                sjdw: '',
-                ztze: 0,
-                id: 0,
-                ssgnq: 0,
-                begainTime: '',
-                endtime: '',
-                xzfl: 0,
-                jsdd: '',
-                prioritize: '',
-                jsms: 0,
-                label: '',
-                projectLeader: '',
-                phone: '',
-                issuingTime: '',
-                acceptanceTime: '',
-                unitIntroduction: '',
-                introduction: '',
-                fj: '',
-                jsjd: '',
-                // 经度
-                longitude:'',
-                //纬度
-                latitude:''
-            },
-            rules: {
-                name: [
-                    { required: true, message: '项目名称不能为空', trigger: 'blur' },
-                ],
-                xmfrdwxz: [
-                    { required: true, message: '项目法人单位不能为空', trigger: 'blur' },
-                ],
-                nature: [
-                    { required: true, message: '项目法人单位性质不能为空', trigger: 'change' }
-                ],
-                ztze: [
-                    { required: true, message: '总投资额不能为空', trigger: 'blur' },
-                    { type: 'number', message: '总投资额必须是数字', trigger: 'blur' },
-                ],
-                ssgnq: [
-                    { required: true, message: '所属功能区不能为空', trigger: 'change' }
-                ],
-                begainTime: [
-                    { required: true, message: '建设起始时间不能为空', trigger: 'change' }
-                ],
-                endTime: [
-                    { required: true, message: '建设结束时间不能为空', trigger: 'change' }
-                ],
-                xzfl: [
-                    { required: true, message: '现状分类不能为空', trigger: 'change' }
-                ],
-                jsms: [
-                    { required: true, message: '建设模式不能为空', trigger: 'change' }
-                ],
-                projectLeader: [
-                    { required: true, message: '项目负责人不能为空', trigger: 'blur' },
-                ],
-                phone: [
-                    { required: true, message: '联系方式不能为空', trigger: 'blur' },
-                    { pattern: /^[\d-]+$/, message: '联系方式只能包含数字和连字符', trigger: 'blur' },
-                ],
-                unitIntroduction: [
-                    { max: 1000, message: '项目法人单位简介长度不能超过1000个字', trigger: 'blur' }
-                ],
-                introduction: [
-                    { max: 1000, message: '项目简介长度不能超过1000个字', trigger: 'blur' }
-                ],
-                tyshxydm: [
-                    { required: true, message: "请填写", trigger: "blur" },
-                    {
-                    pattern: /^[a-zA-Z0-9]{18}$/,
-                    message: "请输入正确格式的18位统一社会信用代码",
-                    trigger: "blur",
-                    },
-                ],
-            },
-            // select映射
-            ssgnqMap: {
-                1: '高端制造与国际贸易区',
-                2: '独墅湖科教创新区',
-                3: '阳澄湖半岛旅游度假区',
-                4: '金鸡湖商务区',
-                5: '苏相合作区'
-            },
-            xmfrdwxzMap: {
-                1: '国企',
-                2: '外资企业',
-                3: '民营企业',
-                4: '其他'
-            },
-            jsmsMap: {
-                1: '工地实施',
-                2: '利用存量用地改扩建',
-            },
-            xzflMap: {
-                1: '已建',
-                2: '在建',
-                3: '拟建',
-            },
-            mlMap:{
-                1:'重点鼓励上楼',
-                2:'有条件上楼',
-            },
-            xfMap:{
-                1:'新一代信息技术',
-                2:'高端装备制造',
-                3:'生物医药及大健康',
-                4:'纳米技术应用及新材料',
-                5:'人工智能及数字产业',
-                6:'新能源及绿色产业',
-            }
+  },
+  data() {
+    return {
+      requiredFields: [
+        "项目名称",
+        "项目法人单位",
+        "项目法人单位性质",
+        "建设模式",
+        "项目负责人",
+        "总投资额（万元）",
+        "联系方式",
+        "所属功能区",
+        "建设起止时间",
+        "现状分类",
+        "统一社会信用代码",
+      ],
+      baseUrl: process.env.VUE_APP_BASE_API,
+      descriptions: [],
+      dialogImageUrl: "",
+      dialogVisibletwo: false,
+      dialogVisible: false,
+      mapDialogVisible: false,
+      mapDialogTitle: "地图",
+      title: "编辑基本信息",
+      form: {
+        name: "",
+        xmfrdwxz: "",
+        nature: 0,
+        sgdw: "",
+        sjdw: "",
+        ztze: 0,
+        id: 0,
+        ssgnq: 0,
+        begainTime: "",
+        endtime: "",
+        xzfl: 0,
+        jsdd: "",
+        prioritize: "",
+        jsms: 0,
+        label: "",
+        projectLeader: "",
+        phone: "",
+        issuingTime: "",
+        acceptanceTime: "",
+        unitIntroduction: "",
+        introduction: "",
+        fj: "",
+        jsjd: "",
+        // 经度
+        longitude: "",
+        //纬度
+        latitude: "",
+      },
+      rules: {
+        name: [
+          { required: true, message: "项目名称不能为空", trigger: "blur" },
+        ],
+        xmfrdwxz: [
+          { required: true, message: "项目法人单位不能为空", trigger: "blur" },
+        ],
+        nature: [
+          {
+            required: true,
+            message: "项目法人单位性质不能为空",
+            trigger: "change",
+          },
+        ],
+        ztze: [
+          { required: true, message: "总投资额不能为空", trigger: "blur" },
+          { type: "number", message: "总投资额必须是数字", trigger: "blur" },
+        ],
+        ssgnq: [
+          { required: true, message: "所属功能区不能为空", trigger: "change" },
+        ],
+        begainTime: [
+          {
+            required: true,
+            message: "建设起始时间不能为空",
+            trigger: "change",
+          },
+        ],
+        endTime: [
+          {
+            required: true,
+            message: "建设结束时间不能为空",
+            trigger: "change",
+          },
+        ],
+        xzfl: [
+          { required: true, message: "现状分类不能为空", trigger: "change" },
+        ],
+        jsms: [
+          { required: true, message: "建设模式不能为空", trigger: "change" },
+        ],
+        projectLeader: [
+          { required: true, message: "项目负责人不能为空", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "联系方式不能为空", trigger: "blur" },
+          {
+            pattern: /^[\d-]+$/,
+            message: "联系方式只能包含数字和连字符",
+            trigger: "blur",
+          },
+        ],
+        unitIntroduction: [
+          {
+            max: 1000,
+            message: "项目法人单位简介长度不能超过1000个字",
+            trigger: "blur",
+          },
+        ],
+        introduction: [
+          {
+            max: 1000,
+            message: "项目简介长度不能超过1000个字",
+            trigger: "blur",
+          },
+        ],
+        tyshxydm: [
+          { required: true, message: "请填写", trigger: "blur" },
+          {
+            pattern: /^[a-zA-Z0-9]{18}$/,
+            message: "请输入正确格式的18位统一社会信用代码",
+            trigger: "blur",
+          },
+        ],
+      },
+      // select映射
+      ssgnqMap: {
+        1: "高端制造与国际贸易区",
+        2: "独墅湖科教创新区",
+        3: "阳澄湖半岛旅游度假区",
+        4: "金鸡湖商务区",
+        5: "苏相合作区",
+      },
+      xmfrdwxzMap: {
+        1: "国企",
+        2: "外资企业",
+        3: "民营企业",
+        4: "其他",
+      },
+      jsmsMap: {
+        1: "工地实施",
+        2: "利用存量用地改扩建",
+      },
+      xzflMap: {
+        1: "已建",
+        2: "在建",
+        3: "拟建",
+      },
+      mlMap: {
+        1: "重点鼓励上楼",
+        2: "有条件上楼",
+      },
+      xfMap: {
+        1: "新一代信息技术",
+        2: "高端装备制造",
+        3: "生物医药及大健康",
+        4: "纳米技术应用及新材料",
+        5: "人工智能及数字产业",
+        6: "新能源及绿色产业",
+      },
+    };
+  },
+  watch: {
+    basicInfo: {
+      handler(newVal) {
+        this.descriptions = this.formatDescriptions(newVal);
+        this.form = {
+          ...newVal,
+          begainTime: newVal.begainTime ? new Date(newVal.begainTime) : "",
+          endTime: newVal.endTime ? new Date(newVal.endTime) : "",
         };
+      },
+      immediate: true,
+      deep: true,
     },
-    watch: {
-        basicInfo: {
-            handler(newVal) {
-                this.descriptions = this.formatDescriptions(newVal);
-                this.form = {
-                    ...newVal,
-                    begainTime: newVal.begainTime ? new Date(newVal.begainTime) : '',
-                    endTime: newVal.endTime ? new Date(newVal.endTime) : '',
-                };
-            },
-            immediate: true,
-            deep: true
-        }
+  },
+  methods: {
+    checkPermi,
+    checkRole,
+    // 添加处理地图选择的方法
+    handleMapConfirm(location) {
+      this.form.jsdd = location.address; // 设置建设地点
+      this.form.longitude = location.lng; // 设置经度
+      this.form.latitude = location.lat; // 设置纬度
+      this.mapDialogVisible = false; // 关闭地图弹窗
     },
-    methods: {
-        checkPermi,
-        checkRole,
-        // 添加处理地图选择的方法
-        handleMapConfirm(location) {
-            this.form.jsdd = location.address; // 设置建设地点
-            this.form.longitude = location.lng;     // 设置经度
-            this.form.latitude = location.lat;     // 设置纬度
-            this.mapDialogVisible = false;    // 关闭地图弹窗
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('/gysl/basicInformation/export', {
-                xmid: this.basicInfo.id
-            }, `基本信息导出${new Date().getTime()}.xlsx`)
-        },
-        // 格式化描述信息
-        formatDescriptions(data) {
-            return [
-                { label: '项目名称', value: data.name },
-                { label: '项目法人单位', value: data.xmfrdwxz },
-                { label: '项目法人单位性质', value: this.xmfrdwxzMap[data.nature] || '' },
-                { label: '施工单位', value: data.sgdw },
-                { label: '设计单位', value: data.sjdw },
-                { label: '总投资额（万元）', value: data.ztze },
-                { label: '所属功能区', value: this.ssgnqMap[data.ssgnq] || '' },
-                {
-                    label: '建设起止时间',
-                    value: `${data.begainTime ? data.begainTime : ''} 至 ${data.endTime ? data.endTime : ''}`
-                },
-                { label: '现状分类', value: this.xzflMap[data.xzfl] || '' },
-                { label: '建设地点', value: data.jsdd },
-                { label: '重点发展产业', value: data.prioritize },
-                { label: '建设模式', value: this.jsmsMap[data.jsms] || '' },
-                { label: '项目标签', value: data.label },
-                { label: '项目负责人', value: data.projectLeader },
-                { label: '联系方式', value: data.phone },
-                { label: '施工许可证发放时间', value: data.issuingTime },
-                { label: '竣工验收时间', value: data.acceptanceTime },
-                { label: '建设进度', value: data.jsjd },
-                { label: '统一社会信用代码', value: data.tyshxydm },
-                { label: '计划投资额(亿元)', value: data.jhtze },
-                { label: '所属产业目录', value: this.mlMap[data.ml] || ''  },
-                { label: '所属细分产业', value: this.xfMap[data.xfcy] || ''  },
-                { label: '项目法人单位简介', value: data.unitIntroduction },
-                { label: '项目简介', value: data.introduction }
-            ];
-        },
-        // 打开编辑对话框
-        edit() {
-            this.dialogVisible = true;
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/gysl/basicInformation/export",
+        {
+          xmid: this.basicInfo.id,
         },
-        // 保存表单
-        saveForm() {
-            if (this.validateForm()) {
-                const formData = this.prepareFormData(this.form);
-                // 触发事件，将数据传递给父组件
-                this.$emit('update-data', formData);
-                this.dialogVisible = false;
-            }
+        `基本信息导出${new Date().getTime()}.xlsx`
+      );
+    },
+    // 格式化描述信息
+    formatDescriptions(data) {
+      const requiredFields = this.requiredFields;
+      return [
+        { label: "项目名称", value: data.name },
+        { label: "项目法人单位", value: data.xmfrdwxz },
+        {
+          label: "项目法人单位性质",
+          value: this.xmfrdwxzMap[data.nature] || "",
         },
-        // 手动验证表单
-        validateForm() {
-            for (const field in this.rules) {
-                const rules = this.rules[field];
-                const value = this.form[field];
-                for (const rule of rules) {
-                    if (rule.required && !value) {
-                        this.$message.error(rule.message);
-                        return false;
-                    }
-                }
-            }
-            return true;
+        { label: "施工单位", value: data.sgdw },
+        { label: "设计单位", value: data.sjdw },
+        { label: "总投资额（万元）", value: data.ztze },
+        { label: "所属功能区", value: this.ssgnqMap[data.ssgnq] || "" },
+        {
+          label: "建设起止时间",
+          value: `${data.begainTime ? data.begainTime : ""} 至 ${
+            data.endTime ? data.endTime : ""
+          }`,
         },
-        // 准备表单数据
-        // 准备表单数据
-        prepareFormData(formData) {
-            // 格式化日期字段
-            const formatDate = (date) => {
-                if (!date) return '';
-                // 如果是 Date 对象，直接格式化；如果是字符串，保持原样
-                return date instanceof Date ? date.toISOString().split('T')[0] : date;
-            };
+        { label: "现状分类", value: this.xzflMap[data.xzfl] || "" },
+        { label: "建设地点", value: data.jsdd },
+        { label: "重点发展产业", value: data.prioritize },
+        { label: "建设模式", value: this.jsmsMap[data.jsms] || "" },
+        { label: "项目标签", value: data.label },
+        { label: "项目负责人", value: data.projectLeader },
+        { label: "联系方式", value: data.phone },
+        { label: "施工许可证发放时间", value: data.issuingTime },
+        { label: "竣工验收时间", value: data.acceptanceTime },
+        { label: "建设进度", value: data.jsjd },
+        { label: "统一社会信用代码", value: data.tyshxydm },
+        { label: "计划投资额(亿元)", value: data.jhtze },
+        { label: "所属产业目录", value: this.mlMap[data.ml] || "" },
+        { label: "所属细分产业", value: this.xfMap[data.xfcy] || "" },
+        { label: "项目法人单位简介", value: data.unitIntroduction },
+        { label: "项目简介", value: data.introduction },
+      ].map((item) => ({
+        ...item,
+        required: requiredFields.includes(item.label),
+      }));
+    },
+    // 打开编辑对话框
+    edit() {
+      this.dialogVisible = true;
+    },
+    // 保存表单
+    saveForm() {
+      if (this.validateForm()) {
+        const formData = this.prepareFormData(this.form);
+        // 触发事件，将数据传递给父组件
+        this.$emit("update-data", formData);
+        this.dialogVisible = false;
+      }
+    },
+    // 手动验证表单
+    validateForm() {
+      for (const field in this.rules) {
+        const rules = this.rules[field];
+        const value = this.form[field];
+        for (const rule of rules) {
+          if (rule.required && !value) {
+            this.$message.error(rule.message);
+            return false;
+          }
+        }
+      }
+      return true;
+    },
+    // 准备表单数据
+    // 准备表单数据
+    prepareFormData(formData) {
+      // 格式化日期字段
+      const formatDate = (date) => {
+        if (!date) return "";
+        // 如果是 Date 对象，直接格式化；如果是字符串，保持原样
+        return date instanceof Date ? date.toISOString().split("T")[0] : date;
+      };
 
-            return {
-                ...formData,
-                begainTime: formatDate(formData.begainTime), // 单独格式化 begainTime
-                endTime: formatDate(formData.endTime),     // 单独格式化 endTime
-                createBy: '',
-                createId: 0,
-                createTime: '',
-                updateBy: '',
-                updateId: 0,
-                updateTime: '',
-            };
-        },
+      return {
+        ...formData,
+        begainTime: formatDate(formData.begainTime), // 单独格式化 begainTime
+        endTime: formatDate(formData.endTime), // 单独格式化 endTime
+        createBy: "",
+        createId: 0,
+        createTime: "",
+        updateBy: "",
+        updateId: 0,
+        updateTime: "",
+      };
+    },
 
-        // formatDateRange(dateRange) {
-        //     if (!dateRange || dateRange.length !== 2) return ['', '']; // 防止空值报错
-        //     // 格式化日期，确保返回 YYYY-MM-DD 格式
-        //     const formatDate = (date) => {
-        //         if (!date) return '';
-        //         // 如果是 Date 对象，直接格式化；如果是字符串，先转成 Date 再格式化
-        //         const d = date instanceof Date ? date : new Date(date);
-        //         return d.toISOString().split('T')[0]; // 取 YYYY-MM-DD 部分
-        //     };
+    // formatDateRange(dateRange) {
+    //     if (!dateRange || dateRange.length !== 2) return ['', '']; // 防止空值报错
+    //     // 格式化日期，确保返回 YYYY-MM-DD 格式
+    //     const formatDate = (date) => {
+    //         if (!date) return '';
+    //         // 如果是 Date 对象，直接格式化；如果是字符串，先转成 Date 再格式化
+    //         const d = date instanceof Date ? date : new Date(date);
+    //         return d.toISOString().split('T')[0]; // 取 YYYY-MM-DD 部分
+    //     };
 
-        //     return [
-        //         formatDate(dateRange[0]), // 开始日期
-        //         formatDate(dateRange[1])  // 结束日期
-        //     ];
-        // },
-        // 处理附件上传成功
-        handleAttachmentSuccess(response, file) {
-            this.form.fj = response.url;
-        },
-        // 上传前验证
-        beforeAttachmentUpload(file) {
-            const isImage = file.type.startsWith('image/');
-            const isLt2M = file.size / 1024 / 1024 < 2;
-            if (!isImage) this.$message.error('只能上传图片文件!');
-            if (!isLt2M) this.$message.error('上传图片大小不能超过 2MB!');
-            return isImage && isLt2M;
-        },
-        // 删除附件
-        removeAttachment() {
-            this.form.fj = '';
-        },
-        // 显示地图弹窗
-        showMap() {
-            this.mapDialogVisible = true;
-        }
-    }
+    //     return [
+    //         formatDate(dateRange[0]), // 开始日期
+    //         formatDate(dateRange[1])  // 结束日期
+    //     ];
+    // },
+    // 处理附件上传成功
+    handleAttachmentSuccess(response, file) {
+      this.form.fj = response.url;
+    },
+    // 上传前验证
+    beforeAttachmentUpload(file) {
+      const isImage = file.type.startsWith("image/");
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      if (!isImage) this.$message.error("只能上传图片文件!");
+      if (!isLt2M) this.$message.error("上传图片大小不能超过 2MB!");
+      return isImage && isLt2M;
+    },
+    // 删除附件
+    removeAttachment() {
+      this.form.fj = "";
+    },
+    // 显示地图弹窗
+    showMap() {
+      this.mapDialogVisible = true;
+    },
+  },
 };
 </script>
 
-
 <style scoped>
 .container {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    background-color: #FFFFFF;
-    box-shadow: 0rem 0.13rem 0.63rem 0rem rgba(177, 177, 177, 0.1);
-    border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background-color: #ffffff;
+  box-shadow: 0rem 0.13rem 0.63rem 0rem rgba(177, 177, 177, 0.1);
+  border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
 }
 
 .content {
-    padding: 1rem;
-    display: flex;
+  padding: 1rem;
+  display: flex;
 }
 
 .containertop {
-    height: auto;
-    display: flex;
-    justify-content: space-between;
-    padding: .5rem;
-    border-bottom: 1px solid #E5E5E5;
+  height: auto;
+  display: flex;
+  justify-content: space-between;
+  padding: 0.5rem;
+  border-bottom: 1px solid #e5e5e5;
 }
 
 .topleft {
-    height: 2rem;
-    width: 8rem;
-    display: flex;
-    gap: 0.4rem;
-    align-items: center;
+  height: 2rem;
+  width: 8rem;
+  display: flex;
+  gap: 0.4rem;
+  align-items: center;
 }
 
 .topleft img {
-    width: 0.81rem;
-    height: 0.81rem;
+  width: 0.81rem;
+  height: 0.81rem;
 }
 
 .topleft span {
-    width: auto;
-    height: 1rem;
-    font-family: aliregular;
-    font-weight: 500;
-    font-size: 1rem;
-    color: #3D424C;
-    line-height: 1rem;
-    text-align: right;
-    font-style: normal;
-    text-transform: none;
+  width: auto;
+  height: 1rem;
+  font-family: aliregular;
+  font-weight: 500;
+  font-size: 1rem;
+  color: #3d424c;
+  line-height: 1rem;
+  text-align: right;
+  font-style: normal;
+  text-transform: none;
 }
 
 .picturediv {
-    width: 18.31rem;
-    height: 25rem;
-    position: relative;
-    overflow: hidden;
+  width: 18.31rem;
+  height: 25rem;
+  position: relative;
+  overflow: hidden;
 }
 
 .picturediv img {
-    width: 100%;
-    height: auto;
-    object-fit: cover;
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
+  width: 100%;
+  height: auto;
+  object-fit: cover;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
 }
 
 .descriptionsdiv {
-    width: calc(100% - 18.31rem);
-    margin-left: 1rem;
-    height: auto;
+  width: calc(100% - 18.31rem);
+  margin-left: 1rem;
+  height: auto;
 }
 
 .two-row-item {
-    height: auto;
+  height: auto;
 }
 
 .tanchuang {
-    width: 70rem;
-    height: auto;
-    padding: 2rem;
+  width: 70rem;
+  height: auto;
+  padding: 2rem;
 }
 </style>
diff --git a/src/views/components/ProjectDetails/Buildings.vue b/src/views/components/ProjectDetails/Buildings.vue
index 177806f..c34f7c8 100644
--- a/src/views/components/ProjectDetails/Buildings.vue
+++ b/src/views/components/ProjectDetails/Buildings.vue
@@ -1,641 +1,863 @@
 <template>
-    <div class="container">
-        <!-- 顶部信息 -->
-        <div class="containertop">
-            <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
-                <span>建筑信息</span>
-            </div>
-            <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
-                <el-button type="primary" size="medium" plain v-if="action === 'fill' || !action || action === 'okay'"
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="addBuildingTag">
-                    <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="新增"
-                        style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-                    新增
-                </el-button>
-                <el-button type="primary" size="medium" plain v-if="buildings.length !== 0"
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;"
-                    @click="handleEdit(selectedBuilding)">
-                    <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
-                        style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-                    编辑
-                </el-button>
-                <el-button type="primary" size="medium" plain v-if="action === 'fill' || !action || action === 'okay'"
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleImport">
-                    <i class="el-icon-download" style="width: 0.6rem; height: 0.6rem; margin-right: 4px;"></i>
-                    导入
-                </el-button>
-                <el-button type="primary" size="medium" plain v-if="checkRole(['admin', 'common','gov'])"
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleExport">
-                    <img src="../../../assets/images/detailsicon/icon-dc@2x.png" alt="导出"
-                        style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-                    导出
-                </el-button>
-            </div>
-        </div>
-        <!-- 栋数（楼栋名称） -->
-        <div class="tagdiv">
-            <div v-if="buildings.length === 0" class="no-data"
-                style="width: 100%; display: flex;align-items: center;justify-content: center;color: gray;">
-                暂无数据
-            </div>
-            <div class="tagitem" v-for="building in buildings" :key="building.id" @click="selectBuilding(building)"
-                :class="[getTagItemClass(building), { 'active-tag': selectedBuilding && selectedBuilding.id === building.id }]">
-                <img src="@/assets/images/detailsicon/icon-楼栋@2x.png" alt="">
-                <span>{{ building.name }}</span>
-                <img src="@/assets/images/detailsicon/icon-gb@2x.png"
-                    v-if="action === 'fill' || !action || action === 'okay'" alt=""
-                    @click.stop="handleDelete(building.id)">
-            </div>
-        </div>
-        <!-- 内容区 -->
-        <div class="content" v-if="buildings.length > 0">
-            <div class="descriptionsdiv">
-                <el-descriptions class="margin-top" :column="4" border>
-                    <el-descriptions-item>
-                        <template slot="label">是否为重要楼栋</template>
-                        {{ getTextForBoolean(selectedBuilding.sfwzyld) }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">层数</template>
-                        {{ selectedBuilding.floor }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">总建筑高度（米）</template>
-                        {{ selectedBuilding.totalBuildingHeight }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">首层高度（平方米）</template>
-                        {{ selectedBuilding.scgd }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">2至4层层高（米）：</template>
-                        {{ selectedBuilding.twoAndFourCg }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">4层以上层高(米)：</template>
-                        {{ selectedBuilding.fourYscg }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">首层地面荷载(吨/)：</template>
-                        {{ selectedBuilding.scdmhz }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">二至三层楼面荷载(吨/平方米)：</template>
-                        {{ selectedBuilding.twoAndThreeLmhz }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">标准层面积(千平方米)：</template>
-                        {{ selectedBuilding.bzcmj }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">柱距：</template>
-                        {{ selectedBuilding.zj }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">是否有吊装口：</template>
-                        {{ getTextForBoolean(selectedBuilding.sfydzk) }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">是否有汽车盘道：</template>
-                        {{ getTextForBoolean(selectedBuilding.sfyqcpd) }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">四层及以上楼面荷载(吨/平方米)：</template>
-                        {{ selectedBuilding.fourYslmhz }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">	地基基础等级：</template>
-                        {{ selectedBuilding.djjcdj }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">	吊车情况：</template>
-                        {{ selectedBuilding.dcqk }}
-                    </el-descriptions-item>
-                    <el-descriptions-item>
-                        <template slot="label">	货梯情况：</template>
-                        {{ selectedBuilding.htqk }}
-                    </el-descriptions-item>
-                </el-descriptions>
-            </div>
-        </div>
-        <!-- 新增编辑楼栋弹窗 -->
-        <el-dialog :title="buildingForm.id ? '编辑楼栋' : '新增楼栋'" :visible.sync="dialogVisible" width="68%">
-            <el-form :model="buildingForm" :rules="rules" ref="buildingFormRef" label-width="260px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="楼栋名称：" prop="name">
-                            <el-input placeholder="请输入楼栋名称" v-model="buildingForm.name"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="是否为重要楼栋：" prop="sfwzyld">
-                            <el-select v-model="buildingForm.sfwzyld" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.isno" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="首层高度（米）：" prop="scgd">
-                            <el-input v-model="buildingForm.scgd" placeholder="请输入首层高度"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="层数：" prop="floor">
-                            <el-input v-model="buildingForm.floor" placeholder="请输入层数"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="4层以上层高（米）：" prop="fourYscg">
-                            <el-input v-model="buildingForm.fourYscg" placeholder="请输入层4层以上层高"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="柱距：" prop="zj">
-                            <el-input v-model="buildingForm.zj" placeholder="请输入柱距"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="2至4层层高（米）：" porp="twoAndFourCg">
-                            <el-input v-model="buildingForm.twoAndFourCg" placeholder="请输入2至4层层高"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="总建筑高度（米）：" prop="totalBuildingHeight">
-                            <el-input v-model="buildingForm.totalBuildingHeight" placeholder="请输入总建筑高度"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="首层地面荷载（吨/平方米）：" prop="scdmhz">
-                            <el-input v-model="buildingForm.scdmhz" placeholder="请输入首层地面荷载"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="二至三层楼面荷载（吨/平方米）：" prop="twoAndThreeLmhz">
-                            <el-input v-model="buildingForm.twoAndThreeLmhz" placeholder="请输入二至三层楼面荷载"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="标准层面积（千平方米）：" prop="bzcmj">
-                            <el-input v-model="buildingForm.bzcmj" placeholder="请输入标准层面积"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="是否有汽车盘道：" prop="sfyqcpd">
-                            <el-select v-model="buildingForm.sfyqcpd" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.isno" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="是否有吊装口：" prop="sfydzk">
-                            <el-select v-model="buildingForm.sfydzk" placeholder="请选择" style="width: 100%;">
-                                <el-option v-for="dict in dict.type.isno" :key="dict.value" :label="dict.label"
-                                    :value="parseInt(dict.value)"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="四层及以上楼面荷载（吨/平方米）：" prop="fourYslmhz">
-                            <el-input v-model="buildingForm.fourYslmhz" placeholder="请输入四层及以上楼面荷载"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="地基基础等级：" prop="djjcdj">
-                            <el-input v-model="buildingForm.djjcdj" placeholder="请输入地基基础等级"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="吊车情况：" prop="dcqk">
-                            <el-input v-model="buildingForm.dcqk" placeholder="请输入吊车情况"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item label="货梯情况：" prop="htqk">
-                            <el-input v-model="buildingForm.htqk" placeholder="请输入货梯情况"></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="handleAddBuilding">确 定</el-button>
-            </span>
-        </el-dialog>
-
-
-        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-            <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-                :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                :data="upload.data" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess"
-                :auto-upload="false" drag>
-                <i class="el-icon-upload"></i>
-                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-                <div class="el-upload__tip text-center" slot="tip">
-                    <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-                        @click="importTemplate">下载模板</el-link>
-                </div>
-            </el-upload>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitFileForm">确 定</el-button>
-                <el-button @click="upload.open = false">取 消</el-button>
-            </div>
-        </el-dialog>
+  <div class="container">
+    <!-- 顶部信息 -->
+    <div class="containertop">
+      <div class="topleft">
+        <img src="@/assets/images/detailsicon/1.png" alt="" />
+        <span>建筑信息</span>
+      </div>
+      <div
+        class="topright"
+        v-if="action === 'fill' || !action || action === 'okay'"
+      >
+        <el-button
+          type="primary"
+          size="medium"
+          plain
+          v-if="action === 'fill' || !action || action === 'okay'"
+          style="
+            border: none;
+            background-color: rgba(43, 98, 241, 0.1);
+            color: #2b62f1;"
+          @click="addBuildingTag"
+        >
+          <img
+            src="@/assets/images/detailsicon/icon-xz@2x.png"
+            alt="新增"
+            style="width: 0.6rem; height: 0.6rem; margin-right: 4px"
+          />
+          新增
+        </el-button>
+        <el-button
+          type="primary"
+          size="medium"
+          plain
+          v-if="buildings.length !== 0"
+          style="
+            border: none;
+            background-color: rgba(43, 98, 241, 0.1);
+            color: #2b62f1;
+          "
+          @click="handleEdit(selectedBuilding)"
+        >
+          <img
+            src="@/assets/images/detailsicon/icon-bj@2x.png"
+            alt="编辑"
+            style="width: 0.6rem; height: 0.6rem; margin-right: 4px"
+          />
+          编辑
+        </el-button>
+        <el-button
+          type="primary"
+          size="medium"
+          plain
+          v-if="action === 'fill' || !action || action === 'okay'"
+          style="
+            border: none;
+            background-color: rgba(43, 98, 241, 0.1);
+            color: #2b62f1;
+          "
+          @click="handleImport"
+        >
+          <i
+            class="el-icon-download"
+            style="width: 0.6rem; height: 0.6rem; margin-right: 4px"
+          ></i>
+          导入
+        </el-button>
+        <el-button
+          type="primary"
+          size="medium"
+          plain
+          v-if="checkRole(['admin', 'common', 'gov'])"
+          style="
+            border: none;
+            background-color: rgba(43, 98, 241, 0.1);
+            color: #2b62f1;
+          "
+          @click="handleExport"
+        >
+          <img
+            src="@/assets/images/detailsicon/icon-dc@2x.png"
+            alt="导出"
+            style="width: 0.6rem; height: 0.6rem; margin-right: 4px"
+          />
+          导出
+        </el-button>
+      </div>
+    </div>
+    <!-- 栋数（楼栋名称） -->
+    <div class="tagdiv">
+      <div
+        v-if="buildings.length === 0"
+        class="no-data"
+        style="
+          width: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: gray;
+        "
+      >
+        暂无数据
+      </div>
+      <div
+        class="tagitem"
+        v-for="building in buildings"
+        :key="building.id"
+        @click="selectBuilding(building)"
+        :class="[
+          getTagItemClass(building),
+          {
+            'active-tag':
+              selectedBuilding && selectedBuilding.id === building.id,
+          },
+        ]"
+      >
+        <img src="@/assets/images/detailsicon/icon-楼栋@2x.png" alt="" />
+        <span>{{ building.name }}</span>
+        <img
+          src="@/assets/images/detailsicon/icon-gb@2x.png"
+          v-if="action === 'fill' || !action || action === 'okay'"
+          alt=""
+          @click.stop="handleDelete(building.id)"
+        />
+      </div>
     </div>
+    <!-- 内容区 -->
+    <div class="content" v-if="buildings.length > 0">
+      <div class="descriptionsdiv">
+        <el-descriptions class="margin-top" :column="4" border>
+          <el-descriptions-item>
+            <template slot="label">
+                <span style="color: red;">*</span>
+                是否为重要楼栋</template>
+            {{ getTextForBoolean(selectedBuilding.sfwzyld) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+                <span style="color: red;">*</span>层数</template>
+            {{ selectedBuilding.floor }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">
+                <span style="color: red;">*</span>总建筑高度（米）</template>
+            {{ selectedBuilding.totalBuildingHeight }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"><span style="color: red;">*</span>首层高度（平方米）</template>
+            {{ selectedBuilding.scgd }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">2至4层层高（米）：</template>
+            {{ selectedBuilding.twoAndFourCg }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">4层以上层高(米)：</template>
+            {{ selectedBuilding.fourYscg }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"><span style="color: red;">*</span>首层地面荷载(吨/)：</template>
+            {{ selectedBuilding.scdmhz }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">二至三层楼面荷载(吨/平方米)：</template>
+            {{ selectedBuilding.twoAndThreeLmhz }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"><span style="color: red;">*</span>标准层面积(千平方米)：</template>
+            {{ selectedBuilding.bzcmj }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">柱距：</template>
+            {{ selectedBuilding.zj }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">是否有吊装口：</template>
+            {{ getTextForBoolean(selectedBuilding.sfydzk) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">是否有汽车盘道：</template>
+            {{ getTextForBoolean(selectedBuilding.sfyqcpd) }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label">四层及以上楼面荷载(吨/平方米)：</template>
+            {{ selectedBuilding.fourYslmhz }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 地基基础等级：</template>
+            {{ selectedBuilding.djjcdj }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 吊车情况：</template>
+            {{ selectedBuilding.dcqk }}
+          </el-descriptions-item>
+          <el-descriptions-item>
+            <template slot="label"> 货梯情况：</template>
+            {{ selectedBuilding.htqk }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+    </div>
+    <!-- 新增编辑楼栋弹窗 -->
+    <el-dialog
+      :title="buildingForm.id ? '编辑楼栋' : '新增楼栋'"
+      :visible.sync="dialogVisible"
+      width="68%"
+    >
+      <el-form
+        :model="buildingForm"
+        :rules="rules"
+        ref="buildingFormRef"
+        label-width="260px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="楼栋名称：" prop="name">
+              <el-input
+                placeholder="请输入楼栋名称"
+                v-model="buildingForm.name"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否为重要楼栋：" prop="sfwzyld">
+              <el-select
+                v-model="buildingForm.sfwzyld"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.isno"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="首层高度（米）：" prop="scgd">
+              <el-input
+                v-model="buildingForm.scgd"
+                placeholder="请输入首层高度"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="层数：" prop="floor">
+              <el-input
+                v-model="buildingForm.floor"
+                placeholder="请输入层数"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="4层以上层高（米）：" prop="fourYscg">
+              <el-input
+                v-model="buildingForm.fourYscg"
+                placeholder="请输入层4层以上层高"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="柱距：" prop="zj">
+              <el-input
+                v-model="buildingForm.zj"
+                placeholder="请输入柱距"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="2至4层层高（米）：" porp="twoAndFourCg">
+              <el-input
+                v-model="buildingForm.twoAndFourCg"
+                placeholder="请输入2至4层层高"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="总建筑高度（米）：" prop="totalBuildingHeight">
+              <el-input
+                v-model="buildingForm.totalBuildingHeight"
+                placeholder="请输入总建筑高度"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="首层地面荷载（吨/平方米）：" prop="scdmhz">
+              <el-input
+                v-model="buildingForm.scdmhz"
+                placeholder="请输入首层地面荷载"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="二至三层楼面荷载（吨/平方米）："
+              prop="twoAndThreeLmhz"
+            >
+              <el-input
+                v-model="buildingForm.twoAndThreeLmhz"
+                placeholder="请输入二至三层楼面荷载"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="标准层面积（千平方米）：" prop="bzcmj">
+              <el-input
+                v-model="buildingForm.bzcmj"
+                placeholder="请输入标准层面积"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否有汽车盘道：" prop="sfyqcpd">
+              <el-select
+                v-model="buildingForm.sfyqcpd"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.isno"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="是否有吊装口：" prop="sfydzk">
+              <el-select
+                v-model="buildingForm.sfydzk"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.isno"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="四层及以上楼面荷载（吨/平方米）："
+              prop="fourYslmhz"
+            >
+              <el-input
+                v-model="buildingForm.fourYslmhz"
+                placeholder="请输入四层及以上楼面荷载"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="地基基础等级：" prop="djjcdj">
+              <el-input
+                v-model="buildingForm.djjcdj"
+                placeholder="请输入地基基础等级"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="吊车情况：" prop="dcqk">
+              <el-input
+                v-model="buildingForm.dcqk"
+                placeholder="请输入吊车情况"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="货梯情况：" prop="htqk">
+              <el-input
+                v-model="buildingForm.htqk"
+                placeholder="请输入货梯情况"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleAddBuilding">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :data="upload.data"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { getToken } from "@/utils/auth";
-import { getjzxxinformationByxmId, addjzxx, updatejzxx, deletejzxx } from '@/api/ManageApi/index';
+import {
+  getjzxxinformationByxmId,
+  addjzxx,
+  updatejzxx,
+  deletejzxx,
+} from "@/api/ManageApi/index";
 import { checkPermi, checkRole } from "@/utils/permission";
 
 export default {
-    dicts: ['isno'],
-    props: {
-        size: {
-            type: String,
-            default: ''
+  dicts: ["isno"],
+  props: {
+    size: {
+      type: String,
+      default: "",
+    },
+    xmId: {
+      type: [Number, String],
+      required: true,
+    },
+    action: {
+      type: String,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      buildings: [],
+      selectedBuilding: null,
+      buildingForm: {
+        bzcmj: 0,
+        createBy: "",
+        createId: 0,
+        createTime: "",
+        floor: 0,
+        fourYscg: 0,
+        fourYslmhz: 0,
+        id: 0,
+        name: "",
+        scdmhz: 0,
+        scgd: 0,
+        sfwzyld: 2,
+        sfydzk: 2,
+        sfyqcpd: 2,
+        totalBuildingHeight: 0,
+        twoAndFourCg: 0,
+        twoAndThreeLmhz: 0,
+        updateBy: "",
+        updateId: 0,
+        updateTime: "",
+        xmId: 0,
+        zj: 0,
+        djjcdj: "",
+        dcqk: "",
+        htqk: "",
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "建筑信息导入",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url:
+          process.env.VUE_APP_BASE_API +
+          "/gysl/buildingInformation/importProjectBuilding",
+        data: {
+          xmId: this.xmId,
         },
-        xmId: {
-            type: [Number, String],
-            required: true
+      },
+      rules: {
+        name: [{ required: true, message: "请输入楼栋名称", trigger: "blur" }],
+        sfwzyld: [
+          {
+            required: true,
+            message: "请选择是否为重要楼栋",
+            trigger: "change",
+          },
+        ],
+        floor: [{ required: true, message: "请输入层数", trigger: "blur" }],
+        totalBuildingHeight: [
+          {
+            required: true,
+            message: "请输入总建筑高度（米）",
+            trigger: "blur",
+          },
+        ],
+        scgd: [
+          { required: true, message: "请输入首层高度（米）", trigger: "blur" },
+        ],
+        twoAndFourCg: [
+          {
+            required: true,
+            message: "请输入2至4层层高（米）",
+            trigger: "blur",
+          },
+        ],
+        scdmhz: [
+          {
+            required: true,
+            message: "请输入首层地面荷载（吨/平方米）",
+            trigger: "blur",
+          },
+        ],
+        bzcmj: [
+          {
+            required: true,
+            message: "请输入标准层面积（千平方米）",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  created() {
+    this.fetchBuildings();
+  },
+  watch: {
+    buildings: {
+      immediate: true,
+      handler(newVal) {
+        // 当 buildings 数据变化时，通知父组件当前状态
+        this.$emit("update:hasBuildingData", newVal.length > 0);
+      },
+    },
+  },
+  methods: {
+    checkPermi,
+    checkRole,
+    /** 导出 */
+    handleExport() {
+      this.download(
+        "/gysl/buildingInformation/export",
+        {
+          xmId: this.xmId,
         },
-        action: {
-            type: String,
-            required: true
-        }
+        `建筑信息${new Date().getTime()}.xlsx`
+      );
     },
-    data() {
-        return {
-            dialogVisible: false,
-            buildings: [],
-            selectedBuilding: null,
-            buildingForm: {
-                bzcmj: 0,
-                createBy: '',
-                createId: 0,
-                createTime: '',
-                floor: 0,
-                fourYscg: 0,
-                fourYslmhz: 0,
-                id: 0,
-                name: '',
-                scdmhz: 0,
-                scgd: 0,
-                sfwzyld: 2,
-                sfydzk: 2,
-                sfyqcpd: 2,
-                totalBuildingHeight: 0,
-                twoAndFourCg: 0,
-                twoAndThreeLmhz: 0,
-                updateBy: '',
-                updateId: 0,
-                updateTime: '',
-                xmId: 0,
-                zj: 0,
-                djjcdj:'',
-                dcqk:'',
-                htqk:''
-            },
-            // 用户导入参数
-            upload: {
-                // 是否显示弹出层（用户导入）
-                open: false,
-                // 弹出层标题（用户导入）
-                title: "建筑信息导入",
-                // 是否禁用上传
-                isUploading: false,
-                // 是否更新已经存在的用户数据
-                updateSupport: 0,
-                // 设置上传的请求头部
-                headers: { Authorization: "Bearer " + getToken() },
-                // 上传的地址
-                url: process.env.VUE_APP_BASE_API + "/gysl/buildingInformation/importProjectBuilding",
-                data: {
-                    xmId: this.xmId
-                }
-            },
-            rules: {
-                name: [
-                    { required: true, message: '请输入楼栋名称', trigger: 'blur' },
-                ],
-                sfwzyld: [
-                    { required: true, message: '请选择是否为重要楼栋', trigger: 'change' }
-                ],
-                floor: [
-                    { required: true, message: '请输入层数', trigger: 'blur' },
-                ],
-                totalBuildingHeight: [
-                    { required: true, message: '请输入总建筑高度（米）', trigger: 'blur' },
-                ],
-                scgd: [
-                    { required: true, message: '请输入首层高度（米）', trigger: 'blur' },
-                ],
-                twoAndFourCg: [
-                    { required: true, message: '请输入2至4层层高（米）', trigger: 'blur' },
-                ],
-                scdmhz: [
-                    { required: true, message: '请输入首层地面荷载（吨/平方米）', trigger: 'blur' },
-                ],
-                bzcmj: [
-                    { required: true, message: '请输入标准层面积（千平方米）', trigger: 'blur' },
-                ]
-            }
-        };
+    // 导入操作
+    handleImport() {
+      this.upload.open = true;
     },
-    created() {
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/gysl/buildingInformation/importTemplate",
+        {},
+        `楼栋导入模板${new Date().getTime()}.xlsx`
+      );
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    handleFileSuccess(response) {
+      this.upload.isUploading = false;
+      this.upload.open = false;
+      this.$refs.upload.clearFiles();
+
+      if (response.code === 200) {
+        this.$modal.msgSuccess(response.msg);
+        // 重新获取表格数据
         this.fetchBuildings();
+        this.$emit("refresh-data"); // 通知父组件刷新
+      } else {
+        this.$modal.msgError(response.msg || "导入失败");
+      }
     },
-    methods: {
-        checkPermi,
-        checkRole,
-        /** 导出 */
-        handleExport() {
-            this.download(
-                "/gysl/buildingInformation/export",
-                {
-                    xmId: this.xmId
-                },
-                `建筑信息${new Date().getTime()}.xlsx`
-            );
-        },
-        // 导入操作
-        handleImport() {
-            this.upload.open = true;
-        },
-        /** 下载模板操作 */
-        importTemplate() {
-            this.download(
-                "/gysl/buildingInformation/importTemplate",
-                {},
-                `楼栋导入模板${new Date().getTime()}.xlsx`
-            );
-        },
-        // 文件上传中处理
-        handleFileUploadProgress(event, file, fileList) {
-            this.upload.isUploading = true;
-        },
-        handleFileSuccess(response) {
-            this.upload.isUploading = false;
-            this.upload.open = false;
-            this.$refs.upload.clearFiles();
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    //翻译1和2
+    getTextForBoolean(value) {
+      return value === 1 ? "是" : "否";
+    },
+    //颜色变化方法
+    getTagItemClass(building) {
+      return {
+        "important-building": building.sfwzyld === 1,
+      };
+    },
+    // 添加建筑信息
+    addBuildingTag() {
+      this.dialogVisible = true;
+      this.buildingForm = {
+        bzcmj: "",
+        createBy: "",
+        createId: "",
+        createTime: "",
+        floor: "",
+        fourYscg: "",
+        fourYslmhz: "",
+        id: "",
+        name: "",
+        scdmhz: "",
+        scgd: "",
+        sfwzyld: 2,
+        sfydzk: 2,
+        sfyqcpd: 2,
+        totalBuildingHeight: "",
+        twoAndFourCg: "",
+        twoAndThreeLmhz: "",
+        updateBy: "",
+        updateId: "",
+        updateTime: "",
+        xmId: this.xmId,
+        zj: "",
+        djjcdj: "",
+        dcqk: "",
+        htqk: "",
+      };
+    },
+    fetchBuildings() {
+      getjzxxinformationByxmId({ xmId: this.xmId })
+        .then((response) => {
+          if (response.code === 200 && response.data) {
+            this.buildings = Object.values(response.data);
 
-            if (response.code === 200) {
-                this.$modal.msgSuccess(response.msg);
-                // 重新获取表格数据
-                this.fetchBuildings();
-                this.$emit("refresh-data"); // 通知父组件刷新
-            } else {
-                this.$modal.msgError(response.msg || "导入失败");
-            }
-        },
-        // 提交上传文件
-        submitFileForm() {
-            this.$refs.upload.submit();
-        },
-        //翻译1和2
-        getTextForBoolean(value) {
-            return value === 1 ? '是' : '否';
-        },
-        //颜色变化方法
-        getTagItemClass(building) {
-            return {
-                'important-building': building.sfwzyld === 1,
-            };
-        },
-        // 添加建筑信息
-        addBuildingTag() {
-            this.dialogVisible = true;
-            this.buildingForm = {
-                bzcmj: '',
-                createBy: '',
-                createId: '',
-                createTime: '',
-                floor: '',
-                fourYscg: '',
-                fourYslmhz: '',
-                id: '',
-                name: '',
-                scdmhz: '',
-                scgd: '',
-                sfwzyld: 2,
-                sfydzk: 2,
-                sfyqcpd: 2,
-                totalBuildingHeight: '',
-                twoAndFourCg: '',
-                twoAndThreeLmhz: '',
-                updateBy: '',
-                updateId: '',
-                updateTime: '',
-                xmId: this.xmId,
-                zj: '',
-                djjcdj:'',
-                dcqk:'',
-                htqk:''
-            };
-        },
-        fetchBuildings() {
+            // 发送是否有建筑数据的标记给父组件
+            this.$emit("has-building-data", this.buildings.length > 0);
 
-            getjzxxinformationByxmId({ xmId: this.xmId })
-                .then(response => {
-                  
-                    if (response.code === 200 && response.data) {
-                        this.buildings = Object.values(response.data);
-                        // 默认选中第一个楼栋
-                        if (this.buildings.length > 0) {
-                            this.selectedBuilding = this.buildings[0];
-                        }
-                    } else { }
-                })
-        },
+            if (this.buildings.length > 0) {
+              this.selectedBuilding = this.buildings[0];
+            }
+          } else {
+            this.buildings = [];
+            this.$emit("has-building-data", false);
+          }
+        })
+        .catch((error) => {
+          console.error("获取建筑信息失败:", error);
+          this.buildings = [];
+          this.$emit("has-building-data", false);
+        });
+    },
 
-        selectBuilding(building) {
-            this.selectedBuilding = building; // 直接使用传入的building对象
-        },
-        handleAddBuilding() {
-            this.$refs.buildingFormRef.validate((valid) => {
-                if (valid) {
-                    const api = this.buildingForm.id ? updatejzxx : addjzxx; // 根据是否有ID判断是新增还是更新
-                    const form = {
-                        ...this.buildingForm
-                    };
-                    api(form)
-                        .then(response => {
-                            if (response.code === 200) {
-                                this.$message.success(form.id ? '更新成功' : '新增成功');
-                                this.dialogVisible = false;
-                                this.fetchBuildings(); // 刷新楼栋列表
-                            } else {
-                                this.$message.error(form.id ? '更新失败' : '新增失败');
-                            }
-                        })
-                        .catch(error => {
-                            console.error(form.id ? '更新失败:' : '新增失败:', error);
-                            this.$message.error(form.id ? '更新失败' : '新增失败');
-                        });
-                } else {
-                    this.$message.error('请填写完整的楼栋信息');
-                    return false;
-                }
+    selectBuilding(building) {
+      this.selectedBuilding = building; // 直接使用传入的building对象
+    },
+    handleAddBuilding() {
+      this.$refs.buildingFormRef.validate((valid) => {
+        if (valid) {
+          const api = this.buildingForm.id ? updatejzxx : addjzxx; // 根据是否有ID判断是新增还是更新
+          const form = {
+            ...this.buildingForm,
+          };
+          api(form)
+            .then((response) => {
+              if (response.code === 200) {
+                this.$message.success(form.id ? "更新成功" : "新增成功");
+                this.dialogVisible = false;
+                this.fetchBuildings(); // 刷新楼栋列表
+              } else {
+                this.$message.error(form.id ? "更新失败" : "新增失败");
+              }
+            })
+            .catch((error) => {
+              console.error(form.id ? "更新失败:" : "新增失败:", error);
+              this.$message.error(form.id ? "更新失败" : "新增失败");
             });
-        },
-        handleDelete(id) {
-            console.log('Deleting building with ID:', id); // 调试信息
+        } else {
+          this.$message.error("请填写完整的楼栋信息");
+          return false;
+        }
+      });
+    },
+    handleDelete(id) {
+      console.log("Deleting building with ID:", id); // 调试信息
 
-            this.$confirm('你确认删除吗?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                deletejzxx([id]) // 传递一个包含ID的数组
-                    .then(response => {
-                        if (response.code === 200) {
-                            this.$message.success('删除成功');
-                            this.fetchBuildings(); // 刷新楼栋列表
-                        } else {
-                            this.$message.error('删除失败');
-                        }
-                    })
-                    .catch(error => {
-                        console.error('删除失败:', error);
-                        this.$message.error('删除失败');
-                    });
-            }).catch(() => {
-                this.$message.info('已取消删除');
+      this.$confirm("你确认删除吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deletejzxx([id]) // 传递一个包含ID的数组
+            .then((response) => {
+              if (response.code === 200) {
+                this.$message.success("删除成功");
+                this.fetchBuildings(); // 刷新楼栋列表
+              } else {
+                this.$message.error("删除失败");
+              }
+            })
+            .catch((error) => {
+              console.error("删除失败:", error);
+              this.$message.error("删除失败");
             });
-        },
-        handleEdit(building) {
-            this.dialogVisible = true;
-            this.buildingForm = { ...building }; // 填充表单数据
-        }
-    }
+        })
+        .catch(() => {
+          this.$message.info("已取消删除");
+        });
+    },
+    handleEdit(building) {
+      this.dialogVisible = true;
+      this.buildingForm = { ...building }; // 填充表单数据
+    },
+  },
 };
 </script>
 
 <style scoped>
 .container {
-    display: flex;
-    flex-direction: column;
-    width: 100%;
-    background-color: #FFFFFF;
-    box-shadow: 0rem 0.13rem 0.63rem 0rem rgba(177, 177, 177, 0.1);
-    border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  background-color: #ffffff;
+  box-shadow: 0rem 0.13rem 0.63rem 0rem rgba(177, 177, 177, 0.1);
+  border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
 }
 
 .content {
-    padding: 1rem;
-    display: flex;
+  padding: 1rem;
+  display: flex;
 }
 
 .containertop {
-    height: auto;
-    display: flex;
-    justify-content: space-between;
-    padding: .5rem;
-    border-bottom: 1px solid #E5E5E5;
+  height: auto;
+  display: flex;
+  justify-content: space-between;
+  padding: 0.5rem;
+  border-bottom: 1px solid #e5e5e5;
 }
 
 .topleft {
-    height: 2rem;
-    width: 8rem;
-    display: flex;
-    gap: 0.4rem;
-    align-items: center;
+  height: 2rem;
+  width: 8rem;
+  display: flex;
+  gap: 0.4rem;
+  align-items: center;
 }
 
 .topleft img {
-    width: 0.81rem;
-    height: 0.81rem;
+  width: 0.81rem;
+  height: 0.81rem;
 }
 
 .topleft span {
-    width: auto;
-    height: 1rem;
-    font-family: aliregular;
-    font-weight: 500;
-    font-size: 1rem;
-    color: #3D424C;
-    line-height: 1rem;
-    text-align: right;
-    font-style: normal;
-    text-transform: none;
+  width: auto;
+  height: 1rem;
+  font-family: aliregular;
+  font-weight: 500;
+  font-size: 1rem;
+  color: #3d424c;
+  line-height: 1rem;
+  text-align: right;
+  font-style: normal;
+  text-transform: none;
 }
 
 .descriptionsdiv {
-    width: 100%;
-    margin-left: 1rem;
-    height: auto;
+  width: 100%;
+  margin-left: 1rem;
+  height: auto;
 }
 
 .tagdiv {
-    padding: 1rem 2rem 1rem 2rem;
-    display: flex;
+  padding: 1rem 2rem 1rem 2rem;
+  display: flex;
+  overflow: auto;
 }
 
 .tagdiv img {
-    width: 1.4rem;
-    height: 1.5rem;
+  width: 1.4rem;
+  height: 1.5rem;
 }
 
 .tagdiv span {
-    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
-    font-weight: 400;
-    font-size: 0.88rem;
-    color: #808080;
-    line-height: 0.88rem;
-    text-align: right;
-    font-style: normal;
-    text-transform: none;
+  font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+  font-weight: 400;
+  font-size: 0.88rem;
+  color: #808080;
+  line-height: 0.88rem;
+  text-align: right;
+  font-style: normal;
+  text-transform: none;
 }
 
 .tagitem {
-    width: 6.25rem;
-    height: 2rem;
-    background: #FAFAFA;
-    border-radius: 2.13rem 2.13rem 2.13rem 2.13rem;
-    display: flex;
-    justify-content: space-around;
-    align-items: center;
-    cursor: pointer;
-    border: 1px solid transparent;
-    /* 添加透明边框保持布局稳定 */
-    transition: all 0.3s ease;
-    /* 添加过渡效果 */
+  width: 6.25rem;
+  height: 2rem;
+  background: #fafafa;
+  border-radius: 2.13rem 2.13rem 2.13rem 2.13rem;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  cursor: pointer;
+  border: 1px solid transparent;
+  /* 添加透明边框保持布局稳定 */
+  transition: all 0.3s ease;
+  /* 添加过渡效果 */
 }
 
 .tagitem.active-tag {
-    border: 1px solid #2B62F1;
-    /* 选中时的蓝色边框 */
-    box-shadow: 0 0 0 2px rgba(43, 98, 241, 0.2);
-    /* 可选的外发光效果 */
+  border: 1px solid #2b62f1;
+  /* 选中时的蓝色边框 */
+  box-shadow: 0 0 0 2px rgba(43, 98, 241, 0.2);
+  /* 可选的外发光效果 */
 }
 
 .tagitem:hover {
-    background: #f0f0f0;
-    /* 鼠标悬停时的背景色变化 */
+  background: #f0f0f0;
+  /* 鼠标悬停时的背景色变化 */
 }
 
 .important-building {
-    background-color: rgba(43, 98, 241, 0.1);
+  background-color: rgba(43, 98, 241, 0.1);
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue
index ad207c3..b9cb24d 100644
--- a/src/views/components/ProjectDetails/Companyenter.vue
+++ b/src/views/components/ProjectDetails/Companyenter.vue
@@ -3,19 +3,19 @@
     <!-- 顶部信息 -->
     <div class="containertop">
       <div class="topleft">
-        <img src="../../../assets/images/detailsicon/1.png" alt="">
+        <img src="@/assets/images/detailsicon/1.png" alt="">
         <span>企业入驻信息</span>
       </div>
       <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
         <el-button v-if="!isEditing" type="primary" size="medium" plain
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="edit">
-          <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
+          <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           编辑
         </el-button>
         <el-button v-else type="primary" size="medium" plain
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="save">
-          <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="保存"
+          <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="保存"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           保存
         </el-button>
@@ -128,7 +128,7 @@
                   <span v-else>{{ scope.row.jyfw }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="zzjgdm" label='组织机构代码'>
+              <!-- <el-table-column prop="zzjgdm" label='组织机构代码'>
                 <template slot-scope="scope">
                   <el-input v-if="scope.row.isEditing" v-model.number="scope.row.zzjgdm"></el-input>
                   <span v-else>{{ scope.row.zzjgdm }}</span>
@@ -139,7 +139,7 @@
                   <el-input v-if="scope.row.isEditing" v-model.number="scope.row.swdjhm"></el-input>
                   <span v-else>{{ scope.row.swdjhm }}</span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button v-if="scope.row.isEditing" size="medium" type="text" icon="el-icon-check"
@@ -263,7 +263,7 @@ export default {
         //（如 tableData 生成的 rzqys）
         this.form = {
           ...newVal,
-          rzqys: this.tableData.length //rzqys
+          rzqys: this.tableData.length 
         };
       },
       immediate: true,
diff --git a/src/views/components/ProjectDetails/Liver.vue b/src/views/components/ProjectDetails/Liver.vue
index 1c4bc9a..59644d6 100644
--- a/src/views/components/ProjectDetails/Liver.vue
+++ b/src/views/components/ProjectDetails/Liver.vue
@@ -3,13 +3,13 @@
         <!-- 顶部信息 -->
         <div class="containertop">
             <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
+                <img src="@/assets/images/detailsicon/1.png" alt="">
                 <span>现场实况</span>
             </div>
             <div class="topright" v-if="action === 'fill' || !action" style="visibility: hidden;">
                 <el-button type="primary" size="medium" plain
                     style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="">
-                    <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="编辑"
+                    <img src="@/assets/images/detailsicon/icon-xz@2x.png" alt="编辑"
                         style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
                     新增
                 </el-button>
@@ -21,11 +21,11 @@
                 <img :src="image.src" alt="现场实况" class="image">
                 <!-- 播放按钮 -->
                 <div class="player-button">
-                    <img src="../../../assets/images/detailsicon/icon-bf@2x (1).png" alt="">
+                    <img src="@/assets/images/detailsicon/icon-bf@2x (1).png" alt="">
                 </div>
                 <!-- 关闭按钮 -->
                 <div class="close-button" @click="removeImage(index)">
-                    <img src="../../../assets/images/detailsicon/icon-关闭@2x.png" alt="">
+                    <img src="@/assets/images/detailsicon/icon-关闭@2x.png" alt="">
                 </div>
                 <!-- 是否在线 -->
                 <div v-if="image.isOnline" class="online-status online">在线</div>
diff --git a/src/views/components/ProjectDetails/Memo.vue b/src/views/components/ProjectDetails/Memo.vue
index 6956968..c8ec3e3 100644
--- a/src/views/components/ProjectDetails/Memo.vue
+++ b/src/views/components/ProjectDetails/Memo.vue
@@ -3,13 +3,13 @@
         <!-- 顶部信息 -->
         <div class="containertop">
             <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
+                <img src="@/assets/images/detailsicon/1.png" alt="">
                 <span>项目备忘录</span>
             </div>
             <div class="topright">
                 <el-button type="primary" size="medium" plain  v-if="action === 'fill' || !action || action === 'okay'"
                     style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleAdd">
-                    <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="新增"
+                    <img src="@/assets/images/detailsicon/icon-xz@2x.png" alt="新增"
                         style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
                     新增
                 </el-button>
@@ -34,9 +34,9 @@
                     <div class="itemtwo">{{ memo.remark }}</div>
                     <div class="itemthree">记录人：{{ memo.createBy }}</div>
                     <div class="iconguanbi" @click="handleDeleteMemo(memo.id)"> <img
-                            src="../../../assets/images/icon-关闭-项目备忘录@2x.png" alt=""></div>
+                            src="@/assets/images/icon-关闭-项目备忘录@2x.png" alt=""></div>
                     <div class="iconguanbi2" @click="handleEditMemo(memo)"> <img
-                            src="../../../assets/images/detailsicon/icon-bj@2x.png" alt=""></div>
+                            src="@/assets/images/detailsicon/icon-bj@2x.png" alt=""></div>
                 </div>
                 <div v-if="memos.length === 0" class="no-data"
                     style="width: 100%; display: flex;align-items: center;justify-content: center;color: gray;">
diff --git a/src/views/components/ProjectDetails/Models.vue b/src/views/components/ProjectDetails/Models.vue
index c1fb598..cd01ed8 100644
--- a/src/views/components/ProjectDetails/Models.vue
+++ b/src/views/components/ProjectDetails/Models.vue
@@ -3,13 +3,13 @@
         <!-- 顶部信息 -->
         <div class="containertop">
             <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
+                <img src="@/assets/images/detailsicon/1.png" alt="">
                 <span>五要素模型信息</span>
             </div>
             <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
                 <el-button type="primary" size="medium" plain
                     style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="toggleEditAll">
-                    <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
+                    <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
                         style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
                     {{ isEditingAll ? '保存' : '编辑' }}
                 </el-button>
diff --git a/src/views/components/ProjectDetails/Months.vue b/src/views/components/ProjectDetails/Months.vue
index 028ad69..02a52ae 100644
--- a/src/views/components/ProjectDetails/Months.vue
+++ b/src/views/components/ProjectDetails/Months.vue
@@ -3,19 +3,19 @@
     <!-- 顶部信息 -->
     <div class="containertop">
       <div class="topleft">
-        <img src="../../../assets/images/detailsicon/1.png" alt="">
+        <img src="@/assets/images/detailsicon/1.png" alt="">
         <span>月度进展信息</span>
       </div>
       <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
         <el-button type="primary" size="medium" plain
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleAdd">
-          <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="新增"
+          <img src="@/assets/images/detailsicon/icon-xz@2x.png" alt="新增"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           新增
         </el-button>
         <el-button type="primary" size="medium" plain v-if="checkRole(['admin', 'common','gov'])"
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleExport">
-          <img src="../../../assets/images/detailsicon/icon-dc@2x.png" alt="导出"
+          <img src="@/assets/images/detailsicon/icon-dc@2x.png" alt="导出"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           导出
         </el-button>
diff --git a/src/views/components/ProjectDetails/Others.vue b/src/views/components/ProjectDetails/Others.vue
index e4567e6..4108cfa 100644
--- a/src/views/components/ProjectDetails/Others.vue
+++ b/src/views/components/ProjectDetails/Others.vue
@@ -3,26 +3,26 @@
     <!-- 顶部信息 -->
     <div class="containertop">
       <div class="topleft">
-        <img src="../../../assets/images/detailsicon/1.png" alt="">
+        <img src="@/assets/images/detailsicon/1.png" alt="">
         <span>其他信息</span>
       </div>
       <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
         <el-button type="primary" size="medium" plain v-if="checkRole(['admin', 'common','gov'])"
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="openDialog('add')">
-          <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="新增"
+          <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="新增"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           新增
         </el-button>
         <el-button type="primary" size="medium" plain v-if="action === 'fill' || !action || action === 'okay'"
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="toggleEditMode"
           :loading="saveLoading">
-          <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
+          <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           {{ isEditMode ? '保存' : '编辑' }}
         </el-button>
         <el-button type="primary" size="medium" plain v-if="checkRole(['admin', 'common','gov'])"
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleExport">
-          <img src="../../../assets/images/detailsicon/icon-dc@2x.png" alt="导出"
+          <img src="@/assets/images/detailsicon/icon-dc@2x.png" alt="导出"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
             导出
         </el-button>
diff --git a/src/views/components/ProjectDetails/Programme.vue b/src/views/components/ProjectDetails/Programme.vue
index ac3bcb5..e1d7a53 100644
--- a/src/views/components/ProjectDetails/Programme.vue
+++ b/src/views/components/ProjectDetails/Programme.vue
@@ -3,25 +3,25 @@
     <!-- 顶部信息 -->
     <div class="containertop">
       <div class="topleft">
-        <img src="../../../assets/images/detailsicon/1.png" alt="">
+        <img src="@/assets/images/detailsicon/1.png" alt="">
         <span>规划信息</span>
       </div>
       <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
         <el-button v-if="!isEditing" type="primary" size="medium" plain
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="edit">
-          <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
+          <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           编辑
         </el-button>
         <el-button v-else type="primary" size="medium" plain
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="save">
-          <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="保存"
+          <img src="@/assets/images/detailsicon/icon-bj@2x.png" alt="保存"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           保存
         </el-button>
         <el-button type="primary" size="medium" plain v-if="checkRole(['admin', 'common','gov'])"
           style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleExport">
-          <img src="../../../assets/images/detailsicon/icon-dc@2x.png" alt="导出"
+          <img src="@/assets/images/detailsicon/icon-dc@2x.png" alt="导出"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
           导出
         </el-button>
diff --git a/src/views/components/ProjectDetails/Projectdraw.vue b/src/views/components/ProjectDetails/Projectdraw.vue
index 15468cb..25d9219 100644
--- a/src/views/components/ProjectDetails/Projectdraw.vue
+++ b/src/views/components/ProjectDetails/Projectdraw.vue
@@ -3,19 +3,19 @@
         <!-- 顶部操作栏 -->
         <div class="containertop">
             <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
+                <img src="@/assets/images/detailsicon/1.png" alt="">
                 <span>项目图例</span>
             </div>
             <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
                 <el-button type="primary" size="medium" plain
                     style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleAdd">
-                    <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="新增"
+                    <img src="@/assets/images/detailsicon/icon-xz@2x.png" alt="新增"
                         style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
                     新增
                 </el-button>
                 <el-button type="primary" size="medium" plain v-if="action === 'fill' || !action || action === 'okay'"
                     style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="handleEdit">
-                    <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="编辑"
+                    <img src="@/assets/images/detailsicon/icon-xz@2x.png" alt="编辑"
                         style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
                     编辑
                 </el-button>
diff --git a/src/views/components/ProjectDetails/Projectgift.vue b/src/views/components/ProjectDetails/Projectgift.vue
index 76d3d91..284ac50 100644
--- a/src/views/components/ProjectDetails/Projectgift.vue
+++ b/src/views/components/ProjectDetails/Projectgift.vue
@@ -3,13 +3,13 @@
         <!-- 顶部信息 -->
         <div class="containertop">
             <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
+                <img src="@/assets/images/detailsicon/1.png" alt="">
                 <span>项目巡礼</span>
             </div>
             <div class="topright" v-if="action === 'fill' || !action || action === 'okay'">
                 <el-button type="primary" size="medium" plain
                     style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="openAddDialog">
-                    <img src="../../../assets/images/detailsicon/icon-xz@2x.png" alt="新增"
+                    <img src="@/assets/images/detailsicon/icon-xz@2x.png" alt="新增"
                         style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
                     新增
                 </el-button>
@@ -21,10 +21,10 @@
             <div v-for="(item, index) in projectList" :key="index" class="image-box">
                 <img :src="baseUrl + item.img" alt="项目图片" class="image">
                 <div class="close-button" @click="removeImage(index)">
-                    <img src="../../../assets/images/detailsicon/icon-关闭@2x.png" alt="">
+                    <img src="@/assets/images/detailsicon/icon-关闭@2x.png" alt="">
                 </div>
                 <div class="iconguanbi2" @click="openEditDialog(item)"> <img
-                        src="../../../assets/images/detailsicon/icon-bj@2x.png" alt=""></div>
+                        src="@/assets/images/detailsicon/icon-bj@2x.png" alt=""></div>
                 <div class="dianjibox" @click="handleItemClick(item)"></div>
                 <div class="bottombox">
                     <div class="bottomtext"><span>{{ item.xmmc || '未命名项目' }}</span></div>
diff --git a/src/views/components/ProjectDetails/Projectpicture.vue b/src/views/components/ProjectDetails/Projectpicture.vue
index 4300f53..bce84f7 100644
--- a/src/views/components/ProjectDetails/Projectpicture.vue
+++ b/src/views/components/ProjectDetails/Projectpicture.vue
@@ -3,7 +3,7 @@
         <!-- 顶部信息 -->
         <div class="containertop">
             <div class="topleft">
-                <img src="../../../assets/images/detailsicon/1.png" alt="">
+                <img src="@/assets/images/detailsicon/1.png" alt="">
                 <span>项目画像</span>
             </div>
             <div class="topright" style="visibility: hidden;">
diff --git a/src/views/components/analysis/daiban.vue b/src/views/components/analysis/daiban.vue
index e4776a7..0c63ce9 100644
--- a/src/views/components/analysis/daiban.vue
+++ b/src/views/components/analysis/daiban.vue
@@ -4,7 +4,7 @@
         <div class="tablebox">
             <!-- 标签行 -->
             <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe>
-                <el-table-column label="项目名称" align="center" prop="name" width="200" />
+                <el-table-column label="项目名称" align="center" prop="name" width="200" show-overflow-tooltip  />
                 <el-table-column label="当前状态" align="center" prop="status">
                     <template slot-scope="scope">
                         <dict-tag :options="dict.type.tbzt" :value="scope.row.status" />
@@ -13,9 +13,9 @@
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                     <template slot-scope="scope">
                         <el-button type="text" @click="getInfo(scope.row, 'fill')"
-                            v-if="statusMap[scope.row.status] === '待填报'">填报</el-button>
+                            v-if="scope.row.status === 1">填报</el-button>
                         <el-button type="text" @click="getInfo(scope.row, 'detail')"
-                            v-if="statusMap[scope.row.status] !== '待填报'">详情</el-button>
+                            v-if="scope.row.status !== 1">详情</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -46,23 +46,6 @@ export default {
             total: 0,
             // 项目表格数据
             postList: [],
-            // 状态颜色映射
-            statusColors: {
-                '审核通过': '#6EDABE',
-                '待填报': '#FFBF6B',
-                '待审核': '#7693D8'
-            },
-            //状态文本映射
-            statusMap: {
-                1: '待填报',
-                2: '待审核',
-                3: '审核通过'
-            },
-            xzflMap: {
-                1: '已建',
-                2: '在建',
-                3: '拟建'
-            },
             // 查询参数
             queryParams: {
                 pageNum: 1,
diff --git a/src/views/components/analysis/message.vue b/src/views/components/analysis/message.vue
index 102cd9a..ff8fb77 100644
--- a/src/views/components/analysis/message.vue
+++ b/src/views/components/analysis/message.vue
@@ -6,7 +6,7 @@
                     <img :src="getIcon(scope.$index)" alt="icon" style="width: 2.19rem; height: 1.25rem;">
                 </template>
             </el-table-column>
-            <el-table-column prop="name" width="300">
+            <el-table-column prop="name" width="300" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span :style="{ color: scope.row.isRead === 2 ? '#ccc' : 'inherit' }">
                         {{ scope.row.name }}
diff --git a/src/views/components/analysis/messagecompany.vue b/src/views/components/analysis/messagecompany.vue
index 1541459..39c1147 100644
--- a/src/views/components/analysis/messagecompany.vue
+++ b/src/views/components/analysis/messagecompany.vue
@@ -6,7 +6,7 @@
                     <img :src="getIcon(scope.$index)" alt="icon" style="width: 2.19rem; height: 1.25rem;">
                 </template>
             </el-table-column>
-            <el-table-column prop="name" width="300">
+            <el-table-column prop="name" width="300" show-overflow-tooltip>
                 <template slot-scope="scope">
                     <span :style="{ color: scope.row.isRead === 2 ? '#ccc' : 'inherit' }">
                         {{ scope.row.name }}
diff --git a/src/views/components/qiyexinxi/qiyexinxi.vue b/src/views/components/qiyexinxi/qiyexinxi.vue
index 8a61e65..a930a14 100644
--- a/src/views/components/qiyexinxi/qiyexinxi.vue
+++ b/src/views/components/qiyexinxi/qiyexinxi.vue
@@ -49,10 +49,6 @@
         </div>
         <!-- 表格内容区 -->
         <div class="tablebox">
-            <!-- 标签行 -->
-            <!-- <div class="tablehead">
-                <div class="headtitle"><span>项目清单</span></div>
-            </div> -->
             <!-- 导入弹窗 -->
             <el-dialog title="导入" :visible.sync="upload.open" width="400px" append-to-body>
                 <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
@@ -69,12 +65,7 @@
                     <el-button type="primary" @click="submitFileForm" :loading="upload.isUploading">确定</el-button>
                 </span>
             </el-dialog>
-            <!-- 导出行 -->
-            <div class="tablebtntwo">
-
-            </div>
             <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe>
-                <!-- <el-table-column type="selection" width="55" align="center" /> -->
                 <el-table-column label="序号" align="center">
                     <template slot-scope="scope">
                         {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
@@ -103,9 +94,9 @@
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" >
                     <template slot-scope="scope">
                         <el-button size="medium" type="text" @click="getInfo(scope.row, 'fill')"
-                            v-if="statusMap[scope.row.status] === '待填报'">填报</el-button>
+                            v-if="scope.row.status === '待填报'">填报</el-button>
                         <el-button size="medium" type="text" @click="getInfo(scope.row, 'detail')"
-                            v-if="statusMap[scope.row.status] !== '待填报'">详情</el-button>
+                            v-if="scope.row.status !== '待填报'">详情</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -138,18 +129,6 @@ export default {
             total: 0,
             // 项目表格数据
             postList: [],
-            // 状态颜色映射
-            statusColors: {
-                '审核通过': '#6EDABE',
-                '待填报': '#FFBF6B',
-                '待审核': '#7693D8'
-            },
-            //状态文本映射
-            statusMap: {
-                1: '待填报',
-                2: '待审核',
-                3: '审核通过'
-            },
             // 查询参数
             queryParams: {
                 current: 1,
@@ -199,7 +178,6 @@ export default {
                 this.loading = false;
             });
         },
-
         // 处理日期范围
         processDateRange() {
             if (this.queryParams.dateRange && this.queryParams.dateRange.length === 2) {
@@ -286,7 +264,7 @@ export default {
 .headerbox {
     background-color: #fff;
     border-radius: .5rem;
-    padding: 1rem;
+    padding: 1rem 1rem 0 1rem;
     margin: .5rem;
     border: 1px solid #eee;
 }
diff --git a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
index a59b5bb..108ee06 100644
--- a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
+++ b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
@@ -1,387 +1,541 @@
 <template>
-    <div>
-        <!-- 政务端页面 -->
-        <!-- 表单查询项 -->
-        <div class="headerbox">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                label-width="200">
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="项目名称" style="width: 100%;">
-                            <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item label="建设起止时间">
-                            <el-date-picker v-model="queryParams.startTime" type="month" placeholder="开始月份"
-                                value-format="yyyy-MM" style="width: 9rem;" :clearable="true">
-                            </el-date-picker>
-                            ~
-                            <el-date-picker v-model="queryParams.endTime" type="month" placeholder="结束月份"
-                                value-format="yyyy-MM" style="width: 9rem;" :clearable="true">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="现状分类">
-                            <el-select v-model="queryParams.xzfl" placeholder="请选择现状分类" clearable>
-                                <el-option v-for="dict in dict.type.xzfl" :key="dict.value" :label="dict.label"
-                                    :value="dict.value" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item label="项目法人单位">
-                            <el-input v-model="queryParams.xmfrdwxz" placeholder="请输入项目名称" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="当前状态">
-                            <el-select v-model="queryParams.status" placeholder="选择当前状态" clearable>
-                                <el-option v-for="dict in dict.type.tbzt" :key="dict.value" :label="dict.label"
-                                    :value="dict.value" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-                            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
-        <!-- 表格内容区 -->
-        <div class="tablebox">
-            <!-- 标签行 -->
-            <!-- <div class="tablehead">
-                <div class="headtitle"><span>项目清单</span></div>
-            </div> -->
-            <!-- 导入弹窗 -->
-            <el-dialog title="导入" :visible.sync="upload.open" width="400px" append-to-body>
-                <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-                    :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                    :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-                    <i class="el-icon-upload"></i>
-                    <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-                    <div class="el-upload__tip text-center" slot="tip">
-                        <span>仅允许导入xls、xlsx格式文件。</span>
-                    </div>
-                </el-upload>
-                <span slot="footer" class="dialog-footer">
-                    <el-button @click="upload.open = false">取消</el-button>
-                    <el-button type="primary" @click="submitFileForm" :loading="upload.isUploading">确定</el-button>
-                </span>
-            </el-dialog>
-            <!-- 导出行 -->
-            <div class="tablebtntwo">
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" @click="handleExport">全量导出</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="primary" @click="handleExporttwo">
-                            单片材料导出
-                        </el-button>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" icon="el-icon-download" @click="importTemplate">下载模板</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="primary" @click="handleImport">批量导入</el-button>
-                    </el-col>
-                </el-row>
+  <div class="container">
+    <!-- 查询表单 -->
+    <div class="headerbox">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="200"
+      >
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="项目名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="建设起止时间">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="month"
+                placeholder="开始月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              ></el-date-picker>
+              ~
+              <el-date-picker
+                v-model="queryParams.endTime"
+                type="month"
+                placeholder="结束月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="现状分类">
+              <el-select
+                v-model="queryParams.xzfl"
+                placeholder="请选择现状分类"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.xzfl"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="项目法人单位">
+              <el-input
+                v-model="queryParams.xmfrdwxz"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="当前状态">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="选择当前状态"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.tbzt"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
 
-            </div>
-            <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe>
-                <el-table-column type="selection" width="55" align="center" />
-                <el-table-column label="序号" align="center">
-                    <template slot-scope="scope">
-                        {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="项目名称" align="center" prop="name" width="200" />
-                <el-table-column label="现状分类" align="center" prop="xzfl">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="项目法人单位" align="center" prop="xmfrdwxz" width="200" />
-                <el-table-column label="统一社会信用代码" align="center" prop="tyshxydm" width="200" />
-                <el-table-column label="项目建设起止时间" align="center" width="200">
-                    <template slot-scope="scope">
-                        {{ formatMonth(scope.row.begainTime) }} 至 {{ formatMonth(scope.row.endTime) }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="总投资额（万元）" align="center" width="130" prop="ztze" />
-                <el-table-column label="总用地面积（平方米）" align="center" width="180" prop="zydmj" />
-                <el-table-column label="当前状态" align="center" prop="status">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.tbzt" :value="scope.row.status" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="getAdd(scope.row, 'fill')"
-                            v-if="scope.row.status === 2">审核</el-button>
-                        <el-button type="text" @click="getAdd(scope.row, 'okay')"
-                            v-if="scope.row.status === 3">编辑</el-button>
-                        <el-button type="text" @click="getAdd(scope.row, 'detail')"
-                            v-if="scope.row.status === 1">详情</el-button>
-                        <el-button type="text" @click="handleDelete(scope.row)" style="color: #F25353;">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current"
-                :limit.sync="queryParams.size" @pagination="getList" />
-        </div>
+    <!-- 表格内容区 -->
+    <div class="table-container">
+      <!-- 按钮行 -->
+      <div class="table-header">
+        <el-row :gutter="10" >
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleExport">全量导出</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleExporttwo"
+              >单片材料导出</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-download"
+              @click="importTemplate"
+              >下载模板</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleImport">批量导入</el-button>
+          </el-col>
+        </el-row>
+      </div>
+
+      <!-- 表格区域 -->
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          stripe
+          height="100%"
+          style="width: 100%"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                scope.$index + 1 + (queryParams.current - 1) * queryParams.size
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目名称"
+            align="center"
+            prop="name"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column label="现状分类" align="center" prop="xzfl">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目法人单位"
+            align="center"
+            prop="xmfrdwxz"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="统一社会信用代码"
+            align="center"
+            prop="tyshxydm"
+            width="200"
+          />
+          <el-table-column label="项目建设起止时间" align="center" width="200">
+            <template slot-scope="scope">
+              {{ formatMonth(scope.row.begainTime) }} 至
+              {{ formatMonth(scope.row.endTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="总投资额（万元）"
+            align="center"
+            width="130"
+            prop="ztze"
+          />
+          <el-table-column
+            label="总用地面积（平方米）"
+            align="center"
+            width="180"
+            prop="zydmj"
+          />
+          <el-table-column label="当前状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tbzt" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="getAdd(scope.row, 'fill')"
+                v-if="scope.row.status === 2"
+                >审核</el-button
+              >
+              <el-button
+                type="text"
+                @click="getAdd(scope.row, 'okay')"
+                v-if="scope.row.status === 3"
+                >编辑</el-button
+              >
+              <el-button
+                type="text"
+                @click="getAdd(scope.row, 'detail')"
+                v-if="scope.row.status === 1"
+                >详情</el-button
+              >
+              <el-button
+                type="text"
+                @click="handleDelete(scope.row)"
+                style="color: #f25353"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <!-- 分页区域 -->
+      <div class="pagination-wrapper">
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.current"
+          :limit.sync="queryParams.size"
+          @pagination="getList"
+        />
+      </div>
     </div>
+
+    <!-- 导入弹窗 -->
+    <el-dialog
+      title="导入"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+        </div>
+      </el-upload>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="upload.open = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="submitFileForm"
+          :loading="upload.isUploading"
+          >确定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import { getBasicInformationPage, deleteBasicInformation } from "@/api/ManageApi/index";
+import {
+  getBasicInformationPage,
+  deleteBasicInformation,
+} from "@/api/ManageApi/index";
 import { getToken } from "@/utils/auth";
 import { checkPermi, checkRole } from "@/utils/permission";
 export default {
-    dicts: ["xzfl",'tbzt'],
-    data() {
-        return {
-            ids: [],
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 项目表格数据
-            postList: [],
-            // 查询参数
-            queryParams: {
-                current: 1,
-                size: 10,
-                xzfl: undefined,
-                name: undefined,
-                xmfrdwxz: undefined,
-                startTime: undefined,
-                endTime: undefined,
-                status: undefined
-            },
-            // 导入相关数据
-            upload: {
-                open: false, // 是否显示导入弹窗
-                isUploading: false, // 是否正在上传
-                updateSupport: 0, // 是否更新已存在数据
-                headers: { Authorization: "Bearer " + getToken() }, // 上传请求头
-                url: process.env.VUE_APP_BASE_API + "/gysl/basicInformation/import", // 上传地址
-            },
-        };
-    },
-    created() {
-        this.getList();
+  dicts: ["xzfl", "tbzt"],
+  data() {
+    return {
+      ids: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目表格数据
+      postList: [],
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        xzfl: undefined,
+        name: undefined,
+        xmfrdwxz: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+      },
+      // 导入相关数据
+      upload: {
+        open: false, // 是否显示导入弹窗
+        isUploading: false, // 是否正在上传
+        updateSupport: 0, // 是否更新已存在数据
+        headers: { Authorization: "Bearer " + getToken() }, // 上传请求头
+        url: process.env.VUE_APP_BASE_API + "/gysl/basicInformation/import", // 上传地址
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermi,
+    checkRole,
+    /** 格式化月份显示 */
+    formatMonth(dateStr) {
+      if (!dateStr) return "";
+      // 如果已经是 YYYY-MM 格式，直接返回
+      if (/^\d{4}-\d{2}$/.test(dateStr)) return dateStr;
+      // 如果是 YYYY-MM-DD 格式，截取前7位
+      if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr.substring(0, 7);
+      return dateStr;
     },
-    methods: {
-        checkPermi,
-        checkRole,
-        /** 格式化月份显示 */
-        formatMonth(dateStr) {
-            if (!dateStr) return '';
-            // 如果已经是 YYYY-MM 格式，直接返回
-            if (/^\d{4}-\d{2}$/.test(dateStr)) return dateStr;
-            // 如果是 YYYY-MM-DD 格式，截取前7位
-            if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr.substring(0, 7);
-            return dateStr;
-        },
 
-        /** 查询项目列表 */
-        getList() {
-            this.loading = true;
-            // 确保日期参数格式正确
-            const params = {
-                ...this.queryParams,
-                begainTime: this.formatMonth(this.queryParams.begainTime),
-                endTime: this.formatMonth(this.queryParams.endTime)
-            };
+    /** 查询项目列表 */
+    getList() {
+      this.loading = true;
+      // 确保日期参数格式正确
+      const params = {
+        ...this.queryParams,
+        begainTime: this.formatMonth(this.queryParams.begainTime),
+        endTime: this.formatMonth(this.queryParams.endTime),
+      };
 
-            // console.log('发送前的查询参数:', JSON.stringify(params, null, 2));
+      // console.log('发送前的查询参数:', JSON.stringify(params, null, 2));
 
-            getBasicInformationPage(params).then((response) => {
-                // console.log('API响应:', response);
-                this.postList = response.data.records;
-                this.total = response.data.total;
-                this.loading = false;
-            }).catch(error => {
-                console.error('API请求错误:', error);
-                console.error('错误详情:', error.response);
-                this.loading = false;
-            });
-        },
-
-        /** 导入按钮操作 */
-        handleImport() {
-            this.upload.open = true;
-        },
+      getBasicInformationPage(params)
+        .then((response) => {
+          // console.log('API响应:', response);
+          this.postList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("API请求错误:", error);
+          console.error("错误详情:", error.response);
+          this.loading = false;
+        });
+    },
 
-        /** 下载模板操作 */
-        importTemplate() {
-            this.download(
-                "/gysl/basicInformation/importTemplate",
-                {},
-                `项目导入模板${new Date().getTime()}.xlsx`
-            );
-        },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+    },
 
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
-        },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/gysl/basicInformation/importTemplate",
+        {},
+        `项目导入模板${new Date().getTime()}.xlsx`
+      );
+    },
 
-        handleFileUploadProgress(event, file, fileList) {
-            this.upload.isUploading = true;
-        },
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
 
-        handleFileSuccess(response, file, fileList) {
-            this.upload.open = false;
-            this.upload.isUploading = false;
-            this.$refs.upload.clearFiles();
-            this.$alert(
-                "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-                response.msg +
-                "</div>",
-                "导入结果",
-                { dangerouslyUseHTMLString: true }
-            );
-            this.getList();
-        },
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
 
-        submitFileForm() {
-            this.$refs.upload.submit();
-        },
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
 
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download(
-                "/gysl/basicInformation/exportInfo",
-                {
-                    idList: this.ids
-                },
-                `基本信息${new Date().getTime()}.xlsx`
-            );
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
 
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/gysl/basicInformation/exportInfo",
+        {
+          idList: this.ids,
         },
+        `基本信息${new Date().getTime()}.xlsx`
+      );
+    },
 
-        /** 单片材料导出按钮操作 */
-        handleExporttwo() {
-            if (this.ids.length === 0) {
-                this.$message.warning('请选择要导出的项目');
-                return;
-            }
+    /** 单片材料导出按钮操作 */
+    handleExporttwo() {
+      if (this.ids.length === 0) {
+        this.$message.warning("请选择要导出的项目");
+        return;
+      }
 
-            this.download(
-                "/gysl/basicInformation/wordExport",
-                {
-                    ids: this.ids.join(","),
-                },
-                `单片材料${new Date().getTime()}.zip`
-            );
+      this.download(
+        "/gysl/basicInformation/wordExport",
+        {
+          ids: this.ids.join(","),
         },
+        `单片材料${new Date().getTime()}.zip`
+      );
+    },
 
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const projectName = row.name; // 获取项目名称
-            const ids = row.id || this.ids;
-            this.$modal
-                .confirm(`是否确认删除项目"${projectName}"？`)
-                .then(() => {
-                    return deleteBasicInformation(ids);
-                })
-                .then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                })
-                .catch(() => { });
-        },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const projectName = row.name; // 获取项目名称
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm(`是否确认删除项目"${projectName}"？`)
+        .then(() => {
+          return deleteBasicInformation(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
 
-        /** 详情按钮操作 */
-        getAdd(row, type) {
-            this.$store.commit("SET_CRUMBS","项目详情");
-            const id = row.id || this.ids[0];
-            this.$router.push({ path: `/manage-add/${id}`, query: { action: type } });
-        },
+    /** 详情按钮操作 */
+    getAdd(row, type) {
+      this.$store.commit("SET_CRUMBS", "项目详情");
+      const id = row.id || this.ids[0];
+      this.$router.push({ path: `/manage-add/${id}`, query: { action: type } });
+    },
 
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams = {
-                current: 1,
-                size: 10,
-                xzfl: undefined,
-                name: undefined,
-                xmfrdwxz: undefined,
-                begainTime: undefined,
-                endTime: undefined,
-                status: undefined,
-            };
-            this.getList();
-        },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        xzfl: undefined,
+        name: undefined,
+        xmfrdwxz: undefined,
+        begainTime: undefined,
+        endTime: undefined,
+        status: undefined,
+      };
+      this.getList();
+    },
 
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.current = 1;
-            this.getList();
-        },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
     },
+  },
 };
 </script>
-<style scoped>
-.headtitle {
-    font-size: 1.25rem;
-    font-weight: 400;
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
 }
 
 .headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 10px;
 }
 
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+.table-wrapper {
+  flex: 1;
+  min-height: 0; /* 非常重要：允许 flex 子项压缩自身 */
+  overflow: hidden;
 }
 
-.tablehead {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+.pagination-wrapper {
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px solid #eee;
 }
 
-.headbtn {
-    display: flex;
+.el-table {
+  height: 100% !important;
 }
 
-.tablebtntwo {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
+.el-table__body-wrapper {
+  overflow-y: auto !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/evalute/configtable/index.vue b/src/views/evalute/configtable/index.vue
index 678cb37..26a0181 100644
--- a/src/views/evalute/configtable/index.vue
+++ b/src/views/evalute/configtable/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container">
     <!-- 项目评价配置 -->
     <div class="headerbox">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="200">
@@ -18,31 +18,44 @@
         </el-row>
       </el-form>
     </div>
+    
     <!-- 表格内容区 -->
-    <div class="tablebox">
-      <!-- 标签行 -->
-      <div class="tablehead">
-        <div class="headbtn">
-          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加规则</el-button>
-        </div>
+    <div class="table-container">
+      <div class="table-header">
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加规则</el-button>
+      </div>
+      
+      <div class="table-wrapper">
+        <el-table 
+          v-loading="loading" 
+          :data="postList" 
+          @selection-change="handleSelectionChange"
+          style="width: 100%"
+          height="100%">
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
+            </template>
+          </el-table-column>
+          <el-table-column label="评价要素" align="center" prop="pjys" />
+          <el-table-column label="评价规则" align="center" prop="pfgz" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button type="text" @click="handleUpdate(scope.row)">编辑</el-button>
+              <el-button type="text" style="color: red;" @click="handleDelete(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      
+      <div class="pagination-wrapper">
+        <pagination 
+          v-show="total > 0" 
+          :total="total" 
+          :page.sync="queryParams.current" 
+          :limit.sync="queryParams.size"
+          @pagination="getList" />
       </div>
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-        <el-table-column label="序号" align="center">
-          <template slot-scope="scope">
-            {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
-          </template>
-        </el-table-column>
-        <el-table-column label="评价要素" align="center" prop="pjys" />
-        <el-table-column label="评价规则" align="center" prop="pfgz" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button type="text" @click="handleUpdate(scope.row)">编辑</el-button>
-            <el-button type="text" style="color: red;" @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current" :limit.sync="queryParams.size"
-        @pagination="getList" />
     </div>
 
     <!-- 添加规则的弹窗 -->
@@ -73,12 +86,12 @@ export default {
       queryParams: {
         current: 1,
         size: 10,
-        pjys: '' // 修改为 pjys
+        pjys: ''
       },
       // 表格数据
       postList: [],
       // 总条数
-      total: 0, // 确保 total 有一个默认值
+      total: 0, 
       // 是否显示搜索条件
       showSearch: true,
       // 是否显示加载中
@@ -136,7 +149,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id); // 使用 id 字段
+      this.ids = selection.map(item => item.id); 
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -149,7 +162,7 @@ export default {
     // 显示编辑规则弹出层
     handleUpdate(row) {
       this.reset();
-      const postId = row.id || this.ids; // 使用 id 字段
+      const postId = row.id || this.ids; 
       this.form = { ...row };
       this.open = true;
       this.title = '编辑规则';
@@ -191,7 +204,7 @@ export default {
     // 删除按钮操作
     handleDelete(row) {
       const postIds = row.id || this.ids;
-      const pjys = row.pjys; // 获取 pjys 字段的内容
+      const pjys = row.pjys; 
       this.$modal.confirm(`是否确认删除"${pjys}"的数据项？`).then(() => {
         return deleteProjectEvaluation(postIds);
       }).then(() => {
@@ -203,70 +216,61 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
 .headerbox {
   background-color: #fff;
   border-radius: .5rem;
-  padding: 1rem;
-  margin: .5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: .5rem;
   border: 1px solid #eee;
 }
 
-.tablebox {
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
   background-color: #fff;
   border-radius: .5rem;
   padding: 1rem;
-  margin: .5rem;
   border: 1px solid #eee;
+  overflow: hidden;
 }
 
-.tablehead {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: .5rem
-}
-
-.headbtn {
-  display: flex;
-}
-
-.tablebtntwo {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
+.table-header {
+  margin-bottom: 10px;
 }
-</style>
 
-<style scoped>
-.headerbox {
-  background-color: #fff;
-  border-radius: .5rem;
-  padding: 1rem;
-  margin: .5rem;
-  border: 1px solid #eee;
+.table-wrapper {
+  flex: 1;
+  overflow: hidden;
 }
 
-.tablebox {
-  background-color: #fff;
-  border-radius: .5rem;
-  padding: 1rem;
-  margin: .5rem;
-  border: 1px solid #eee;
+.el-table {
+  height: 100% !important;
 }
 
-.tablehead {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: .5rem
+.el-table__body-wrapper {
+  overflow-y: auto !important;
 }
 
-.headbtn {
-  display: flex;
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
 }
 
-.tablebtntwo {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/evalute/evalist/index.vue b/src/views/evalute/evalist/index.vue
index a677494..344fc61 100644
--- a/src/views/evalute/evalist/index.vue
+++ b/src/views/evalute/evalist/index.vue
@@ -1,36 +1,78 @@
 <template>
-  <div>
+  <div class="container">
     <!-- 表单查询项 -->
     <div class="headerbox">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="200">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="200"
+      >
         <el-row>
           <el-col :span="5">
-            <el-form-item label="项目名称" style="width: 100%;">
-              <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
+            <el-form-item label="项目名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="建设起止时间">
-              <el-date-picker v-model="queryParams.begainTime" type="month" placeholder="开始月份" value-format="yyyy-MM"
-                style="width: 9rem;" :clearable="true">
+              <el-date-picker
+                v-model="queryParams.begainTime"
+                type="month"
+                placeholder="开始月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              >
               </el-date-picker>
               ~
-              <el-date-picker v-model="queryParams.endTime" type="month" placeholder="结束月份" value-format="yyyy-MM"
-                style="width: 9rem;" :clearable="true">
+              <el-date-picker
+                v-model="queryParams.endTime"
+                type="month"
+                placeholder="结束月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="现状分类">
-              <el-select v-model="queryParams.xzfl" placeholder="现状分类" clearable>
-                <el-option v-for="dict in dict.type.xzfl" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select
+                v-model="queryParams.xzfl"
+                placeholder="现状分类"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.xzfl"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="评价等级">
-              <el-select v-model="queryParams.pjdj" placeholder="请选择评价等级" clearable>
-                <el-option v-for="dict in dict.type.qdpjdj" :key="dict.value" :label="dict.label" :value="dict.value" />
+              <el-select
+                v-model="queryParams.pjdj"
+                placeholder="请选择评价等级"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.qdpjdj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -38,60 +80,103 @@
         <el-row>
           <el-col :span="8">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <!-- 表格内容区 -->
-    <div class="tablebox">
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"
-        @sort-change="handleSortChange">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-        <el-table-column label="序号" align="center">
-          <template slot-scope="scope">
-            {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
-          </template>
-        </el-table-column>
-        <el-table-column label="项目名称" align="center" prop="name" />
-        <el-table-column label="现状分类" align="center">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
-          </template>
-        </el-table-column>
-        <el-table-column label="项目法人单位" align="center" prop="xmfrdwxz" />
-        <el-table-column label="项目建设起止时间" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
-          </template>
-        </el-table-column>
-        <el-table-column label="项目评价" align="center" width="130" sortable="custom" prop="pjdj">
-          <template slot-scope="scope">
-            {{ scope.row.pjdj }} / {{ scope.row.count }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button type="text" @click="handleInfo(scope.row, 'detail')">详情</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current" :limit.sync="queryParams.size"
-        @pagination="getList" />
+    <div class="table-container">
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          @sort-change="handleSortChange"
+          height="100%"
+          style="width: 100%"
+        >
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                scope.$index + 1 + (queryParams.current - 1) * queryParams.size
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="项目名称" align="center" prop="name"  show-overflow-tooltip/>
+          <el-table-column label="现状分类" align="center">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目法人单位"
+            align="center"
+            prop="xmfrdwxz"
+            show-overflow-tooltip
+          />
+          <el-table-column label="项目建设起止时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目评价"
+            align="center"
+            width="130"
+            sortable="custom"
+            prop="pjdj"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.pjdj }} / {{ scope.row.count }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            fixed="right"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" @click="handleInfo(scope.row, 'detail')"
+                >详情</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.current"
+            :limit.sync="queryParams.size"
+            @pagination="getList"
+          />
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { getProjectEvaluationList, updateProjectEvaluationList } from '@/api/ManageApi/index.js';
+import {
+  getProjectEvaluationList,
+  updateProjectEvaluationList,
+} from "@/api/ManageApi/index.js";
 import { checkPermi, checkRole } from "@/utils/permission";
 
 export default {
-  dicts: [
-    'xzfl', 'qdpjdj'
-  ],
+  dicts: ["xzfl", "qdpjdj"],
   data() {
     return {
       postList: [],
@@ -100,40 +185,40 @@ export default {
       queryParams: {
         current: 1,
         size: 10,
-        name: '',
-        begainTime: '',
-        endTime: '',
-        xzfl: '',
-        pjdj: '',
-        qdpjdj: '',
+        name: "",
+        begainTime: "",
+        endTime: "",
+        xzfl: "",
+        pjdj: "",
+        qdpjdj: "",
       },
       showSearch: true,
       dialogVisible: false,
       editForm: {
-        id: '',
-        name: '',
-        dateRange: '',
-        xzfl: '',
-        pjdj: '',
-        xmfrdwxz: '',
+        id: "",
+        name: "",
+        dateRange: "",
+        xzfl: "",
+        pjdj: "",
+        xmfrdwxz: "",
       },
       infoDialogVisible: false,
       infoForm: {
-        id: '',
-        name: '',
-        dateRange: '',
-        xzfl: '',
-        pjdj: '',
-        xmfrdwxz: '',
-      }
+        id: "",
+        name: "",
+        dateRange: "",
+        xzfl: "",
+        pjdj: "",
+        xmfrdwxz: "",
+      },
     };
   },
   methods: {
     checkPermi,
     checkRole,
     handleSortChange({ column, prop, order }) {
-      if (prop === 'pjdj') {
-        this.queryParams.sort = order === 'ascending' ? 1 : 2;
+      if (prop === "pjdj") {
+        this.queryParams.sort = order === "ascending" ? 1 : 2;
         this.getList();
       }
     },
@@ -144,11 +229,11 @@ export default {
       this.queryParams = {
         current: 1,
         size: 10,
-        name: '',
-        begainTime: '',
-        endTime: '',
-        xzfl: '',
-        pjdj: ''
+        name: "",
+        begainTime: "",
+        endTime: "",
+        xzfl: "",
+        pjdj: "",
       };
       this.handleQuery();
     },
@@ -163,24 +248,23 @@ export default {
         pjdj: this.queryParams.pjdj,
         begainTime: this.queryParams.begainTime || null,
         endTime: this.queryParams.endTime || null,
-        sort: this.queryParams.sort || 1 // 默认正序
+        sort: this.queryParams.sort || 1, // 默认正序
       };
 
       getProjectEvaluationList(params)
-        .then(response => {
+        .then((response) => {
           this.postList = response.data?.records || [];
           this.total = response.data?.total || 0;
         })
-        .catch(error => {
-          console.error('获取项目评价失败:', error);
-          this.$message.error('数据加载失败');
+        .catch((error) => {
+          console.error("获取项目评价失败:", error);
+          this.$message.error("数据加载失败");
         })
         .finally(() => {
           this.loading = false;
         });
     },
-    handleSelectionChange(selection) {
-    },
+    handleSelectionChange(selection) {},
     handleInfo(row, type) {
       this.$store.commit("SET_CRUMBS", "项目详情");
       const id = row.id || this.ids[0];
@@ -189,7 +273,7 @@ export default {
     handleUpdate(row) {
       this.editForm = {
         ...row,
-        dateRange: [row.begainTime, row.endTime]
+        dateRange: [row.begainTime, row.endTime],
       };
       this.dialogVisible = true;
     },
@@ -197,66 +281,75 @@ export default {
       const formData = {
         ...this.editForm,
         begainTime: this.editForm.dateRange[0],
-        endTime: this.editForm.dateRange[1]
+        endTime: this.editForm.dateRange[1],
       };
       updateProjectEvaluationList(formData)
-        .then(response => {
-          this.$message.success('修改成功');
+        .then((response) => {
+          this.$message.success("修改成功");
           this.dialogVisible = false;
           this.getList();
         })
-        .catch(error => {
-          console.error('修改项目失败:', error);
-          this.$message.error('修改失败');
+        .catch((error) => {
+          console.error("修改项目失败:", error);
+          this.$message.error("修改失败");
         });
     },
-    handleDelete(row) {
-      // 处理删除
-    },
     formatMonthYear(date) {
-      // if (!date) return '';
       return date;
-      // // 确保传入的是完整日期，然后只显示年月部分
-      // const fullDate = date.includes('-') ? date : `${date}-01`; // 如果只有年月，补上日期
-      // return fullDate.split('-').slice(0, 2).join('-');
-    }
+    },
   },
   mounted() {
     this.getList();
-  }
+  },
 };
 </script>
 
-
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
   background-color: #fff;
-  border-radius: .5rem;
-  padding: 1rem;
-  margin: .5rem;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
   border: 1px solid #eee;
 }
 
-.tablebox {
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
   background-color: #fff;
-  border-radius: .5rem;
+  border-radius: 0.5rem;
   padding: 1rem;
-  margin: .5rem;
   border: 1px solid #eee;
+  overflow: hidden;
 }
 
-.tablehead {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
 }
 
-.headbtn {
-  display: flex;
+.el-table {
+  height: 90% !important;
+}
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
 }
 
-.tablebtntwo {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/evalute/supervision/index.vue b/src/views/evalute/supervision/index.vue
index 77ac5bd..7d2ff43 100644
--- a/src/views/evalute/supervision/index.vue
+++ b/src/views/evalute/supervision/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="supervision-container">
+  <div class="supervision-container container">
     <!-- 搜索区域 -->
-    <div class="search-area">
+    <div class="search-area headerbox">
       <el-form :model="searchForm" inline>
         <el-form-item label="提醒名称">
           <el-input
@@ -29,7 +29,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="tablebox">
+    <div class="tablebox table-container">
       <div class="operation-area">
         <el-button
           type="primary"
@@ -38,92 +38,102 @@
           >添加规则</el-button
         >
       </div>
-      <el-table
-        :data="tableData"
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-       >
-        <!-- <el-table-column type="selection" align="center" /> -->
-        <el-table-column label="序号" width="80" align="center">
-          <template slot-scope="scope">
-            {{ scope.$index + 1 }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="rulesName"
-          label="提醒名称"
-          min-width="200"
-          align="center"
-        />
-        <el-table-column
-          prop="alertType"
-          label="提醒类型"
-          min-width="150"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.alertType === 1">全局自定义通知</span>
-            <span v-if="scope.row.alertType === 2">项目即将结束(企业)</span>
-            <span v-if="scope.row.alertType === 3">项目即将建设完成(政务)</span>
-            <span v-if="scope.row.alertType === 4">项目自定义通知</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="alertRecipients"
-          label="提醒对象"
-          min-width="120"
-          align="center"
+      <div class="table-wrapper">
+        <el-table
+          :data="tableData"
+          style="width: 100%"
+          height="100%"
+          @selection-change="handleSelectionChange"
         >
-          <template slot-scope="scope">
-            <span v-if="scope.row.alertRecipients === 2">政务用户</span>
-            <span v-if="scope.row.alertRecipients === 1">企业用户</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="alertManner"
-          label="提醒方式"
-          min-width="120"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.alertManner == 1">定期提醒</span>
-            <span v-if="scope.row.alertManner == 2">不定期提醒</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="alertTime"
-          label="提醒时间"
-          min-width="180"
-          align="center"
-        />
+          <!-- <el-table-column type="selection" align="center" /> -->
+          <el-table-column label="序号" width="80" align="center">
+            <template slot-scope="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="rulesName"
+            label="提醒名称"
+            min-width="200"
+            align="center"
+          />
+          <el-table-column
+            prop="alertType"
+            label="提醒类型"
+            min-width="150"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.alertType === 1">全局自定义通知</span>
+              <span v-if="scope.row.alertType === 2">项目即将结束(企业)</span>
+              <span v-if="scope.row.alertType === 3"
+                >项目即将建设完成(政务)</span
+              >
+              <span v-if="scope.row.alertType === 4">项目自定义通知</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="alertRecipients"
+            label="提醒对象"
+            min-width="120"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.alertRecipients === 2">政务用户</span>
+              <span v-if="scope.row.alertRecipients === 1">企业用户</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="alertManner"
+            label="提醒方式"
+            min-width="120"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span v-if="scope.row.alertManner == 1">定期提醒</span>
+              <span v-if="scope.row.alertManner == 2">不定期提醒</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="alertTime"
+            label="提醒时间"
+            min-width="180"
+            align="center"
+          />
 
-        <!-- <el-table-column
+          <!-- <el-table-column
           prop="createBy"
           label="创建人"
           min-width="120"
           align="center"
         /> -->
-        <el-table-column label="操作" width="200" fixed="right" align="center">
-          <template slot-scope="scope">
-            <el-button type="text" @click="handleDetail(scope.row)"
-              >详情</el-button
-            >
-            <el-button
-              type="text"
-              @click="handleEdit(scope.row)"
-              style="color: #67c23a"
-              >编辑</el-button
-            >
-            <el-button
-              type="text"
-              @click="handleDelete(scope.row)"
-              style="color: red"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+          <el-table-column
+            label="操作"
+            width="200"
+            fixed="right"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" @click="handleDetail(scope.row)"
+                >详情</el-button
+              >
+              <el-button
+                type="text"
+                @click="handleEdit(scope.row)"
+                style="color: #67c23a"
+                >编辑</el-button
+              >
+              <el-button
+                type="text"
+                @click="handleDelete(scope.row)"
+                style="color: red"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
 
       <!-- 分页 -->
       <pagination
@@ -260,7 +270,7 @@ export default {
       pagination: {
         total: 0,
         current: 1,
-        size: 10,
+        size: 20,
       },
       selectedRows: [],
       dialogVisible: false,
@@ -638,4 +648,60 @@ export default {
     }
   }
 }
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+  padding: 10px;
+  box-sizing: border-box;
+}
+
+.headerbox {
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 10px;
+}
+
+.table-wrapper {
+  flex: 1;
+  overflow: hidden;
+}
+
+.el-table {
+  height: 100% !important;
+}
+
+.el-table__body-wrapper {
+  overflow-y: auto !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
+}
 </style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 53998bb..ff0f357 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -203,7 +203,7 @@ export default {
       window.location.href = 'https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login'
     },
     handleEnterpriseLogin() {
-      // window.location.href = 'https://gysl.sipac.gov.cn';
+      location.href  = process.env.VUE_APP_BASE_API + "/system/singlelogin/login";
     }
   }
 }
diff --git a/src/views/login_v1.vue b/src/views/login_v1.vue
index 65811dd..913f6cf 100644
--- a/src/views/login_v1.vue
+++ b/src/views/login_v1.vue
@@ -200,10 +200,10 @@ export default {
       });
     },
     handleGovernmentLogin() {
-      window.location.href = 'https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login'
+      location.href = 'https://qyt.sipac.gov.cn/sipsg-enterprise-mobile-manage/#/login'
     },
     handleEnterpriseLogin() {
-      window.location.href = 'https://gysl.sipac.gov.cn';
+     location.href  = process.env.VUE_APP_BASE_API + "/system/singlelogin/login";
     }
   }
 }
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index 67a4dd1..a15e66a 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -64,7 +64,11 @@
       </div>
       <!-- 建筑信息 -->
       <div id="buildings">
-        <Buildings :action="action" :xmId="projectId"></Buildings>
+        <Buildings
+          :action="action"
+          :xmId="projectId"
+          @has-building-data="hasBuildingData = $event"
+        ></Buildings>
       </div>
       <!-- 要素模型信息 -->
       <div id="models">
@@ -195,6 +199,7 @@ export default {
   },
   data() {
     return {
+      hasBuildingData: false,
       activeSection: "basic",
       sections: [
         { id: "basic", label: "基本信息" },
@@ -214,7 +219,7 @@ export default {
       isContainerVisible: true,
       isSubmitted: false,
       lastScrollTop: 0,
-      scrollDirection: 'down',
+      scrollDirection: "down",
       scrollTimeout: null,
       basicInformation: {
         acceptanceTime: "",
@@ -355,12 +360,12 @@ export default {
       this.scrollTimeout = setTimeout(() => {
         const scrollPosition = container.scrollTop;
         if (scrollPosition > this.lastScrollTop) {
-          this.scrollDirection = 'down';
+          this.scrollDirection = "down";
         } else {
-          this.scrollDirection = 'up';
+          this.scrollDirection = "up";
         }
         this.lastScrollTop = scrollPosition;
-        const offset = this.scrollDirection === 'down' ? 500 : 200;
+        const offset = this.scrollDirection === "down" ? 500 : 200;
         const adjustedScrollPosition = scrollPosition + offset;
         for (let i = this.sections.length - 1; i >= 0; i--) {
           const element = document.getElementById(this.sections[i].id);
@@ -368,7 +373,9 @@ export default {
             const elementPosition = element.offsetTop - container.offsetTop;
             if (elementPosition <= adjustedScrollPosition) {
               if (this.activeSection !== this.sections[i].id) {
-                console.log(`切换到 ${this.sections[i].label}，位置: ${elementPosition}，偏移: ${offset}`);
+                console.log(
+                  `切换到 ${this.sections[i].label}，位置: ${elementPosition}，偏移: ${offset}`
+                );
                 this.activeSection = this.sections[i].id;
               }
               break;
@@ -435,6 +442,7 @@ export default {
     },
     // 提交数据
     async submitAll() {
+
       // 创建全局加载动画
       const loading = this.$loading({
         lock: true,
@@ -443,6 +451,13 @@ export default {
         background: "rgba(0, 0, 0, 0.7)",
       });
 
+      // 校验建筑信息是否填写
+      if (!this.hasBuildingData) {
+        this.$message.error("请填写建筑信息");
+        loading.close();
+        return;
+      }
+      
       // 校验 wysmxInformations
       if (
         this.wysmxInformations.length === 0 ||
@@ -574,7 +589,7 @@ export default {
     },
     handleMenuClick() {
       if (this.$refs.menuRef) {
-          this.$refs.menuRef.$el.blur();
+        this.$refs.menuRef.$el.blur();
       }
     },
   },
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index ea864ad..7ebe880 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -1,35 +1,765 @@
 <template>
-  <div>
-    <!-- 企业端 -->
-    <div v-if="showCompanySection">
-      <!-- <div> -->
-      <qiyeduan />
+  <div class="container">
+    <!-- 查询表单 -->
+    <!-- 政务端 -->
+    <div class="headerbox" v-if="checkRole(['common', 'gov'])">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="200"
+      >
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="项目名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="建设起止时间">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="month"
+                placeholder="开始月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              ></el-date-picker>
+              ~
+              <el-date-picker
+                v-model="queryParams.endTime"
+                type="month"
+                placeholder="结束月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="现状分类">
+              <el-select
+                v-model="queryParams.xzfl"
+                placeholder="请选择现状分类"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.xzfl"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="项目法人单位">
+              <el-input
+                v-model="queryParams.xmfrdwxz"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="当前状态">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="选择当前状态"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.tbzt"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 企业端的查询项 -->
+    <div class="headerbox" v-else>
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="200"
+      >
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="项目名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="建设起止时间">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="month"
+                placeholder="开始月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              >
+              </el-date-picker>
+              ~
+              <el-date-picker
+                v-model="queryParams.endTime"
+                type="month"
+                placeholder="结束月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="现状分类">
+              <el-select
+                v-model="queryParams.xzfl"
+                placeholder="现状分类"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.xzfl"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                size="medium"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button
+                icon="el-icon-refresh"
+                size="medium"
+                @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
+
+    <!-- 表格内容区 -->
     <!-- 政务端 -->
-    <div v-if="checkRole(['common','gov'])">
-      <zhengwuduan />
+    <div class="table-container" v-if="checkRole(['common', 'gov'])">
+      <!-- 按钮行 -->
+      <div class="table-header">
+        <el-row :gutter="4">
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleExport">全量导出</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleExporttwo"
+              >单片材料导出</el-button
+            >
+          </el-col>
+        </el-row>
+        <el-row :gutter="4">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-download"
+              @click="importTemplate"
+              >下载模板</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="handleImport">批量导入</el-button>
+          </el-col>
+        </el-row>
+      </div>
+
+      <!-- 表格区域 -->
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          stripe
+          height="100%"
+          style="width: 100%"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                scope.$index + 1 + (queryParams.current - 1) * queryParams.size
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目名称"
+            align="center"
+            prop="name"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column label="现状分类" align="center" prop="xzfl">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目法人单位"
+            align="center"
+            prop="xmfrdwxz"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="统一社会信用代码"
+            align="center"
+            prop="tyshxydm"
+            width="200"
+          />
+          <el-table-column label="项目建设起止时间" align="center" width="200">
+            <template slot-scope="scope">
+              {{ formatMonth(scope.row.begainTime) }} 至
+              {{ formatMonth(scope.row.endTime) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="总投资额（万元）"
+            align="center"
+            width="130"
+            prop="ztze"
+          />
+          <el-table-column
+            label="总用地面积（平方米）"
+            align="center"
+            width="180"
+            prop="zydmj"
+          />
+          <el-table-column label="当前状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tbzt" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                @click="getAdd(scope.row, 'fill')"
+                v-if="scope.row.status === 2"
+                >审核</el-button
+              >
+              <el-button
+                type="text"
+                @click="getAdd(scope.row, 'okay')"
+                v-if="scope.row.status === 3"
+                >编辑</el-button
+              >
+              <el-button
+                type="text"
+                @click="getAdd(scope.row, 'detail')"
+                v-if="scope.row.status === 1"
+                >详情</el-button
+              >
+              <el-button
+                type="text"
+                @click="handleDelete(scope.row)"
+                style="color: #f25353"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <!-- 分页区域 -->
+      <div class="pagination-wrapper">
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.current"
+          :limit.sync="queryParams.size"
+          @pagination="getList"
+        />
+      </div>
     </div>
+
+    <!-- 企业端表格内容区 -->
+    <div class="table-container" v-else>
+      <!-- 导入弹窗 -->
+      <el-dialog
+        title="导入"
+        :visible.sync="upload.open"
+        width="400px"
+        append-to-body
+      >
+        <el-upload
+          ref="upload"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="upload.headers"
+          :action="upload.url + '?updateSupport=' + upload.updateSupport"
+          :disabled="upload.isUploading"
+          :on-progress="handleFileUploadProgress"
+          :on-success="handleFileSuccess"
+          :auto-upload="false"
+          drag
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-center" slot="tip">
+            <span>仅允许导入xls、xlsx格式文件。</span>
+          </div>
+        </el-upload>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="upload.open = false">取消</el-button>
+          <el-button
+            type="primary"
+            @click="submitFileForm"
+            :loading="upload.isUploading"
+            >确定</el-button
+          >
+        </span>
+      </el-dialog>
+
+      <!-- 表格区域 -->
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          stripe
+        >
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                scope.$index + 1 + (queryParams.current - 1) * queryParams.size
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目名称"
+            align="center"
+            prop="name"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column label="现状分类" align="center" prop="xzfl">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目法人单位"
+            align="center"
+            prop="xmfrdwxz"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="统一社会信用代码"
+            align="center"
+            prop="tyshxydm"
+            width="200"
+          />
+          <el-table-column label="项目建设起止时间" align="center" width="200">
+            <template slot-scope="scope">
+              {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="总投资额（万元）"
+            align="center"
+            width="130"
+            prop="ztze"
+          />
+          <el-table-column
+            label="总用地面积（平方米）"
+            align="center"
+            width="180"
+            prop="zydmj"
+          />
+          <el-table-column label="当前状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.tbzt" :value="scope.row.status" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                size="medium"
+                type="text"
+                @click="getInfo(scope.row, 'fill')"
+                v-if="scope.row.status === 1"
+                >填报</el-button
+              >
+              <el-button
+                size="medium"
+                type="text"
+                @click="getInfo(scope.row, 'detail')"
+                v-if="scope.row.status !== 1"
+                >详情</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+
+      <!-- 分页区域 -->
+      <div class="pagination-wrapper">
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.current"
+          :limit.sync="queryParams.size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+
+    <!-- 导入按钮弹窗 -->
+    <el-dialog
+      title="导入"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+        </div>
+      </el-upload>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="upload.open = false">取消</el-button>
+        <el-button
+          type="primary"
+          @click="submitFileForm"
+          :loading="upload.isUploading"
+          >确定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import qiyeduan from '@/views/components/qiyexinxi/qiyexinxi.vue'
-import zhengwuduan from '@/views/components/zhengwuxinxi/zhengwuxinxi.vue'
+import {
+  getBasicInformationPage,
+  deleteBasicInformation,
+} from "@/api/ManageApi/index";
+import { getToken } from "@/utils/auth";
 import { checkPermi, checkRole } from "@/utils/permission";
-
 export default {
-  components: { qiyeduan, zhengwuduan },
+  dicts: ["xzfl", "tbzt"],
+  data() {
+    return {
+      ids: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目表格数据
+      postList: [],
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        xzfl: undefined,
+        name: undefined,
+        xmfrdwxz: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+      },
+      // 导入相关数据
+      upload: {
+        open: false, // 是否显示导入弹窗
+        isUploading: false, // 是否正在上传
+        updateSupport: 0, // 是否更新已存在数据
+        headers: { Authorization: "Bearer " + getToken() }, // 上传请求头
+        url: process.env.VUE_APP_BASE_API + "/gysl/basicInformation/import", // 上传地址
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
   methods: {
     checkPermi,
-    checkRole
+    checkRole,
+    /** 格式化月份显示 */
+    formatMonth(dateStr) {
+      if (!dateStr) return "";
+      // 如果已经是 YYYY-MM 格式，直接返回
+      if (/^\d{4}-\d{2}$/.test(dateStr)) return dateStr;
+      // 如果是 YYYY-MM-DD 格式，截取前7位
+      if (/^\d{4}-\d{2}-\d{2}$/.test(dateStr)) return dateStr.substring(0, 7);
+      return dateStr;
+    },
+
+    /** 查询项目列表 */
+    getList() {
+      this.loading = true;
+      // 确保日期参数格式正确
+      const params = {
+        ...this.queryParams,
+        begainTime: this.formatMonth(this.queryParams.begainTime),
+        endTime: this.formatMonth(this.queryParams.endTime),
+      };
+
+      getBasicInformationPage(params)
+        .then((response) => {
+          this.postList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("API请求错误:", error);
+          console.error("错误详情:", error.response);
+          this.loading = false;
+        });
+    },
+
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.open = true;
+    },
+
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/gysl/basicInformation/importTemplate",
+        {},
+        `项目导入模板${new Date().getTime()}.xlsx`
+      );
+    },
+
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
+
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/gysl/basicInformation/exportInfo",
+        {
+          idList: this.ids,
+        },
+        `基本信息${new Date().getTime()}.xlsx`
+      );
+    },
+
+    /** 单片材料导出按钮操作 */
+    handleExporttwo() {
+      if (this.ids.length === 0) {
+        this.$message.warning("请选择要导出的项目");
+        return;
+      }
+
+      this.download(
+        "/gysl/basicInformation/wordExport",
+        {
+          ids: this.ids.join(","),
+        },
+        `单片材料${new Date().getTime()}.zip`
+      );
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const projectName = row.name;
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm(`是否确认删除项目"${projectName}"？`)
+        .then(() => {
+          return deleteBasicInformation(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+
+    /** 详情按钮操作 */
+    getAdd(row, type) {
+      this.$store.commit("SET_CRUMBS", "项目详情");
+      const id = row.id || this.ids[0];
+      this.$router.push({ path: `/manage-add/${id}`, query: { action: type } });
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        xzfl: undefined,
+        name: undefined,
+        xmfrdwxz: undefined,
+        begainTime: undefined,
+        endTime: undefined,
+        status: undefined,
+      };
+      this.getList();
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
   },
-  computed: {
-    showCompanySection() {
-      const isCompany = this.checkRole(['company']);
-      const isCommon = this.checkRole(['common','gov']);
-      // 如果两个角色都存在，则隐藏企业端
-      return isCompany && !isCommon;
-    }
-  }
-}
-</script>
\ No newline at end of file
+};
+</script>
+
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+.headerbox {
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
+}
+
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
+}
+
+.el-table {
+  height: 100% !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
+}
+</style>
diff --git a/src/views/models/badlist/index.vue b/src/views/models/badlist/index.vue
index 22114a9..fb13433 100644
--- a/src/views/models/badlist/index.vue
+++ b/src/views/models/badlist/index.vue
@@ -1,259 +1,394 @@
 <template>
-    <div>
-        <!-- 负面清单 -->
-        <!-- 表单查询项 -->
-        <div class="headerbox">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                label-width="200">
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="项目名称" style="width: 100%;">
-                            <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item label="建设起止时间">
-                            <el-date-picker v-model="queryParams.startTime" type="month" placeholder="开始月份"
-                                value-format="yyyy-MM" style="width: 9rem;" :clearable="true">
-                            </el-date-picker>
-                            ~
-                            <el-date-picker v-model="queryParams.endTime" type="month" placeholder="结束月份"
-                                value-format="yyyy-MM" style="width: 9rem;" :clearable="true">
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="现状分类">
-                            <el-select v-model="queryParams.xzfl" placeholder="现状分类" clearable>
-                                <el-option v-for="dict in dict.type.xzfl" :key="dict.value" :label="dict.label"
-                                    :value="dict.value" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item label="项目法人单位">
-                            <el-input v-model="queryParams.xmfrdwxz" placeholder="请输入项目名称" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="当前状态">
-                            <el-select v-model="queryParams.status" placeholder="选择当前状态" clearable>
-                                <el-option v-for="dict in dict.type.tbzt" :key="dict.value" :label="dict.label"
-                                    :value="dict.value" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search"
-                                @click="handleQuery">查询</el-button>
-                            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
-        <!-- 表格内容区 -->
-        <div class="tablebox">
-            <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe>
-                <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                <el-table-column label="序号" align="center">
-                    <template slot-scope="scope">
-                        {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="项目名称" align="center" prop="name" width="200" />
-                <el-table-column label="现状分类" align="center" prop="xzfl">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="项目法人单位" align="center" prop="xmfrdwxz" width="200" />
-                <el-table-column label="统一信用代码" align="center" prop="tyshxydm" width="200" />
-                <el-table-column label="项目建设起止时间" align="center" width="200">
-                    <template slot-scope="scope">
-                        {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="总投资额（万元）" align="center" width="130" prop="ztze" />
-                <el-table-column label="总用地面积（平方米）" align="center" width="180" prop="zydmj" />
-                <el-table-column label="当前状态" align="center" prop="status">
-                    <template slot-scope="scope">
-                        <span :style="{ color: statusColors[statusMap[scope.row.status]] }">{{
-                            statusMap[scope.row.status] }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="getAdd(scope.row, 'detail')">详情</el-button>
-                        <el-button type="text" @click="handleDelete(scope.row)" v-if="checkRole(['admin'])"
-                            style="color: #F25353;">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current"
-                :limit.sync="queryParams.size" @pagination="getList" />
-        </div>
+  <div class="container">
+    <!-- 负面清单 -->
+    <!-- 表单查询项 -->
+    <div class="headerbox">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="200"
+      >
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="项目名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="建设起止时间">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="month"
+                placeholder="开始月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              >
+              </el-date-picker>
+              ~
+              <el-date-picker
+                v-model="queryParams.endTime"
+                type="month"
+                placeholder="结束月份"
+                value-format="yyyy-MM"
+                style="width: 9rem"
+                :clearable="true"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="现状分类">
+              <el-select
+                v-model="queryParams.xzfl"
+                placeholder="现状分类"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.xzfl"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="项目法人单位">
+              <el-input
+                v-model="queryParams.xmfrdwxz"
+                placeholder="请输入项目名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="当前状态">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="选择当前状态"
+                clearable
+              >
+                <el-option
+                  v-for="dict in dict.type.tbzt"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
+    <!-- 表格内容区 -->
+    <div class="table-container">
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          stripe
+          height="100%"
+        >
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                scope.$index + 1 + (queryParams.current - 1) * queryParams.size
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目名称"
+            align="center"
+            prop="name"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column label="现状分类" align="center" prop="xzfl">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.xzfl" :value="scope.row.xzfl" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="项目法人单位"
+            align="center"
+            prop="xmfrdwxz"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="统一信用代码"
+            align="center"
+            prop="tyshxydm"
+            width="200"
+          />
+          <el-table-column label="项目建设起止时间" align="center" width="200">
+            <template slot-scope="scope">
+              {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="总投资额（万元）"
+            align="center"
+            width="130"
+            prop="ztze"
+          />
+          <el-table-column
+            label="总用地面积（平方米）"
+            align="center"
+            width="180"
+            prop="zydmj"
+          />
+          <el-table-column label="当前状态" align="center" prop="status">
+            <template slot-scope="scope">
+              <span
+                :style="{ color: statusColors[statusMap[scope.row.status]] }"
+                >{{ statusMap[scope.row.status] }}</span
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            fixed="right"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" @click="getAdd(scope.row, 'detail')"
+                >详情</el-button
+              >
+              <el-button
+                type="text"
+                @click="handleDelete(scope.row)"
+                v-if="checkRole(['admin'])"
+                style="color: #f25353"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
+        @pagination="getList"
+      />
+    </div>
+  </div>
 </template>
 
 <script>
-import { getBasicInformationPage, deleteBasicInformation } from "@/api/ManageApi/index";
+import {
+  getBasicInformationPage,
+  deleteBasicInformation,
+} from "@/api/ManageApi/index";
 import { checkPermi, checkRole } from "@/utils/permission";
 export default {
-    dicts: ["xzfl","tbzt"],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 项目表格数据
-            postList: [],
-            // 状态颜色映射
-            statusColors: {
-                '审核通过': '#6EDABE',
-                '待填报': '#FFBF6B',
-                '待审核': '#7693D8'
-            },
-            // 状态文本映射
-            statusMap: {
-                1: '待填报',
-                2: '待审核',
-                3: '审核通过'
-            },
-            // 查询参数
-            queryParams: {
-                current: 1,
-                size: 10,
-                xzfl: undefined,
-                name: undefined,
-                xmfrdwxz: undefined,
-                startTime: undefined,
-                endTime: undefined,
-                status: undefined,
-                isFmqd: 1
-            }
-        };
-    },
-    created() {
-        this.getList();
-    },
-    methods: {
-        checkPermi,
-        checkRole,
-        /** 查询项目列表 */
-        getList() {
-            this.loading = true;
+  dicts: ["xzfl", "tbzt"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目表格数据
+      postList: [],
+      // 状态颜色映射
+      statusColors: {
+        审核通过: "#6EDABE",
+        待填报: "#FFBF6B",
+        待审核: "#7693D8",
+      },
+      // 状态文本映射
+      statusMap: {
+        1: "待填报",
+        2: "待审核",
+        3: "审核通过",
+      },
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        xzfl: undefined,
+        name: undefined,
+        xmfrdwxz: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+        isFmqd: 1,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermi,
+    checkRole,
+    /** 查询项目列表 */
+    getList() {
+      this.loading = true;
 
-            // 只查询isFmqd=2的数据
-            const params = {
-                ...this.queryParams,
-                isFmqd: 1
-            };
+      // 只查询isFmqd=2的数据
+      const params = {
+        ...this.queryParams,
+        isFmqd: 1,
+      };
 
-            getBasicInformationPage(params).then((response) => {
-                this.postList = response.data.records;
-                this.total = response.data.total;
-                this.loading = false;
-            }).catch(error => {
-                console.error('API请求错误:', error);
-                this.loading = false;
-            });
-        },
+      getBasicInformationPage(params)
+        .then((response) => {
+          this.postList = response.data.records;
+          this.total = response.data.total;
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("API请求错误:", error);
+          this.loading = false;
+        });
+    },
 
-        //当选择项发生变化时会触发该事件
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
-        },
+    //当选择项发生变化时会触发该事件
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
 
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const ids = row.id || this.ids;
-            this.$modal
-                .confirm('是否确认删除项目id为"' + ids + '"的数据项？')
-                .then(() => {
-                    return deleteBasicInformation(ids);
-                })
-                .then(() => {
-                    this.getList();
-                    this.$modal.msgSuccess("删除成功");
-                })
-                .catch(() => { });
-        },
-        /** 详情按钮操作 */
-        getAdd(row, type) {
-            this.$store.commit("SET_CRUMBS",  "项目详情");
-            const id = row.id || this.ids[0];
-            this.$router.push({ path: `/manage-add/${id}`, query: { action: type } });
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams = {
-                current: 1,
-                size: 10,
-                xzfl: undefined,
-                name: undefined,
-                xmfrdwxz: undefined,
-                startTime: undefined,
-                endTime: undefined,
-                status: undefined,
-                isFmqd: 1
-            };
-            this.getList();
-        },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除项目id为"' + ids + '"的数据项？')
+        .then(() => {
+          return deleteBasicInformation(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 详情按钮操作 */
+    getAdd(row, type) {
+      this.$store.commit("SET_CRUMBS", "项目详情");
+      const id = row.id || this.ids[0];
+      this.$router.push({ path: `/manage-add/${id}`, query: { action: type } });
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        xzfl: undefined,
+        name: undefined,
+        xmfrdwxz: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+        isFmqd: 1,
+      };
+      this.getList();
+    },
 
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.current = 1;
-            this.getList();
-        }
-    }
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+  },
 };
 </script>
-<style scoped>
+
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
 }
 
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
 }
 
-.tablehead {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+.el-table {
+  height: 100% !important;
 }
 
-.headbtn {
-    display: flex;
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
 }
 
-.tablebtntwo {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/orientedtwo/bqspan/index.vue b/src/views/orientedtwo/bqspan/index.vue
index 73b1c8c..4b10e6a 100644
--- a/src/views/orientedtwo/bqspan/index.vue
+++ b/src/views/orientedtwo/bqspan/index.vue
@@ -1,157 +1,235 @@
 <template>
-    <div>
-        <!-- 产业标签 -->
-        <!-- 表单查询项 -->
-        <div class="headerbox">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                label-width="200">
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="企业名称" style="width: 100%;">
-                            <el-input v-model="queryParams.name" placeholder="请输入企业名称" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="标签代码" style="width: 100%;">
-                            <el-input v-model="queryParams.bqdm" placeholder="请输入标签代码" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="标签状态" style="width: 100%;">
-                            <el-input v-model="queryParams.bqzt" placeholder="请输入标签状态" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="用户类型">
-                            <el-input v-model="queryParams.yhlx" placeholder="请输入用户类型" clearable
-                                @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item>
-                            <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-                            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
-        <!-- 表格内容区 -->
-        <div class="tablebox">
-            <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe>
-                <el-table-column label="序号" align="center">
-                    <template slot-scope="scope">
-                        {{ (scope.$index + 1) + (queryParams.current - 1) * queryParams.size }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="企业名称" align="center" prop="name" width="200" />
-                <el-table-column label="统一信用代码" align="center" prop="tyshxydm" width="200" />
-                <el-table-column label="标签代码" align="center" prop="bqdm" />
-                <el-table-column label="有效状态" align="center" prop="state" width="200" />
-                <el-table-column label="用户类型" align="center" width="130" prop="yhlx" />
-                <el-table-column label="标签注释" align="center" width="180" prop="bqzs" />
-                <el-table-column label="标签状态" align="center" prop="bqzt" />
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="getAdd(scope.row, 'detail')">详情</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current"
-                :limit.sync="queryParams.size" @pagination="getList" />
-        </div>
+  <div class="container">
+    <!-- 产业标签 -->
+    <!-- 表单查询项 -->
+    <div class="headerbox">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="200"
+      >
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="企业名称" style="width: 100%">
+              <el-input
+                v-model="queryParams.name"
+                placeholder="请输入企业名称"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="标签代码" style="width: 100%">
+              <el-input
+                v-model="queryParams.bqdm"
+                placeholder="请输入标签代码"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="标签状态" style="width: 100%">
+              <el-input
+                v-model="queryParams.bqzt"
+                placeholder="请输入标签状态"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="用户类型">
+              <el-input
+                v-model="queryParams.yhlx"
+                placeholder="请输入用户类型"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item>
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格内容区 -->
+    <div class="table-container">
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          @selection-change="handleSelectionChange"
+          stripe
+          height="100%"
+        >
+          <el-table-column label="序号" align="center">
+            <template slot-scope="scope">
+              {{
+                scope.$index + 1 + (queryParams.current - 1) * queryParams.size
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="企业名称"
+            align="center"
+            prop="name"
+            width="200"
+          />
+          <el-table-column
+            label="统一信用代码"
+            align="center"
+            prop="tyshxydm"
+            width="200"
+          />
+          <el-table-column label="标签代码" align="center" prop="bqdm" />
+          <el-table-column
+            label="有效状态"
+            align="center"
+            prop="state"
+            width="200"
+          />
+          <el-table-column
+            label="用户类型"
+            align="center"
+            width="130"
+            prop="yhlx"
+          />
+          <el-table-column
+            label="标签注释"
+            align="center"
+            width="180"
+            prop="bqzs"
+          />
+          <el-table-column label="标签状态" align="center" prop="bqzt" />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" @click="getAdd(scope.row, 'detail')"
+                >详情</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination-wrapper">
+        <pagination
+         
+          :total="total"
+          :page.sync="queryParams.current"
+          :limit.sync="queryParams.size"
+          @pagination="getList"
+        />
+      </div>
+    </div>
 
-        <!-- 详情弹窗 -->
-        <el-dialog title="详情" :visible.sync="dialogVisible" width="50%">
-            <el-form :model="detailData" label-width="200px">
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="企业名称:">
-                            <span>{{ detailData.name }}</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="统一信用代码:">
-                            <span>{{ detailData.tyshxydm }}</span>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+    <!-- 详情弹窗 -->
+    <el-dialog title="详情" :visible.sync="dialogVisible" width="50%">
+      <el-form :model="detailData" label-width="200px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="企业名称:">
+              <span>{{ detailData.name }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="统一信用代码:">
+              <span>{{ detailData.tyshxydm }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="标签标记场景代码:">
-                            <span>{{ detailData.bqdm }}</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="标签代码:">
-                            <span>{{ detailData.state }}</span>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标签标记场景代码:">
+              <span>{{ detailData.bqdm }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标签代码:">
+              <span>{{ detailData.state }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="标签值编码：">
-                            <span>{{ detailData.bqzbm }}</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="有效状态：">
-                            <span>{{ detailData.state }}</span>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标签值编码：">
+              <span>{{ detailData.bqzbm }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="有效状态：">
+              <span>{{ detailData.state }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="标签注释：">
-                            <span>{{ detailData.bqzs }}</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="用户类型：">
-                            <span>{{ detailData.yhlx }}</span>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标签注释：">
+              <span>{{ detailData.bqzs }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户类型：">
+              <span>{{ detailData.yhlx }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="标签标记用户：">
-                            <span>{{ detailData.bqzt }}</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="标签标记单位：">
-                            <span>{{ detailData.bqbjdw }}</span>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标签标记用户：">
+              <span>{{ detailData.bqzt }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标签标记单位：">
+              <span>{{ detailData.bqbjdw }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="标签状态：">
-                            <span>{{ detailData.bqzt }}</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="数据来源名称：">
-                            <span>{{ detailData.sjlymc }}</span>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">关闭</el-button>
-            </span>
-        </el-dialog>
-    </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标签状态：">
+              <span>{{ detailData.bqzt }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="数据来源名称：">
+              <span>{{ detailData.sjlymc }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -159,133 +237,162 @@ import { getCybqInformationPage, getSpanById } from "@/api/ManageApi/index";
 import { checkPermi, checkRole } from "@/utils/permission";
 
 export default {
-    dicts: ["xzfl"],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 项目表格数据
-            postList: [],
-            // 查询参数
-            queryParams: {
-                current: 1,
-                size: 10,
-                bqdm: undefined,
-                bqzt: undefined,
-                yhlx: undefined,
-                name: undefined,
-                startTime: undefined,
-                endTime: undefined,
-                status: undefined,
-            },
-            // 弹窗显示控制
-            dialogVisible: false,
-            // 详情数据
-            detailData: {}
-        };
-    },
-    created() {
-        this.getList();
-    },
-    methods: {
-        checkPermi,
-        checkRole,
-        /** 查询项目列表 */
-        getList() {
-            this.loading = true;
+  dicts: ["xzfl"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目表格数据
+      postList: [],
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        bqdm: undefined,
+        bqzt: undefined,
+        yhlx: undefined,
+        name: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+      },
+      // 弹窗显示控制
+      dialogVisible: false,
+      // 详情数据
+      detailData: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermi,
+    checkRole,
+    /** 查询项目列表 */
+    getList() {
+      this.loading = true;
 
-            //api
-            getCybqInformationPage(this.queryParams).then((response) => {
-                this.postList = [...response.data.records];
-                this.total = response.data.total;
-                this.loading = false;
-            }).catch();
-        },
+      //api
+      getCybqInformationPage(this.queryParams)
+        .then((response) => {
+          this.postList = [...response.data.records];
+          this.total = response.data.total;
+          this.loading = false;
+        })
+        .catch();
+    },
 
-        // 当选择项发生变化时会触发该事件
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
-        },
+    // 当选择项发生变化时会触发该事件
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
 
-        /** 详情按钮操作 */
-        /** 详情按钮操作 */
-        getAdd(row) {
-            this.loading = true;
-            getSpanById(row.id).then((response) => {
-                this.detailData = response.data;
-                this.dialogVisible = true;
-                this.loading = false;
-            }).catch((error) => {
-                this.$message.error("获取详情失败：" + error.message);
-                this.loading = false;
-            });
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams = {
-                current: 1,
-                size: 10,
-                bqdm: undefined,
-                bqzt: undefined,
-                yhlx: undefined,
-                name: undefined,
-                startTime: undefined,
-                endTime: undefined,
-                status: undefined,
-            };
-            this.getList();
-        },
+    /** 详情按钮操作 */
+    /** 详情按钮操作 */
+    getAdd(row) {
+      this.loading = true;
+      getSpanById(row.id)
+        .then((response) => {
+          this.detailData = response.data;
+          this.dialogVisible = true;
+          this.loading = false;
+        })
+        .catch((error) => {
+          this.$message.error("获取详情失败：" + error.message);
+          this.loading = false;
+        });
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        bqdm: undefined,
+        bqzt: undefined,
+        yhlx: undefined,
+        name: undefined,
+        startTime: undefined,
+        endTime: undefined,
+        status: undefined,
+      };
+      this.getList();
+    },
 
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.current = 1;
-            this.getList();
-        }
-    }
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
 }
 
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
 }
 
-.tablehead {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+.el-table {
+  height: 100% !important;
 }
 
-.headbtn {
-    display: flex;
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
 }
 
-.tablebtntwo {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/orientedtwo/content/index.vue b/src/views/orientedtwo/content/index.vue
index 621ff05..477117d 100644
--- a/src/views/orientedtwo/content/index.vue
+++ b/src/views/orientedtwo/content/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container">
     <!-- 表单查询项 -->
     <div class="headerbox">
       <el-form
@@ -77,17 +77,17 @@
     </div>
 
     <!-- 表格内容区 -->
-    <div class="tablebox">
+    <div class="table-container">
       <!-- 导出行 -->
-      <div class="tablebtntwo">
-        <el-row :gutter="10" class="mb8">
+      <div class="table-header">
+        <el-row :gutter="4" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
               >新增</el-button
             >
           </el-col>
         </el-row>
-        <el-row :gutter="10" class="mb8">
+        <el-row :gutter="4" class="mb8">
           <el-col :span="1.5">
             <el-button
               type="primary"
@@ -106,10 +106,12 @@
           </el-col>
         </el-row>
       </div>
+      <div class="table-wrapper">
       <el-table
         v-loading="loading"
         :data="postList"
         @selection-change="handleSelectionChange"
+        height="100%"
       >
         <!-- <el-table-column type="selection" width="55" align="center" /> -->
         <el-table-column label="序号" width="60" align="center">
@@ -153,6 +155,8 @@
           </template>
         </el-table-column>
       </el-table>
+      </div>
+      <div class="pagination-wrapper">
       <pagination
         v-show="total > 0"
         :total="total"
@@ -160,6 +164,7 @@
         :limit.sync="queryParams.size"
         @pagination="getList"
       />
+      </div>
     </div>
 
     <!-- 添加或修改项目对话框 -->
@@ -524,38 +529,60 @@ export default {
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
   background-color: #fff;
   border-radius: 0.5rem;
-  padding: 1rem;
-  margin: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
   border: 1px solid #eee;
 }
 
-.tablebox {
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
   background-color: #fff;
   border-radius: 0.5rem;
   padding: 1rem;
-  margin: 0.5rem;
   border: 1px solid #eee;
+  overflow: hidden;
 }
 
-.tablehead {
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
   display: flex;
   justify-content: space-between;
-  align-items: center;
 }
 
-.headbtn {
-  display: flex;
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
 }
 
-.tablebtntwo {
-  margin-top: 1rem;
-  margin-bottom: 1rem;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
+.el-table {
+  height: 100% !important;
+}
+
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
+}
+
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/orientedtwo/subdivide/index.vue b/src/views/orientedtwo/subdivide/index.vue
index e4da2dd..ce71205 100644
--- a/src/views/orientedtwo/subdivide/index.vue
+++ b/src/views/orientedtwo/subdivide/index.vue
@@ -1,429 +1,593 @@
 <template>
-    <div>
-        <!-- 细分产业管理 -->
-        <!-- 表单查询项 -->
-        <div class="headerbox">
-            <el-form ref="queryForm" :model="queryParams" size="small" label-width="100px" style="margin-left: -30px;">
-                <el-row>
-                    <el-col :span="5">
-                        <el-form-item label="产业类别" prop="cylb">
-                            <el-select v-model="queryParams.cylb" placeholder="请选择产业类别">
-                                <el-option v-for="dict in dict.type.cylb" :key="dict.value" :label="dict.label"
-                                    :value="dict.value"></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
-                        <el-form-item label="产业细分" prop="cyxf" style="width: 100%;">
-                            <el-input v-model="queryParams.cyxf" placeholder="请输入产业细分"
-                                :fetch-suggestions="querySearchAsync" @keyup.enter.native="handleQuery" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="7">
-                        <el-form-item label="上楼适应性" prop="slsyx">
-                            <el-select v-model="queryParams.slsyx" placeholder="请选择上楼适应性" clearable
-                                style="width: 20rem;">
-                                <el-option v-for="dict in dict.type.slsyx" :key="dict.value" :label="dict.label"
-                                    :value="dict.value" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="3">
-                        <el-form-item label="更新时间" prop="updateTime">
-                            <el-date-picker v-model="queryParams.startTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
-                                value-format="yyyy-MM-dd HH:mm:ss" :style="{ width: '18rem' }" placeholder="选择日期时间"
-                                clearable />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="8">
-                        <el-form-item style="margin-left: -70px;">
-                            <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-                            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
-        <!-- 表格内容区 -->
-        <div class="tablebox">
-            <!-- 导出行 -->
-            <div class="tablebtntwo">
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-                    </el-col>
-                </el-row>
-                <el-row :gutter="10" class="mb8">
-                    <el-col :span="1.5">
-                        <el-button type="primary" icon="el-icon-download" @click="handleImport">导入</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                        <el-button type="primary" icon="el-icon-upload2" @click="handleExport">全量导出</el-button>
-                    </el-col>
-                </el-row>
-            </div>
-            <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-                <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                <el-table-column label="序号" width="60" align="center">
-                    <template slot-scope="scope">
-                        {{ (queryParams.current - 1) * queryParams.size + scope.$index + 1 }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="产业类别" align="center" prop="cylb">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.cylb" :value="scope.row.cylb" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="产业细分" align="center" prop="cyxf" />
-                <el-table-column label="原材料及生产环节" align="center" prop="ycljschj" />
-                <el-table-column label="上楼适应性" align="center" prop="slsyx">
-                    <template slot-scope="scope">
-                        <dict-tag :options="dict.type.slsyx" :value="scope.row.slsyx" />
-                    </template>
-                </el-table-column>
-                <el-table-column label="更新时间" align="center" prop="updateTime" width="180" />
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" >
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="handleUpdate(scope.row)">编辑</el-button>
-                        <el-button type="text" @click="handleDelete(scope.row)" style="color: red;">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.current"
-                :limit.sync="queryParams.size" @pagination="getList" />
-        </div>
-
-        <!-- 添加或修改项目对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="40rem" append-to-body>
-            <el-form ref="form" :model="form" :rules="rules" label-width="160px">
-                <el-form-item label="产业类别" prop="cylb" style="width: 100%;">
-                    <el-select v-model="form.cylb" placeholder="请选择产业类别" style="width: 100%;">
-                        <el-option v-for="dict in dict.type.cylb" :key="dict.value" :label="dict.label"
-                            :value="dict.value"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="产业细分" prop="cyxf">
-                    <el-input v-model="form.cyxf" placeholder="请输入产业细分" />
-                </el-form-item>
-                <el-form-item label="原材料及生产环节" prop="ycljschj">
-                    <el-input v-model="form.ycljschj" placeholder="请输入原材料及生产环节" />
-                </el-form-item>
-                <el-form-item label="上楼适应性" prop="slsyx">
-                    <el-select v-model="form.slsyx" placeholder="请选择上楼适应性" style="width: 100%;">
-                        <el-option v-for="dict in dict.type.slsyx" :key="dict.value" :label="dict.label"
-                            :value="parseInt(dict.value)"></el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitForm">确 定</el-button>
-                <el-button @click="cancel">取 消</el-button>
-            </div>
-        </el-dialog>
+  <div class="container">
+    <!-- 细分产业管理 -->
+    <!-- 表单查询项 -->
+    <div class="headerbox">
+      <el-form
+        ref="queryForm"
+        :model="queryParams"
+        size="small"
+        label-width="100px"
+        style="margin-left: -30px"
+      >
+        <el-row>
+          <el-col :span="5">
+            <el-form-item label="产业类别" prop="cylb">
+              <el-select
+                v-model="queryParams.cylb"
+                placeholder="请选择产业类别"
+              >
+                <el-option
+                  v-for="dict in dict.type.cylb"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="产业细分" prop="cyxf" style="width: 100%">
+              <el-input
+                v-model="queryParams.cyxf"
+                placeholder="请输入产业细分"
+                :fetch-suggestions="querySearchAsync"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="7">
+            <el-form-item label="上楼适应性" prop="slsyx">
+              <el-select
+                v-model="queryParams.slsyx"
+                placeholder="请选择上楼适应性"
+                clearable
+                style="width: 20rem"
+              >
+                <el-option
+                  v-for="dict in dict.type.slsyx"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item label="更新时间" prop="updateTime">
+              <el-date-picker
+                v-model="queryParams.startTime"
+                type="datetime"
+                format="yyyy-MM-dd HH:mm:ss"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :style="{ width: '18rem' }"
+                placeholder="选择日期时间"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item style="margin-left: -70px">
+              <el-button
+                type="primary"
+                icon="el-icon-search"
+                @click="handleQuery"
+                >查询</el-button
+              >
+              <el-button icon="el-icon-refresh" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <!-- 表格内容区 -->
+    <div class="table-container">
+      <!-- 导出行 -->
+      <div class="table-header">
+        <el-row :gutter="4" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd"
+              >新增</el-button
+            >
+          </el-col>
+        </el-row>
+        <el-row :gutter="5" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-download"
+              @click="handleImport"
+              >导入</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              icon="el-icon-upload2"
+              @click="handleExport"
+              >全量导出</el-button
+            >
+          </el-col>
+        </el-row>
+      </div>
+      <div class="table-wrapper">
+        <el-table
+          v-loading="loading"
+          :data="postList"
+          height="100%"
+          @selection-change="handleSelectionChange"
+        >
+          <!-- <el-table-column type="selection" width="55" align="center" /> -->
+          <el-table-column label="序号" width="60" align="center">
+            <template slot-scope="scope">
+              {{
+                (queryParams.current - 1) * queryParams.size + scope.$index + 1
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column label="产业类别" align="center" prop="cylb">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.cylb" :value="scope.row.cylb" />
+            </template>
+          </el-table-column>
+          <el-table-column label="产业细分" align="center" prop="cyxf" />
+          <el-table-column
+            label="原材料及生产环节"
+            align="center"
+            prop="ycljschj"
+          />
+          <el-table-column label="上楼适应性" align="center" prop="slsyx">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.slsyx" :value="scope.row.slsyx" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="更新时间"
+            align="center"
+            prop="updateTime"
+            width="180"
+          />
+          <el-table-column
+            label="操作"
+            align="center"
+            class-name="small-padding fixed-width"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button type="text" @click="handleUpdate(scope.row)"
+                >编辑</el-button
+              >
+              <el-button
+                type="text"
+                @click="handleDelete(scope.row)"
+                style="color: red"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+       <div class="pagination-wrapper">
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.current"
+        :limit.sync="queryParams.size"
+        @pagination="getList"
+      />
+       </div>
+    </div>
 
-        <!-- 导入对话框 -->
-        <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-            <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-                :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-                :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-                <i class="el-icon-upload"></i>
-                <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-                <div class="el-upload__tip text-center" slot="tip">
-                    <span>仅允许导入xls、xlsx格式文件。</span>
-                    <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-                        @click="importTemplate">下载模板</el-link>
-                </div>
-            </el-upload>
-            <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="submitFileForm">确 定</el-button>
-                <el-button @click="upload.open = false">取 消</el-button>
-            </div>
-        </el-dialog>
+    <!-- 添加或修改项目对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="40rem" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="160px">
+        <el-form-item label="产业类别" prop="cylb" style="width: 100%">
+          <el-select
+            v-model="form.cylb"
+            placeholder="请选择产业类别"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in dict.type.cylb"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产业细分" prop="cyxf">
+          <el-input v-model="form.cyxf" placeholder="请输入产业细分" />
+        </el-form-item>
+        <el-form-item label="原材料及生产环节" prop="ycljschj">
+          <el-input
+            v-model="form.ycljschj"
+            placeholder="请输入原材料及生产环节"
+          />
+        </el-form-item>
+        <el-form-item label="上楼适应性" prop="slsyx">
+          <el-select
+            v-model="form.slsyx"
+            placeholder="请选择上楼适应性"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in dict.type.slsyx"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
 
-    </div>
+    <!-- 导入对话框 -->
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { getToken } from "@/utils/auth";
-import { getXfcyglPage, addXfcygl, updateXfcygl, deleteXfcygl } from "@/api/ManageApi/index";
-import fileload from "@/components/FileUpload/index.vue"
+import {
+  getXfcyglPage,
+  addXfcygl,
+  updateXfcygl,
+  deleteXfcygl,
+} from "@/api/ManageApi/index";
+import fileload from "@/components/FileUpload/index.vue";
 
 export default {
-    dicts: ['cylb', 'slsyx'],
-    components: {
-        fileload
+  dicts: ["cylb", "slsyx"],
+  components: {
+    fileload,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 目录表格数据
+      postList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示添加或修改弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        cyxf: undefined,
+        cylb: undefined,
+        slsyx: undefined,
+      },
+      // 表单参数
+      form: {
+        cyxf: undefined,
+        cylb: undefined,
+        ycljschj: undefined,
+        slsyx: undefined,
+        endTime: undefined,
+        startTime: undefined,
+      },
+      // 表单校验
+      rules: {
+        cyxf: [
+          { required: true, message: "产业细分不能为空", trigger: "blur" },
+        ],
+        cylb: [
+          { required: true, message: "产业类别不能为空", trigger: "change" },
+        ],
+        slsyx: [
+          { required: true, message: "上楼适应性不能为空", trigger: "blur" },
+        ],
+        ycljschj: [
+          {
+            required: true,
+            message: "原材料及生产环节不能为空",
+            trigger: "change",
+          },
+        ],
+      },
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "细分产业导入",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/gysl/xfcygl/imporXfcy",
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /**导出 */
+    handleExport() {
+      this.download(
+        "/gysl/xfcygl/exportXfcy",
+        {
+          ...this.form,
+        },
+        `细分产业管理${new Date().getTime()}.xlsx`
+      );
     },
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 目录表格数据
-            postList: [],
-            // 弹出层标题
-            title: "",
-            // 是否显示添加或修改弹出层
-            open: false,
-            // 是否显示详情弹出层
-            detailOpen: false,
-            // 查询参数
-            queryParams: {
-                current: 1,
-                size: 10,
-                cyxf: undefined,
-                cylb: undefined,
-                slsyx: undefined,
-            },
-            // 表单参数
-            form: {
-                cyxf: undefined,
-                cylb: undefined,
-                ycljschj: undefined,
-                slsyx: undefined,
-                endTime: undefined,
-                startTime: undefined
-            },
-            // 表单校验
-            rules: {
-                cyxf: [
-                    { required: true, message: "产业细分不能为空", trigger: "blur" }
-                ],
-                cylb: [
-                    { required: true, message: "产业类别不能为空", trigger: "change" }
-                ],
-                slsyx: [
-                    { required: true, message: "上楼适应性不能为空", trigger: "blur" }
-                ],
-                ycljschj: [
-                    { required: true, message: "原材料及生产环节不能为空", trigger: "change" }
-                ]
-            },
-            upload: {
-                // 是否显示弹出层（用户导入）
-                open: false,
-                // 弹出层标题（用户导入）
-                title: "细分产业导入",
-                // 是否禁用上传
-                isUploading: false,
-                // 是否更新已经存在的用户数据
-                updateSupport: 0,
-                // 设置上传的请求头部
-                headers: { Authorization: "Bearer " + getToken() },
-                // 上传的地址
-                url: process.env.VUE_APP_BASE_API + "/gysl/xfcygl/imporXfcy",
-            },
-        };
+
+    querySearchAsync(queryString, cb) {
+      let results = [];
+      getXfcyglPage({ cyxf: queryString }).then((res) => {
+        res.data.records.forEach((item) => {
+          results.push({
+            value: item.cyxf,
+            id: item.id,
+          });
+        });
+      });
+      cb(results);
     },
-    created() {
-        this.getList();
+    // 查询目录列表
+    getList() {
+      this.loading = true;
+      getXfcyglPage(this.queryParams)
+        .then((response) => {
+          this.postList = response.data.records.map((item) => ({
+            ...item,
+          }));
+          this.total = response.data.total;
+          this.loading = false;
+        })
+        .catch((error) => {
+          console.error("API Request Error:", error);
+          this.loading = false;
+        });
     },
-    methods: {
-        /**导出 */
-        handleExport() {
-            this.download(
-                "/gysl/xfcygl/exportXfcy",
-                {
-                    ...this.form,
-                },
-                `细分产业管理${new Date().getTime()}.xlsx`
-            );
-        },
-
-        querySearchAsync(queryString, cb) {
-            let results = [];
-            getXfcyglPage({ cyxf: queryString }).then(res => {
-                res.data.records.forEach(item => {
-                    results.push({
-                        value: item.cyxf,
-                        id: item.id,
-                    });
-                });
-
-            });
-            cb(results);
-        },
-        // 查询目录列表
-        getList() {
-            this.loading = true;
-            getXfcyglPage(this.queryParams).then(response => {
-                this.postList = response.data.records.map(item => ({
-                    ...item,
-                }));
-                this.total = response.data.total;
-                this.loading = false;
-            }).catch(error => {
-                console.error('API Request Error:', error);
-                this.loading = false;
-            });
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                id: undefined,
-                cyxf: undefined,
-                cylb: undefined,
-                ycljschj: undefined,
-                slsyx: undefined,
-                createBy: undefined,
-                createId: undefined,
-                createTime: undefined,
-                updateBy: undefined,
-                updateId: undefined,
-                updateTime: undefined,
-                startTime: undefined
-            };
-            this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.current = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id);
-            this.single = selection.length !== 1;
-            this.multiple = !selection.length;
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset();
-            this.open = true;
-            this.title = "新增细分产业";
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset();
-            const catalogId = row.id;
-            this.form = { ...row };
-            this.open = true;
-            this.title = "编辑细分产业";
-        },
-        /** 提交按钮 */
-        submitForm: function () {
-            this.$refs["form"].validate(valid => {
-                if (valid) {
-                    if (this.form.id !== undefined) {
-                        updateXfcygl(this.form).then(response => {
-                            this.$modal.msgSuccess("修改成功");
-                            this.open = false;
-                            this.getList();
-                        }).catch(error => {
-                            console.error('API Request Error:', error);
-                        });
-                    } else {
-                        addXfcygl(this.form).then(response => {
-                            this.$modal.msgSuccess("新增成功");
-                            this.open = false;
-                            this.getList();
-                        }).catch(error => {
-                            console.error('API Request Error:', error);
-                        });
-                    }
-                }
-            });
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const catalogIds = row.id || this.ids;
-            this.$modal.confirm('是否确认删除该数据项？').then(() => {
-                return deleteXfcygl([catalogIds]);
-            }).then(() => {
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        cyxf: undefined,
+        cylb: undefined,
+        ycljschj: undefined,
+        slsyx: undefined,
+        createBy: undefined,
+        createId: undefined,
+        createTime: undefined,
+        updateBy: undefined,
+        updateId: undefined,
+        updateTime: undefined,
+        startTime: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增细分产业";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const catalogId = row.id;
+      this.form = { ...row };
+      this.open = true;
+      this.title = "编辑细分产业";
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateXfcygl(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.open = false;
                 this.getList();
-                this.$modal.msgSuccess("删除成功");
-            }).catch(() => { });
-        },
-        // 导入操作
-        handleImport() {
-            this.upload.open = true;
-        },
-        /** 下载模板操作 */
-        importTemplate() {
-            this.download(
-                "/gysl/xfcygl/importTemplate",
-                {},
-                `细分产业模板${new Date().getTime()}.xlsx`
-            );
-        },
-        // 文件上传中处理
-        handleFileUploadProgress(event, file, fileList) {
-            this.upload.isUploading = true;
-        },
-        // 文件上传成功处理
-        handleFileSuccess(response, file, fileList) {
-            this.upload.open = false;
-            this.upload.isUploading = false;
-            this.$refs.upload.clearFiles();
-            this.$alert(
-                "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-                response.msg +
-                "</div>",
-                "导入结果",
-                { dangerouslyUseHTMLString: true }
-            );
-            this.getList();
-        },
-        // 提交上传文件
-        submitFileForm() {
-            this.$refs.upload.submit();
-        },
-    }
+              })
+              .catch((error) => {
+                console.error("API Request Error:", error);
+              });
+          } else {
+            addXfcygl(this.form)
+              .then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              })
+              .catch((error) => {
+                console.error("API Request Error:", error);
+              });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const catalogIds = row.id || this.ids;
+      this.$modal
+        .confirm("是否确认删除该数据项？")
+        .then(() => {
+          return deleteXfcygl([catalogIds]);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    // 导入操作
+    handleImport() {
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/gysl/xfcygl/importTemplate",
+        {},
+        `细分产业模板${new Date().getTime()}.xlsx`
+      );
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+  },
 };
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+.container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  overflow: hidden;
+}
 .headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem 1rem 0rem 1rem;
+  margin-bottom: 0.5rem;
+  border: 1px solid #eee;
+}
+
+.table-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  border: 1px solid #eee;
+  overflow: hidden;
+}
+
+.table-header {
+  margin-bottom: 1rem;
+  width: 99.7%;
+  display: flex;
+  justify-content: space-between;
 }
 
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
+.table-wrapper {
+  flex: 1;
+  min-height: 0;
+  overflow: hidden;
 }
 
-.tablehead {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+.el-table {
+  height: 100% !important;
 }
 
-.headbtn {
-    display: flex;
+/* 隐藏滚动条但保留功能 */
+.table-container ::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none;
 }
 
-.tablebtntwo {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
+/* 兼容 Firefox */
+.table-container {
+  scrollbar-width: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/tongjifenxi/index.vue b/src/views/tongjifenxi/index.vue
index 253c5cd..91eee4f 100644
--- a/src/views/tongjifenxi/index.vue
+++ b/src/views/tongjifenxi/index.vue
@@ -182,7 +182,7 @@ export default {
 
 /* 第一行：第一个模块占两列 */
 .item-1 {
-  /* background-image: url(../../../src/assets/images/allbg.png); */
+  /* background-image: url(@/src/assets/images/allbg.png); */
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }
diff --git a/vue.config.js b/vue.config.js
index 27466ca..2e59aac 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,13 +40,13 @@ module.exports = {
   // webpack-dev-server 相关配置
   devServer: {
     host: '0.0.0.0',
-    // public:'192.168.0.119',
+    public:'192.168.0.119',
     port: port,
     open: true,
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.0.109:7071/`,
+        target: `http://192.168.0.108:7071/`,
         // target: `http://39.101.188.84:7071/`,
         changeOrigin: true,
         pathRewrite: {