diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js
index 24d6d15..aa9e2dc 100644
--- a/src/api/ManageApi/index.js
+++ b/src/api/ManageApi/index.js
@@ -1,6 +1,42 @@
 // src/api/ManageApi/index.js
 import request from '@/utils/request';
+import { getToken } from '@/utils/auth'; 
 
+
+// 企业--基本信息==下载模板（基本信息模板）
+export function exportBasicInformationTemplate() {
+  return request({
+    url: '/gysl/basicInformation/importTemplate',
+    method: 'post',
+    responseType: 'blob',
+    headers: {
+      'Authorization': `Bearer ${getToken()}` 
+    }
+  });
+}
+// 分页查询所有数据
+export function getBasicInformationPage(params) {
+  return request({
+    url:'/gysl/basicInformation/page',
+    method: 'get',
+    params
+  })
+}
+// 企业基本信息--的导入功能
+export function importBasicInformation(data) {
+  const formData = new FormData();
+  formData.append('file', data.file);
+
+  return request({
+    url: '/gysl/basicInformation/import',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data',
+      'Authorization': `Bearer ${getToken()}`,
+    },
+  });
+}
 // 企业--基本信息==展示
 export function getBasicInformationById(id) {
   return request({
@@ -26,14 +62,6 @@ export function exportBasicInformation(params) {
     responseType: 'blob'
   });
 }
-// 分页查询所有数据
-export function getBasicInformationPage(params) {
-  return request({
-    url:'/gysl/basicInformation/page',
-    method: 'get',
-    params
-  })
-}
 // 项目详情 规划信息
 // 修改规划信息
 export function updateProgrammeInformation(data) {
@@ -488,4 +516,14 @@ export function getxmmmbById(id) {
     method:'get',
     params:{id}
   })
+}
+
+//单片材料管理
+//新增数据
+export function getclglPage(data) {
+  return request({
+    url:'/gysl/dpclgl/add',
+    method:'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/assets/images/icon-关闭-项目备忘录@2x.png b/src/assets/images/icon-关闭-项目备忘录@2x.png
new file mode 100644
index 0000000..4e5141e
Binary files /dev/null and b/src/assets/images/icon-关闭-项目备忘录@2x.png differ
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 411cd70..c0c3de8 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -25,13 +25,7 @@
           <i class="el-icon-caret-bottom"/>
         </div>
         <el-dropdown-menu slot="dropdown">
-          <!-- <router-link to="/user/profile">
-            <el-dropdown-item>个人中心</el-dropdown-item>
-          </router-link> -->
-          <!-- <el-dropdown-item @click.native="setting = true">
-            <span>布局设置</span>
-          </el-dropdown-item> -->
-          <el-dropdown-item divided @click.native="logout">
+          <el-dropdown-item  @click.native="logout">
             <span>退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
@@ -228,7 +222,7 @@ export default {
           cursor: pointer;
           position: absolute;
           right: -20px;
-          top: 25px;
+          top: 15px;
           font-size: 12px;
         }
       }
diff --git a/src/views/compilation/knowledge/index.vue b/src/views/compilation/knowledge/index.vue
index 3a8241b..2425153 100644
--- a/src/views/compilation/knowledge/index.vue
+++ b/src/views/compilation/knowledge/index.vue
@@ -49,9 +49,9 @@
         <el-table-column label="上传时间" align="center" prop="scsj" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
-            <el-button size="mini" type="text"  @click="getInfo(scope.row)">详情</el-button>
-            <el-button size="mini" type="text"  @click="handleUpdate(scope.row)">编辑</el-button>
-            <el-button size="mini" type="text"  @click="handleDelete(scope.row)" style="color: red;">删除</el-button>
+            <el-button size="mini" type="text" @click="getInfo(scope.row)">详情</el-button>
+            <el-button size="mini" type="text" @click="handleUpdate(scope.row)">编辑</el-button>
+            <el-button size="mini" type="text" @click="handleDelete(scope.row)" style="color: red;">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -71,6 +71,10 @@
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+        <!-- 如果文件类型是网络信息（假设值为 4） -->
+        <el-form-item v-if="form.lx === '3'" label="网址" prop="scyh">
+          <el-input v-model="form.scsj" placeholder="请输入网址" />
+        </el-form-item>
         <el-form-item label="上传用户" prop="scyh">
           <el-input v-model="form.scyh" placeholder="请输入上传用户" />
         </el-form-item>
@@ -100,6 +104,9 @@
               :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item v-if="detailForm.lx === '3'" label="网址" prop="scyh">
+          <el-input v-model="detailForm.scsj" placeholder="请输入网址" readonly />
+        </el-form-item>
         <el-form-item label="上传用户" prop="scyh">
           <el-input v-model="detailForm.scyh" placeholder="请输入上传用户" />
         </el-form-item>
diff --git a/src/views/compilation/onecailiao/index.vue b/src/views/compilation/onecailiao/index.vue
index c491df5..22ec3f7 100644
--- a/src/views/compilation/onecailiao/index.vue
+++ b/src/views/compilation/onecailiao/index.vue
@@ -65,8 +65,7 @@
           <el-input v-model="form.author" placeholder="请输入发布人" />
         </el-form-item>
         <el-form-item label="内容">
-          <!-- 富文本编辑器 -->
-          <quill-editor class="editor" v-model="form.content" :options="editorOption"></quill-editor>
+          <Editorone v-model="form.content" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -97,35 +96,18 @@
       </div>
       <!-- 内容区域 -->
       <div class="previewcontent">
-        <quill-editor class="editor preview-editor" v-model="previewData.content" :options="previewEditorOption" readonly></quill-editor>
+        <div v-html="previewData.content"></div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { quillEditor } from "vue-quill-editor";
-import "quill/dist/quill.core.css";
-import "quill/dist/quill.snow.css";
-import "quill/dist/quill.bubble.css";
-
-// 工具栏配置
-const toolbarOptions = () => {
-  return [
-    ["bold", "italic", "underline", "strike"], // 加粗 斜体 下划线 删除线
-    [{ list: "ordered" }, { list: "bullet" }], // 有序、无序列表
-    [{ indent: "-1" }, { indent: "+1" }], // 缩进
-    [{ size: ["small", false, "large", "huge"] }], // 字体大小
-    [{ header: [1, 2, 3, 4, 5, 6, false] }], // 标题
-    [{ color: [] }, { background: [] }], // 字体颜色、字体背景颜色
-    [{ align: [] }], // 对齐方式
-    ["clean"], // 清除文本格式
-    ["link"], // 链接
-  ];
-};
+import Editorone from '@/components/Editor';
+import { getclglPage } from '@/api/ManageApi/index';
 
 export default {
-  components: { quillEditor },
+  components: { Editorone },
   data() {
     return {
       loading: false,
@@ -142,7 +124,6 @@ export default {
       dialogVisible: false,
       dialogTitle: '新增',
       form: {
-        id: null,
         title: '',
         date: '',
         unit: '',
@@ -155,29 +136,15 @@ export default {
         unit: [{ required: true, message: '请输入发布单位', trigger: 'blur' }],
         author: [{ required: true, message: '请输入发布人', trigger: 'blur' }]
       },
-      editorOption: {
-        placeholder: "请输入内容",
-        modules: {
-          toolbar: {
-            container: toolbarOptions(),
-          },
-        },
-      },
-      previewMode: false, // 添加预览模式状态变量
-      previewData: {}, // 用于存储预览的数据
-      previewEditorOption: {
-        readOnly: true,
-        modules: {
-          toolbar: false, // 隐藏工具栏
-        },
-      },
+      previewMode: false, 
+      previewData: {}, 
     };
   },
   methods: {
     handleAdd() {
       this.dialogTitle = '新增';
       this.dialogVisible = true;
-      this.form = { id: null, title: '', date: '', unit: '', author: '', content: '' };
+      this.form = { title: '', date: '', unit: '', author: '', content: '' };
     },
     handleEdit(row) {
       this.dialogTitle = '编辑';
@@ -208,12 +175,22 @@ export default {
       this.$refs.form.validate(valid => {
         if (valid) {
           if (this.form.id) {
+            // 编辑操作
             const index = this.postList.findIndex(item => item.id === this.form.id);
             this.postList.splice(index, 1, this.form);
           } else {
-            this.form.id = this.postList.length + 1;
-            this.postList.push(this.form);
+            // 新增操作
+            const newForm = { ...this.form }; 
+            newForm.id = this.postList.length + 1; 
+            this.postList.push(newForm);
             this.total += 1;
+            const formData = { ...newForm };
+            delete formData.id;
+
+            // 调用新增数据接口
+            getclglPage(formData).then(response => {
+              this.$message({ type: 'success', message: '新增成功!' });
+            })
           }
           this.dialogVisible = false;
           this.$message({ type: 'success', message: '操作成功!' });
@@ -263,11 +240,6 @@ export default {
   margin-bottom: 1rem;
 }
 
-.editor {
-  height: 300px;
-  margin-bottom: 50px;
-}
-
 .previewbox {
   width: 90%;
   height: auto;
@@ -314,17 +286,4 @@ export default {
 .previewcontent {
   margin-top: 1rem;
 }
-
-/* 去掉预览模式下编辑器的边框 */
-.preview-editor ::v-deep .ql-container.ql-snow {
-  border: none !important;
-}
-.preview-editor ::v-deep .ql-editor {
-  padding: 0 0 !important;
-}
-.preview-editor ::v-deep .ql-editor {
-    pointer-events: none; /* 禁止鼠标交互 */
-    user-select: none;    /* 禁止文本选择 */
-}
-
 </style>
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue
index 2a97dc0..42d864a 100644
--- a/src/views/components/ProjectDetails/Companyenter.vue
+++ b/src/views/components/ProjectDetails/Companyenter.vue
@@ -7,16 +7,20 @@
         <span>企业入驻信息</span>
       </div>
       <div class="topright">
-        <!-- 编辑按钮 -->
         <el-button type="primary" size="medium" plain
-          style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="toggleEdit">
+          style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;">
           <img src="../../../assets/images/detailsicon/icon-bj@2x.png" alt="编辑"
             style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-          {{ editMode ? '保存' : '编辑' }}
+          编辑
+        </el-button>
+        <el-button type="primary" size="medium" plain
+          style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;">
+          <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 class="descriptionsdiv">
@@ -25,120 +29,156 @@
             <template slot="label">
               入驻企业数（家）
             </template>
-            <el-input v-model="currentCompany.rzqys" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.rzqys }}</span>
+            18100000000
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               入驻企业行业类型
             </template>
-            <el-input v-model="currentCompany.rzqyhylx" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.rzqyhylx }}</span>
+            苏州市
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               人员数量（人）
             </template>
-            <el-input v-model="currentCompany.rysl" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.rysl }}</span>
+            kooriookami
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               入住率（%）
             </template>
-            <el-input v-model="currentCompany.rzl" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.rzl }}</span>
+            18100000000
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               已出租（售）面积（平方米）
             </template>
-            <el-input v-model="currentCompany.yczmj" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.yczmj }}</span>
+            苏州市
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               空置出租（售）面积（平方米）
             </template>
-            <el-input v-model="currentCompany.kzczmj" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.kzczmj }}</span>
+            kooriookami
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               工业厂房平均租金（元/平方米*月）
             </template>
-            <el-input v-model="currentCompany.gycfpjzj" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.gycfpjzj }}</span>
+            18100000000
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               工业厂房平均物业费(元/平方米*月)
             </template>
-            <el-input v-model="currentCompany.gycfpjwyf" v-if="editMode"></el-input>
-            <span v-else>{{ currentCompany.gycfpjwyf }}</span>
+            苏州市
           </el-descriptions-item>
         </el-descriptions>
       </div>
     </div>
+    <!-- 内容区 -->
+    <div class="content">
+      <div class="descriptionsdiv">
+        <div class="spandiv" @click="openDialog"><span>新增企业入驻</span></div>
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="address" label="序号" width="200">
+          </el-table-column>
+          <el-table-column prop="name" label="企业名称" width="300">
+            <template slot-scope="scope">
+              <span style="color: #2B62F1;">{{ scope.row.name }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="number" label="统一社会信用代码" width="300">
+          </el-table-column>
+          <el-table-column prop="name" label="所属行业" width="300">
+          </el-table-column>
+          <el-table-column prop="data" label='租金价格' width="250">
+          </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" >保存</el-button>
+              <el-button v-else size="mini" type="text" icon="el-icon-edit" >编辑</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" style="color: #F25353;">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <div style="visibility: hidden;"></div>
+          <el-pagination :current-page="4" :page-sizes="[100, 200, 300, 400]" :page-size="100"
+            layout="total, prev, pager, next, jumper" :total="400">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <!-- 弹窗 -->
+    <el-dialog title="企业入驻" :visible.sync="dialogVisible" width="400px" append-to-body>
+      <el-upload>
+        <i class="el-icon-upload" style="margin-left: 7rem;"></i>
+        <div class="el-upload__text" style="margin-left: 7rem;"><em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip" style="margin-top: -1.5rem; margin-left: 9rem;">
+          <!-- <div class="el-upload__tip" slot="tip">
+                <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+              </div> -->
+          <!-- <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">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { updateqyrz, getqyrzById } from '@/api/ManageApi/index';
-
 export default {
   data() {
     return {
-      editMode: false, // 编辑模式状态
-      currentCompany: {
-        rzqys: 0, // 入驻企业数
-        rzqyhylx: '', // 入驻企业行业类型
-        rysl: 0, // 人员数量
-        rzl: 0, // 入住率
-        yczmj: 0, // 已出租面积
-        kzczmj: 0, // 空置出租面积
-        gycfpjzj: 0, // 工业厂房平均租金
-        gycfpjwyf: 0, // 工业厂房平均物业费
-      },
-    };
-  },
-  mounted() {
-    this.fetchCompanyData(); // 页面加载时获取数据
+      tableData: [
+        {
+          date: '2016-05-02',
+          name: '大众电脑生成制造基地',
+          number: 123456,
+          address: ' 1518 弄',
+          data: '1000',
+          status: '在建'
+        },
+        {
+          date: '2016-05-04',
+          name: '大众电脑生成制造基地',
+          address: ' 1517 弄',
+          number: 123456,
+          data: '1500',
+          status: '拟建'
+        },
+        {
+          date: '2016-05-01',
+          name: '大众电脑生成制造基地',
+          address: ' 1519 弄',
+          number: 123456,
+          data: '2000',
+          status: '已建'
+        },
+        {
+          date: '2016-05-03',
+          name: '大众电脑生成制造基地',
+          address: ' 1516 弄',
+          number: 123456,
+          data: '2500',
+          status: '在建'
+        }
+      ],
+      dialogVisible: false, // 控制弹窗显示与隐藏
+    }
   },
   methods: {
-    // 切换编辑模式
-    toggleEdit() {
-      if (this.editMode) {
-        this.saveData(); // 如果是编辑模式，点击后保存数据
-      }
-      this.editMode = !this.editMode; // 切换编辑模式
-    },
-    // 获取企业入驻信息
-    async fetchCompanyData() {
-      try {
-        const response = await getqyrzById(this.$route.params.id);
-        this.currentCompany = response.data; // 更新数据
-      } catch (error) {
-        console.error('获取企业入驻信息失败:', error);
-        this.$message.error('获取企业入驻信息失败');
-      }
-    },
-    // 保存数据
-    async saveData() {
-      try {
-        const response = await updateqyrz(this.currentCompany);
-        if (response.success) {
-          this.$message.success('保存成功');
-        } else {
-          this.$message.error('保存失败');
-        }
-      } catch (error) {
-        console.error('保存失败:', error);
-        this.$message.error('保存失败');
-      }
+    openDialog() {
+      this.dialogVisible = true; // 打开弹窗
     }
   }
-};
+}
 </script>
 
 <style scoped>
@@ -151,6 +191,11 @@ export default {
   border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
 }
 
+.content {
+  padding: 1rem;
+  display: flex;
+}
+
 .containertop {
   height: auto;
   display: flex;
@@ -185,13 +230,37 @@ export default {
   text-transform: none;
 }
 
+.picturediv {
+  width: 18.31rem;
+  height: 25.31rem;
+  background-color: lightblue;
+}
+
 .descriptionsdiv {
   width: 100%;
   margin-left: 1rem;
   height: auto;
 }
 
+.two-row-item {
+  height: 20rem;
+}
+
 .tagdiv {
   padding: 1rem 3em 1rem 1rem;
 }
+
+.block {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 1rem;
+}
+
+.spandiv {
+  padding: 0 0 1rem 0;
+  color: #0052D9;
+  font-size: .8rem;
+  cursor: pointer;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Liver.vue b/src/views/components/ProjectDetails/Liver.vue
index de1b943..39c9e05 100644
--- a/src/views/components/ProjectDetails/Liver.vue
+++ b/src/views/components/ProjectDetails/Liver.vue
@@ -43,7 +43,6 @@ export default {
                 { src: 'https://picsum.photos/300/200?random=1', isOnline: true },
                 { src: 'https://picsum.photos/300/200?random=2', isOnline: false },
                 { src: 'https://picsum.photos/300/200?random=3', isOnline: true },
-                // 添加更多图片
             ]
         };
     },
diff --git a/src/views/components/ProjectDetails/Memo.vue b/src/views/components/ProjectDetails/Memo.vue
index dd3185d..2ee59dc 100644
--- a/src/views/components/ProjectDetails/Memo.vue
+++ b/src/views/components/ProjectDetails/Memo.vue
@@ -7,13 +7,6 @@
                 <span>项目备忘录</span>
             </div>
             <div class="topright">
-                <el-button type="primary" size="medium" plain
-                    style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;"
-                    @click="handleEditMemo">
-                    <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
                     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="新增"
@@ -38,11 +31,9 @@
                 <div v-for="memo in memos" :key="memo.id" class="descriptionditem">
                     <div class="itemone">{{ memo.createTime }}</div>
                     <div class="itemtwo">{{ memo.remark }}</div>
-                    <div class="itemthree">{{ memo.createBy }}</div>
-                    <div class="itemfour">
-                        <el-button type="text" @click="handleEditMemo(memo)">编辑</el-button>
-                        <el-button type="text" @click="handleDeleteMemo(memo.id)">删除</el-button>
-                    </div>
+                    <div class="itemthree">记录人：{{ memo.createBy }}</div>
+                    <div class="iconguanbi" @click="handleDeleteMemo(memo.id)"> <img 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>
                 </div>
             </div>
         </div>
@@ -50,7 +41,14 @@
         <!-- 新增/编辑弹窗表单 -->
         <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px">
             <el-form :model="newMemo" label-width="100px">
-                <el-form-item label="备忘录内容">
+                <el-form-item label="姓名">
+                    <el-input v-model="newMemo.createBy" disabled></el-input>
+                </el-form-item>
+                <el-form-item label="备忘时间">
+                    <el-date-picker type="date" placeholder="选择日期" v-model="newMemo.createTime" disabled
+                        style="width: 21.75rem;"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="关键/主题字">
                     <el-input type="textarea" v-model="newMemo.remark" :rows="4"></el-input>
                 </el-form-item>
             </el-form>
@@ -81,14 +79,16 @@ export default {
             dialogTitle: '新增备忘录',
             newMemo: {
                 id: null,
-                remark: '', // 只需要发送 remark
-                xmId: this.xmId, // 使用传入的 xmId
+                remark: '',
+                xmId: this.xmId,
+                createTime: '',
+                createBy: '',
             },
-            memos: [], // 备忘录列表
+            memos: [],
         };
     },
     created() {
-        this.fetchMemos(); // 页面加载时获取数据
+        this.fetchMemos();
     },
     methods: {
         onSubmit() {
@@ -98,7 +98,7 @@ export default {
         // 获取备忘录数据
         fetchMemos() {
             const params = {
-                xmId: this.xmId, // 使用传入的 xmId
+                xmId: this.xmId,
             };
             getxmmmbPage(params)
                 .then(response => {
@@ -120,6 +120,8 @@ export default {
                 id: null,
                 remark: '', // 只需要发送 remark
                 xmId: this.xmId, // 使用传入的 xmId
+                createTime: new Date().toISOString().slice(0, 10), // 设置当前时间
+                createBy: this.getCurrentUserName(), // 获取当前账号的名称
             };
         },
         // 打开编辑弹窗
@@ -131,6 +133,8 @@ export default {
                     id: memo.id,
                     remark: memo.remark, // 只需要发送 remark
                     xmId: memo.xmId,
+                    createTime: memo.createTime, // 使用现有时间
+                    createBy: memo.createBy, // 使用现有姓名
                 };
             }
         },
@@ -193,6 +197,11 @@ export default {
                     });
             }
         },
+        // 获取当前账号的名称
+        getCurrentUserName() {
+            // 假设当前账号的名称存储在 Vuex store 中
+            return this.$store.state.user.name; // 根据实际情况调整
+        },
     },
 };
 </script>
@@ -292,6 +301,7 @@ export default {
     border: 0.06rem solid #E6E6E6;
     padding: .5rem;
     position: relative;
+    gap: 1rem;
 }
 
 .itemone {
@@ -316,6 +326,7 @@ export default {
     line-height: 0.88rem;
     font-style: normal;
     text-transform: none;
+    margin-top: .5rem;
 }
 
 .itemthree {
@@ -342,4 +353,30 @@ export default {
     resize: none;
     /* 禁止调整大小 */
 }
+
+.iconguanbi {
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+.iconguanbi2 {
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
+    width: 2rem;
+    height: 2rem;
+    background-color: rgba(43,98,241,0.1);
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.iconguanbi2 img{
+    width: 1.2rem;
+    height: 1.2rem;
+}
+.iconguanbi img{
+    width: 1.4rem;
+    height: 1.4rem;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Others.vue b/src/views/components/ProjectDetails/Others.vue
index 56237a2..31f5280 100644
--- a/src/views/components/ProjectDetails/Others.vue
+++ b/src/views/components/ProjectDetails/Others.vue
@@ -38,11 +38,8 @@
     <div class="tagdiv">
       <div class="descriptionsdiv">
         <el-descriptions class="margin-top" :column="4" border>
-          <el-descriptions-item label="键">
-            {{ otherInfo.zdname }}
-          </el-descriptions-item>
-          <el-descriptions-item label="值">
-            {{ otherInfo.zdinfor }}
+          <el-descriptions-item v-for="(item, index) in otherInfo" :key="index" :label="item.zdname">
+            {{ item.zdinfor }}
           </el-descriptions-item>
         </el-descriptions>
       </div>
@@ -51,11 +48,11 @@
     <!-- 表单弹窗 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="30%">
       <el-form :model="form" label-width="80px">
-        <el-form-item label="键">
-          <el-input v-model="form.zdname" placeholder="请输入键"></el-input>
+        <el-form-item label="字段名称">
+          <el-input v-model="form.zdname" placeholder="请输入字段名称"></el-input>
         </el-form-item>
-        <el-form-item label="值">
-          <el-input v-model="form.zdinfor" placeholder="请输入值"></el-input>
+        <el-form-item label="字段内容">
+          <el-input v-model="form.zdinfor" placeholder="请输入字段内容 "></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -78,10 +75,7 @@ export default {
   },
   data() {
     return {
-      otherInfo: { // 其他信息
-        zdname: '', // 键
-        zdinfor: '' // 值
-      },
+      otherInfo: [], // 其他信息，初始化为空数组
       dialogVisible: false, // 控制弹窗显示
       dialogTitle: '', // 弹窗标题
       form: { // 表单数据
@@ -100,7 +94,7 @@ export default {
       getOtherInfoByxmid({ xmId: this.xmId }) // 确保参数名和接口定义一致
         .then(response => {
           if (response.code === 200 && response.data) {
-            this.otherInfo = response.data; // 填充数据
+            this.otherInfo = response.data; // 填充数据，假设 response.data 是一个数组
           } else {
             console.error("获取其他信息失败：数据为空");
           }
diff --git a/src/views/components/ProjectDetails/Projectgift.vue b/src/views/components/ProjectDetails/Projectgift.vue
index c3c4336..c80bdd4 100644
--- a/src/views/components/ProjectDetails/Projectgift.vue
+++ b/src/views/components/ProjectDetails/Projectgift.vue
@@ -23,6 +23,10 @@
                 <div class="close-button" @click="removeImage(index)">
                     <img src="../../../assets/images/detailsicon/icon-关闭@2x.png" alt="">
                 </div>
+                <div class="bottombox">
+                    <div class="bottomtext"><span>新科大厦项目正在施工</span></div>
+                    <div class="bottomtime"><span>2025-02-11</span></div>
+                </div>
             </div>
         </div>
         <!-- 弹窗 -->
@@ -31,7 +35,7 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="项目名称">
-                            <el-input v-model="form.projectName" placeholder="请输入项目名称"></el-input>
+                            <el-input v-model="form.xmmc" placeholder="请输入项目名称"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
@@ -41,10 +45,11 @@
                     </el-col>
                 </el-row>
                 <el-form-item label="网页地址">
-                    <el-input v-model="form.webAddress" placeholder="请输入网页地址"></el-input>
+                    <el-input v-model="form.webUrl" placeholder="请输入网页地址"></el-input>
                 </el-form-item>
                 <el-form-item label="时间">
-                    <el-date-picker v-model="form.time" type="datetime" placeholder="选择日期时间"></el-date-picker>
+                    <el-date-picker v-model="form.sj" type="datetime" placeholder="选择日期时间" style="width: 51rem;"
+                        value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                 </el-form-item>
                 <el-form-item label="图片上传">
                     <el-upload action="https://jsonplaceholder.typicode.com/posts/" list-type="picture-card"
@@ -56,13 +61,13 @@
                     </el-dialog>
                 </el-form-item>
                 <el-form-item label="说明">
-                    <el-input v-model="form.description" type="textarea" :rows="4" placeholder="请输入说明"></el-input>
+                    <el-input v-model="form.content" type="textarea" :rows="4" placeholder="请输入说明"></el-input>
                 </el-form-item>
                 <el-form-item label="大事记">
-                    <el-input v-model="form.majorEvents" type="textarea" :rows="4" placeholder="请输入大事记"></el-input>
+                    <el-input v-model="form.bigEvent" type="textarea" :rows="4" placeholder="请输入大事记"></el-input>
                 </el-form-item>
                 <el-form-item label="新闻事件">
-                    <el-input v-model="form.newsEvents" type="textarea" :rows="4" placeholder="请输入新闻事件"></el-input>
+                    <el-input v-model="form.newsEvent" type="textarea" :rows="4" placeholder="请输入新闻事件"></el-input>
                 </el-form-item>
                 <el-form-item label="附件上传">
                     <el-upload action="https://jsonplaceholder.typicode.com/posts/" :on-preview="handleFilePreview"
@@ -73,27 +78,51 @@
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="handleAddElement">确 定</el-button>
+                <el-button type="primary" @click="handleAddXmxl">确 定</el-button>
             </span>
         </el-dialog>
     </div>
 </template>
 
 <script>
-import { getXmxlPage } from '@/api/ManageApi/index.js';
+import { addXmxl, getXmxlPage } from '@/api/ManageApi/index.js';
 
 export default {
     data() {
         return {
-            images: [],
+            images: [
+                { src: 'https://picsum.photos/300/200?random=1', },
+                { src: 'https://picsum.photos/300/200?random=2', },
+                { src: 'https://picsum.photos/300/200?random=3', },
+            ],
             dialogVisible: false,
             previewDialogVisible: false,
             previewImageUrl: '',
-            fileList: []
+            fileList: [],
+            form: {
+                xmmc: '',
+                year: '',
+                webUrl: '',
+                sj: '',
+                content: '',
+                bigEvent: '',
+                newsEvent: '',
+                fj: '',
+                img: '',
+                createBy: '',
+                createId: 0,
+                createTime: '',
+                id: 0,
+                updateBy: '',
+                updateId: 0,
+                updateTime: '',
+                xmId: 0 // 确保 xmId 存在
+            }
         };
     },
     created() {
-        const xmid = this.$route.query.xmid; 
+        const xmid = this.$route.query.xmid; // 假设 xmid 通过路由参数传递
+        this.form.xmId = xmid; // 设置 xmId
         this.fetchImages(xmid);
     },
     methods: {
@@ -102,17 +131,22 @@ export default {
                 const response = await getXmxlPage({ xmid });
                 if (response.data && response.data.list) {
                     this.images = response.data.list.map(item => ({
-                        src: item.fj 
+                        src: item.fj
                     }));
                 }
             } catch (error) {
-                this.$message.error('获取图片失败');
+                // this.$message.error('获取图片失败');
                 console.error(error);
             }
         },
         handleAdd() {
             this.dialogVisible = true;
         },
+        removeImage(index) {
+            if (confirm('确定要删除吗？')) {
+                this.images.splice(index, 1);
+            }
+        },
         handleRemove(file, fileList) {
             this.fileList = fileList;
         },
@@ -143,25 +177,29 @@ export default {
             this.handleAddXmxl();
         },
         async handleAddXmxl() {
-            const formData = new FormData();
-            this.fileList.forEach((file, index) => {
-                formData.append(`fj[${index}]`, file.raw);
-            });
-
-            // 添加其他表单数据
-            formData.append('createBy', '');
-            formData.append('createId', 0);
-            formData.append('createTime', '');
-            formData.append('id', 0);
-            formData.append('jkmc', '');
-            formData.append('sj', '');
-            formData.append('status', 0);
-            formData.append('updateBy', '');
-            formData.append('updateId', 0);
-            formData.append('updateTime', '');
+            // 收集表单数据
+            const requestData = {
+                bigEvent: this.form.bigEvent,
+                content: this.form.content,
+                createBy: this.form.createBy,
+                createId: this.form.createId,
+                createTime: this.form.createTime,
+                fj: this.form.fj,
+                id: this.form.id,
+                img: this.form.img,
+                newsEvent: this.form.newsEvent,
+                sj: this.form.sj,
+                updateBy: this.form.updateBy,
+                updateId: this.form.updateId,
+                updateTime: this.form.updateTime,
+                webUrl: this.form.webUrl,
+                xmId: this.form.xmId,
+                xmmc: this.form.xmmc,
+                year: this.form.year
+            };
 
             try {
-                const response = await addXmxl(formData);
+                const response = await addXmxl(requestData);
                 this.$message.success('新增成功');
                 console.log(response);
                 this.fetchImages(); // 刷新图片列表
@@ -170,9 +208,6 @@ export default {
                 console.error(error);
             }
         },
-        removeImage(index) {
-            this.images.splice(index, 1);
-        }
     }
 };
 </script>
@@ -257,4 +292,36 @@ export default {
     height: 100%;
     object-fit: cover;
 }
+
+.bottombox {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    position: absolute;
+    bottom: .5rem;
+    padding: .2rem;
+    width: 97%;
+}
+
+.bottomtext {
+    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-weight: 500;
+    font-size: 1.13rem;
+    color: #FFFFFF;
+    line-height: 1.56rem;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+}
+
+.bottomtime {
+    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-weight: 400;
+    font-size: 0.75rem;
+    color: rgba(255, 255, 255, 0.8);
+    line-height: 1rem;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Title.vue b/src/views/components/ProjectDetails/Title.vue
index dea9ba9..3e0b8a3 100644
--- a/src/views/components/ProjectDetails/Title.vue
+++ b/src/views/components/ProjectDetails/Title.vue
@@ -2,7 +2,7 @@
     <div class="container">
         <!-- 顶部信息 -->
         <div class="containertop">
-            <h3>{{ name }}</h3>
+            <h3>THI SIP高端装备工业港</h3>
         </div>
     </div>
 </template>
diff --git a/src/views/components/ProjectDetails/companyenter（备份）.vue b/src/views/components/ProjectDetails/companyenter（备份）.vue
index cc3a860..2a97dc0 100644
--- a/src/views/components/ProjectDetails/companyenter（备份）.vue
+++ b/src/views/components/ProjectDetails/companyenter（备份）.vue
@@ -7,20 +7,16 @@
         <span>企业入驻信息</span>
       </div>
       <div class="topright">
+        <!-- 编辑按钮 -->
         <el-button type="primary" size="medium" plain
-          style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;">
+          style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;" @click="toggleEdit">
           <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
-          style="border: none;background-color: rgba(43,98,241,0.1);color: #2B62F1;">
-          <img src="../../../assets/images/detailsicon/icon-dc@2x.png" alt="编辑"
-            style="width: 0.6rem; height: 0.6rem; margin-right: 4px;">
-          导出
+          {{ editMode ? '保存' : '编辑' }}
         </el-button>
       </div>
     </div>
+
     <!-- 内容区上方的表格 -->
     <div class="tagdiv">
       <div class="descriptionsdiv">
@@ -29,147 +25,120 @@
             <template slot="label">
               入驻企业数（家）
             </template>
-            18100000000
+            <el-input v-model="currentCompany.rzqys" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.rzqys }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               入驻企业行业类型
             </template>
-            苏州市
+            <el-input v-model="currentCompany.rzqyhylx" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.rzqyhylx }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               人员数量（人）
             </template>
-            kooriookami
+            <el-input v-model="currentCompany.rysl" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.rysl }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               入住率（%）
             </template>
-            18100000000
+            <el-input v-model="currentCompany.rzl" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.rzl }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               已出租（售）面积（平方米）
             </template>
-            苏州市
+            <el-input v-model="currentCompany.yczmj" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.yczmj }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               空置出租（售）面积（平方米）
             </template>
-            kooriookami
+            <el-input v-model="currentCompany.kzczmj" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.kzczmj }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               工业厂房平均租金（元/平方米*月）
             </template>
-            18100000000
+            <el-input v-model="currentCompany.gycfpjzj" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.gycfpjzj }}</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
               工业厂房平均物业费(元/平方米*月)
             </template>
-            苏州市
+            <el-input v-model="currentCompany.gycfpjwyf" v-if="editMode"></el-input>
+            <span v-else>{{ currentCompany.gycfpjwyf }}</span>
           </el-descriptions-item>
         </el-descriptions>
       </div>
     </div>
-    <!-- 内容区 -->
-    <div class="content">
-      <div class="descriptionsdiv">
-        <span>新增企业入驻</span>
-        <el-table :data="tableData" style="width: 100%">
-          <el-table-column prop="address" label="序号" width="200">
-          </el-table-column>
-          <el-table-column prop="name" label="企业名称" width="300">
-            <template slot-scope="scope">
-              <span style="color: #2B62F1;">{{ scope.row.name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="number" label="统一社会信用代码" width="300">
-          </el-table-column>
-          <el-table-column prop="name" label="所属行业" width="300">
-          </el-table-column>
-          <el-table-column prop="data" label='租金价格' width="250">
-          </el-table-column>
-          <el-table-column prop="data" label='操作' width="200">
-          </el-table-column>
-        </el-table>
-        <div class="block">
-          <div style="visibility: hidden;"></div>
-          <!-- @size-change="handleSizeChange" 
-          @current-change="handleCurrentChange" -->
-          <el-pagination 
-            :current-page="4" :page-sizes="[100, 200, 300, 400]" :page-size="100"
-            layout="total, prev, pager, next, jumper" :total="400">
-          </el-pagination>
-        </div>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
+import { updateqyrz, getqyrzById } from '@/api/ManageApi/index';
+
 export default {
-  props: {
-    size: {
-      type: String,
-      default: '' // 提供默认值
-    }
-  },
   data() {
     return {
-      tableData: [
-        {
-          date: '2016-05-02',
-          name: '大众电脑生成制造基地',
-          number: 123456,
-          address: ' 1518 弄',
-          data: '1000',
-          status: '在建'
-        },
-        {
-          date: '2016-05-04',
-          name: '大众电脑生成制造基地',
-          address: ' 1517 弄',
-          number: 123456,
-          data: '1500',
-          status: '拟建'
-        },
-        {
-          date: '2016-05-01',
-          name: '大众电脑生成制造基地',
-          address: ' 1519 弄',
-          number: 123456,
-          data: '2000',
-          status: '已建'
-        },
-        {
-          date: '2016-05-03',
-          name: '大众电脑生成制造基地',
-          address: ' 1516 弄',
-          number: 123456,
-          data: '2500',
-          status: '在建'
-        }
-      ],
-    }
+      editMode: false, // 编辑模式状态
+      currentCompany: {
+        rzqys: 0, // 入驻企业数
+        rzqyhylx: '', // 入驻企业行业类型
+        rysl: 0, // 人员数量
+        rzl: 0, // 入住率
+        yczmj: 0, // 已出租面积
+        kzczmj: 0, // 空置出租面积
+        gycfpjzj: 0, // 工业厂房平均租金
+        gycfpjwyf: 0, // 工业厂房平均物业费
+      },
+    };
+  },
+  mounted() {
+    this.fetchCompanyData(); // 页面加载时获取数据
   },
   methods: {
-    getStatusColor(status) {
-      switch (status) {
-        case '在建':
-          return 'color: #2DD29F;';
-        case '拟建':
-          return 'color: #F08445;';
-        case '已建':
-          return 'color: #2B62F1;';
+    // 切换编辑模式
+    toggleEdit() {
+      if (this.editMode) {
+        this.saveData(); // 如果是编辑模式，点击后保存数据
+      }
+      this.editMode = !this.editMode; // 切换编辑模式
+    },
+    // 获取企业入驻信息
+    async fetchCompanyData() {
+      try {
+        const response = await getqyrzById(this.$route.params.id);
+        this.currentCompany = response.data; // 更新数据
+      } catch (error) {
+        console.error('获取企业入驻信息失败:', error);
+        this.$message.error('获取企业入驻信息失败');
+      }
+    },
+    // 保存数据
+    async saveData() {
+      try {
+        const response = await updateqyrz(this.currentCompany);
+        if (response.success) {
+          this.$message.success('保存成功');
+        } else {
+          this.$message.error('保存失败');
+        }
+      } catch (error) {
+        console.error('保存失败:', error);
+        this.$message.error('保存失败');
       }
     }
   }
-}
+};
 </script>
 
 <style scoped>
@@ -182,11 +151,6 @@ export default {
   border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
 }
 
-.content {
-  padding: 1rem;
-  display: flex;
-}
-
 .containertop {
   height: auto;
   display: flex;
@@ -221,29 +185,13 @@ export default {
   text-transform: none;
 }
 
-.picturediv {
-  width: 18.31rem;
-  height: 25.31rem;
-  background-color: lightblue;
-}
-
 .descriptionsdiv {
   width: 100%;
   margin-left: 1rem;
   height: auto;
 }
 
-.two-row-item {
-  height: 20rem;
-}
-
 .tagdiv {
   padding: 1rem 3em 1rem 1rem;
 }
-.block{
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  margin-top: 1rem;
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/components/analysis/daiban.vue b/src/views/components/analysis/daiban.vue
new file mode 100644
index 0000000..ddace04
--- /dev/null
+++ b/src/views/components/analysis/daiban.vue
@@ -0,0 +1,67 @@
+<template>
+  <div class="mainbox">
+    <div class="item" v-for="(item, index) in items" :key="index"
+      :class="{ 'gray-background': index % 2 === 0, 'white-background': index % 2 !== 0 }" @click="getInfo(item)">
+      <div>{{ item.xmmc }}</div>
+      <div>{{ item.status }}</div>
+      <div style="color:#7F99DB ;">
+        <span v-if="item.status === '待填报'">去填报</span>
+        <span v-else-if="item.status === '审核通过'">去查看</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Daiban",
+  data() {
+    return {
+      items: [
+        { id: 9, xmmc: '项目A', status: '待填报' },
+        { id: 9, xmmc: '项目B', status: '审核通过' },
+        { id: 9, xmmc: '项目C', status: '待填报' },
+        { id: 9, xmmc: '项目D', status: '审核通过' },
+        { id: 9, xmmc: '项目D', status: '审核通过' },
+      ]
+    };
+  },
+  methods: {
+    getInfo(item) {
+      this.$store.commit("SET_CRUMBS", this.$route.meta.title + "详情");
+      const id = item.id;
+      this.$router.push({ path: `/manage-info/${id}` });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.mainbox {
+  display: flex;
+  flex-direction: column;
+  padding: 0 1rem 0 0;
+  margin-top: 0.5rem;
+  height: 22rem;
+  overflow: auto;
+}
+
+.item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 2rem 1rem;
+  cursor: pointer;
+  /* 添加鼠标指针样式 */
+}
+
+.gray-background {
+  background-color: #f5f5f5;
+  /* 灰色背景 */
+}
+
+.white-background {
+  background-color: #ffffff;
+  /* 白色背景 */
+}
+</style>
\ No newline at end of file
diff --git a/src/views/components/moxintianxie/index.vue b/src/views/components/moxintianxie/index.vue
new file mode 100644
index 0000000..6f61137
--- /dev/null
+++ b/src/views/components/moxintianxie/index.vue
@@ -0,0 +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("表单已重置");
+      },
+      // 取消表单
+      cancelForm() {
+        this.$confirm("确定要取消当前操作吗？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.resetForm();
+            this.$message.info("表单已取消");
+          })
+          .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
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index 1e04658..98f4bb6 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -8,7 +8,9 @@
                 返回
             </el-button>
         </div>
-        <div class="containerbody">
+        <div style="display: flex;justify-content: center;">
+        <el-button type="primary" v-if="isSubmitted" disabled>已提交</el-button></div>
+        <div class="containerbody" v-if="isContainerVisible">
             <!-- 目录 -->
             <div class="containerhead">
                 <el-menu :default-active="activeSection" mode="horizontal" @select="scrollToSection"
@@ -40,9 +42,9 @@
                 <Months></Months>
             </div>
             <!-- 企业入驻信息 -->
-            <!-- <div id="companyenter">
+            <div id="companyenter">
                 <Companyenter></Companyenter>
-            </div> -->
+            </div>
             <!-- 项目画像 -->
             <div id="projectpicture">
                 <Projectpicture></Projectpicture>
@@ -51,10 +53,6 @@
             <div id="projectpicturetwo">
                 <Projectpicturetwo :id="projectId"></Projectpicturetwo>
             </div>
-            <!-- 项目图例 -->
-            <div id="projectpicturetwo">
-                <Projectpicturetwo22 :xmId="projectId"></Projectpicturetwo22>
-            </div>
             <!-- 项目巡礼 -->
             <div id="projectgift">
                 <Projectgift></Projectgift>
@@ -72,7 +70,9 @@
                 <Others :xmId="projectId"></Others>
             </div>
             <div class="footer">
-                <el-button type="primary">审核通过</el-button>
+                <el-button type="primary" v-if="checkRole(['admin','common']) && !isSubmitted">审核通过</el-button>
+                <el-button type="primary" v-if="checkRole(['admin','company']) && !isSubmitted" @click="submitReview">提交审核</el-button>
+
             </div>
         </div>
         <!-- 返回顶部按钮 -->
@@ -84,8 +84,7 @@
 import Title from '../components/ProjectDetails/Title.vue';
 import Basic from '../components/ProjectDetails/Basic.vue';
 import Buildings from '../components/ProjectDetails/Buildings.vue';
-import Projectpicturetwo22 from '../components/ProjectDetails/Projectpicturetwo22.vue';
-// import Companyenter from '../components/ProjectDetails/companyenter.vue';
+import Companyenter from '../components/ProjectDetails/companyenter.vue';
 import Liver from '../components/ProjectDetails/Liver.vue';
 import Memo from '../components/ProjectDetails/Memo.vue';
 import Models from '../components/ProjectDetails/Models.vue';
@@ -95,14 +94,14 @@ import Projectgift from '../components/ProjectDetails/Projectgift.vue';
 import Projectpicture from '../components/ProjectDetails/Projectpicture.vue';
 import Projectpicturetwo from '../components/ProjectDetails/Projectpicturetwo.vue';
 import Others from '../components/ProjectDetails/Others.vue';
+import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 
 export default {
     components: {
         Title,
         Basic,
         Buildings,
-        Projectpicturetwo22,
-        // Companyenter,
+        Companyenter,
         Liver,
         Memo,
         Models,
@@ -130,7 +129,9 @@ export default {
                 { id: 'memo', label: '项目备忘录' },
                 { id: 'others', label: '其他信息' }
             ],
-            projectId: null
+            projectId: null,
+            isContainerVisible: true, // 控制 containerbody 的显示状态
+            isSubmitted: false // 控制提交审核按钮的状态和文本内容
         };
     },
     created() {
@@ -139,6 +140,8 @@ export default {
         this.loadData();
     },
     methods: {
+        checkPermi,
+        checkRole,
         loadData() {
             // 根据 projectId 加载数据的逻辑
             console.log('Loading data for project ID:', this.projectId);
@@ -163,6 +166,31 @@ export default {
         goBack() {
             this.$router.go(-1); // 返回上一个页面
         },
+        submitReview() {
+            this.$confirm('确定要提交审核吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                // 提交审核的逻辑
+                console.log('提交审核');
+                // 隐藏 containerbody
+                this.isContainerVisible = false;
+                // 设置按钮为已提交状态
+                this.isSubmitted = true;
+                // 可以在这里调用提交审核的 API
+                // submitReviewApi(this.projectId).then(response => {
+                //     console.log('审核提交成功', response);
+                // }).catch(error => {
+                //     console.error('审核提交失败', error);
+                // });
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消提交'
+                });
+            });
+        }
     }
 };
 </script>
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index 5c18256..91ad6e4 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -47,10 +47,26 @@
       <div class="tablehead">
         <div class="headtitle"><span>项目清单</span></div>
         <div class="headbtn">
-          <el-button type="primary" icon="el-icon-download" @click="downloadTemplate">下载模板</el-button>
-          <el-button type="primary" size="mini" @click="handleImport">批量导入</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="importTemplate">下载模板</el-button>
+          <el-button type="primary" size="mini" @click="handleImport">导入</el-button> <!-- 导入按钮 -->
         </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">
@@ -77,7 +93,7 @@
         <el-table-column label="项目名称" align="center" prop="name" width="200" />
         <el-table-column label="现状分类" align="center" prop="xzfl" />
         <el-table-column label="项目法人单位" align="center" prop="xmfrdwxz" width="200" />
-        <el-table-column label="项目建设起止时间" align="center"  width="200">
+        <el-table-column label="项目建设起止时间" align="center" width="200">
           <template slot-scope="scope">
             {{ scope.row.begainTime }} 至 {{ scope.row.endTime }}
           </template>
@@ -103,15 +119,16 @@
 </template>
 
 <script>
-import { getBasicInformationPage } from '@/api/ManageApi/index';
+import { getBasicInformationPage } from "@/api/ManageApi/index";
+import { getToken } from "@/utils/auth";
 
 export default {
   name: "Post",
-  dicts: ['xzfl'],
+  dicts: ["xzfl"],
   data() {
     return {
       // 遮罩层
-      loading: false,
+      loading: true,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -130,10 +147,6 @@ export default {
         '待填报': '#FFBF6B',
         '待审核': '#7693D8'
       },
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -144,24 +157,13 @@ export default {
         dateRange: [],
         status: undefined
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      
-      },
-      // 用户导入参数
+      // 导入相关数据
       upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "导入",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 上传的地址
-        url: location.origin + "/api/system/post/importData"
+        open: false, // 是否显示导入弹窗
+        isUploading: false, // 是否正在上传
+        updateSupport: 0, // 是否更新已存在数据
+        headers: { Authorization: "Bearer " + getToken() }, // 上传请求头
+        url: process.env.VUE_APP_BASE_API + "/gysl/basicInformation/import", // 上传地址
       },
     };
   },
@@ -169,110 +171,79 @@ export default {
     this.getList();
   },
   methods: {
-    // 导入
+    /** 查询项目列表 */
+    getList() {
+      this.loading = true;
+      getBasicInformationPage(this.queryParams).then((response) => {
+        this.postList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+
+    /** 导入按钮操作 */
     handleImport() {
       this.upload.open = true;
     },
+
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download(
+        "/gysl/basicInformation/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.$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();
     },
-    /** 查询项目列表 */
-    getList() {
-      this.loading = true;
-      const params = {
-        ...this.queryParams,
-        current: this.queryParams.pageNum,
-        size: this.queryParams.pageSize,
-        startTime: this.queryParams.dateRange ? this.queryParams.dateRange[0] : undefined,
-        endTime: this.queryParams.dateRange ? this.queryParams.dateRange[1] : undefined,
-        name: this.queryParams.postName,
-        xmfrdwxz: this.queryParams.xmfrdwxz,
-        xzfl: this.queryParams.postCode
-      };
-      getBasicInformationPage(params).then(response => {
-        const defaultStatusColors = {
-          '审核通过': '#6EDABE',
-          '待填报': '#FFBF6B',
-          '待审核': '#7693D8'
-        };
-        const defaultTotalLandAreas = [5000, 6000, 7000]; // 假设默认的用地面积
 
-        this.postList = response.data.records.map((item, index) => ({
-          ...item,
-          status: item.status || Object.keys(defaultStatusColors)[index % Object.keys(defaultStatusColors).length],
-          totalLandArea: item.totalLandArea || defaultTotalLandAreas[index % defaultTotalLandAreas.length]
-        }));
-        this.total = response.data.total;
-        this.loading = false;
-      }).catch(error => {
-        console.error('获取项目列表失败', error);
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        postCode: undefined,
-        postName: undefined,
-        postSort: undefined,
-        status: "0",
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 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 = "添加项目";
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/gysl/basicInformation/exportInfo",
+        {
+          ...this.queryParams,
+        },
+        `项目列表${new Date().getTime()}.xlsx`
+      );
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids[0];
-      const foundItem = this.postList.find(item => item.id === id);
-      if (foundItem) {
-        this.form = { ...foundItem };
-        this.open = true;
-        this.title = "修改项目";
-      } else {
-        console.error('项目未找到');
-      }
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除项目id为"' + ids + '"的数据项？')
+        .then(() => {
+          return delBasicInformation(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => { });
     },
     /** 详情按钮操作 */
     getInfo(row) {
@@ -280,99 +251,18 @@ export default {
       const id = row.id || this.ids[0];
       this.$router.push({ path: `/manage-info/${id}` });
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            const index = this.postList.findIndex(item => item.id === this.form.id);
-            if (index !== -1) {
-              this.postList.splice(index, 1, { ...this.form });
-              this.$modal.msgSuccess("修改成功");
-            } else {
-              console.error('项目未找到');
-            }
-          } else {
-            this.form.id = this.postList.length + 1;
-            this.postList.push({ ...this.form });
-            this.$modal.msgSuccess("新增成功");
-          }
-          this.open = false;
-          this.getList();
-        }
-      });
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids.join(',');
-      this.postList = this.postList.filter(item => !ids.split(',').includes(String(item.id)));
-      this.$modal.msgSuccess("删除成功");
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/post/export', {
-        ...this.queryParams
-      }, `post_${new Date().getTime()}.xlsx`);
-    },
-    handleExportCommand(command) {
-      let fileName = '';
-      switch (command) {
-        case 'single-material':
-          fileName = 'single-material';
-          break;
-        case 'report':
-          fileName = 'report';
-          break;
-        case 'project-manual':
-          fileName = 'project-manual';
-          break;
-        default:
-          this.$message.error('未知的导出类型');
-          return;
-      }
-      this.download(`system/post/export/${fileName}`, {
-        ...this.queryParams
-      }, `${fileName}_${new Date().getTime()}.xlsx`).then(() => {
-        this.$message.success('下载成功');
-      }).catch(() => {
-        this.$message.error('下载失败');
-      });
-    },
-    download(url, params, fileName) {
-      return new Promise((resolve, reject) => {
-        const request = new XMLHttpRequest();
-        request.open('GET', `${process.env.VUE_APP_BASE_API}/${url}`, true);
-        request.responseType = 'blob';
-        request.onload = () => {
-          if (request.status === 200) {
-            const blob = new Blob([request.response], { type: 'application/vnd.ms-excel' });
-            const link = document.createElement('a');
-            link.href = window.URL.createObjectURL(blob);
-            link.download = fileName;
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-            resolve();
-          } else {
-            reject(new Error('下载失败'));
-          }
-        };
-        request.onerror = () => {
-          reject(new Error('下载失败'));
-        };
-        request.send();
-      });
-    },
-    // 下载模板
-    downloadTemplate() {
-      this.download('system/post/template', {}, `template_${new Date().getTime()}.xlsx`).then(() => {
-        this.$message.success('模板下载成功');
-      }).catch(() => {
-        this.$message.error('模板下载失败');
-      });
-    }
-  }
+  },
 };
 </script>
 
diff --git a/src/views/models/manages/index.vue b/src/views/models/manages/index.vue
index 90564bd..4c5e52c 100644
--- a/src/views/models/manages/index.vue
+++ b/src/views/models/manages/index.vue
@@ -1,106 +1,146 @@
 <template>
     <div>
-        <div class="headerbox">
-            <el-form size="small" :inline="true" label-width="7rem">
-                <el-row style="margin-top: 1rem;">
-                    <el-col :span="6">
-                        <el-form-item label="关键要素" style="width: 100%;">
-                            <el-input placeholder="请输入关键要素" clearable style="width: 14rem;"
-                                v-model="searchForm.keyElement" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="具体指标" style="width: 100%;">
-                            <el-input placeholder="请输入具体指标" clearable style="width: 14rem;"
-                                v-model="searchForm.specificIndicator" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="8">
-                        <el-form-item style="margin-left: 2.5rem;">
-                            <el-button type="primary" icon="el-icon-search" size="mini"
-                                @click="fetchElements">查询</el-button>
-                            <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </div>
+        <div v-if="checkRole(['admin', 'common'])">
+            <div class="headerbox">
+                <el-form size="small" :inline="true" label-width="7rem">
+                    <el-row style="margin-top: 1rem;">
+                        <el-col :span="6">
+                            <el-form-item label="关键要素" style="width: 100%;">
+                                <el-input placeholder="请输入关键要素" clearable style="width: 14rem;"
+                                    v-model="searchForm.keyElement" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="具体指标" style="width: 100%;">
+                                <el-input placeholder="请输入具体指标" clearable style="width: 14rem;"
+                                    v-model="searchForm.specificIndicator" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="8">
+                            <el-form-item style="margin-left: 2.5rem;">
+                                <el-button type="primary" icon="el-icon-search" size="mini"
+                                    @click="fetchElements">查询</el-button>
+                                <el-button icon="el-icon-refresh" size="mini" @click="resetSearchForm">重置</el-button>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                </el-form>
+            </div>
 
-        <div class="tablebox" style="margin: .5rem;">
-            <el-button type="primary" icon="el-icon-plus" @click="dialogVisible = true; resetForm()">新增要素</el-button>
+            <div class="tablebox" style="margin: .5rem;">
+                <el-button type="primary" icon="el-icon-plus"
+                    @click="dialogVisible = true; resetForm()">新增要素</el-button>
 
-            <!-- 渲染所有要素 -->
-            <div v-for="(element, index) in tableData" :key="index" class="tablebox">
-                <div class="boxheader">
-                    <div class="headerone">
-                        <!-- 关键要素/重要要素 -->
-                        <div>{{ element.type === 1 ? '关键要素' : '重要要素' }}：</div>
-                        <!-- 关键要素/重要要素的名称 -->
-                        <div>{{ element.name }}</div>
-                    </div>
-                    <!-- 对要素的类型和名称进行编辑 -->
-                    <div class="headertwo">
-                        <el-button type="primary" icon="el-icon-edit" size="mini"
-                            @click="handleUpdate(element)">编辑要素</el-button>
-                        <el-button type="primary" icon="el-icon-edit"
-                            @click="showAddIndicatorDialog(element)">新增指标</el-button>
+                <!-- 渲染所有要素 -->
+                <div v-for="(element, index) in tableData" :key="index" class="tablebox">
+                    <div class="boxheader">
+                        <div class="headerone">
+                            <!-- 关键要素/重要要素 -->
+                            <div>{{ element.type === 1 ? '关键要素' : '重要要素' }}：</div>
+                            <!-- 关键要素/重要要素的名称 -->
+                            <div>{{ element.name }}</div>
+                        </div>
+                        <!-- 对要素的类型和名称进行编辑 -->
+                        <div class="headertwo">
+                            <el-button type="primary" icon="el-icon-edit" size="mini"
+                                @click="handleUpdate(element)">编辑要素</el-button>
+                            <el-button type="primary" icon="el-icon-edit"
+                                @click="showAddIndicatorDialog(element)">新增指标</el-button>
+                        </div>
                     </div>
+                    <!-- 每个要素对应的指标和详细要求的展示，这里编辑和删除只是删除这个指标（不删除要素） -->
+                    <el-table :data="element.indicators" style="width: 100%">
+                        <el-table-column prop="id" label="序号" width="180"></el-table-column>
+                        <el-table-column prop="jtzb" label="具体指标" width="180"></el-table-column>
+                        <el-table-column prop="xxyq" label="详细要求" width="950"></el-table-column>
+                        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="text"
+                                    @click="handleUpdateIndicator(scope.row)">编辑指标</el-button>
+                                <el-button size="mini" type="text" @click="handleDelete(scope.row)"
+                                    style="color: #F25353;">删除指标</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
                 </div>
-                <!-- 每个要素对应的指标和详细要求的展示，这里编辑和删除只是删除这个指标（不删除要素） -->
-                <el-table :data="element.indicators" style="width: 100%">
-                    <el-table-column prop="id" label="序号" width="180"></el-table-column>
-                    <el-table-column prop="jtzb" label="具体指标" width="180"></el-table-column>
-                    <el-table-column prop="xxyq" label="详细要求" width="950"></el-table-column>
-                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                        <template slot-scope="scope">
-                            <el-button size="mini" type="text" @click="handleUpdateIndicator(scope.row)">编辑指标</el-button>
-                            <el-button size="mini" type="text" @click="handleDelete(scope.row)" style="color: #F25353;">删除指标</el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
             </div>
+
+            <!-- 这是新增要素/编辑要素弹窗 -->
+            <el-dialog :title="form.id ? '编辑要素' : '新增要素'" :visible.sync="dialogVisible" width="30%">
+                <el-form :model="form" label-width="80px">
+                    <el-form-item label="类型">
+                        <el-select v-model="form.type" placeholder="请选择类型">
+                            <el-option v-for="dict in dict.type.yslx" :key="dict.value" :label="dict.label"
+                                :value="parseInt(dict.value)"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="名称">
+                        <el-input v-model="form.name" placeholder="请输入名称"></el-input>
+                    </el-form-item>
+                </el-form>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="handleAddElement">确 定</el-button>
+                </span>
+            </el-dialog>
+
+            <!-- 这是新增指标/编辑指标弹窗 -->
+            <el-dialog :title="indicatorForm.id ? '编辑指标' : '新增指标'" :visible.sync="indicatorDialogVisible" width="30%">
+                <el-form :model="indicatorForm" label-width="80px">
+                    <el-form-item label="具体指标">
+                        <el-input v-model="indicatorForm.jtzb" placeholder="请输入具体指标"></el-input>
+                    </el-form-item>
+                    <el-form-item label="详细内容">
+                        <el-input v-model="indicatorForm.xxyq" placeholder="请输入详细要求"></el-input>
+                    </el-form-item>
+                </el-form>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="indicatorDialogVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="handleAddIndicator">确 定</el-button>
+                </span>
+            </el-dialog>
         </div>
+        <div v-if="checkRole(['admin', 'company'])">
+            <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-dialog :title="form.id ? '编辑要素' : '新增要素'" :visible.sync="dialogVisible" width="30%">
-            <el-form :model="form" label-width="80px">
-                <el-form-item label="类型">
-                    <el-select v-model="form.type" placeholder="请选择类型">
-                        <el-option v-for="dict in dict.type.yslx" :key="dict.value" :label="dict.label"
-                            :value="parseInt(dict.value)"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="名称">
-                    <el-input v-model="form.name" placeholder="请输入名称"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="handleAddElement">确 定</el-button>
-            </span>
-        </el-dialog>
+                    <!-- 填报类型 -->
+                    <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-dialog :title="indicatorForm.id ? '编辑指标' : '新增指标'" :visible.sync="indicatorDialogVisible" width="30%">
-            <el-form :model="indicatorForm" label-width="80px">
-                <el-form-item label="具体指标">
-                    <el-input v-model="indicatorForm.jtzb" placeholder="请输入具体指标"></el-input>
-                </el-form-item>
-                <el-form-item label="详细内容">
-                    <el-input v-model="indicatorForm.xxyq" placeholder="请输入详细要求"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="indicatorDialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="handleAddIndicator">确 定</el-button>
-            </span>
-        </el-dialog>
+                    <!-- 操作按钮 -->
+                    <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>
 </template>
 
 <script>
-import { addElement, getAllElements } from '@/api/ManageApi/index'; 
-
+import { addElement, getAllElements } from '@/api/ManageApi/index';
+import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 export default {
     dicts: ['yslx'],
     data() {
@@ -114,18 +154,34 @@ export default {
             indicatorDialogVisible: false, // 控制新增/编辑指标弹窗的显示
             form: {
                 id: null,
+                companyName: "XXXXXX公司", // 公司名称
+                projectName: "", // 项目名称
                 type: '',
-                name: ''
+                name: '',
+                tableData: [
+                    { label: "危险品等级", value: "" },
+                    { label: "生产火灾危险等级", value: "" },
+                    { label: "设备载重", value: "" },
+                    { label: "货梯要求", value: "" },
+                    { label: "员工密度", value: "" },
+                    { label: "加工精度", value: "" },
+                    { label: "减振措施", value: "" },
+                    { label: "环境保护", value: "" },
+                    { label: "生产类型", value: "" },
+                    { label: "层高要求", value: "" },
+                ],
             },
             indicatorForm: {
                 id: null,
                 jtzb: '',
                 xxyq: '',
-                elementId: null 
+                elementId: null
             }
         };
     },
     methods: {
+        checkPermi,
+        checkRole,
         // 查询要素
         fetchElements() {
             getAllElements(this.searchForm).then(response => {
@@ -230,4 +286,12 @@ export default {
 .headertwo {
     display: flex;
 }
+.form-container {
+  max-width: 1500px;
+  margin: 20px auto;
+  padding: 20px;
+  background-color: #fff;
+  border-radius: 8px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
 </style>
\ No newline at end of file
diff --git a/src/views/onecailiao-info/index.vue b/src/views/onecailiao-info/index.vue
deleted file mode 100644
index 601796d..0000000
--- a/src/views/onecailiao-info/index.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    <div>123123</div>
-</template>
\ No newline at end of file
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 91bfd6b..5237eb2 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -53,7 +53,10 @@
     </div>
     <div class="grid-item item-6">
       <!-- 地图模块 -->
-      <div>
+      <div class="mapareaone">
+        <div style="position: absolute; top: 2rem;left: 5rem; z-index: 999;">
+          <el-input  placeholder="请输入项目名称" />
+        </div>
         <MapArea />
       </div>
     </div>
@@ -183,4 +186,7 @@ export default {
   grid-column: span 3;
   /* 占三列 */
 }
+.mapareaone{
+  position: relative;
+}
 </style>
diff --git a/src/views/tongjifenxi/index.vue b/src/views/tongjifenxi/index.vue
index 3727b20..2d087f7 100644
--- a/src/views/tongjifenxi/index.vue
+++ b/src/views/tongjifenxi/index.vue
@@ -1,159 +1,265 @@
 <template>
-
-    <div class="grid-container">
-      <div class="grid-item item-1">
-        <!-- 整体项目情况 -->
-        <div class="allarea">
-          <AllArea />
-        </div>
+  <div class="grid-container">
+    <div class="grid-item item-1">
+      <!-- 整体项目情况 -->
+      <div class="allarea">
+        <AllArea />
       </div>
-      <div class="grid-item item-2">
-        <!-- 消息通知 -->
-        <div class="itemhead">
-          <span>消息通知</span>
-        </div>
-        <div class="mainarea">
-          <Message />
-        </div>
+    </div>
+    <div class="grid-item item-2">
+      <!-- 消息通知 -->
+      <div class="itemhead">
+        <span>消息通知</span>
       </div>
-      <div class="grid-item item-1">
-        <!-- 整体项目情况 -->
-        <div class="allarea">
-
-        </div>
+      <div class="mainarea">
+        <Message />
       </div>
-      <div class="grid-item item-2">
-        <!-- 消息通知 -->
-        <div class="itemhead">
-          <span>我的待办</span>
-        </div>
-        <div class="mainarea">
+    </div>
+    <div class="grid-item item-1">
+      <!-- 整体项目情况 -->
+      <div class="allarea">
+      </div>
+    </div>
+    <div class="grid-item item-2 bottombox">
+      <!-- 消息通知 -->
+      <div class="itemhead">
+        <span>关联项目</span>
+      </div>
+      <div class="mainarea" style="height: 22rem;overflow: auto;">
+        <div class="mainareaitem" v-for="(item, index) in items" :key="index">
+          <div class="itemleft">
+            <div class="xmmctitle">{{ item.xmmc }}</div>
+            <div class="lefttwo">
+              <div>现状分类：{{ item.xcfl }}</div>
+              <div>总投资额：{{ item.ztzje }}</div>
+              <div>填报时间：{{ item.tbrq }}</div>
+            </div>
+          </div>
+          <div class="itemright" :class="getStatusClass(item.status)">
+            <div class="rightword">{{ item.status }}</div>
+          </div>
         </div>
       </div>
     </div>
-  </template>
-  
-  <script>
-  import AllArea from '@/views/components/analysis/all.vue'
-  import FunctionArea from '@/views/components/analysis/function.vue'
-  import InvestArea from '@/views/components/analysis/invest.vue'
-  import Message from '@/views/components/analysis/message.vue'
-  import ProjectList from '@/views/components/analysis/projectList.vue'
-  import MapArea from '@/views/components/analysis/map.vue'
-  
-  export default {
-    name: "Pc2FbEcharts",
-    components: {
-      AllArea,
-      FunctionArea,
-      InvestArea,
-      Message,
-      ProjectList,
-      MapArea,
-    },
-    data() {
-      return {};
-    },
-    mounted() {
-  
-    },
-    methods: {
-  
-    },
-  };
-  </script>
-  
-  <style scoped>
-  .grid-container {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    /* 三列 */
-    grid-template-rows: auto auto auto;
-    /* 三行 */
-    gap: 1rem;
-    /* 模块之间的间隔 */
-    padding: 1rem;
-    /* 容器内边距 */
-  }
-  
-  .grid-item {
-    background-color: #FFFFFF;
-    border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
-  }
-  
-  .itemhead {
-    width: 100%;
-    border-left: 0.25rem solid #2B62F1;
-    margin: 0.94rem 0;
-    height: 1.25rem;
-    display: flex;
-    align-items: center;
-  }
-  .relaitem{
-    position: relative;
-  }
-  .itemsall{
-    position: absolute;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    top: 5.5rem;
-    left: 7.2rem;
-  }
-  .itemsall span:nth-child(1){
-    font-family: DIN, DIN;
-    font-weight: 500;
-    font-size: 1.75rem;
-    color: #292C33;
-    line-height: 2.44rem;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .itemsall span:nth-child(2){
-    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
-    font-weight: 400;
-    font-size: 0.88rem;
-    color: #9E9E9E;
-    line-height: 1.25rem;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .itemhead span {
-    margin-left: 1rem;
-    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
-    font-weight: 600;
-    font-size: 1rem;
-    color: #3D424C;
-    line-height: 1.69rem;
-    text-align: left;
-    font-style: normal;
-    text-transform: none;
-  }
-  .mainarea{
-    padding: 0rem 0rem 0 1.4rem;
-    overflow: auto;
-  }
-  
-  /* 第一行：第一个模块占两列 */
-  .item-1 {
-    grid-column: span 2;
-    background-image: url(../../../src/assets/images/allbg.png);
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-  }
-  
-  .allarea {
-    width: 100%;
-    height: 14.5rem;
-    padding: 1rem 1.5rem;
-  }
-  
-  /* 最后一行：一个模块占一整行 */
-  .item-6 {
-    grid-column: span 3;
-    /* 占三列 */
-  }
-  </style>
\ No newline at end of file
+    <div class="grid-item item-2">
+      <!-- 消息通知 -->
+      <div class="itemhead">
+        <span>我的待办</span>
+      </div>
+      <div class="mainarea">
+        <daiban />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import AllArea from '@/views/components/analysis/all.vue'
+import FunctionArea from '@/views/components/analysis/function.vue'
+import InvestArea from '@/views/components/analysis/invest.vue'
+import Message from '@/views/components/analysis/message.vue'
+import daiban from '@/views/components/analysis/daiban.vue'
+
+export default {
+  name: "Pc2FbEcharts",
+  components: {
+    AllArea,
+    FunctionArea,
+    InvestArea,
+    Message,
+    daiban
+  },
+  data() {
+    return {
+      items: [
+        { xmmc: '项目A', xcfl: '分类1', ztzje: '100万', tbrq: '2023-10-01', status: '待填报' },
+        { xmmc: '项目B', xcfl: '分类2', ztzje: '200万', tbrq: '2023-10-02', status: '待审核' },
+        { xmmc: '项目C', xcfl: '分类3', ztzje: '300万', tbrq: '2023-10-03', status: '审核通过' },
+        { xmmc: '项目D', xcfl: '分类3', ztzje: '300万', tbrq: '2023-10-03', status: '待填报' },
+      ]
+    };
+  },
+  mounted() {
+
+  },
+  methods: {
+    getStatusClass(status) {
+      switch (status) {
+        case '待填报':
+          return 'status-red';
+        case '待审核':
+          return 'status-yellow';
+        case '审核通过':
+          return 'status-green';
+        default:
+          return '';
+      }
+    }
+  },
+};
+</script>
+
+<style scoped>
+.grid-container {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  /* 三列 */
+  grid-template-rows: auto auto auto;
+  /* 三行 */
+  gap: 1rem;
+  /* 模块之间的间隔 */
+  padding: 1rem;
+  /* 容器内边距 */
+}
+
+.grid-item {
+  background-color: #FFFFFF;
+  border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
+}
+
+.itemhead {
+  width: 100%;
+  border-left: 0.25rem solid #2B62F1;
+  margin: 0.94rem 0;
+  height: 1.25rem;
+  display: flex;
+  align-items: center;
+}
+
+.relaitem {
+  position: relative;
+}
+
+.itemsall {
+  position: absolute;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  top: 5.5rem;
+  left: 7.2rem;
+}
+
+.itemsall span:nth-child(1) {
+  font-family: DIN, DIN;
+  font-weight: 500;
+  font-size: 1.75rem;
+  color: #292C33;
+  line-height: 2.44rem;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+
+.itemsall span:nth-child(2) {
+  font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+  font-weight: 400;
+  font-size: 0.88rem;
+  color: #9E9E9E;
+  line-height: 1.25rem;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+
+.itemhead span {
+  margin-left: 1rem;
+  font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+  font-weight: 600;
+  font-size: 1rem;
+  color: #3D424C;
+  line-height: 1.69rem;
+  text-align: left;
+  font-style: normal;
+  text-transform: none;
+}
+
+.mainarea {
+  padding: 0rem 0rem 0 1.4rem;
+  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+/* 第一行：第一个模块占两列 */
+.item-1 {
+  width: 67rem;
+  background-image: url(../../../src/assets/images/allbg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+}
+
+.allarea {
+  width: 80rem;
+  height: 14.5rem;
+  padding: 1rem 1.5rem;
+}
+
+/* 最后一行：一个模块占一整行 */
+.item-6 {
+  grid-column: span 3;
+  /* 占三列 */
+}
+
+.mainareaitem {
+  /* padding: .5rem 0 .5rem .5rem; */
+  display: flex;
+  justify-content: space-between;
+  border: 1px solid #ccc;
+  margin: 0 1rem 0 0;
+
+}
+
+.itemleft {
+  padding: .5rem 0 .5rem .5rem;
+  display: flex;
+  flex-direction: column;
+  width: 70%;
+  gap: 1rem;
+}
+
+.itemright {
+  width: 8rem;
+  height: 5rem;
+  display: flex;
+  color: white;
+  font-size: 1rem;
+  position: relative;
+  clip-path: polygon(0 0, 100% 0, 101% 100%);
+  justify-content: flex-end;
+  align-items: flex-start;
+}
+
+.rightword {
+  transform: rotate(32deg);
+  margin-top: -0.3rem;
+  padding: 25px 0.5rem 2px 5px;
+}
+
+.status-red {
+  background-color: #FFC77C;
+}
+
+.status-yellow {
+  background-color: #7F99DB;
+}
+
+.status-green {
+  background-color: #74DCC1;
+}
+
+.bottombox {
+  height: 26rem;
+}
+
+.xmmctitle {
+  color: #2B62F1;
+}
+
+.lefttwo {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 619d314..5389993 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -31,12 +31,13 @@ module.exports = {
   // webpack-dev-server 相关配置
   devServer: {
     host: '0.0.0.0',
+    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.111:7071`,
+        target: `http://192.168.0.111:7071/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''