From 1d3c096c31a57a88d204c47e8c778ea418b43965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 30 May 2025 16:13:20 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E5=85=AC=E4=BA=8B=E5=85=AC=E5=BC=80?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infoport/discussions.html                          | 1 +
 infoport/discussionsDetail_06.html                 | 2 ++
 infoport/discussionsDetail_07.html                 | 5 +++++
 infoport/static/js/project/discussionsDetail_06.js | 6 ++++--
 infoport/static/js/project/discussionsDetail_07.js | 9 +++++++--
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/infoport/discussions.html b/infoport/discussions.html
index 9f08321..0677cb2 100644
--- a/infoport/discussions.html
+++ b/infoport/discussions.html
@@ -293,6 +293,7 @@
                                     <div class="new_list_li">
                                         <a href="discussionsDetail_07.html?id={{value.code}}">{{value.name}}</a>
                                         <p>{{value.code}}</p>
+                                        <p style="flex: .5;text-align: right;">{{value.totalArea}}亩</p>
                                         <p>{{value.resourceType}}</p>
                                     </div>
                                 {{/each}}
diff --git a/infoport/discussionsDetail_06.html b/infoport/discussionsDetail_06.html
index 153aedf..c90bcb9 100644
--- a/infoport/discussionsDetail_06.html
+++ b/infoport/discussionsDetail_06.html
@@ -30,7 +30,9 @@
                 </div>
                 <div class="new_content_content" style="margin-top: 10px;" id="code"></div>
                 <div class="new_content_content" id="biddingType"></div>
+                <div class="new_content_content" id="operationType"></div>
                 <div class="new_content_content" id="secondParty"></div>
+                <div class="new_content_content" id="location"></div>
                 <div class="new_content_content" id="settleType"></div>
                 <div class="new_content_content" id="totalAmount"></div>
                 <div class="new_content_content" id="settledAmount"></div>
diff --git a/infoport/discussionsDetail_07.html b/infoport/discussionsDetail_07.html
index 8078292..694e048 100644
--- a/infoport/discussionsDetail_07.html
+++ b/infoport/discussionsDetail_07.html
@@ -31,6 +31,11 @@
                 <div class="new_content_content" style="margin-top: 10px;" id="code"></div>
                 <div class="new_content_content" id="biddingType"></div>
                 <div class="new_content_content" id="secondParty"></div>
+                <div class="new_content_content" id="location"></div>
+                <div class="new_content_content" id="east"></div>
+                <div class="new_content_content" id="west"></div>
+                <div class="new_content_content" id="south"></div>
+                <div class="new_content_content" id="north"></div>
                 <div class="new_content_content" id="settleType"></div>
                 <div class="new_content_content" id="totalAmount"></div>
                 <div class="new_content_content" id="settledAmount"></div>
diff --git a/infoport/static/js/project/discussionsDetail_06.js b/infoport/static/js/project/discussionsDetail_06.js
index 0e050a4..5c12f10 100644
--- a/infoport/static/js/project/discussionsDetail_06.js
+++ b/infoport/static/js/project/discussionsDetail_06.js
@@ -62,10 +62,12 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) {
             $('#name').html(content.name);
             $('#code').html('资产编码：' + content.code);
             $('#biddingType').html('资产类别：'+content.assetType);
+            $('#operationType').html('经营属性：'+content.operationType);
             $('#secondParty').html('构建时间：'+content.buildTime);
+            $('#location').html('坐落位置：'+content.location);
             $('#settleType').html('使用情况：'+content.useType);
-            $('#totalAmount').html('数量：'+content.netValue);
-            $('#settledAmount').html('单位：'+content.unit);
+            $('#totalAmount').html('数量/建筑面积：'+content.netValue);
+            $('#settledAmount').html('计量单位：'+content.unit);
             $('#receivedAmount').html('原值：'+content.originalValue);
         }
     }
diff --git a/infoport/static/js/project/discussionsDetail_07.js b/infoport/static/js/project/discussionsDetail_07.js
index 9ef2c8e..e1ef827 100644
--- a/infoport/static/js/project/discussionsDetail_07.js
+++ b/infoport/static/js/project/discussionsDetail_07.js
@@ -58,10 +58,15 @@ define(['jquery', "template", "Tools"], function ($, template, Tools) {
         if (data.code == 200) {
             var content = data.rows[0];
             $('#name').html(content.name);
-            $('#code').html('资产编码：' + content.code);
+            $('#code').html('资源编码：' + content.code);
             $('#biddingType').html('资源分类：'+content.resourceSort);
             $('#secondParty').html('资源类型：'+content.resourceType);
-            $('#settleType').html('面积：'+content.totalArea);
+            $('#location').html('坐落位置：'+(content.location || ''));
+            $('#east').html('东至：'+(content.east || ''));
+            $('#west').html('西至：'+(content.west || ''));
+            $('#south').html('南至：'+(content.south || ''));
+            $('#north').html('北至：'+(content.north || ''));
+            $('#settleType').html('面积：'+content.totalArea + '亩');
             $('#totalAmount').html('使用情况：'+content.useType);
         }
     }