Merge branch 'master' of http://smartcost.f3322.net:3000/MaiXinRong/IndexSystem

app/controller/compare_controller.js

@@ -8,6 +8,7 @@
  * @version
  */
 
+const libConst = require('../const/lib');
 module.exports = app => {
     class CompareController extends app.BaseController {
         /**
@@ -17,7 +18,11 @@ module.exports = app => {
          * @return {void}
          */
         async index (ctx) {
-            await this.layout('compare/index.ejs', {}, '');
+            const libList = await ctx.service.quotaLib.getList(libConst.status.enter);
+            const renderData = {
+                libList
+            };
+            await this.layout('compare/index.ejs', renderData, 'compare/modal.ejs');
         }
     }
 

app/view/compare/index.ejs

@@ -1,160 +1,81 @@
-<div class="panel-sidebar">
-    <div class="panel-title">
-        <div class="title-bar">
-            <h2>指标数据源</h2>
-        </div>
-    </div>
-    <div class="scrollbar-auto">
-        <div class="nav-box">
-            <ul class="nav-list list-unstyled">
-                <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>XXX标段 2018-03-14 17:12:23</span></label></a></li>
-                <li class="bg-warning"><a href="#" class="text-truncate"><label><input type="checkbox"> <span>YYY标段 2018-03-13 17:12:23</span></label></a></li>
-                <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>ZZZ标段 2018-03-11 17:12:23</span></label></a></li>
-                <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>AAA标段 2018-03-11 17:12:23</span></label></a></li>
-                <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>BBB标段 2018-03-11 17:12:23</span></label></a></li>
-                <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>CCC标段 2018-03-11 17:12:23</span></label></a></li>
-            </ul>
-        </div>
-    </div>
-</div>
 <div class="panel-content">
-    <div class="panel-title">
+    <div class="panel-title fluid">
         <div class="title-main">
-            <div class="btn-group col-3 pr-0">
-                <input type="text" class="form-control form-control-sm m-0" placeholder="输入项目节名称检索" >
+            <div class="btn-group">
+                <a class="btn btn-primary btn-sm" href="#generate-data" data-toggle="modal" data-target="#generate-data">指标源：<%= libList.length %></a>
+            </div>
+            <div class="btn-group col-2 pr-0">
+                <input type="text" class="form-control form-control-sm m-0" placeholder="输入项目节名称" >
             </div>
             <div class="btn-group">
-                <button class="btn btn-sm btn-primary " type="button">检索指标</button>
+                <button class="btn btn-sm btn-primary " type="button">定位项目节</button>
             </div>
         </div>
     </div>
     <div class="content-wrap">
         <div class="c-header p-0 col-12">
-            <div class="card text-white bg-dark">
-                <div class="card-body row">
-                    <div class="col-auto">
-                        <span class="btn btn-light btn-sm"><i class="fa fa-search"></i> 路侧护栏</span>
-                    </div>
-                    <div class="col-auto">
-                        <span class="btn btn-light btn-sm">数据源：5</span>
-                        <span class="btn btn-light btn-sm">参与计算：3</span>
-                    </div>
-                    <div class="col-2">
-                        <div class="input-group input-group-sm mb-0">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text" id="basic-addon1">数量</span>
-                            </div>
-                            <input type="text" class="form-control" value="7000" >
-                            <div class="input-group-append">
-                                <a class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" >组成</a>
-                                <div class="dropdown-menu p-2">
-                                    <table class="table table-sm table-bordered mb-0">
-                                        <tr><th class="text-center">单位</th><th class="text-center">数量</th><th class="text-center">合计</th></tr>
-                                        <tr><td>单位1</td><td class="text-right">3000</td><td><input type="checkbox" class="form-control" checked></td></tr>
-                                        <tr><td>单位2</td><td class="text-right">4000</td><td><input type="checkbox" class="form-control" checked></td></tr>
-                                        <tr><td>合计</td><td  class="text-right" colspan="2">7000</td></tr>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-2">
-                        <div class="input-group input-group-sm mb-0">
-                            <div class="input-group-prepend">
-                                <span class="input-group-text" id="basic-addon1">经济指标</span>
-                            </div>
-                            <input type="text" class="form-control" value="66020" readonly>
-
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="card text-white bg-danger">
-                <div class="card-body row">
-                    <div class="col-auto">
-                        <h4>检索 "关键词" 没有结果</h4>
-                    </div>
-                </div>
-            </div>
         </div>
         <div class="c-body">
             <div class="sjs-height-1">
-                <table class="table table-bordered">
+                <table class="table table-bordered table-sm">
+                    <thead>
                     <tr>
-                        <th class="text-center">序号</th>
-                        <th class="text-center">参与计算</th>
-                        <th class="text-center">编号</th>
-                        <th class="text-center">名称</th>
-                        <th class="text-center">单位</th>
-                        <th class="text-center">设计数量1</th>
-                        <th class="text-center">设计数量2</th>
-                        <th class="text-center">经济指标</th>
-                        <th class="text-center">金额</th>
-                        <th class="text-center">所属标段</th>
-                        <th class="text-center">上传时间</th>
-                        <th class="text-center">所在位置</th>
-                        <th class="text-center">备注</th>
+                        <th class="text-center" rowspan="2"></th>
+                        <th class="text-center" rowspan="2">指标编号</th>
+                        <th class="text-center" rowspan="2">项目或费用名称</th>
+                        <th class="text-center" rowspan="2" colspan="2">指标单位</th>
+                        <th class="text-center" colspan="3">经济指标</th>
+                        <th class="text-center" rowspan="2">平均指标</th>
+                        <th class="text-center" rowspan="2">计算规则</th>
+                        <th class="text-center" rowspan="2">备注</th>
                     </tr>
                     <tr>
-                        <td>1</td>
-                        <td><input type="checkbox" checked  class="form-control"></td>
-                        <td>编号</td>
-                        <td>名称</td>
-                        <td class="text-center">单位</td>
-                        <td class="text-right">设计数量1</td>
-                        <td class="text-right">设计数量2</td>
-                        <td class="text-right">经济指标</td>
-                        <td class="text-right">金额</td>
-                        <td>所属标段</td>
-                        <td>上传时间</td>
-                        <td>所在位置</td>
-                        <td>备注</td>
+                        <th>XXX标段</th>
+                        <th>YYY标段</th>
+                        <th>ZZZ标段</th>
                     </tr>
-                    <tr class="table-secondary">
-                        <td>2</td>
-                        <td><input type="checkbox" class="form-control"></td>
-                        <td>编号</td>
-                        <td>名称</td>
-                        <td class="text-center">单位</td>
-                        <td class="text-right">设计数量1</td>
-                        <td class="text-right">设计数量2</td>
-                        <td class="text-right">经济指标</td>
-                        <td class="text-right">金额</td>
-                        <td>所属标段</td>
-                        <td>上传时间</td>
-                        <td>所在位置</td>
-                        <td>备注</td>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>1</td>
+                        <td>z1</td>
+                        <td>临时工程</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>3</td>
-                        <td><input type="checkbox" checked class="form-control"></td>
-                        <td>编号</td>
-                        <td>名称</td>
-                        <td class="text-center">单位</td>
-                        <td class="text-right">设计数量1</td>
-                        <td class="text-right">设计数量2</td>
-                        <td class="text-right">经济指标</td>
-                        <td class="text-right">金额</td>
-                        <td>所属标段</td>
-                        <td>上传时间</td>
-                        <td>所在位置</td>
-                        <td>备注</td>
+                        <td>2</td>
+                        <td>z1-a</td>
+                        <td>临时道路</td>
+                        <td></td>
+                        <td>km</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>指新建便道与利用原有道路的总长</td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>4</td>
-                        <td><input type="checkbox" checked class="form-control"></td>
-                        <td>编号</td>
-                        <td>名称</td>
-                        <td class="text-center">单位</td>
-                        <td class="text-right">设计数量1</td>
-                        <td class="text-right">设计数量2</td>
-                        <td class="text-right">经济指标</td>
-                        <td class="text-right">金额</td>
-                        <td>所属标段</td>
-                        <td>上传时间</td>
-                        <td>所在位置</td>
-                        <td>备注</td>
+                        <td>2</td>
+                        <td>z1-a-1</td>
+                        <td>临时道路公路公里造价</td>
+                        <td>元</td>
+                        <td>公路公里</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>合价/路线总长度</td>
+                        <td></td>
                     </tr>
+                    </tbody>
                 </table>
             </div>
         </div>

app/view/compare/modal.ejs

@@ -0,0 +1,31 @@
+<!-- 设置计算式 -->
+<div id="generate-data" class="modal" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">选择需要对比指标源</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            </div>
+            <div class="modal-body">
+                <div class="modal-height-500-scroll">
+                    <table class="table table-bordered">
+                        <tr><th>指标源</th><th>选择</th></tr>
+                        <% if(libList.length > 0) { %>
+                        <% libList.forEach(function(lib) { %>
+                        <tr class="table-secondary"><td><%= lib.filename %></td><td><input type="checkbox"></td></tr>
+                        <% }) %>
+                        <% } %>
+                    </table>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-primary">生成对比结果</button>
+                <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- JS. -->
+<script type="text/javascript">
+    $('#generate-data').modal('show');
+</script>