From b7dcb89468603152415374c788df3a96744c69a2 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 17 Apr 2025 10:52:38 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=A7=E4=B8=9A=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ProjectDetails/Models.vue      |   2 +-
 .../components/ProjectDetails/Others.vue      |   4 +-
 src/views/components/analysis/daiban.vue      |   2 +-
 src/views/components/analysis/map2.vue        | 284 ------------------
 src/views/components/analysis/projectList.vue |   2 +-
 src/views/components/qiyexinxi/qiyexinxi.vue  |   2 +-
 .../components/zhengwuxinxi/zhengwuxinxi.vue  |   2 +-
 src/views/manage-info/index.vue               |   4 +-
 src/views/orientedtwo/bqspan/index.vue        |  46 ++-
 src/views/tool/1.vue                          |  47 ---
 10 files changed, 45 insertions(+), 350 deletions(-)
 delete mode 100644 src/views/components/analysis/map2.vue
 delete mode 100644 src/views/tool/1.vue

diff --git a/src/views/components/ProjectDetails/Models.vue b/src/views/components/ProjectDetails/Models.vue
index 02c1c29..eed25bc 100644
--- a/src/views/components/ProjectDetails/Models.vue
+++ b/src/views/components/ProjectDetails/Models.vue
@@ -93,7 +93,7 @@ export default {
         wysmxInfo: {
             immediate: true,
             handler(newVal) {
-                console.log('接收到的 wysmxInfo 数据:', newVal);
+                // console.log('接收到的 wysmxInfo 数据:', newVal);
                 this.form = newVal.map(item => ({
                     // id: item.id,
                     xmId: item.xmId,
diff --git a/src/views/components/ProjectDetails/Others.vue b/src/views/components/ProjectDetails/Others.vue
index 853907a..968d957 100644
--- a/src/views/components/ProjectDetails/Others.vue
+++ b/src/views/components/ProjectDetails/Others.vue
@@ -87,7 +87,7 @@ export default {
     }
   },
   created() {
-    console.log('anotherInfo 内容:', this.anotherInfo);
+    // console.log('anotherInfo 内容:', this.anotherInfo);
   },
   data() {
     return {
@@ -213,7 +213,7 @@ export default {
 
       try {
         // 打印检查 xmId
-        console.log('当前项目ID:', this.xmId);
+        // console.log('当前项目ID:', this.xmId);
 
         // 准备请求数据
         const requestData = {
diff --git a/src/views/components/analysis/daiban.vue b/src/views/components/analysis/daiban.vue
index 59fb4d9..57466c1 100644
--- a/src/views/components/analysis/daiban.vue
+++ b/src/views/components/analysis/daiban.vue
@@ -94,7 +94,7 @@ export default {
                 endTime: this.queryParams.dateRange ? this.queryParams.dateRange[1] : undefined
             };
             
-            console.log('【查询参数】', params); // 打印查询参数
+            // console.log('【查询参数】', params); 
             
             getBasicInformationPage(params).then((response) => {
                 this.postList = response.data.records;
diff --git a/src/views/components/analysis/map2.vue b/src/views/components/analysis/map2.vue
deleted file mode 100644
index 0319feb..0000000
--- a/src/views/components/analysis/map2.vue
+++ /dev/null
@@ -1,284 +0,0 @@
-<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-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">
-                        <span>{{ xzflMap[scope.row.xzfl] }}</span>
-                    </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">
-                        <span :style="{ color: statusColors[statusMap[scope.row.status]] }">{{
-                            statusMap[scope.row.status] }}</span>
-                    </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>
-</template>
-
-<script>
-import { getBasicInformationPage, deleteBasicInformation } from "@/api/ManageApi/index";
-import { getToken } from "@/utils/auth";
-import { checkPermi, checkRole } from "@/utils/permission";
-export default {
-    dicts: ["xzfl"],
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 项目表格数据
-            postList: [],
-            // 状态颜色映射
-            statusColors: {
-                '审核通过': '#6EDABE',
-                '待填报': '#FFBF6B',
-                '待审核': '#7693D8'
-            },
-            // 状态文本映射
-            statusMap: {
-                1: '待填报',
-                2: '待审核',
-                3: '审核通过'
-            },
-            xzflMap: {
-                1: '已建',
-                2: '在建',
-                3: '拟建'
-            },
-            // 查询参数
-            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;
-        },
-
-        /** 查询项目列表 */
-        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));
-
-            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;
-        },
-
-        /** 下载模板操作 */
-        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[0]
-                },
-                `基本信息${new Date().getTime()}.xlsx`
-            );
-        },
-
-        /** 删除按钮操作 */
-        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", this.$route.meta.title + "新增");
-            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();
-        },
-    },
-};
-</script>
-<style scoped>
-.headerbox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
-}
-
-.tablebox {
-    background-color: #fff;
-    border-radius: .5rem;
-    padding: 1rem;
-    margin: .5rem;
-    border: 1px solid #eee;
-}
-
-.tablehead {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
-.headbtn {
-    display: flex;
-}
-
-.tablebtntwo {
-    margin-top: 1rem;
-    margin-bottom: 1rem;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/components/analysis/projectList.vue b/src/views/components/analysis/projectList.vue
index 09f1cf2..2d455ae 100644
--- a/src/views/components/analysis/projectList.vue
+++ b/src/views/components/analysis/projectList.vue
@@ -119,7 +119,7 @@ export default {
                 endTime: this.queryParams.dateRange ? this.queryParams.dateRange[1] : undefined
             };
 
-            console.log('【查询参数】', params); // 打印查询参数
+            // console.log('【查询参数】', params); 
 
             getBasicInformationPage(params).then((response) => {
                 this.postList = response.data.records;
diff --git a/src/views/components/qiyexinxi/qiyexinxi.vue b/src/views/components/qiyexinxi/qiyexinxi.vue
index baee13d..fc2a323 100644
--- a/src/views/components/qiyexinxi/qiyexinxi.vue
+++ b/src/views/components/qiyexinxi/qiyexinxi.vue
@@ -194,7 +194,7 @@ export default {
                 endTime: this.queryParams.dateRange ? this.queryParams.dateRange[1] : undefined
             };
 
-            console.log('【查询参数】', params); // 打印查询参数
+            // console.log('【查询参数】', params); 
 
             getBasicInformationPage(params).then((response) => {
                 this.postList = response.data.records;
diff --git a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
index 0bdc0a8..5909147 100644
--- a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
+++ b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
@@ -223,7 +223,7 @@ export default {
                 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);
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index 919bce5..acb8d37 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -291,7 +291,7 @@ export default {
             tempBasicInformation(tempData)
                 .then(response => {
                     this.$message.success('暂存成功');
-                    console.log('暂存数据:', response);
+                    // console.log('暂存数据:', response);
                 })
                 .catch(error => {
                     this.$message.error('暂存失败');
@@ -308,7 +308,7 @@ export default {
                 const response = await getqyBasicInformationPage(params);
                 return response.data.total || 0; // 返回总数，默认为0
             } catch (error) {
-                console.error('获取企业总数失败:', error);
+                // console.error('获取企业总数失败:', error);
                 return 0;
             }
         },
diff --git a/src/views/orientedtwo/bqspan/index.vue b/src/views/orientedtwo/bqspan/index.vue
index 00522f2..cdbb64b 100644
--- a/src/views/orientedtwo/bqspan/index.vue
+++ b/src/views/orientedtwo/bqspan/index.vue
@@ -69,15 +69,15 @@
 
         <!-- 详情弹窗 -->
         <el-dialog title="详情" :visible.sync="dialogVisible" width="50%">
-            <el-form :model="detailData" label-width="120px">
+            <el-form :model="detailData" label-width="200px">
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="企业名称">
+                        <el-form-item label="企业名称:">
                             <span>{{ detailData.name }}</span>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="统一信用代码">
+                        <el-form-item label="统一信用代码:">
                             <span>{{ detailData.tyshxydm }}</span>
                         </el-form-item>
                     </el-col>
@@ -85,12 +85,12 @@
 
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="标签标记场景代码">
+                        <el-form-item label="标签标记场景代码:">
                             <span>{{ detailData.bqdm }}</span>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="标签代码">
+                        <el-form-item label="标签代码:">
                             <span>{{ detailData.state }}</span>
                         </el-form-item>
                     </el-col>
@@ -98,12 +98,38 @@
 
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="用户类型">
+                        <el-form-item label="标签值编码：">
                             <span>{{ detailData.yhlx }}</span>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="标签注释">
+                        <el-form-item label="有效状态：">
+                            <span>{{ detailData.bqzs }}</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.bqzs }}</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.bqzs }}</span>
                         </el-form-item>
                     </el-col>
@@ -111,12 +137,12 @@
 
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="标签状态">
+                        <el-form-item label="标签状态：">
                             <span>{{ detailData.bqzt }}</span>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="标签注释">
+                        <el-form-item label="数据来源名称：">
                             <span>{{ detailData.bqzs }}</span>
                         </el-form-item>
                     </el-col>
@@ -173,7 +199,7 @@ export default {
                     tyshxydm: '123456789012345678',
                     bqdm: 'DEFAULT',
                     state: '有效',
-                    yhlx: '默认用户类型',
+                    yhlx: '企业用户',
                     bqzs: '默认标签注释',
                     bqzt: '默认标签状态'
                 }
diff --git a/src/views/tool/1.vue b/src/views/tool/1.vue
deleted file mode 100644
index 5c4a541..0000000
--- a/src/views/tool/1.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-upload: {
-    open: false,
-    isUploading: false,
-    headers: { Authorization: "Bearer " + getToken() },
-    url: process.env.VUE_APP_BASE_API + "/gysl/ml/importMl"
-  }
-  
-      /** 导出按钮操作 */
-      handleExport() {
-        console.log('【导出参数】', JSON.stringify(this.queryParams, null, 2));
-        this.$modal.confirm('确认导出所有数据?').then(() => {
-          return exportCatalog(this.queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(error => {
-          console.error('导出失败:', error);
-        });
-      },
-  
-      /** 导入按钮操作 */
-      handleImport() {
-        this.upload.open = true;
-      },
-  
-      /** 下载模板操作 */
-      importTemplate() {
-        this.download("/gysl/ml/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(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-        this.getList();
-      },
-  
-      // 提交上传文件
-      submitFileForm() {
-        this.$refs.upload.submit();
-      }
\ No newline at end of file

From 3dde55e88ec0b7dfefad0eb646b95c59895d0774 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 17 Apr 2025 10:59:05 +0800
Subject: [PATCH 2/6] 1

---
 src/views/components/ProjectDetails/Models.vue         | 2 +-
 src/views/components/ProjectDetails/Projectpicture.vue | 6 +++++-
 src/views/components/zhengwuxinxi/zhengwuxinxi.vue     | 2 +-
 src/views/manage-info/index.vue                        | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/components/ProjectDetails/Models.vue b/src/views/components/ProjectDetails/Models.vue
index eed25bc..417a6ae 100644
--- a/src/views/components/ProjectDetails/Models.vue
+++ b/src/views/components/ProjectDetails/Models.vue
@@ -139,7 +139,7 @@ export default {
         }
     },
     created() {
-        console.log('wysmxInfo 内容:', this.wysmxInfo); // 初始化时打印数据
+        // console.log('wysmxInfo 内容:', this.wysmxInfo); // 初始化时打印数据
     }
 };
 </script>
diff --git a/src/views/components/ProjectDetails/Projectpicture.vue b/src/views/components/ProjectDetails/Projectpicture.vue
index 25b52dd..7369dde 100644
--- a/src/views/components/ProjectDetails/Projectpicture.vue
+++ b/src/views/components/ProjectDetails/Projectpicture.vue
@@ -41,7 +41,7 @@
                 </div>
             </div>
             <div class="descriptionsdivtwo">
-                <spanmanage :xmId=this.id></spanmanage>
+                <spanmanage :xmId=this.id :action="action"></spanmanage>
             </div>
         </div>
     </div>
@@ -65,6 +65,10 @@ export default {
         id: {
             type: Number,
             default: 0
+        },
+        action: {
+            type: String,
+            required: true
         }
     },
     data() {
diff --git a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
index 5909147..05ef22e 100644
--- a/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
+++ b/src/views/components/zhengwuxinxi/zhengwuxinxi.vue
@@ -226,7 +226,7 @@ export default {
             // console.log('发送前的查询参数:', JSON.stringify(params, null, 2));
 
             getBasicInformationPage(params).then((response) => {
-                console.log('API响应:', response);
+                // console.log('API响应:', response);
                 this.postList = response.data.records;
                 this.total = response.data.total;
                 this.loading = false;
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index acb8d37..ea15bc4 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -228,7 +228,7 @@ export default {
         checkPermi,
         checkRole,
         loadData() {
-            console.log('Loading data for project ID:', this.projectId);
+            // console.log('Loading data for project ID:', this.projectId);
             this.loading = true; // 添加加载状态
             getBasicInformationById(this.projectId).then(response => {
                 const data = response.data;
@@ -240,7 +240,7 @@ export default {
                 this.projectRemarks = data.projectRemarks;
 
                 // 确保数据已加载
-                console.log('Loaded qyrzInformation111111111111:', this.qyrzInformation);
+                // console.log('Loaded qyrzInformation111111111111:', this.qyrzInformation);
             }).finally(() => {
                 this.loading = false;
             });

From 26659a0f9515e7704c1c0e8ed529428a5362daf4 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 17 Apr 2025 13:28:16 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=A1=AB=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue            |   1 -
 src/views/components/moxintianxie/index.vue | 210 ++++++++++----------
 src/views/components/tianbao/tianbao.vue    | 168 +++++++++++-----
 src/views/evalute/supervision/index.vue     |   4 -
 4 files changed, 218 insertions(+), 165 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 800b560..1dd0caf 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -34,7 +34,6 @@ import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import bearicon from '@/components/bearicon'
 import { checkPermi, checkRole } from "@/utils/permission"
-import { name } from 'mars2d'
 
 export default {
   components: {
diff --git a/src/views/components/moxintianxie/index.vue b/src/views/components/moxintianxie/index.vue
index 6f61137..dba17c5 100644
--- a/src/views/components/moxintianxie/index.vue
+++ b/src/views/components/moxintianxie/index.vue
@@ -1,109 +1,109 @@
 <template>
-    <div class="form-container">
-      <h2>公司项目信息填报</h2>
-      <el-form :model="form" label-width="120px" label-position="left">
-        <!-- 公司名称 -->
-        <el-form-item label="公司名称">
-          <el-input v-model="form.companyName" placeholder="XXXXXX公司" disabled />
-        </el-form-item>
-  
-        <!-- 项目名称 -->
-        <el-form-item label="项目名称" required>
-          <el-input v-model="form.projectName" placeholder="请输入项目名称" />
-        </el-form-item>
-  
-        <!-- 填报类型 -->
-        <el-form-item label="填报类型">
-          <el-table :data="form.tableData" border style="width: 100%">
-            <el-table-column prop="label" label="项目" width="200" />
-            <el-table-column prop="value" label="填写内容">
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.value" :placeholder="`请输入${scope.row.label}`" />
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-form-item>
-  
-        <!-- 操作按钮 -->
-        <el-form-item>
-          <el-button type="primary" @click="submitForm">提交</el-button>
-          <el-button @click="resetForm">重置</el-button>
-          <el-button @click="cancelForm">取消</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-  </template>
-  
-  <script>
-  export default {
-    data() {
-      return {
-        form: {
-          companyName: "XXXXXX公司", // 公司名称
-          projectName: "", // 项目名称
-          tableData: [
-            { label: "危险品等级", value: "" },
-            { label: "生产火灾危险等级", value: "" },
-            { label: "设备载重", value: "" },
-            { label: "货梯要求", value: "" },
-            { label: "员工密度", value: "" },
-            { label: "加工精度", value: "" },
-            { label: "减振措施", value: "" },
-            { label: "环境保护", value: "" },
-            { label: "生产类型", value: "" },
-            { label: "层高要求", value: "" },
-          ],
-        },
-      };
-    },
-    methods: {
-      // 提交表单
-      submitForm() {
-        console.log("提交表单数据：", this.form);
-        this.$message.success("表单提交成功！");
-      },
-      // 重置表单
-      resetForm() {
-        this.form.projectName = "";
-        this.form.tableData.forEach((item) => {
-          item.value = "";
-        });
-        this.$message.info("表单已重置");
+  <div class="form-container">
+    <h2>公司项目信息填报</h2>
+    <el-form :model="form" label-width="120px" label-position="left">
+      <!-- 公司名称 -->
+      <el-form-item label="公司名称">
+        <el-input v-model="form.companyName" placeholder="XXXXXX公司" disabled />
+      </el-form-item>
+
+      <!-- 项目名称 -->
+      <el-form-item label="项目名称" required>
+        <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+      </el-form-item>
+
+      <!-- 填报类型 -->
+      <el-form-item label="填报类型">
+        <el-table :data="form.tableData" border style="width: 100%">
+          <el-table-column prop="label" label="项目" width="200" />
+          <el-table-column prop="value" label="填写内容">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.value" :placeholder="`请输入${scope.row.label}`" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form-item>
+
+      <!-- 操作按钮 -->
+      <el-form-item>
+        <el-button type="primary" @click="submitForm">提交</el-button>
+        <el-button @click="resetForm">重置</el-button>
+        <el-button @click="cancelForm">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {
+        companyName: "XXXXXX公司", // 公司名称
+        projectName: "", // 项目名称
+        tableData: [
+          { label: "危险品等级", value: "" },
+          { label: "生产火灾危险等级", value: "" },
+          { label: "设备载重", value: "" },
+          { label: "货梯要求", value: "" },
+          { label: "员工密度", value: "" },
+          { label: "加工精度", value: "" },
+          { label: "减振措施", value: "" },
+          { label: "环境保护", value: "" },
+          { label: "生产类型", value: "" },
+          { label: "层高要求", value: "" },
+        ],
       },
-      // 取消表单
-      cancelForm() {
-        this.$confirm("确定要取消当前操作吗？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+    };
+  },
+  methods: {
+    // 提交表单
+    submitForm() {
+      console.log("提交表单数据：", this.form);
+      this.$message.success("表单提交成功！");
+    },
+    // 重置表单
+    resetForm() {
+      this.form.projectName = "";
+      this.form.tableData.forEach((item) => {
+        item.value = "";
+      });
+      this.$message.info("表单已重置");
+    },
+    // 取消表单
+    cancelForm() {
+      this.$confirm("确定要取消当前操作吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.resetForm();
+          this.$message.info("表单已取消");
         })
-          .then(() => {
-            this.resetForm();
-            this.$message.info("表单已取消");
-          })
-          .catch(() => {});
-      },
+        .catch(() => {});
     },
-  };
-  </script>
-  
-  <style scoped>
-  .form-container {
-    max-width: 800px;
-    margin: 20px auto;
-    padding: 20px;
-    background-color: #fff;
-    border-radius: 8px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  }
-  
-  h2 {
-    text-align: center;
-    margin-bottom: 20px;
-    color: #303133;
-  }
-  
-  .el-form-item {
-    margin-bottom: 20px;
-  }
-  </style>
\ No newline at end of file
+  },
+};
+</script>
+
+<style scoped>
+.form-container {
+  max-width: 800px;
+  margin: 20px auto;
+  padding: 20px;
+  background-color: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+
+h2 {
+  text-align: center;
+  margin-bottom: 20px;
+  color: #303133;
+}
+
+.el-form-item {
+  margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/components/tianbao/tianbao.vue b/src/views/components/tianbao/tianbao.vue
index 050de94..310722f 100644
--- a/src/views/components/tianbao/tianbao.vue
+++ b/src/views/components/tianbao/tianbao.vue
@@ -1,88 +1,146 @@
 <template>
-    <div>
-        <div>
-            <div class="form-container">
-                <h2>模型信息填报</h2>
-                <el-form :model="form" label-width="120px" label-position="left">
-                    <!-- 公司名称 -->
-                    <el-form-item label="公司名称">
-                        <el-input v-model="form.companyName" placeholder="XXXXXX公司" disabled />
-                    </el-form-item>
-
-                    <!-- 项目名称 -->
-                    <el-form-item label="项目名称" required>
-                        <el-input v-model="form.projectName" placeholder="请输入项目名称" />
-                    </el-form-item>
-
-                    <!-- 填报类型 -->
-                    <el-form-item label="填报类型">
-                        <el-table :data="form.tableData" border style="width: 100%">
-                            <el-table-column prop="label" label="项目" width="200" />
-                            <el-table-column prop="value" label="填写内容">
-                                <template slot-scope="scope">
-                                    <el-input v-model="scope.row.value" :placeholder="`请输入${scope.row.label}`" />
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </el-form-item>
-
-                    <!-- 操作按钮 -->
-                    <el-form-item>
-                        <el-button type="primary" @click="submitForm">提交</el-button>
-                        <el-button @click="resetForm">重置</el-button>
-                        <el-button @click="cancelForm">取消</el-button>
-                    </el-form-item>
-                </el-form>
-            </div>
-        </div>
+    <div class="form-container">
+        <el-form :model="form" label-width="140px" label-position="left">
+            <div class="tianbao">基本信息:</div>
+            <!-- 公司名称 -->
+            <el-form-item label="公司名称" style="margin-left: 0.7rem;">
+                <el-input v-model="this.name" placeholder="" disabled />
+            </el-form-item>
+        </el-form>
+        <el-form :model="form" label-width="150px" label-position="left">
+            <!-- 项目名称 -->
+            <el-form-item label="项目名称" required>
+                <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+            </el-form-item>
+            <!-- 填报类型 -->
+            <div class="tianbao">填报模型:</div>
+            <el-form-item label="危险品等级" required>
+                <el-input v-model="form.projectName" placeholder="请输入危险品等级" />
+            </el-form-item>
+            <el-form-item label="生产火灾危险等级" required>
+                <el-input v-model="form.projectName" placeholder="请输入生产火灾危险等级" />
+            </el-form-item>
+            <el-form-item label="设备载重" required>
+                <el-input v-model="form.projectName" placeholder="请输入设备载重" />
+            </el-form-item>
+            <el-form-item label="货梯要求" required>
+                <el-input v-model="form.projectName" placeholder="请输入货梯要求" />
+            </el-form-item>
+            <el-form-item label="员工密度" required>
+                <el-input v-model="form.projectName" placeholder="请输入员工密度" />
+            </el-form-item>
+            <el-form-item label="加工精度" required>
+                <el-input v-model="form.projectName" placeholder="请输入加工精度" />
+            </el-form-item>
+            <el-form-item label="减振措施" required>
+                <el-input v-model="form.projectName" placeholder="请输入减振措施" />
+            </el-form-item>
+            <el-form-item label="环境保护" required>
+                <el-input v-model="form.projectName" placeholder="请输入环境保护" />
+            </el-form-item>
+            <el-form-item label="生产类型" required>
+                <el-input v-model="form.projectName" placeholder="请输入生产类型" />
+            </el-form-item>
+            <el-form-item label="层高要求" required>
+                <el-input v-model="form.projectName" placeholder="请输入层高要求" />
+            </el-form-item>
+            <!-- 操作按钮 -->
+            <el-form-item>
+                <el-button type="primary" @click="submitForm">提交</el-button>
+                <el-button @click="resetForm">重置</el-button>
+                <!-- <el-button @click="cancelForm">取消</el-button> -->
+            </el-form-item>
+        </el-form>
     </div>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
-    dicts: ['yslx'],
     data() {
         return {
             form: {
-                companyName: "XXXXXX公司",
-                projectName: "",
+                projectName: "", // 项目名称
                 tableData: [
-                    { label: '项目1', value: '' },
-                    { label: '项目2', value: '' },
-                    // 可以根据实际需求添加更多项目
+                    { label: "危险品等级", value: "" },
+                    { label: "生产火灾危险等级", value: "" },
+                    { label: "设备载重", value: "" },
+                    { label: "货梯要求", value: "" },
+                    { label: "员工密度", value: "" },
+                    { label: "加工精度", value: "" },
+                    { label: "减振措施", value: "" },
+                    { label: "环境保护", value: "" },
+                    { label: "生产类型", value: "" },
+                    { label: "层高要求", value: "" },
                 ],
             },
         };
     },
+    mounted() {
+        this.username = this.$store.state.user.nickName
+    },
+    computed: {
+        ...mapGetters(["avatar", "name", "sidebarRouters", "nickName"]),
+    },
     methods: {
         // 提交表单
         submitForm() {
-            // 这里添加提交表单的逻辑
-            console.log('提交表单', this.form);
-            this.$message.success('提交成功');
+            console.log("提交表单数据：", this.form);
+            // this.$message.success("表单提交成功！");
+            this.$message.warning("暂未开放");
         },
-        
         // 重置表单
         resetForm() {
             this.form.projectName = "";
-            this.form.tableData.forEach(item => item.value = "");
+            this.form.tableData.forEach((item) => {
+                item.value = "";
+            });
+            this.$message.info("表单已重置");
         },
-        
         // 取消表单
         cancelForm() {
-            this.$router.back(); // 返回上一页，或者根据实际需求进行其他操作
-        }
-    }
+            this.$confirm("确定要取消当前操作吗？", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.resetForm();
+                    this.$message.info("表单已取消");
+                })
+                .catch(() => { });
+        },
+    },
 };
 </script>
 
 <style scoped>
 .form-container {
-    max-width: 1500px;
-    margin: 20px auto;
-    padding: 20px;
+    width: 100%;
+    padding: 30px 50px;
     background-color: #fff;
     border-radius: 8px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
+}
+
+h2 {
+    text-align: center;
+    margin-bottom: 20px;
+    color: #303133;
+}
+
+.el-form-item {
+    margin-bottom: 20px;
+}
+
+.tianbao {
+    width: 70%;
+    height: 2rem;
+    display: flex;
+    align-items: center;
+    justify-content: left;
+    font-weight: bold;
+    margin-bottom: 1rem;
+    margin-left: -20px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/evalute/supervision/index.vue b/src/views/evalute/supervision/index.vue
index bec228a..08e79c7 100644
--- a/src/views/evalute/supervision/index.vue
+++ b/src/views/evalute/supervision/index.vue
@@ -55,7 +55,6 @@
         </el-table-column>
 
         <el-table-column prop="alertTime" label="提醒时间" min-width="180" align="center" />
-
         <!-- <el-table-column
           prop="createBy"
           label="创建人"
@@ -213,12 +212,10 @@ export default {
       });
     },
     // 处理弹框关闭
-    // 处理弹框关闭
     handleClose(done) {
       this.dialogVisible = false;
       this.isView = false;
       this.isReminder = 1; // 重置为默认值
-
       // 完整重置表单数据
       this.ruleForm = {
         rulesName: "",
@@ -296,7 +293,6 @@ export default {
       });
     },
     // 打开添加规则弹框
-    // 打开添加规则弹框
     handleAdd() {
       this.isView = false;
       this.dialogVisible = true;

From eed22376a4b80a0d5ad0ed5919e2dbde5ffbbafa Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 17 Apr 2025 14:13:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...rojectpicturetwo22.vue => Projectdraw.vue} |  0
 .../components/ProjectDetails/spanmanage.vue  |  8 ++-
 src/views/components/tianbao/tianbao.vue      | 61 ++++---------------
 src/views/manage-add/index.vue                |  6 +-
 src/views/manage-info/index.vue               |  6 +-
 5 files changed, 22 insertions(+), 59 deletions(-)
 rename src/views/components/ProjectDetails/{Projectpicturetwo22.vue => Projectdraw.vue} (100%)

diff --git a/src/views/components/ProjectDetails/Projectpicturetwo22.vue b/src/views/components/ProjectDetails/Projectdraw.vue
similarity index 100%
rename from src/views/components/ProjectDetails/Projectpicturetwo22.vue
rename to src/views/components/ProjectDetails/Projectdraw.vue
diff --git a/src/views/components/ProjectDetails/spanmanage.vue b/src/views/components/ProjectDetails/spanmanage.vue
index 1110663..6778d3e 100644
--- a/src/views/components/ProjectDetails/spanmanage.vue
+++ b/src/views/components/ProjectDetails/spanmanage.vue
@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="tablebody" v-if="isGroupOpen(group.type)">
-                <el-table :data="group.list" style="width: 100%;" v-loading="loading">
+                <el-table :data="group.list" style="width: 100%;" v-loading="loading" empty-text>
                     <el-table-column prop="name" label="标签名称" width="260">
                         <template slot-scope="scope">
                             <div v-if="!scope.row.editing">{{ scope.row.name }}</div>
@@ -47,10 +47,12 @@
                             </div>
                         </template>
                     </el-table-column>
-
                 </el-table>
             </div>
         </div>
+        <div v-if="groupedTags.length === 0" style="color: gray;">
+            暂无标签
+        </div>
 
         <!-- 添加标签弹窗 -->
         <el-dialog title="添加标签" :visible.sync="tagModalVisible" width="30%" :close-on-click-modal="false"
@@ -113,7 +115,7 @@ export default {
                 type: [{ required: true, message: '请选择标签类型', trigger: 'change' }],
                 name: [{ required: true, message: '请输入标签名称', trigger: 'blur' }]
             },
-            // 类型映射
+
             TypeMap: {
                 1: "新一代信息技术",
                 2: "高端装备制造",
diff --git a/src/views/components/tianbao/tianbao.vue b/src/views/components/tianbao/tianbao.vue
index 310722f..bd19f27 100644
--- a/src/views/components/tianbao/tianbao.vue
+++ b/src/views/components/tianbao/tianbao.vue
@@ -1,54 +1,28 @@
 <template>
     <div class="form-container">
-        <el-form :model="form" label-width="140px" label-position="left">
+        <el-form :model="form" label-width="130px" label-position="left">
             <div class="tianbao">基本信息:</div>
             <!-- 公司名称 -->
             <el-form-item label="公司名称" style="margin-left: 0.7rem;">
-                <el-input v-model="this.name" placeholder="" disabled />
+                <el-input v-model="name" placeholder="" disabled />
             </el-form-item>
         </el-form>
-        <el-form :model="form" label-width="150px" label-position="left">
+        <el-form :model="form" label-width="140px" label-position="left">
             <!-- 项目名称 -->
             <el-form-item label="项目名称" required>
-                <el-input v-model="form.projectName" placeholder="请输入项目名称" />
+                <el-input v-model="form.projectName" placeholder=""/>
             </el-form-item>
-            <!-- 填报类型 -->
+        </el-form>
+        <el-form :model="form" label-width="140px" label-position="left">
             <div class="tianbao">填报模型:</div>
-            <el-form-item label="危险品等级" required>
-                <el-input v-model="form.projectName" placeholder="请输入危险品等级" />
-            </el-form-item>
-            <el-form-item label="生产火灾危险等级" required>
-                <el-input v-model="form.projectName" placeholder="请输入生产火灾危险等级" />
-            </el-form-item>
-            <el-form-item label="设备载重" required>
-                <el-input v-model="form.projectName" placeholder="请输入设备载重" />
-            </el-form-item>
-            <el-form-item label="货梯要求" required>
-                <el-input v-model="form.projectName" placeholder="请输入货梯要求" />
-            </el-form-item>
-            <el-form-item label="员工密度" required>
-                <el-input v-model="form.projectName" placeholder="请输入员工密度" />
-            </el-form-item>
-            <el-form-item label="加工精度" required>
-                <el-input v-model="form.projectName" placeholder="请输入加工精度" />
-            </el-form-item>
-            <el-form-item label="减振措施" required>
-                <el-input v-model="form.projectName" placeholder="请输入减振措施" />
-            </el-form-item>
-            <el-form-item label="环境保护" required>
-                <el-input v-model="form.projectName" placeholder="请输入环境保护" />
-            </el-form-item>
-            <el-form-item label="生产类型" required>
-                <el-input v-model="form.projectName" placeholder="请输入生产类型" />
-            </el-form-item>
-            <el-form-item label="层高要求" required>
-                <el-input v-model="form.projectName" placeholder="请输入层高要求" />
+            <!-- 动态生成表单项 -->
+            <el-form-item v-for="(item, index) in form.tableData" :key="index" :label="item.label" required>
+                <el-input v-model="item.value" :placeholder="`请输入${item.label}`" />
             </el-form-item>
             <!-- 操作按钮 -->
             <el-form-item>
                 <el-button type="primary" @click="submitForm">提交</el-button>
                 <el-button @click="resetForm">重置</el-button>
-                <!-- <el-button @click="cancelForm">取消</el-button> -->
             </el-form-item>
         </el-form>
     </div>
@@ -56,11 +30,12 @@
 
 <script>
 import { mapGetters } from 'vuex'
+
 export default {
     data() {
         return {
             form: {
-                projectName: "", // 项目名称
+                projectName: "", 
                 tableData: [
                     { label: "危险品等级", value: "" },
                     { label: "生产火灾危险等级", value: "" },
@@ -97,19 +72,6 @@ export default {
             });
             this.$message.info("表单已重置");
         },
-        // 取消表单
-        cancelForm() {
-            this.$confirm("确定要取消当前操作吗？", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.resetForm();
-                    this.$message.info("表单已取消");
-                })
-                .catch(() => { });
-        },
     },
 };
 </script>
@@ -120,7 +82,6 @@ export default {
     padding: 30px 50px;
     background-color: #fff;
     border-radius: 8px;
-    /* box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); */
 }
 
 h2 {
diff --git a/src/views/manage-add/index.vue b/src/views/manage-add/index.vue
index 59c3585..5141644 100644
--- a/src/views/manage-add/index.vue
+++ b/src/views/manage-add/index.vue
@@ -60,7 +60,7 @@
             </div>
             <!-- 项目图例 -->
             <div id="projectpicturetwo">
-                <Projectpicturetwo22 :action="action" :xmId="projectId"> </Projectpicturetwo22>
+                <Projectdraw :action="action" :xmId="projectId"> </Projectdraw>
             </div>
             <!-- 项目巡礼 -->
             <div id="projectgift">
@@ -108,7 +108,7 @@ import Months from '@/views/components/ProjectDetails/Months.vue';
 import Programme from '@/views/components/ProjectDetails/Programme.vue';
 import Projectgift from '@/views/components/ProjectDetails/Projectgift.vue';
 import Projectpicture from '@/views/components/ProjectDetails/Projectpicture.vue';
-import Projectpicturetwo22 from '@/views/components/ProjectDetails/Projectpicturetwo22.vue';
+import Projectdraw from '@/views/components/ProjectDetails/Projectdraw.vue';
 import Others from '@/views/components/ProjectDetails/Others.vue';
 import Supericon from '@/views/components/ProjectDetails/supervisionicon.vue';
 import { checkPermi, checkRole } from "@/utils/permission";
@@ -127,7 +127,7 @@ export default {
         Programme,
         Projectgift,
         Projectpicture,
-        Projectpicturetwo22,
+        Projectdraw,
         Others,
         Supericon
     },
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index ea15bc4..cefea81 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -60,7 +60,7 @@
             </div>
             <!-- 项目图例 -->
             <div id="projectpicturetwo">
-                <Projectpicturetwo22 :action="action" :xmId="projectId"> </Projectpicturetwo22>
+                <Projectdraw :action="action" :xmId="projectId"> </Projectdraw>
             </div>
             <!-- 项目巡礼 -->
             <div id="projectgift">
@@ -106,7 +106,7 @@ import Months from '@/views/components/ProjectDetails/Months.vue';
 import Programme from '@/views/components/ProjectDetails/Programme.vue';
 import Projectgift from '@/views/components/ProjectDetails/Projectgift.vue';
 import Projectpicture from '@/views/components/ProjectDetails/Projectpicture.vue';
-import Projectpicturetwo22 from '@/views/components/ProjectDetails/Projectpicturetwo22.vue';
+import Projectdraw from '@/views/components/ProjectDetails/Projectdraw.vue';
 import Others from '@/views/components/ProjectDetails/Others.vue';
 import { checkPermi, checkRole } from "@/utils/permission";
 import { getBasicInformationById, fillBasicInformation, auditBasicInformation, tempBasicInformation, getqyBasicInformationPage } from '@/api/ManageApi/index';
@@ -124,7 +124,7 @@ export default {
         Programme,
         Projectgift,
         Projectpicture,
-        Projectpicturetwo22,
+        Projectdraw,
         Others,
     },
     data() {

From 30cde332ee6d7c5ac64292ab872318b1a2906a3f Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 17 Apr 2025 15:15:39 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=9C=88=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectDetails/Companyenter.vue           |   2 +-
 .../components/ProjectDetails/Months.vue      | 134 ++++++++++++------
 src/views/manage-add/index.vue                |   2 +-
 src/views/manage-info/index.vue               |   2 +-
 4 files changed, 95 insertions(+), 45 deletions(-)

diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue
index 6e74055..dacfb5f 100644
--- a/src/views/components/ProjectDetails/Companyenter.vue
+++ b/src/views/components/ProjectDetails/Companyenter.vue
@@ -420,7 +420,7 @@ export default {
 .block {
   width: 98%;
   display: flex;
-  justify-content: space-between;
+  justify-content: right;
   margin-top: 1rem;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Months.vue b/src/views/components/ProjectDetails/Months.vue
index a70c8f2..9577592 100644
--- a/src/views/components/ProjectDetails/Months.vue
+++ b/src/views/components/ProjectDetails/Months.vue
@@ -24,19 +24,22 @@
           </el-table-column>
           <el-table-column prop="monthlyInvestment" label="当月完成投资" width="220" align="center">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.isEditing" v-model.number="scope.row.monthlyInvestment" style="width: 100%;"></el-input>
+              <el-input v-if="scope.row.isEditing" v-model.number="scope.row.monthlyInvestment"
+                style="width: 100%;"></el-input>
               <span v-else>{{ scope.row.monthlyInvestment }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="cumulativeInvestment" label="累计完成投资" width="280" align="center">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.isEditing" v-model.number="scope.row.cumulativeInvestment" style="width: 100%;"></el-input>
+              <el-input v-if="scope.row.isEditing" v-model.number="scope.row.cumulativeInvestment"
+                style="width: 100%;"></el-input>
               <span v-else>{{ scope.row.cumulativeInvestment }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="cumulativeArea" label='截止目前累计建成面积(平方米)' width="280" align="center">
             <template slot-scope="scope">
-              <el-input v-if="scope.row.isEditing" v-model.number="scope.row.cumulativeArea" style="width: 100%;"></el-input>
+              <el-input v-if="scope.row.isEditing" v-model.number="scope.row.cumulativeArea"
+                style="width: 100%;"></el-input>
               <span v-else>{{ scope.row.cumulativeArea }}</span>
             </template>
           </el-table-column>
@@ -48,15 +51,18 @@
           </el-table-column>
           <el-table-column label="操作" width="200" align="center">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.isEditing" size="mini" type="text" icon="el-icon-check" @click="handleSave(scope.row)">保存</el-button>
-              <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-              <el-button size="mini" type="text" icon="el-icon-delete" style="color: #F25353;" @click="handleDelete(scope.row)">删除</el-button>
+              <el-button v-if="scope.row.isEditing" size="mini" type="text" icon="el-icon-check"
+                @click="handleSave(scope.row)">保存</el-button>
+              <el-button v-else size="mini" type="text" icon="el-icon-edit"
+                @click="handleEdit(scope.row)">编辑</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" style="color: #F25353;"
+                @click="handleDelete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
         <div class="block">
           <div style="visibility: hidden;"></div>
-          <el-pagination :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
+          <el-pagination :current-page="current" :page-sizes="[10, 20, 30, 40]" :page-size="size"
             layout="total, prev, pager, next, jumper" :total="total">
           </el-pagination>
         </div>
@@ -66,24 +72,46 @@
 </template>
 
 <script>
+import { getMonthInformationPage } from "@/api/ManageApi/index";
+
 export default {
+  props: {
+    action: {
+      type: String,
+      required: true,
+    },
+    xmId: {
+      type: Number,
+      required: true,
+    },
+  },
   data() {
     return {
       tableData: [
-
+        {
+          month: '2024-10',
+          status: '未更新',
+          monthlyInvestment: 0,
+          cumulativeInvestment: 0,
+          cumulativeArea: 0,
+          progressDetails: '暂无数据',
+          isEditing: false,
+        },
       ],
-      currentPage: 1,
-      pageSize: 10,
+      current: 1,
+      size: 10,
       total: 0,
-    }
+    };
   },
   methods: {
     getStatusColor(status) {
       switch (status) {
-        case '未更新':
-          return 'color: #2DD29F;';
-        case '已更新':
-          return 'color: #2B62F1;';
+        case "未更新":
+          return "color: #2DD29F;";
+        case "已更新":
+          return "color: #2B62F1;";
+        default:
+          return ""; 
       }
     },
     handleEdit(row) {
@@ -91,38 +119,60 @@ export default {
     },
     handleSave(row) {
       row.isEditing = false;
-      // 实现保存逻辑，例如调用后端API保存数据
-      console.log('保存:', row);
+      console.log("保存:", row);
       this.$message({
-        type: 'success',
-        message: '保存成功!'
+        type: "success",
+        message: "保存成功!",
       });
     },
     handleDelete(row) {
-      this.$confirm('你确定要删除此条记录吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        console.log('删除:', row);
-        // 实现删除逻辑
-        const index = this.tableData.indexOf(row);
-        if (index !== -1) {
-          this.tableData.splice(index, 1);
-        }
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
+      this.$confirm("你确定要删除此条记录吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          console.log("删除:", row);
+          // 确保 tableData 是数组
+          if (Array.isArray(this.tableData)) {
+            const index = this.tableData.indexOf(row);
+            if (index !== -1) {
+              this.tableData.splice(index, 1);
+            }
+          }
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
         });
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        });
-      });
-    }
-  }
-}
+    },
+    async getMonthInformationPage() {
+      try {
+        const response = await getMonthInformationPage({ xmId: this.xmId });
+        // 确保 response.data.records 是数组
+        if (Array.isArray(response.data.records) && response.data.records.length > 0) {
+          this.tableData = response.data.records; 
+          this.total = response.data.total || 0;
+        } else {
+          // 如果后端返回的数据为空数组，保留默认数据
+          this.total = 0;
+        }
+      } catch (error) {
+        console.error("获取月度进展信息失败:", error);
+        this.$message.error("获取月度进展信息失败");
+      }
+    },
+  },
+  created() {
+    this.getMonthInformationPage();
+  },
+};
 </script>
 
 <style scoped>
diff --git a/src/views/manage-add/index.vue b/src/views/manage-add/index.vue
index 5141644..a582a4e 100644
--- a/src/views/manage-add/index.vue
+++ b/src/views/manage-add/index.vue
@@ -46,7 +46,7 @@
             </div>
             <!-- 月度进展信息 -->
             <div id="months">
-                <Months :action="action"></Months>
+                <Months :action="action" :xmId="projectId"></Months>
             </div>
             <!-- 企业入驻信息 -->
             <div id="companyenter">
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index cefea81..31eea8d 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -46,7 +46,7 @@
             </div>
             <!-- 月度进展信息 -->
             <div id="months">
-                <Months :action="action"></Months>
+                <Months :action="action" :xmId=projectId></Months>
             </div>
             <!-- 企业入驻信息 -->
             <div id="companyenter">

From 4b6e8c417224bfc5a869281f2d5b8b26332108de Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Thu, 17 Apr 2025 15:16:00 +0800
Subject: [PATCH 6/6] api

---
 src/api/ManageApi/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js
index cdf6168..8602b60 100644
--- a/src/api/ManageApi/index.js
+++ b/src/api/ManageApi/index.js
@@ -397,7 +397,6 @@ export function getqyrzById(id) {
   });
 }
 //企业入驻信息
-// 修改信息
 // 根据项目ID分页查询所有入驻企业
 export function getqyBasicInformationPage(params) {
   return request({
@@ -427,6 +426,15 @@ export function deleteqyBasicInformation(idList) {
   });
 }
 
+//月度进展信息
+//根据项目ID查询所有数据
+export function getMonthInformationPage(params) {
+  return request({
+    url: '/gysl/projectProgress/page',
+    method: 'get',
+    params
+  });
+}
 
 //建筑信息表
 //新增数据