From 6f4bac3dd2175eb8d205933a375fcefe1b6f573f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Sun, 25 Jun 2023 13:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=B3=E5=B1=B1=E4=BF=A1=E6=81=AF=E6=B8=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 infoport/homestead.html                   |  2 +-
 infoport/homesteadDetail.html             |  2 +-
 infoport/property.html                    |  2 +-
 infoport/propertyDetail.html              |  2 +-
 infoport/resource.html                    |  2 +-
 infoport/resourceDetail.html              |  2 +-
 infoport/resourceNew.html                 | 11 +++++------
 infoport/static/js/project/resourceNew.js | 10 ++++++----
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/infoport/homestead.html b/infoport/homestead.html
index 393e7d6..c25fc7b 100644
--- a/infoport/homestead.html
+++ b/infoport/homestead.html
@@ -70,7 +70,7 @@
                     </a>
                 </div>
                 <div class="header_nav">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                         </div>
diff --git a/infoport/homesteadDetail.html b/infoport/homesteadDetail.html
index b2abe50..863e5ec 100644
--- a/infoport/homesteadDetail.html
+++ b/infoport/homesteadDetail.html
@@ -43,7 +43,7 @@
                     </a>
                 </div>
                 <div class="header_nav">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                         </div>
diff --git a/infoport/property.html b/infoport/property.html
index 472d96d..ce0b5c3 100644
--- a/infoport/property.html
+++ b/infoport/property.html
@@ -73,7 +73,7 @@
                     </a>
                 </div>
                 <div class="header_nav">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                         </div>
diff --git a/infoport/propertyDetail.html b/infoport/propertyDetail.html
index 0d72c5a..4e8fe16 100644
--- a/infoport/propertyDetail.html
+++ b/infoport/propertyDetail.html
@@ -44,7 +44,7 @@
                     </a>
                 </div>
                 <div class="header_nav">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                         </div>
diff --git a/infoport/resource.html b/infoport/resource.html
index d613687..f2c6ff7 100644
--- a/infoport/resource.html
+++ b/infoport/resource.html
@@ -71,7 +71,7 @@
                     </a>
                 </div>
                 <div class="header_nav active">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                             <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt="">
diff --git a/infoport/resourceDetail.html b/infoport/resourceDetail.html
index 95ace2d..1a82556 100644
--- a/infoport/resourceDetail.html
+++ b/infoport/resourceDetail.html
@@ -43,7 +43,7 @@
                     </a>
                 </div>
                 <div class="header_nav active">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                             <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt="">
diff --git a/infoport/resourceNew.html b/infoport/resourceNew.html
index 2064fb6..ffc9ce3 100644
--- a/infoport/resourceNew.html
+++ b/infoport/resourceNew.html
@@ -43,9 +43,8 @@
                 </select>
                 <select id="useTypeContent" onchange="useTypeChange()">
                     <option value="">全部</option>
-                    <option value="1">未流转</option>
-                    <option value="2">部分流转</option>
-                    <option value="3">已流转</option>
+                    <option value="2">闲置</option>
+                    <option value="3">出租</option>
 <!--                    <script id="useTypeData" type="text/html">-->
 <!--                        {{each useType as value i}}-->
 <!--                        {{/each}}-->
@@ -71,7 +70,7 @@
                     </a>
                 </div>
                 <div class="header_nav active">
-                    <a href="resource.html">
+                    <a href="resourceNew.html">
                         <div>
                             <i class="i3"></i>
                             <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt="">
@@ -111,8 +110,8 @@
                                 <td>{{value.deptName}}</td>
                                 <td>{{value.code}}</td>
                                 <td>{{value.name}}</td>
-                                <td>{{value.useType}}</td>
-                                <td>{{value.useType}}</td>
+                                <td>{{value.resourceType}}</td>
+                                <td>{{value.resourceSort}}</td>
                                 <td>{{value.totalArea}}</td>
                                 <td>{{value.status}}</td>
                             </tr>
diff --git a/infoport/static/js/project/resourceNew.js b/infoport/static/js/project/resourceNew.js
index 9139f68..adcb79a 100644
--- a/infoport/static/js/project/resourceNew.js
+++ b/infoport/static/js/project/resourceNew.js
@@ -293,9 +293,10 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
     selectSecondChange = function(){
         $('.page_s1').html('');
         module.data.propertyList = "";
-        tools.doGet(resourceList, {
+        tools.doGet(assetresourceList, {
             deptId: $('#treeselectSecondContent').val(),
             translate_dict: 1,
+            useType:$('#useTypeContent').val(),
             pageNum: 1,
             pageSize: 10,
         }, module.assetList , true);
@@ -317,9 +318,9 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
     useTypeChange = function () {
         $('.page_s1').html('');
         module.data.propertyList = "";
-        tools.doGet(resourceList, {
+        tools.doGet(assetresourceList, {
             deptId: $('#treeselectSecondContent').val() == null ? 100 : $('#treeselectSecondContent').val(),
-            dkzt:$('#useTypeContent').val(),
+            useType:$('#useTypeContent').val(),
             translate_dict: 1,
             pageNum: 1,
             pageSize: 10,
@@ -327,8 +328,9 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function
     }
 
     turnThePage = function (pageNum) {
-        tools.doGet(resourceList, {
+        tools.doGet(assetresourceList, {
             deptId: $('#treeselectSecondContent').val() == null ? 100 : $('#treeselectSecondContent').val(),
+            useType:$('#useTypeContent').val(),
             translate_dict: 1,
             pageNum: pageNum,
             pageSize: 10,