| @@ -70,7 +70,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav"> | <div class="header_nav"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| </div> | </div> | ||||
| @@ -43,7 +43,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav"> | <div class="header_nav"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| </div> | </div> | ||||
| @@ -73,7 +73,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav"> | <div class="header_nav"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| </div> | </div> | ||||
| @@ -44,7 +44,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav"> | <div class="header_nav"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| </div> | </div> | ||||
| @@ -71,7 +71,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav active"> | <div class="header_nav active"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt=""> | <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt=""> | ||||
| @@ -43,7 +43,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav active"> | <div class="header_nav active"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt=""> | <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt=""> | ||||
| @@ -43,9 +43,8 @@ | |||||
| </select> | </select> | ||||
| <select id="useTypeContent" onchange="useTypeChange()"> | <select id="useTypeContent" onchange="useTypeChange()"> | ||||
| <option value="">全部</option> | <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">--> | <!-- <script id="useTypeData" type="text/html">--> | ||||
| <!-- {{each useType as value i}}--> | <!-- {{each useType as value i}}--> | ||||
| <!-- {{/each}}--> | <!-- {{/each}}--> | ||||
| @@ -71,7 +70,7 @@ | |||||
| </a> | </a> | ||||
| </div> | </div> | ||||
| <div class="header_nav active"> | <div class="header_nav active"> | ||||
| <a href="resource.html"> | |||||
| <a href="resourceNew.html"> | |||||
| <div> | <div> | ||||
| <i class="i3"></i> | <i class="i3"></i> | ||||
| <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt=""> | <img src="static/images/nav_bg.png" class="i_bg xuanzhuan" alt=""> | ||||
| @@ -111,8 +110,8 @@ | |||||
| <td>{{value.deptName}}</td> | <td>{{value.deptName}}</td> | ||||
| <td>{{value.code}}</td> | <td>{{value.code}}</td> | ||||
| <td>{{value.name}}</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.totalArea}}</td> | ||||
| <td>{{value.status}}</td> | <td>{{value.status}}</td> | ||||
| </tr> | </tr> | ||||
| @@ -293,9 +293,10 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function | |||||
| selectSecondChange = function(){ | selectSecondChange = function(){ | ||||
| $('.page_s1').html(''); | $('.page_s1').html(''); | ||||
| module.data.propertyList = ""; | module.data.propertyList = ""; | ||||
| tools.doGet(resourceList, { | |||||
| tools.doGet(assetresourceList, { | |||||
| deptId: $('#treeselectSecondContent').val(), | deptId: $('#treeselectSecondContent').val(), | ||||
| translate_dict: 1, | translate_dict: 1, | ||||
| useType:$('#useTypeContent').val(), | |||||
| pageNum: 1, | pageNum: 1, | ||||
| pageSize: 10, | pageSize: 10, | ||||
| }, module.assetList , true); | }, module.assetList , true); | ||||
| @@ -317,9 +318,9 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function | |||||
| useTypeChange = function () { | useTypeChange = function () { | ||||
| $('.page_s1').html(''); | $('.page_s1').html(''); | ||||
| module.data.propertyList = ""; | module.data.propertyList = ""; | ||||
| tools.doGet(resourceList, { | |||||
| tools.doGet(assetresourceList, { | |||||
| deptId: $('#treeselectSecondContent').val() == null ? 100 : $('#treeselectSecondContent').val(), | deptId: $('#treeselectSecondContent').val() == null ? 100 : $('#treeselectSecondContent').val(), | ||||
| dkzt:$('#useTypeContent').val(), | |||||
| useType:$('#useTypeContent').val(), | |||||
| translate_dict: 1, | translate_dict: 1, | ||||
| pageNum: 1, | pageNum: 1, | ||||
| pageSize: 10, | pageSize: 10, | ||||
| @@ -327,8 +328,9 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function | |||||
| } | } | ||||
| turnThePage = function (pageNum) { | turnThePage = function (pageNum) { | ||||
| tools.doGet(resourceList, { | |||||
| tools.doGet(assetresourceList, { | |||||
| deptId: $('#treeselectSecondContent').val() == null ? 100 : $('#treeselectSecondContent').val(), | deptId: $('#treeselectSecondContent').val() == null ? 100 : $('#treeselectSecondContent').val(), | ||||
| useType:$('#useTypeContent').val(), | |||||
| translate_dict: 1, | translate_dict: 1, | ||||
| pageNum: pageNum, | pageNum: pageNum, | ||||
| pageSize: 10, | pageSize: 10, | ||||