diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js
index 68ab0ca..d161b74 100644
--- a/src/api/ManageApi/index.js
+++ b/src/api/ManageApi/index.js
@@ -689,7 +689,7 @@ export function  xmlist(){
 
 //企业统计
 //整体项目情况
-export function allproject(){
+export function allinformationtwo(){
   return request({
     url:'/gysl/qyStats/allProject',
     method:'get'
diff --git a/src/assets/images/标签管理.png b/src/assets/images/标签管理.png
new file mode 100644
index 0000000..d9fd9b8
Binary files /dev/null and b/src/assets/images/标签管理.png differ
diff --git a/src/views/components/ProjectDetails/Buildings.vue b/src/views/components/ProjectDetails/Buildings.vue
index 7fc962c..cbd37a4 100644
--- a/src/views/components/ProjectDetails/Buildings.vue
+++ b/src/views/components/ProjectDetails/Buildings.vue
@@ -14,7 +14,7 @@
                     新增
                 </el-button>
                 <el-button type="primary" size="medium" plain
-                    v-if="buildings.length !== 0 && (action === 'fill' || !action)"
+                    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="编辑"
@@ -44,7 +44,8 @@
                 :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" alt=""
+                <img src="@/assets/images/detailsicon/icon-gb@2x.png" v-if="action === 'fill' || !action || action === 'okay'"
+                    alt=""
                     @click.stop="handleDelete(building.id)">
             </div>
         </div>
diff --git a/src/views/components/ProjectDetails/Projectpicture.vue b/src/views/components/ProjectDetails/Projectpicture.vue
index c39145b..c21b3f3 100644
--- a/src/views/components/ProjectDetails/Projectpicture.vue
+++ b/src/views/components/ProjectDetails/Projectpicture.vue
@@ -6,7 +6,7 @@
                 <img src="../../../assets/images/detailsicon/1.png" alt="">
                 <span>项目画像</span>
             </div>
-            <div class="topright" style="visibility: hidden;"> 
+            <div class="topright" style="visibility: hidden;">
                 <el-button type="primary" size="medium" plain>
                     编辑
                 </el-button>
@@ -40,13 +40,23 @@
                     </div>
                 </div>
             </div>
+            <div class="descriptionsdivtwo">
+                <div class="tablehead">
+                    <img src="@/assets/images/标签管理.png" alt="">
+                    <span style="margin-top: -0.3rem;">标签管理：</span>
+                    <!-- <span style="margin-top: .3rem;"></span> -->
+                </div>
+                <div class="tablebody">
+                    <div>123</div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 
 <script>
 import * as echarts from 'echarts';
-import { getpicture, getpicturelist } from '@/api/ManageApi/index'; // 确保路径正确
+import { getpicture, getpicturelist } from '@/api/ManageApi/index'; 
 
 export default {
     props: {
@@ -264,7 +274,7 @@ export default {
 .topleft span {
     width: auto;
     height: 0.88rem;
-    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-family: aliregular;
     font-weight: 500;
     font-size: 0.88rem;
     color: #3D424C;
@@ -280,17 +290,22 @@ export default {
 }
 
 .descriptionsdiv {
-    width: 52rem;
+    width: 20rem;
     margin-left: 10rem;
     height: 25.31rem;
 }
+.descriptionsdivtwo {
+    width: 20rem;
+    margin-left: 3rem;
+    height: 25.31rem;
+}
 
 .two-row-item {
     height: 20rem;
 }
 
 .tablebody {
-    margin-top: 2rem;
+    margin-top: 1rem;
 }
 
 .table-container {
@@ -306,7 +321,7 @@ export default {
     font-weight: bold;
     text-align: center;
     background-color: #F2F4F7;
-    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-family: aliregular;
     font-weight: 600;
     font-size: 0.88rem;
     color: #3D3D3D;
diff --git a/src/views/components/analysis/all.vue b/src/views/components/analysis/all.vue
index b6e1542..aad8e72 100644
--- a/src/views/components/analysis/all.vue
+++ b/src/views/components/analysis/all.vue
@@ -86,7 +86,7 @@
                     <img src="@/assets/images/icon-yjsl@2x.png" alt="">
                     <div class="itemleft">
                         <div class="lefttitle">拟建数量(个)</div>
-                        <div class="number">{{ currentYearData.currentBuilding2 }}</div>
+                        <div class="number">{{ currentYearData.currentBuilding3 }}</div>
                     </div>
                 </div>
             </div>
@@ -112,7 +112,8 @@ export default {
                 currentYearProject: 0,      //总数
                 currentYearGrossArea: 0,    //面积
                 currentYearBuilding1: 0,  // 已建
-                currentBuilding2: 0      // 在建
+                currentBuilding2: 0,      // 在建
+                currentBuilding3: 0
             },
             loading: false,
             error: null
@@ -160,7 +161,8 @@ export default {
                     currentYearProject: response.data.currentYearProject || 0,
                     currentYearGrossArea: response.data.currentYearGrossArea || 0,
                     currentYearBuilding1: response.data.currentYearBuilding1 || 0,
-                    currentBuilding2: response.data.currentBuilding2 || 0
+                    currentBuilding2: response.data.currentBuilding2 || 0 ,
+                    currentBuilding3: response.data.currentBuilding3 || 0
                 };
             } catch (error) {
                 console.error("获取数据失败:", error);
diff --git a/src/views/components/analysis/allcompany.vue b/src/views/components/analysis/allcompany.vue
index 3ccac51..5a78163 100644
--- a/src/views/components/analysis/allcompany.vue
+++ b/src/views/components/analysis/allcompany.vue
@@ -4,9 +4,9 @@
             <div class="top">
                 <div class="title">整体项目情况</div>
                 <div class="importdiv">
-                    <el-date-picker v-model="selectedYear" type="year" placeholder="选择年份" format="yyyy"
+                    <!-- <el-date-picker v-model="selectedYear" type="year" placeholder="选择年份" format="yyyy"
                         value-format="yyyy" @change="handleYearChange">
-                    </el-date-picker>
+                    </el-date-picker> -->
                     <!-- <el-button icon="el-icon-upload2" style="background-color: #2B62F1; color: #FFFFFF;"
                         @click="handleExport">
                         报告导出
@@ -86,7 +86,7 @@
                     <img src="@/assets/images/icon-yjsl@2x.png" alt="">
                     <div class="itemleft">
                         <div class="lefttitle">拟建数量(个)</div>
-                        <div class="number">{{ currentYearData.currentBuilding2 }}</div>
+                        <div class="number">{{ currentYearData.currentBuilding3 }}</div>
                     </div>
                 </div>
             </div>
@@ -95,7 +95,7 @@
 </template>
 
 <script>
-import { allproject } from '@/api/ManageApi';
+import { allinformationtwo } from '@/api/ManageApi';
 
 export default {
     data() {
@@ -109,10 +109,11 @@ export default {
                 allBuilding3: 0   // 拟建
             },
             currentYearData: {
-                currentYearProject: 0,      //总数
-                currentYearGrossArea: 0,    //面积
+                currentYearProject: 0,     //总数
+                currentYearGrossArea: 0,   //面积
                 currentYearBuilding1: 0,  // 已建
-                currentBuilding2: 0      // 在建
+                currentBuilding2: 0 ,       // 在建
+                currentBuilding3: 0       // 在建
             },
             loading: false,
             error: null
@@ -145,7 +146,7 @@ export default {
             this.loading = true;
             try {
                 // 调用 API 时传入 years 参数
-                const response = await allproject({ 
+                const response = await allinformationtwo({ 
                     years: this.selectedYear,
                     _t: Date.now() // 添加时间戳防止缓存
                 });
@@ -160,7 +161,8 @@ export default {
                     currentYearProject: response.data.currentYearProject || 0,
                     currentYearGrossArea: response.data.currentYearGrossArea || 0,
                     currentYearBuilding1: response.data.currentYearBuilding1 || 0,
-                    currentBuilding2: response.data.currentBuilding2 || 0
+                    currentBuilding2: response.data.currentBuilding2 || 0,
+                    currentBuilding3: response.data.currentBuilding3 || 0,
                 };
             } catch (error) {
                 console.error("获取数据失败:", error);
diff --git a/src/views/components/analysis/map.vue b/src/views/components/analysis/map.vue
index 748b3c2..e281e45 100644
--- a/src/views/components/analysis/map.vue
+++ b/src/views/components/analysis/map.vue
@@ -18,7 +18,8 @@
         </div>
 
         <div class="rightdiv">
-          <el-input v-model="searchBox" placeholder="请输入地点名称" class="search-input" @input="handleSearchInput" clearable>
+          <el-input v-model="searchBox" placeholder="请输入项目名称" class="search-input" @input="handleSearchInput"
+            @clear="handleClear" clearable>
             <el-button slot="append" icon="el-icon-search" @click="toSearch"></el-button>
           </el-input>
         </div>
@@ -100,7 +101,7 @@ export default {
         projectLeader: '',
         phone: '',
         ztze: '',
-        xmfrdwxz:''
+        xmfrdwxz: ''
       },
       showLocationIcon: false,
       iconPosition: {
@@ -126,6 +127,11 @@ export default {
     this.debouncedSearch = debounce(this.toSearch, 300);
   },
   methods: {
+    handleClear() {
+      this.showLocationIcon = false; 
+      this.searchList = []; 
+      this.hasSearched = false; 
+    },
     toggleCollapse() {
       this.isCollapsed = !this.isCollapsed;
     },
@@ -133,6 +139,7 @@ export default {
       if (this.searchBox.trim() === '') {
         this.searchList = [];
         this.hasSearched = false;
+        this.showLocationIcon = false;  
         return;
       }
       this.debouncedSearch();
@@ -166,25 +173,25 @@ export default {
         });
     },
     centerMap(item) {
-        if (!item.jsdd) {
-          this.$message.warning('该项目未落图！');
-          return;
-        }
+      if (!item.jsdd) {
+        this.$message.warning('该项目未落图！');
+        return;
+      }
 
-        this.searchBox = item.name;
-        this.searchList = [];
-        this.selectedProject = {
-          name: item.name,
-          projectLeader: item.projectLeader || '暂无',
-          phone: item.phone || '暂无',
-          ztze: item.ztze || '暂无',
-          xmfrdwxz: item.xmfrdwxz || '暂无',
-          xzfl: item.xzfl || '暂无'
-        };
-
-        this.showLocationIcon = true;
-        this.setRandomIconPosition();
-      },
+      this.searchBox = item.name;
+      this.searchList = [];
+      this.selectedProject = {
+        name: item.name,
+        projectLeader: item.projectLeader || '暂无',
+        phone: item.phone || '暂无',
+        ztze: item.ztze || '暂无',
+        xmfrdwxz: item.xmfrdwxz || '暂无',
+        xzfl: item.xzfl || '暂无'
+      };
+
+      this.showLocationIcon = true;
+      this.setRandomIconPosition();
+    },
     showDialog() {
       if (this.selectedProject.name) {
         this.dialogVisible = true;
@@ -401,7 +408,8 @@ export default {
   font-family: aliregular;
   width: 3rem;
 }
-.value{
+
+.value {
   color: #3D424C;
   font-family: aliregular;
 }
diff --git a/src/views/components/analysis/message.vue b/src/views/components/analysis/message.vue
index 9a9e80b..45e6715 100644
--- a/src/views/components/analysis/message.vue
+++ b/src/views/components/analysis/message.vue
@@ -14,8 +14,14 @@
                 </template>
             </el-table-column>
             <el-table-column prop="date" width="100">
+                <template slot-scope="scope">
+                    {{ scope.row.date }}
+                </template>
             </el-table-column>
         </el-table>
+        <div v-if="tableData.length === 0" class="no-data">
+            暂无数据
+        </div>
 
         <!-- 详情弹窗 -->
         <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
@@ -30,6 +36,7 @@
         </el-dialog>
     </div>
 </template>
+
 <script>
 import { getAllMessages } from '@/api/ManageApi/index';
 import { markSmartReminderAsRead } from '@/api/ManageApi/index';
@@ -117,4 +124,7 @@ export default {
     width: 30rem;
     height: 14.5rem;
 }
+.no-data{
+  color: gray;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/components/analysis/messagecompany.vue b/src/views/components/analysis/messagecompany.vue
index c0c2661..57d1b3b 100644
--- a/src/views/components/analysis/messagecompany.vue
+++ b/src/views/components/analysis/messagecompany.vue
@@ -14,8 +14,14 @@
                 </template>
             </el-table-column>
             <el-table-column prop="date" width="100">
+                <template slot-scope="scope">
+                    {{ scope.row.date }}
+                </template>
             </el-table-column>
         </el-table>
+        <div v-if="tableData.length === 0" class="no-data">
+            暂无数据
+        </div>
 
         <!-- 详情弹窗 -->
         <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="40%">
@@ -30,6 +36,8 @@
         </el-dialog>
     </div>
 </template>
+
+
 <script>
 import { getAllMessagestwo } from '@/api/ManageApi/index';
 import { markSmartReminderAsRead } from '@/api/ManageApi/index';
@@ -117,4 +125,7 @@ export default {
     width: 30rem;
     height: 14.5rem;
 }
+.no-data{
+  color: gray;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/components/qiyexinxi/qiyexinxi.vue b/src/views/components/qiyexinxi/qiyexinxi.vue
index 4060c6d..baee13d 100644
--- a/src/views/components/qiyexinxi/qiyexinxi.vue
+++ b/src/views/components/qiyexinxi/qiyexinxi.vue
@@ -37,9 +37,7 @@
                                 @keyup.enter.native="handleQuery" />
                         </el-form-item>
                     </el-col> -->
-                </el-row>
-                <el-row>
-                    <el-col :span="8">
+                    <el-col :span="5">
                         <el-form-item>
                             <el-button type="primary" icon="el-icon-search" size="mini"
                                 @click="handleQuery">查询</el-button>
diff --git a/src/views/evalute/evalist/index.vue b/src/views/evalute/evalist/index.vue
index 4df01f6..3247fa0 100644
--- a/src/views/evalute/evalist/index.vue
+++ b/src/views/evalute/evalist/index.vue
@@ -10,18 +10,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <!-- <el-form-item label="建设起止时间">
-              <el-date-picker v-model="queryParams.begainTime" 
-              type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
-                style="width: 11rem;" :clearable="true">
-              </el-date-picker>
-              ~
-              <el-date-picker v-model="queryParams.endTime" 
-              type="date" placeholder="结束日期" 
-              value-format="yyyy-MM-dd"
-                style="width: 10.5rem;" :clearable="true">
-              </el-date-picker>
-            </el-form-item> -->
             <el-form-item label="建设起止时间">
               <el-date-picker v-model="queryParams.begainTime" type="month" placeholder="开始月份" value-format="yyyy-MM"
                 style="width: 9rem;" :clearable="true">
@@ -114,7 +102,13 @@
         </el-form-item>
         <el-form-item label="评价等级">
           <el-select v-model="infoForm.pjdj" placeholder="请选择评价等级" clearable>
-            <el-option v-for="dict in dict.type.pjdj" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-option label="全部" :value="0" />
+            <el-option label="总投资额" :value="1" />
+            <el-option label="层数" :value="2" />
+            <el-option label="首层层高" :value="3" />
+            <el-option label="2层及以上层高" :value="4" />
+            <el-option label="首层地面荷载" :value="5" />
+            <el-option label="二层及以上楼面荷载" :value="6" />
           </el-select>
         </el-form-item>
         <el-form-item label="项目法人单位">
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index c5a7b34..c1e267c 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -352,22 +352,22 @@ export default {
 
 
             // 如果所有校验通过，则准备数据并提交
-            // const submitData = this.prepareSubmitData();
-            // console.log('准备提交的完整数据:', JSON.stringify(submitData, null, 2)); // 打印完整数据
+            const submitData = this.prepareSubmitData();
+            console.log('准备提交的完整数据:', JSON.stringify(submitData, null, 2)); // 打印完整数据
 
-            // fillBasicInformation(submitData)
-            //     .then(response => {
-            //         this.$message.success('提交成功');
-            //         this.isSubmitted = true;
-            //         this.$router.push('/manage');
-            //     })
-            //     .catch(error => {
-            //         this.$message.error('提交失败');
-            //         console.error('提交错误:', error);
-            //     })
-            //     .finally(() => {
-            //         this.loading = false;
-            //     });
+            fillBasicInformation(submitData)
+                .then(response => {
+                    this.$message.success('提交成功');
+                    this.isSubmitted = true;
+                    this.$router.push('/manage');
+                })
+                .catch(error => {
+                    this.$message.error('提交失败');
+                    console.error('提交错误:', error);
+                })
+                .finally(() => {
+                    this.loading = false;
+                });
         },
 
         // 审核通过的提交数据
diff --git a/src/views/tongjifenxi/index.vue b/src/views/tongjifenxi/index.vue
index ab78888..20a2acf 100644
--- a/src/views/tongjifenxi/index.vue
+++ b/src/views/tongjifenxi/index.vue
@@ -15,26 +15,31 @@
         <Message2 />
       </div>
     </div>
-    <div class="grid-item  bottombox">
+    <div class="grid-item bottombox">
       <!-- 关联项目 -->
       <div class="itemhead">
         <span>关联项目</span>
       </div>
       <div class="mainarea" style="height: 22rem; overflow: auto;">
-        <div class="mainareaitem" v-for="(item, index) in postList" :key="index">
-          <div class="itemleft">
-            <div class="xmmctitle" @click="getInfo(item, 'detail')">{{ item.name }}</div>
-            <div class="lefttwo">
-              <div>现状分类：{{ xzflMap[item.xzfl] }}</div>
-              <div>总投资额：{{ item.ztze }}</div>
-              <div>填报时间：{{ item.updateTime }}</div>
-              <div>状态：{{ statusMap[item.status] }}</div>
+        <div v-if="postList.length > 0">
+          <div class="mainareaitem" v-for="(item, index) in postList" :key="index">
+            <div class="itemleft">
+              <div class="xmmctitle" @click="getInfo(item, 'detail')">{{ item.name }}</div>
+              <div class="lefttwo">
+                <div>现状分类：{{ xzflMap[item.xzfl] }}</div>
+                <div>总投资额：{{ item.ztze }}</div>
+                <div>填报时间：{{ item.updateTime }}</div>
+                <div>状态：{{ statusMap[item.status] }}</div>
+              </div>
+            </div>
+            <div class="itemright" :class="getStatusClass(item.status)">
+              <div class="rightword">{{ statusMap[item.status] }}</div>
             </div>
-          </div>
-          <div class="itemright" :class="getStatusClass(item.status)">
-            <div class="rightword">{{ statusMap[item.status] }}</div>
           </div>
         </div>
+        <div v-else class="no-data">
+          暂无数据
+        </div>
       </div>
     </div>
     <div class="grid-item item-2">
@@ -249,4 +254,7 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
+.no-data{
+  color: gray;
+}
 </style>
\ No newline at end of file