调整样式

app/public/js/compare.js

@@ -239,7 +239,8 @@ $(document).ready(function () {
 
     $('#export-excel').click(function () {
         const excelIo = new GC.Spread.Excel.IO();
-        const fileName = '指标对比.xlsx';
+        const date = new Date();
+        const fileName = '指标对比.' + date.Format("yyyy.MM.dd.hh.mm.ss") + '.xlsx';
         const sJson = JSON.stringify(compareObj.spread.toJSON());
         excelIo.save(sJson, function(blob) {
             saveAs(blob, fileName);

app/public/js/global.js

@@ -94,4 +94,26 @@ GetUrlQueryString = function (name) {
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
     var r = window.location.search.substr(1).match(reg);
     return r ?  unescape(r[2]) : null;
+};
+
+// 对Date的扩展，将 Date 转化为指定格式的String
+// 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
+// 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
+// 例子：
+// (new Date()).Format("yyyy-MM-dd hh:mm:ss.S") ==> 2006-07-02 08:09:04.423
+// (new Date()).Format("yyyy-M-d h:m:s.S")      ==> 2006-7-2 8:9:4.18
+Date.prototype.Format = function (fmt) { //author: meizz
+    var o = {
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
 }

app/view/compare/index.ejs

@@ -2,13 +2,13 @@
     <div class="panel-title fluid">
         <div class="title-main d-flex justify-content-between">
             <div>
-                <div class="btn-group">
+                <div class="d-inline-flex">
                     <a class="btn btn-primary btn-sm" href="#generate-data" data-toggle="modal" data-target="#generate-data">造价文件：0</a>
                 </div>
-                <div class="btn-group pr-0">
+                <div class="d-inline-flex pr-0">
                     <input type="text" class="form-control form-control-sm m-0" placeholder="输入指标节点编号或者名称" id="keyword" style="width:200px">
                 </div>
-                <div class="btn-group">
+                <div class="d-inline-flex">
                     <button class="btn btn-sm btn-primary " type="button" id="search">搜索</button>
                 </div>
             </div>

app/view/lib/detail.ejs

@@ -1,11 +1,13 @@
 <div class="panel-content">
     <div class="panel-title fluid">
-        <div class="title-main">
-            <h2>
+        <div class="title-main d-flex justify-content-between">
+            <div>
                 <%= libInfo.filename %>
+            </div>
+            <div>
                 <% if(libInfo.status === libConst.status.pend) { %><a href="#storage" data-toggle="modal" data-target="#storage" class="btn btn-primary btn-sm pull-right">入库</a><% } %>
                 <a href="#del" data-toggle="modal" data-target="#del" class="btn btn-outline-danger btn-sm pull-right">从库中删除</a>
-            </h2>
+            </div>
         </div>
     </div>
     <div class="content-wrap">

app/view/lib/global.ejs

@@ -1,10 +1,12 @@
 <div class="panel-content">
     <div class="panel-title fluid">
-        <div class="title-main">
-            <h2>
+        <div class="title-main d-flex justify-content-between">
+            <div>
                 <%= libInfo.filename %>
+            </div>
+            <div>
                 <a href="/lib/detail/<%= ctx.params.id %>" class="btn btn-primary btn-sm pull-right">填写项目节参数</a>
-            </h2>
+            </div>
         </div>
     </div>
     <div class="content-wrap">

app/view/lib/index.ejs

@@ -2,7 +2,7 @@
     <div class="panel-title fluid">
         <div class="title-main d-flex justify-content-between">
             <div>
-                <div class="btn-group">
+                <div class="d-inline-flex">
                     <ul class="nav nav-pills m-0">
                         <li class="nav-item">
                             <a class="nav-link <% if(status === undefined) { %>active<% } %>" href="/lib">全部</a>

app/view/template/index.ejs

@@ -14,10 +14,10 @@
     <div class="panel-title">
         <div class="title-main d-flex justify-content-between">
             <div>
-                <div class="btn-group">
+                <div class="d-inline-flex">
                     <%= selectNode.code %> <%= selectNode.name %>
                 </div>
-                <div class="btn-group ml-3">
+                <div class="d-inline-flex ml-3">
                     <input id="nodeMatchCode" data-toggle="tooltip" data-placement="bottom" title="<%- selectNode.match_type ? nodeConst.matchTypeStr[selectNode.match_type] : '' %>" type="text" class="m-0 form-control form-control-sm" placeholder="填写绑定的分项节点" value="<%= selectNode.match_key%>" org-value="<%= selectNode.match_key%>">
                 </div>
                 <a href="javascript:void(0)" data-toggle="popover"  data-content="默认都以分项编号为绑定依据，预留费用请输入分项名称。"><i class="fa fa-question-circle"></i></a>