MaiXinRong пре 6 година
родитељ
комит
d814e2bf14

+ 0 - 1
app/controller/compare_controller.js

@@ -90,7 +90,6 @@ module.exports = app => {
                         n.children = await ctx.service.tenderIndex.getAllDataByCondition({where: condition});
                     }
                 }
-                console.log(tenders);
                 ctx.body = {err: 0, msg: '', data: tenders};
             } catch (err) {
                 ctx.body = {err: 1, msg: err.toString(), data: []};

Разлика између датотеке није приказан због своје велике величине
+ 2 - 2
app/public/css/bootstrap/bootstrap.min.css


BIN
app/public/css/logo.png


+ 4 - 3
app/public/css/main.css

@@ -164,12 +164,13 @@ body {
 .panel-title>.title-main .btn.pull-right {
   margin:10px 0 0 10px
 }
-.panel-title>.title-main .form-control {
-  margin:10px 0 0 0
-}
+
 .panel-title>.title-main{
   padding-left: 15px
 }
+.panel-title>.title-main .dropdown-item{
+  line-height: normal;
+}
 /*滚动*/
 .scrollbar-auto {
     overflow-y: auto;

+ 0 - 2
app/service/tender_node.js

@@ -34,13 +34,11 @@ module.exports = app => {
                 const sql = 'Select * From ' + this.tableName +
                     '  Where `lib_id` = ? and `index_class` = ? and `class_name` = ?';
                 const sqlParam = [tenderId, indexClass, className];
-                console.log(this.db.format(sql, sqlParam));
                 return await this.db.query(sql, sqlParam);
             } else {
                 const sql = 'Select * From ' + this.tableName +
                     '  Where `lib_id` = ? and `index_class` = ?';
                 const sqlParam = [tenderId, indexClass];
-                console.log(this.db.format(sql, sqlParam));
                 return await this.db.query(sql, sqlParam);
             }
         }

+ 1 - 1
app/view/compare/index.ejs

@@ -21,7 +21,7 @@
                             </button>
                             <div class="dropdown-menu" aria-labelledby="index-dy">
                                 <% for (const dy of dyNames) { %>
-                                <a class="dropdown-item" data='<%- JSON.stringify({indexClass: nodeConst.indexClass.dy, className: dy.name }) %>'><%- dy.name %></a>
+                                <a class="dropdown-item" data='<%- JSON.stringify({indexClass: nodeConst.indexClass.dy, className: dy.name }) %>' href="javascript: void(0);"><%- dy.name %></a>
                                 <% } %>
                             </div>
                         </div>