From a4d7fe8873710bcd106f91aa3d8163b051108d97 Mon Sep 17 00:00:00 2001
From: yanfeiyong <2060201549@qq.com>
Date: Fri, 7 Mar 2025 15:42:41 +0800
Subject: [PATCH] 1

---
 src/views/components/ProjectDetails/Basic.vue |  10 +-
 src/views/components/ProjectDetails/Memo.vue  |  90 ++++++--
 .../components/ProjectDetails/Others.vue      | 202 ++++++++++++++++++
 .../ProjectDetails/Projectpicturetwo.vue      |   6 +-
 src/views/manage-info/index.vue               |  11 +-
 5 files changed, 297 insertions(+), 22 deletions(-)
 create mode 100644 src/views/components/ProjectDetails/Others.vue

diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue
index c882b73..5ed5f9f 100644
--- a/src/views/components/ProjectDetails/Basic.vue
+++ b/src/views/components/ProjectDetails/Basic.vue
@@ -105,6 +105,7 @@
     </div>
 </template>
 
+
 <script>
 import { getBasicInformationById, updateBasicInformation } from '@/api/ManageApi/index';
 
@@ -187,13 +188,16 @@ export default {
         handleExport() {
             this.download('system/post/export', {
                 ...this.queryParams
-            }, `post_${new Date().getTime()}.xlsx`)
+            }, `post_${new Date().getTime()}.xlsx`);
         },
         edit() {
             this.dialogVisible = true;
         },
         saveForm() {
-            updateBasicInformation(this.form)
+            // 确保 form 数据是一个有效的对象
+            const formData = { ...this.form };
+
+            updateBasicInformation(formData)
                 .then(response => {
                     console.log('Data saved successfully:', response.data);
                     this.$message.success('数据保存成功！');
@@ -210,6 +214,8 @@ export default {
 };
 </script>
 
+
+
 <style scoped>
 .container {
     display: flex;
diff --git a/src/views/components/ProjectDetails/Memo.vue b/src/views/components/ProjectDetails/Memo.vue
index ecdb132..3b0f6f1 100644
--- a/src/views/components/ProjectDetails/Memo.vue
+++ b/src/views/components/ProjectDetails/Memo.vue
@@ -8,7 +8,8 @@
             </div>
             <div class="topright">
                 <el-button type="primary" icon="el-icon-edit" size="medium" plain style="border: none;"> 导入</el-button>
-                <el-button type="primary" icon="el-icon-upload" size="medium" plain style="border: none;"> 导出</el-button>
+                <el-button type="primary" icon="el-icon-upload" size="medium" plain style="border: none;">
+                    导出</el-button>
             </div>
         </div>
         <div class="content">
@@ -22,16 +23,22 @@
                     </el-form-item>
                 </el-form>
             </div>
-            <div class="descriptionsdiv">
-                <el-tag :key="tag" v-for="tag in dynamicTags" closable :disable-transitions="false"
-                    @close="handleClose(tag)">
-                    {{ tag }}
-                </el-tag>
-                <el-input class="input-new-tag" v-if="inputVisible" v-model="inputValue" ref="saveTagInput" size="small"
-                    @keyup.enter.native="handleInputConfirm" @blur="handleInputConfirm">
-                </el-input>
-                <el-button v-else class="button-new-tag" size="small" @click="showInput">+ New Tag</el-button>
-
+            <div class="descriptionsdivnext">
+                <div class="descriptionditem">
+                    <div class="itemone">2024-09-28</div>
+                    <div class="itemtwo">该项目已完工，需继续更新</div>
+                    <div class="itemthree">2024-09-28</div>
+                </div>
+                <div class="descriptionditem">
+                    <div class="itemone">2024-09-28</div>
+                    <div class="itemtwo">该项目已完工，需继续更新</div>
+                    <div class="itemthree">2024-09-28</div>
+                </div>
+                <div class="descriptionditem">
+                    <div class="itemone">2024-09-28</div>
+                    <div class="itemtwo">该项目已完工，需继续更新</div>
+                    <div class="itemthree">2024-09-28</div>
+                </div>
             </div>
         </div>
     </div>
@@ -47,7 +54,7 @@ export default {
             form: {
                 name: '',
                 region: '',
-                date1: null, // 确保初始值为 null 或者一个默认日期
+                date1: null,
                 date2: '',
                 delivery: false,
                 type: [],
@@ -59,7 +66,7 @@ export default {
     methods: {
         onSubmit() {
             console.log('submit!');
-            console.log(this.form); // 确保在提交时可以正确读取 form 数据
+            console.log(this.form);
         },
         handleClose(tag) {
             this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
@@ -99,7 +106,7 @@ export default {
     padding: 1rem;
     display: flex;
     flex-direction: column;
-    gap: 2rem;
+    gap: 1rem;
 }
 
 .containertop {
@@ -159,4 +166,59 @@ export default {
     margin-left: 10px;
     vertical-align: bottom;
 }
+
+.descriptionsdivnext {
+    display: flex;
+    height: 8rem;
+    margin-top: -1rem;
+    gap: 1rem;
+}
+
+.descriptionditem {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    width: 21.75rem;
+    height: 7rem;
+    background: #FBFCFF;
+    border-radius: 0.25rem 0.25rem 0.25rem 0.25rem;
+    border: 0.06rem solid #E6E6E6;
+    padding: .5rem;
+}
+
+.itemone {
+    width: 5.88rem;
+    height: 0.88rem;
+    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-weight: 500;
+    font-size: 0.88rem;
+    color: #3D424C;
+    line-height: 0.88rem;
+    font-style: normal;
+    text-transform: none;
+}
+
+.itemtwo {
+    width: 100%;
+    height: 2rem;
+    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-weight: 400;
+    font-size: 0.88rem;
+    color: #3D424C;
+    line-height: 0.88rem;
+    font-style: normal;
+    text-transform: none;
+}
+
+.itemthree {
+    width: 6.06rem;
+    height: 0.88rem;
+    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-weight: 400;
+    font-size: 0.88rem;
+    color: #808080;
+    line-height: 0.88rem;
+    font-style: normal;
+    text-transform: none;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Others.vue b/src/views/components/ProjectDetails/Others.vue
new file mode 100644
index 0000000..1c187f9
--- /dev/null
+++ b/src/views/components/ProjectDetails/Others.vue
@@ -0,0 +1,202 @@
+<template>
+    <div class="container">
+      <!-- 顶部信息 -->
+      <div class="containertop">
+        <div class="topleft">
+          <img src="../../../assets/images/detailsicon/1.png" alt="">
+          <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;">
+            <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;">
+            导出
+          </el-button>
+        </div>
+      </div>
+      <!-- 内容区上方的表格 -->
+      <div class="tagdiv">
+        <div class="descriptionsdiv">
+          <el-descriptions class="margin-top" :column="4" border>
+            <el-descriptions-item>
+              <template slot="label">
+                改造前容积率
+              </template>
+              18100000000
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                改造后容积率
+              </template>
+              苏州市
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                亩均税收（万元/每亩）
+              </template>
+              kooriookami
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                亩均销售（万元/每亩）
+              </template>
+              18100000000
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                贷款情况
+              </template>
+              苏州市
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                荣誉情况
+              </template>
+              苏州市
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    props: {
+      size: {
+        type: String,
+        default: '' // 提供默认值
+      }
+    },
+    data() {
+      return {
+        tableData: [
+          {
+            date: '2016-05-02',
+            name: '大众电脑生成制造基地',
+            address: ' 1518 弄',
+            data: '1000',
+            status: '在建'
+          },
+          {
+            date: '2016-05-04',
+            name: '大众电脑生成制造基地',
+            address: ' 1517 弄',
+            data: '1500',
+            status: '拟建'
+          },
+          {
+            date: '2016-05-01',
+            name: '大众电脑生成制造基地',
+            address: ' 1519 弄',
+            data: '2000',
+            status: '已建'
+          },
+          {
+            date: '2016-05-03',
+            name: '大众电脑生成制造基地',
+            address: ' 1516 弄',
+            data: '2500',
+            status: '在建'
+          }
+        ],
+      }
+    },
+    methods: {
+      getStatusColor(status) {
+        switch (status) {
+          case '在建':
+            return 'color: #2DD29F;';
+          case '拟建':
+            return 'color: #F08445;';
+          case '已建':
+            return 'color: #2B62F1;';
+        }
+      }
+    }
+  }
+  </script>
+  
+  <style scoped>
+  .container {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    background-color: #FFFFFF;
+    box-shadow: 0rem 0.13rem 0.63rem 0rem rgba(177, 177, 177, 0.1);
+    border-radius: 0.5rem 0.5rem 0.5rem 0.5rem;
+  }
+  
+  .content {
+    padding: 1rem;
+    display: flex;
+  }
+  
+  .containertop {
+    height: auto;
+    display: flex;
+    justify-content: space-between;
+    padding: .7rem 0;
+    padding: .5rem;
+    border-bottom: 1px solid #E5E5E5;
+  }
+  
+  .topleft {
+    width: 8rem;
+    display: flex;
+    gap: 0.4rem;
+    align-items: center;
+  }
+  
+  .topleft img {
+    width: 0.81rem;
+    height: 0.81rem;
+  }
+  
+  .topleft span {
+    width: auto;
+    height: 0.88rem;
+    font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+    font-weight: 500;
+    font-size: 0.88rem;
+    color: #3D424C;
+    line-height: 0.88rem;
+    text-align: right;
+    font-style: normal;
+    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>
+  
\ No newline at end of file
diff --git a/src/views/components/ProjectDetails/Projectpicturetwo.vue b/src/views/components/ProjectDetails/Projectpicturetwo.vue
index 7417ddd..f305c2d 100644
--- a/src/views/components/ProjectDetails/Projectpicturetwo.vue
+++ b/src/views/components/ProjectDetails/Projectpicturetwo.vue
@@ -51,7 +51,7 @@
           </div>
           <div class="classify">
               内部
-            </div>
+          </div>
         </div>
       </div>
 
@@ -63,7 +63,7 @@
             </div>
         </div>
       </div>
-    </div>
+    </div> 
 
     <!-- 编辑/新增对话框 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="500px">
@@ -76,7 +76,7 @@
         </el-form-item>
         <el-form-item label="经纬度">
           <el-input v-model="form.latitude" placeholder="纬度"></el-input>
-          <el-input v-model="form.longitude" placeholder="经度"></el-input>
+          <el-input v-model="form.longitude" placeholder="经度"></el-input> 
         </el-form-item>
         <el-form-item label="图片上传">
           <el-upload action="https://jsonplaceholder.typicode.com/posts/" :on-success="handleUploadSuccess"
diff --git a/src/views/manage-info/index.vue b/src/views/manage-info/index.vue
index c268557..d27239b 100644
--- a/src/views/manage-info/index.vue
+++ b/src/views/manage-info/index.vue
@@ -65,8 +65,8 @@
                 <Memo></Memo>
             </div>
             <!-- 其他信息 -->
-            <div id="others">
-                <Memo></Memo>
+            <div class="bottombox" id="others">
+                <Others></Others>
             </div>
             <!-- 返回顶部 -->
             <!-- <el-backtop target=".backtop"></el-backtop> -->
@@ -87,6 +87,7 @@ import Programme from '../components/ProjectDetails/Programme.vue';
 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';
 
 export default {
     components: {
@@ -101,7 +102,8 @@ export default {
         Programme,
         Projectgift,
         Projectpicture,
-        Projectpicturetwo
+        Projectpicturetwo,
+        Others
     },
     data() {
         return {
@@ -219,4 +221,7 @@ export default {
     background-color: #2B62F1;
     border-bottom: none;
 }
+.bottombox{
+    margin-bottom: 1rem;
+}
 </style>
\ No newline at end of file