Merge branch 'feature/app_login' into develop

protected/controller/ProjectController.php

@@ -345,6 +345,9 @@ class ProjectController extends DooController
                 } else {
                     $statusStr = '';
                 }
+                $displayPercentSnTotalProgresswidth = floatval($displayPercentSnTotalProgress) >= 100 ? '100%' : $displayPercentSnTotalProgress;
+                $displayPercentCurrTotalProgresswidth = floatval($displayPercentCurrTotalProgress) >= 100 ? '100%' : $displayPercentCurrTotalProgress;
+                $displayPercentLessTotalProgresswidth = floatval($displayPercentLessTotalProgress) >= 100 ? '100%' : $displayPercentLessTotalProgress;
                 $bdhtmlstr .= '
 				<tr>
 					<td><a href="/project/' . $this->params['pid'] . '/section/' . $value['pmid'] . '/detail">' . $value['pmname'] . '</a></td>
@@ -352,9 +355,9 @@ class ProjectController extends DooController
 					<td class="taR">￥' . $totalmoney . '</td>
 					<td>
 					    <div class="progress">
-						<div class="progress-bar progress-bar-success" style="width: ' . $displayPercentSnTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nTotalProgress . '">' . $displayPercentSnTotalProgress . '</div>
-						<div class="progress-bar" style="width:' . $displayPercentCurrTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrTotalProgress . '">' . $displayPercentCurrTotalProgress . '</div>
-						<div class="progress-bar progress-bar-gary" style="width:' . $displayPercentLessTotalProgress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nlessTotalProgress . '">' . $displayPercentLessTotalProgress . '</div>
+						<div class="progress-bar progress-bar-success" style="width: ' . $displayPercentSnTotalProgresswidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nTotalProgress . '">' . $displayPercentSnTotalProgress . '</div>
+						<div class="progress-bar" style="width:' . $displayPercentCurrTotalProgresswidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrTotalProgress . '">' . $displayPercentCurrTotalProgress . '</div>
+						<div class="progress-bar progress-bar-gary" style="width:' . $displayPercentLessTotalProgresswidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nlessTotalProgress . '">' . $displayPercentLessTotalProgress . '</div>
 					    </div>
 					</td>
 				    </tr>';
@@ -368,6 +371,8 @@ class ProjectController extends DooController
                 $otherprogress = round((($biaoduantotalmoney - $currTotal['totalplus']) / $biaoduantotalmoney) * 100) . '%';
                 $biaoduantotalmoney = number_format($biaoduantotalmoney, 2, '.', ',');
             }
+            $progresswidth = floatval($progress) >= 100 ? '100%' : $progress;
+            $otherprogresswidth = floatval($otherprogress) >= 100 ? '100%' : $otherprogress;
             $htmlstr .= '<div class="project">
 			<div class="proSection">
 			    <table class="table">
@@ -376,8 +381,8 @@ class ProjectController extends DooController
 					<td width="150"><span aria-hidden="true" data-icon="u"></span> ' . $v['stname'] . '<a id="idt_' . $v['stid'] . '" href="#secoption" data-toggle="modal" title="编辑/查看KEY" stid="' . $v['stid'] . '" proname="' . $v['stname'] . '" key="' . $v['stkey'] . '"><span data-icon="S" aria-hidden="true" class="closePanel" data-placement="bottom" data-toggle="tooltip" data-original-title="查看KEY" style="font-size:18px"></span></a></td>
 					<td width="90">总价：</td><td width="165">￥<b style="font-size:16px">' . $biaoduantotalmoney . '</b></td>
 					<td width="60">完成进度：</td><td><div class="progress">
-						<div class="progress-bar progress-bar-success" style="width:' . $progress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>
-						<div class="progress-bar progress-bar-danger" style="width:' . $otherprogress . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $notherprogress . '">' . $otherprogress . '</div>
+						<div class="progress-bar progress-bar-success" style="width:' . $progresswidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥' . $nprogress . '">' . $progress . '</div>
+						<div class="progress-bar progress-bar-danger" style="width:' . $otherprogresswidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $notherprogress . '">' . $otherprogress . '</div>
 					    </div></td>
 				    </tr>
 				</thead>

protected/controller/RProjectController.php

@@ -178,6 +178,9 @@ class RProjectController extends DooController
                         $dispstopnowtotal = $pstopnowtotal . '%';
                         $pnowtotal = 100 - $pcurrdone - $pstopnowtotal;
                         $dispnowtotal = $pnowtotal . '%';
+                        $dispstopnowtotalwidth = $pstopnowtotal >= 100 ? '100%' : $dispstopnowtotal;
+                        $dispcurrdonewidth = $pcurrdone >= 100 ? '100%' : $dispcurrdone;
+                        $dispnowtotalwidth = $pnowtotal >= 100 ? '100%' : $dispnowtotal;
                         $countNum = $this->numofperact->getLastNew2($v['pmid'])['numpname'];
                         if (!isset($countNum)) {
                             $countNum = 0;
@@ -198,9 +201,9 @@ class RProjectController extends DooController
                                     <td class="taR">￥' . number_format($v['contracttotal'], 2, '.', ',') . '</td>
                                     <td>
                                         <div class="progress">
-                                        <div class="progress-bar progress-bar-success" style="width: ' . $dispstopnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nstopnowtotal . '">' . $dispstopnowtotal . '</div>
-                                        <div class="progress-bar" style="width:' . $dispcurrdone . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrdone . '">' . $dispcurrdone . '</div>
-                                        <div class="progress-bar progress-bar-gary" style="width:' . $dispnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nnowtotal . '">' . $dispnowtotal . '</div>
+                                        <div class="progress-bar progress-bar-success" style="width: ' . $dispstopnowtotalwidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nstopnowtotal . '">' . $dispstopnowtotal . '</div>
+                                        <div class="progress-bar" style="width:' . $dispcurrdonewidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrdone . '">' . $dispcurrdone . '</div>
+                                        <div class="progress-bar progress-bar-gary" style="width:' . $dispnowtotalwidth . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nnowtotal . '">' . $dispnowtotal . '</div>
                                         </div>
                                     </td>
                                     </tr>';

protected/view/r-project-section.html

@@ -48,8 +48,8 @@
 					<td width="60">完成进度：</td>
 					<td>
 					    <div class="progress">
-						<div class="progress-bar progress-bar-success" style="width:{{conArray' value.phetongTotal}};" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥{{conArray' value.nhetongTotal}}">{{conArray' value.phetongTotal}}</div>
-						<div class="progress-bar progress-bar-danger" style="width:{{conArray' value.phetongTotal2}};" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥{{conArray' value.ncurrdoneInt}}">{{conArray' value.phetongTotal2}}</div>
+						<div class="progress-bar progress-bar-success" style="width:<!-- if tofloat({{conArray' value.phetongTotal}}) >= 100 -->100%<!-- else -->{{conArray' value.phetongTotal}}<!-- endif -->;" data-placement="bottom" data-toggle="tooltip" data-original-title="累计完成：￥{{conArray' value.nhetongTotal}}">{{conArray' value.phetongTotal}}</div>
+						<div class="progress-bar progress-bar-danger" style="width:<!-- if tofloat({{conArray' value.phetongTotal2}}) >= 100 -->100%<!-- else -->{{conArray' value.phetongTotal2}}<!-- endif -->;" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥{{conArray' value.ncurrdoneInt}}">{{conArray' value.phetongTotal2}}</div>
 					    </div>
 					</td>
 				    </tr>

protected/view/r-project.html

@@ -43,7 +43,7 @@
 				<div class="title fL"><h5><a href="{{rootUrl}}rproject/{{proArray' value.pid}}/section">{{proArray' value.pname}}</a></h5>{{formatDate(proArray' value.intime,'Y-m-d')}}</div>
 				<div class="detail fR"><p data-original-title="总价：￥{{proArray' value.bcontracttotal}} 变更：+￥{{proArray' value.bchangTotal}}" data-placement="bottom" data-toggle="tooltip">总价：￥{{proArray' value.bcontracttotal}}元 (<span class="colRed">+￥{{proArray' value.bchangTotal}}</span>)</p>
 				    <div class="progress">
-					<div class="progress-bar progress-bar-success" style="width: {{proArray' value.pcurrdone}};">{{proArray' value.pcurrdone}}</div>
+					<div class="progress-bar progress-bar-success" style="width: <!-- if tofloat({{proArray' value.pcurrdone}}) >= 100 -->100%<!-- else -->{{proArray' value.pcurrdone}}<!-- endif -->;">{{proArray' value.pcurrdone}}</div>
 				    </div>
 				</div>
 				<!-- if {{proArray' value.numofchecking}} > 0 --><div class="detail2 fR"><p style="margin:0 0 5px 0" class="colOrange">有 <b>{{proArray' value.numofchecking}}</b> 个标段需要审批</p></div><!-- endif -->

protected/view/s-project-section.html

@@ -57,9 +57,9 @@
 								<!-- loop MyMeasureArray -->
 								<tr>
 									<td width="15%"><a href="{{rootUrl}}sproject/{{MyMeasureArray' value.pid}}/section/{{MyMeasureArray' value.pmid}}/detail">{{MyMeasureArray' value.pmname}}</a><br>{{MyMeasureArray' value.type}}</td><td width="16%" class="taR">￥<b>{{MyMeasureArray' value.totalplus}}</b><br>第 {{MyMeasureArray' value.totalnum}} 期（<span class="colOrange">{{MyMeasureArray' value.ownstatus}}</span>）</td><td width="40%" class="taR"><div class="progress">
-									<div data-original-title="截止上期完成：￥{{MyMeasureArray' value.nstopnow}}" data-toggle="tooltip" data-placement="bottom" style="width: {{MyMeasureArray' value.dispstopnow}};" class="progress-bar progress-bar-success">{{MyMeasureArray' value.dispstopnow}}</div>
-									<div data-original-title="本期完成：￥{{MyMeasureArray' value.ncurrdone}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.dispcurrdone}}" class="progress-bar">{{MyMeasureArray' value.dispcurrdone}}</div>
-									<div data-original-title="未完成：￥{{MyMeasureArray' value.nless}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.pless}}" class="progress-bar progress-bar-gary">{{MyMeasureArray' value.pless}}</div>
+									<div data-original-title="截止上期完成：￥{{MyMeasureArray' value.nstopnow}}" data-toggle="tooltip" data-placement="bottom" style="width: <!-- if tofloat({{MyMeasureArray' value.dispstopnow}}) >= 100 -->100%<!-- else -->{{MyMeasureArray' value.dispstopnow}}<!-- endif -->;" class="progress-bar progress-bar-success">{{MyMeasureArray' value.dispstopnow}}</div>
+									<div data-original-title="本期完成：￥{{MyMeasureArray' value.ncurrdone}}" data-toggle="tooltip" data-placement="bottom" style="width:<!-- if tofloat({{MyMeasureArray' value.dispcurrdone}}) >= 100 -->100%<!-- else -->{{MyMeasureArray' value.dispcurrdone}}<!-- endif -->" class="progress-bar">{{MyMeasureArray' value.dispcurrdone}}</div>
+									<div data-original-title="未完成：￥{{MyMeasureArray' value.nless}}" data-toggle="tooltip" data-placement="bottom" style="width:<!-- if tofloat({{MyMeasureArray' value.pless}}) >= 100 -->100%<!-- else -->{{MyMeasureArray' value.pless}}<!-- endif -->" class="progress-bar progress-bar-gary">{{MyMeasureArray' value.pless}}</div>
 								</div></td>
 								</tr>
 								<!-- endloop -->

protected/view/s-project.html

@@ -45,7 +45,7 @@
 				<div class="title fL"><h5><a href="{{rootUrl}}sproject/{{conArray' value.pid}}/section">{{conArray' value.pname}}</a>（{{conArray' value.countTotalMeasureInt}}个标段）</h5>{{formatDate(conArray' value.intime,'Y-m-d')}}</div>
 				<div class="detail fR"><p data-original-title="总价：￥{{pros' value.bcontracttotal}} 变更：+￥{{pros' value.bchangTotal}}" data-placement="bottom" data-toggle="tooltip">总价：￥{{conArray' value.bcontracttotal}}元 (<span class="colRed">+￥{{conArray' value.bchangTotal}}</span>)</p>
 				    <div class="progress">
-					<div class="progress-bar progress-bar-success" style="width: {{conArray' value.pcurrdone}};">{{conArray' value.pcurrdone}}</div>
+					<div class="progress-bar progress-bar-success" style="width: <!-- if tofloat({{conArray' value.pcurrdone}}) >= 100 -->100%<!-- else -->{{conArray' value.pcurrdone}}<!-- endif -->;">{{conArray' value.pcurrdone}}</div>
 				    </div></div>
 				<div class="detail2 fR"><p>业主单位：{{conArray' value.company}}</p><p>我的标段：{{conArray' value.countmeasure}}</p></div>
 			    </div>