|
|
@@ -308,11 +308,11 @@
|
|
|
</div>
|
|
|
<table class="table table-bordered table-2sm mb-0 mt-1 table-dark">
|
|
|
<% if (materialData) { %>
|
|
|
- <tr><th>含税(信息价/指数法)</th><td><%= materialData.m_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.m_tp, 1+materialData.rate/100), 2) : null %></td><td><%= materialData.ex_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.ex_tp, 1+materialData.rate/100), 2) : null %></td></tr>
|
|
|
- <tr><th>不含税(信息价/指数法)</th><td><%= materialData.m_tp !== null ? ctx.helper.round(materialData.m_tp, 2) : null %></td><td><%= materialData.ex_tp !== null ? ctx.helper.round(materialData.ex_tp, 2) : null %></td></tr>
|
|
|
+ <tr><th>含税(信息价/指数法)</th><td width="70"><%= materialData.m_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.m_tp, 1+materialData.rate/100), 2) : '0' %></td><td width="70"><%= materialData.ex_tp !== null ? ctx.helper.round(ctx.helper.mul(materialData.ex_tp, 1+materialData.rate/100), 2) : '0' %></td></tr>
|
|
|
+ <tr><th>不含税(信息价/指数法)</th><td width="70"><%= materialData.m_tp !== null ? ctx.helper.round(materialData.m_tp, 2) : '0' %></td><td width="70"><%= materialData.ex_tp !== null ? ctx.helper.round(materialData.ex_tp, 2) : '0' %></td></tr>
|
|
|
<% } else { %>
|
|
|
- <tr><th>含税(信息价/指数法)</th><td></td><td></td></tr>
|
|
|
- <tr><th>不含税(信息价/指数法)</th><td></td><td></td></tr>
|
|
|
+ <tr><th>含税(信息价/指数法)</th><td width="70">0</td><td width="70">0</td></tr>
|
|
|
+ <tr><th>不含税(信息价/指数法)</th><td width="70">0</td><td width="70">0</td></tr>
|
|
|
<% } %>
|
|
|
</table>
|
|
|
</div>
|
|
|
@@ -1314,7 +1314,7 @@
|
|
|
map.setMapStyleV2({styleId: '20d4aea41cf71387395f2dc835f1c4b6'});
|
|
|
if (polyLineList.length > 0) {
|
|
|
for (const pl of polyLineList) {
|
|
|
- const polyline = new BMapGL.Polyline(pl.map, {strokeColor: pl.color, strokeWeight:15, strokeOpacity:1});
|
|
|
+ const polyline = new BMapGL.Polyline(pl.map, {strokeColor: pl.color, strokeWeight:10, strokeOpacity:1});
|
|
|
map.addOverlay(polyline);
|
|
|
}
|
|
|
}
|