From 862300a3dc79c2b5af69a8d8776f39408e412b76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Mon, 1 Apr 2024 11:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=B3=E5=B1=B1=E4=BF=A1=E6=81=AF=E6=B8=AF?=
 =?UTF-8?q?=EF=BC=9A=E8=B5=84=E6=BA=90=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=83=85=E5=86=B5=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infoport/resourceNew.html                     | 20 +++++++++----------
 infoport/resourceNewDetail.html               |  2 +-
 infoport/static/js/project/resourceDetail.js  |  2 +-
 infoport/static/js/project/resourceNew.js     |  4 ++--
 .../static/js/project/resourceNewDetail.js    |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/infoport/resourceNew.html b/infoport/resourceNew.html
index 96b1075..53d8948 100644
--- a/infoport/resourceNew.html
+++ b/infoport/resourceNew.html
@@ -95,14 +95,14 @@
                 <table align="center" cellspacing="0" cellpadding="0" border="0" width="100%" id="propertyContent">
                     <script id="propertyData" type="text/html">
                         <tr>
-                            <td>镇</td>
-                            <td>村</td>
-                            <td>资源编码</td>
-                            <td>资源名称</td>
-                            <td>资源分类</td>
-                            <td>资源类型</td>
-                            <td>面积/亩</td>
-                            <td>使用情况</td>
+                            <td style="width: 8%;">镇</td>
+                            <td style="width: 8%;">村</td>
+                            <td style="width: 14%;">资源编码</td>
+                            <td style="width: 26%;">资源名称</td>
+                            <td style="width: 14%;">资源分类</td>
+                            <td style="width: 14%;">资源类型</td>
+                            <td style="width: 8%;">面积/亩</td>
+                            <td style="width: 8%;">使用情况</td>
                         </tr>
                         {{each propertyList as value i}}
                             <tr onclick="openDialog({{value.id}})">
@@ -113,7 +113,7 @@
                                 <td>{{value.resourceType}}</td>
                                 <td>{{value.resourceSort}}</td>
                                 <td>{{value.totalArea}}</td>
-                                <td>{{value.useType==2?'闲置':'出租'}}</td>
+                                <td>{{value.useType}}</td>
                             </tr>
                         {{/each}}
                     </script>
@@ -169,7 +169,7 @@
                             <td>面积/亩</td>
                             <td>{{propertyDetail.totalArea}}</td>
                             <td>使用情况</td>
-                            <td>{{propertyDetail.useType==2?'闲置':'出租'}}</td>
+                            <td>{{propertyDetail.useType}}</td>
                             <td></td>
                             <td></td>
                         </tr>
diff --git a/infoport/resourceNewDetail.html b/infoport/resourceNewDetail.html
index 089d8eb..687cfa6 100644
--- a/infoport/resourceNewDetail.html
+++ b/infoport/resourceNewDetail.html
@@ -101,7 +101,7 @@
                                 <td>面积/亩</td>
                                 <td>{{propertyDetail.totalArea}}</td>
                                 <td>使用情况</td>
-                                <td>{{propertyDetail.useType==2?'闲置':'出租'}}</td>
+                                <td>{{propertyDetail.useType}}</td>
                             </tr>
 
                         </table>
diff --git a/infoport/static/js/project/resourceDetail.js b/infoport/static/js/project/resourceDetail.js
index 185e615..1717132 100644
--- a/infoport/static/js/project/resourceDetail.js
+++ b/infoport/static/js/project/resourceDetail.js
@@ -152,4 +152,4 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
     }
 
     return module;
-});
\ No newline at end of file
+});
diff --git a/infoport/static/js/project/resourceNew.js b/infoport/static/js/project/resourceNew.js
index b3c0fca..7e205d0 100644
--- a/infoport/static/js/project/resourceNew.js
+++ b/infoport/static/js/project/resourceNew.js
@@ -184,7 +184,7 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
             //资产列表
             tools.doGet(assetresourceList, {
                 deptId: 100,
-                // translate_dict: 1,
+                translate_dict: 1,
                 pageNum: 1,
                 pageSize: 10,
                 useType:'2'
@@ -373,4 +373,4 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
     }
 
     return module;
-});
\ No newline at end of file
+});
diff --git a/infoport/static/js/project/resourceNewDetail.js b/infoport/static/js/project/resourceNewDetail.js
index 9b8342f..e59b627 100644
--- a/infoport/static/js/project/resourceNewDetail.js
+++ b/infoport/static/js/project/resourceNewDetail.js
@@ -152,4 +152,4 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
     }
 
     return module;
-});
\ No newline at end of file
+});