合并之后部分bug

protected/config/routes.conf.php

@@ -37,7 +37,9 @@ $route['*']['/rproject/:pid/section/:pmid/detail'] = array('RProjectController',
 $route['*']['/rproject/:pmid/measure/detail'] = array('RProjectController', 'proMeasure');
 $route['*']['/rproject/:pid/section/:pmid/report/:mpid'] = array('RProjectController', 'proReport');
 $route['*']['/rproject/:pid/section/:pmid/files'] = array('RProjectController', 'proSectionFiles');
+$route['*']['/rproject/:pid/section/:pmid/files/page/:pindex'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/recover'] = array('RProjectController', 'proSectionFilesRecover');
+$route['*']['/rproject/:pid/section/:pmid/files/recover/page/:pindex'] = array('RProjectController', 'proSectionFilesRecover');
 $route['*']['/rproject/section/get/:iaid/attachment'] = array('RProjectController', 'proSectionGetFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/num/:numpname/page/:pindex'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/user/:userid/page/:pindex'] = array('RProjectController', 'proSectionFiles');
@@ -54,7 +56,9 @@ $route['get']['/sproject/:pid/section'] = array('SProjectController', 'proSectio
 $route['get']['/sproject/:pid/section/:pmid/detail'] = array('SProjectController', 'proDetail');
 $route['get']['/sproject/:pid/section/measure'] = array('SProjectController', 'proMeasure');
 $route['*']['/sproject/:pid/section/:pmid/files'] = array('SProjectController', 'proSectionFiles');
+$route['*']['/sproject/:pid/section/:pmid/files/page/:pindex'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/recover'] = array('SProjectController', 'proSectionFilesRecover');
+$route['*']['/sproject/:pid/section/:pmid/files/recover/page/:pindex'] = array('SProjectController', 'proSectionFilesRecover');
 $route['*']['/sproject/:pid/section/:pmid/files/num/:numpname/page/:pindex'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/user/:userid/page/:pindex'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/num/:numpname/user/:userid/page/:pindex'] = array('SProjectController', 'proSectionFiles');

protected/view/r-project-section-files-recover.html

@@ -59,10 +59,14 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
-                    <a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+                    <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
-                <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
-                <!--<li><a href="w-project-section-measure.html">计量台帐</a></li>-->
+                <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <!-- if {{mpid}}>0 -->
+                <li>
+                    <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
+                </li>
+                <!-- endif -->
             </ul>
             <!--导航-->
 

protected/view/s-project-section-files-recover.html

@@ -59,10 +59,9 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
-                    <a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+                    <a href="{{rootUrl}}sproject/{{pid}}/section/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
-                <!--<li><a href="w-project-section-measure.html">计量台帐</a></li>-->
             </ul>
             <!--导航-->
 

protected/view/s-project-section-files.html

@@ -34,7 +34,8 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray'
+                                value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
@@ -46,7 +47,8 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray'
+                                    value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -57,14 +59,9 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
-                    <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+                    <a href="{{rootUrl}}sproject/{{pid}}/section/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
-                <!-- if {{mpid}}>0 -->
-                <li>
-                    <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
-                </li>
-                <!-- endif -->
             </ul>
             <!--导航-->
             <!--筛选工具-->
@@ -116,7 +113,8 @@
                                     tips="{{itemMeasureArray' value.tips}}"
                                     href="#"
                                     numpname="第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期"
-                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray' value.filename}}</a></td>
+                                    id="fname_{{itemMeasureArray' value.imnid}}">{{itemMeasureArray'
+                                value.filename}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
                             <td>{{itemMeasureArray' value.pmname}}</td>
                             <td width="">{{itemMeasureArray' value.realname}}</td>