变基master 到 develop

protected/config/routes.conf.php

@@ -39,7 +39,6 @@ $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');
@@ -62,7 +61,6 @@ $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/section/get/:iaid/attachment'] = array('SProjectController', 'proSectionGetFiles');

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

@@ -34,12 +34,7 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-<<<<<<< HEAD
                             <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>
@@ -51,12 +46,7 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-<<<<<<< HEAD
                                 <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>-->
@@ -67,7 +57,6 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
-<<<<<<< HEAD
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
@@ -76,12 +65,6 @@
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
                 </li>
                 <!-- endif -->
-=======
-                    <a href="{{rootUrl}}project/{{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>-->
->>>>>>> 短信类型增加
             </ul>
             <!--导航-->
 
@@ -96,11 +79,7 @@
                         <tr>
                             <th width="">文件名</th>
                             <th width="">期</th>
-<<<<<<< HEAD
                             <!--<th width="">节点</th>-->
-=======
-                            <th width="">节点</th>
->>>>>>> 短信类型增加
                             <th width="">上传者</th>
                             <th width="">上传时间</th>
                             <th width="">删除</th>
@@ -113,13 +92,8 @@
                             <!-- loop itemMeasureArray -->
                             <td width=""><span class="fileico ico-jpg"></span><a
                                     fileext="{{itemMeasureArray' value.fileext}}"
-<<<<<<< HEAD
                                     imnid="{{itemMeasureArray' value.imnid}}"
                                     iaid="{{itemMeasureArray' value.iaid}}"
-=======
-                                    imnid="{{itematta' value.imnid}}"
-                                    iaid="{{itematta' value.iaid}}"
->>>>>>> 短信类型增加
                                     filename="{{itemMeasureArray' value.filename}}"
                                     realname="{{itemMeasureArray' value.realname}}"
                                     intime="{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}"
@@ -129,11 +103,7 @@
                                     id="fname_{{itemMeasureArray' value.imnid}}"
                                     href="#">{{itemMeasureArray' value.filename}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
-<<<<<<< HEAD
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
-=======
-                            <td>{{itemMeasureArray' value.pmname}}</td>
->>>>>>> 短信类型增加
                             <td width="">{{itemMeasureArray' value.realname}}</td>
                             <td width="">{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}</td>
                             <td class="text-error">{{itemMeasureArray' value.delname}}</td>
@@ -144,13 +114,8 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
-<<<<<<< HEAD
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a id="down_{{itemMeasureArray' value.imnid}}" iaid="{{itemMeasureArray' value.iaid}}"><i
-=======
-                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
-                                        <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
->>>>>>> 短信类型增加
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"
                                                imnid="{{itemMeasureArray' value.imnid}}" href="#"
@@ -192,11 +157,7 @@
                             <th width="60">格式</th>
                             <td id="fileico"><span class="fileico ico-jpg"></span>.jpg</td>
                             <th width="60">所在期</th>
-<<<<<<< HEAD
                             <td id="numpname2">第二期</td>
-=======
-                            <td id="numpname">第二期</td>
->>>>>>> 短信类型增加
                         </tr>
                         <tr>
                             <th width="60">上传者</th>
@@ -290,11 +251,7 @@
             $("#realname").html(realname);
             $("#intime").html(intime);
             $("#tips").html(tips);
-<<<<<<< HEAD
             $("#numpname2").html(numpname);
-=======
-            $("#numpname").html(numpname);
->>>>>>> 短信类型增加
             $("#imnid").val(imnid);
             $(".filesDetail").show();
         });
@@ -312,19 +269,11 @@
                 cache: false,
                 contentType: false,
                 data: form_data,
-<<<<<<< HEAD
                 url: "/rproject/{{pid}}/section/{{pmid}}/files",
                 processData: false,
                 success: function (data) {
                     if (data['status'] == 1) {
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files";
-=======
-                url: "/project/{{pid}}/section/{{pmid}}/files",
-                processData: false,
-                success: function (data) {
-                    if (data['status'] == 1) {
-                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files";
->>>>>>> 短信类型增加
                     }
                 }
             });
@@ -337,19 +286,11 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'reconvery'},
-<<<<<<< HEAD
                 url: "/rproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
                         $("#file-replace").show();
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files/recover";
-=======
-                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
-                success: function (data) {
-                    if (data['status'] == 1) {
-                        $("#file-replace").show();
-                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
->>>>>>> 短信类型增加
                     }
                 }
             });
@@ -362,7 +303,6 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'del'},
-<<<<<<< HEAD
                 url: "/rproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
@@ -372,29 +312,16 @@
                     if (data['status'] == 2) {
                         $("#file-del2").modal('show');
                         $("#file-del").modal('hide');
-=======
-                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
-                success: function (data) {
-                    if (data['status'] == 1) {
-                        $("#file-del").hide();
-                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
-                    }
-                    if (data['status'] == 2) {
-                        $("#file-del2").show();
-                        $("#file-del").hide();
->>>>>>> 短信类型增加
                     }
                 }
             });
         });
-<<<<<<< HEAD
 
         $("a[id^='down_']").click(function () {
             var iaid = $(this).attr('iaid');
             window.location.href = "{{rootUrl}}rproject/section/get/" + iaid + "/attachment";
         });
-=======
->>>>>>> 短信类型增加
+
     });
 </script>
 </body>

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

@@ -34,12 +34,7 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-<<<<<<< HEAD
                             <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>
@@ -51,12 +46,7 @@
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-<<<<<<< HEAD
                                 <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>-->
@@ -67,16 +57,9 @@
             <!--导航-->
             <ul class="nav nav-tabs">
                 <li>
-<<<<<<< HEAD
                     <a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li class="active"><a href="{{rootUrl}}project/{{pid}}/section/{{pmid}}/files">附件</a></li>
-=======
-                    <a href="{{rootUrl}}project/{{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>-->
->>>>>>> 短信类型增加
             </ul>
             <!--导航-->
 
@@ -91,11 +74,7 @@
                         <tr>
                             <th width="">文件名</th>
                             <th width="">期</th>
-<<<<<<< HEAD
                             <!--<th width="">节点</th>-->
-=======
-                            <th width="">节点</th>
->>>>>>> 短信类型增加
                             <th width="">上传者</th>
                             <th width="">上传时间</th>
                             <th width="">删除</th>
@@ -108,13 +87,8 @@
                             <!-- loop itemMeasureArray -->
                             <td width=""><span class="fileico ico-jpg"></span><a
                                     fileext="{{itemMeasureArray' value.fileext}}"
-<<<<<<< HEAD
                                     imnid="{{itemMeasureArray' value.imnid}}"
                                     iaid="{{itemMeasureArray' value.iaid}}"
-=======
-                                    imnid="{{itematta' value.imnid}}"
-                                    iaid="{{itematta' value.iaid}}"
->>>>>>> 短信类型增加
                                     filename="{{itemMeasureArray' value.filename}}"
                                     realname="{{itemMeasureArray' value.realname}}"
                                     intime="{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}"
@@ -124,11 +98,7 @@
                                     id="fname_{{itemMeasureArray' value.imnid}}"
                                     href="#">{{itemMeasureArray' value.filename}}</a></td>
                             <td>第{{ToChinaseNum(itemMeasureArray' value.numpname)}}期</td>
-<<<<<<< HEAD
                             <!--<td>{{itemMeasureArray' value.pmname}}</td>-->
-=======
-                            <td>{{itemMeasureArray' value.pmname}}</td>
->>>>>>> 短信类型增加
                             <td width="">{{itemMeasureArray' value.realname}}</td>
                             <td width="">{{formatDate(itemMeasureArray' value.intime,'Y-m-d')}}</td>
                             <td class="text-error">{{itemMeasureArray' value.delname}}</td>
@@ -139,13 +109,8 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
-<<<<<<< HEAD
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a id="down_{{itemMeasureArray' value.imnid}}" iaid="{{itemMeasureArray' value.iaid}}"><i
-=======
-                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
-                                        <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
->>>>>>> 短信类型增加
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"
                                                imnid="{{itemMeasureArray' value.imnid}}" href="#"
@@ -187,11 +152,7 @@
                             <th width="60">格式</th>
                             <td id="fileico"><span class="fileico ico-jpg"></span>.jpg</td>
                             <th width="60">所在期</th>
-<<<<<<< HEAD
                             <td id="numpname2">第二期</td>
-=======
-                            <td id="numpname">第二期</td>
->>>>>>> 短信类型增加
                         </tr>
                         <tr>
                             <th width="60">上传者</th>
@@ -285,11 +246,7 @@
             $("#realname").html(realname);
             $("#intime").html(intime);
             $("#tips").html(tips);
-<<<<<<< HEAD
             $("#numpname2").html(numpname);
-=======
-            $("#numpname").html(numpname);
->>>>>>> 短信类型增加
             $("#imnid").val(imnid);
             $(".filesDetail").show();
         });
@@ -307,19 +264,11 @@
                 cache: false,
                 contentType: false,
                 data: form_data,
-<<<<<<< HEAD
                 url: "/sproject/{{pid}}/section/{{pmid}}/files",
                 processData: false,
                 success: function (data) {
                     if (data['status'] == 1) {
                         window.location.href = "{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files";
-=======
-                url: "/project/{{pid}}/section/{{pmid}}/files",
-                processData: false,
-                success: function (data) {
-                    if (data['status'] == 1) {
-                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files";
->>>>>>> 短信类型增加
                     }
                 }
             });
@@ -332,19 +281,11 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'reconvery'},
-<<<<<<< HEAD
                 url: "/sproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
                         $("#file-replace").show();
                         window.location.href = "{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files/recover";
-=======
-                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
-                success: function (data) {
-                    if (data['status'] == 1) {
-                        $("#file-replace").show();
-                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
->>>>>>> 短信类型增加
                     }
                 }
             });
@@ -357,7 +298,6 @@
                 dataType: "json",
                 cache: false,
                 data: {"imnid": imnid, "optype": 'del'},
-<<<<<<< HEAD
                 url: "/sproject/{{pid}}/section/{{pmid}}/files/recover",
                 success: function (data) {
                     if (data['status'] == 1) {
@@ -367,30 +307,15 @@
                     if (data['status'] == 2) {
                         $("#file-del2").modal('show');
                         $("#file-del").modal('hide');
-=======
-                url: "/project/{{pid}}/section/{{pmid}}/files/recover",
-                success: function (data) {
-                    if (data['status'] == 1) {
-                        $("#file-del").hide();
-                        window.location.href = "{{rootUrl}}project/{{pid}}/section/{{pmid}}/files/recover";
-                    }
-                    if (data['status'] == 2) {
-                        $("#file-del2").show();
-                        $("#file-del").hide();
->>>>>>> 短信类型增加
                     }
                 }
             });
         });
-<<<<<<< HEAD
-
 
         $("a[id^='down_']").click(function () {
             var iaid = $(this).attr('iaid');
             window.location.href = "{{rootUrl}}sproject/section/get/" + iaid + "/attachment";
         });
-=======
->>>>>>> 短信类型增加
     });
 </script>
 </body>