Startsida Utforska Hjälp
Logga in
maixinrong
/
IndexSystem
1
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

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

MaiXinRong 7 år sedan
förälder
022e6677bd 1d336e3f6b
incheckning
7dff642c08
11 ändrade filer med 40 tillägg och 14 borttagningar
Delad Vy Visa Diff Statistik
  1. 2 1
      app/base/base_service.js
  2. 4 0
      app/controller/lib_controller.js
  3. BIN
      app/public/css/logo.png
  4. 17 0
      app/service/quota_lib.js
  5. 2 2
      app/view/layout/layout.ejs
  6. 1 1
      app/view/lib/detail.ejs
  7. 5 1
      app/view/lib/global.ejs
  8. 4 4
      app/view/lib/index.ejs
  9. 3 3
      app/view/lib/modal.ejs
  10. 1 1
      app/view/login/login.ejs
  11. 1 1
      config/menu.js

+ 2 - 1
app/base/base_service.js
Visa fil 

@@ -150,8 +150,9 @@ class BaseService extends Service {
 
      * @returns {Promise<void>}
 
      */
 
     async deleteData(data, transaction) {
 
+        const count = await this.count(data);
 
         const deleteResult = await transaction.delete(this.tableName, data);
 
-        if (!deleteResult.affectedRows > 0) {
 
+        if (deleteResult.affectedRows !== count) {
 
             throw '删除错误';
 
         }
 
     }

+ 4 - 0
app/controller/lib_controller.js
Visa fil 

@@ -154,6 +154,10 @@ module.exports = app => {
 
                 }
 
                 //获取指标源数据
 
                 const libInfo = await ctx.service.quotaLib.getLibDataById(lid);
 
+                //改变是否第一次进入detail页
 
+                if(libInfo.openitem_tab === 0){
 
+                    const reuslt = await ctx.service.quotaLib.updateOpenItemTab(lid);
 
+                }
 
                 const billsData = await ctx.service.bills.getDataByLibId(lid);
 
                 // if(libInfo.status === libConst.status.enter){
 
                 //     throw '指标源已入库';

BIN
app/public/css/logo.png
Visa fil


+ 17 - 0
app/service/quota_lib.js
Visa fil 

@@ -132,6 +132,23 @@ module.exports = app => {
 
         }
 
 
         /**
 
+         * 改变第一次进入detail后状态
 
+         *
 
+         * @param {Object} id - 更新的id
 
+         * @return {Boolean} - 更新结果
 
+         */
 
+        async updateOpenItemTab(id) {
 
+            const updateData = {
 
+                openitem_tab: 1,
 
+                id,
 
+            };
 
+
 
+            const result = this.db.update(this.tableName, updateData);
 
+
 
+            return result.affectedRows > 0;
 
+        }
 
+
 
+        /**
 
          * 指标源批量入库
 
          *
 
          * @param {Object} postData - 文件信息数据

+ 2 - 2
app/view/layout/layout.ejs
Visa fil 

@@ -5,7 +5,7 @@
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta http-equiv="x-ua-compatible" content="ie=edge">
 
-    <title>指标库-纵横经济指标系统</title>
 
+    <title>纵横造价指标系统</title>
 
     <link rel="stylesheet" href="/public/css/bootstrap/bootstrap.min.css">
 
     <link rel="stylesheet" href="/public/css/main.css">
 
     <link rel="stylesheet" href="/public/css/font-awesome/font-awesome.min.css">
 
@@ -23,7 +23,7 @@
 
 
 <body>
 
 <div class="header">
 
-    <h1 class="logo"><a>指标库-纵横经济指标系统</a></h1>
 
+    <h1 class="logo"><a>纵横造价指标系统</a></h1>
 
     <div class="poj-name">
 
         <span class="name"><%= ctx.title %></span>
 
     </div>

+ 1 - 1
app/view/lib/detail.ejs
Visa fil 

@@ -15,7 +15,7 @@
 
                     <a class="nav-link" href="/lib/global/<%= ctx.params.id %>">全局参数</a>
 
                 </li>
 
                 <li class="nav-item">
 
-                    <a class="nav-link active" href="/lib/detail/<%= ctx.params.id %>">项目节参数</a>
 
+                    <a class="nav-link active" href="javascript:void(0);">项目节参数</a>
 
                 </li>
 
             </ul>
 
         </div>

+ 5 - 1
app/view/lib/global.ejs
Visa fil 

@@ -11,10 +11,14 @@
 
         <div class="c-header p-0 col-12">
 
             <ul class="nav nav-tabs">
 
                 <li class="nav-item">
 
-                    <a class="nav-link active" href="my-Library-detail.html">全局参数</a>
 
+                    <a class="nav-link active" href="javascript:void(0);">全局参数</a>
 
                 </li>
 
                 <li class="nav-item">
 
+                    <% if(libInfo.openitem_tab === 0) { %>
 
                     <a class="nav-link disabled"  data-container="body" data-toggle="popover" data-placement="right" data-content="请点击右上角「填写项目节参数」">项目节参数</a>
 
+                    <% } else { %>
 
+                    <a class="nav-link" href="/lib/detail/<%= ctx.params.id %>">项目节参数</a>
 
+                    <% } %>
 
                 </li>
 
             </ul>
 
         </div>

+ 4 - 4
app/view/lib/index.ejs
Visa fil 

@@ -25,7 +25,7 @@
 
                 </div>
 
             </div>
 
             <div>
 
-                <a href="#upload" data-toggle="modal" data-target="#upload" class="btn btn-primary btn-sm pull-right">导入指标源</a>
 
+                <a href="#upload" data-toggle="modal" data-target="#upload" class="btn btn-primary btn-sm pull-right">导入造价文件</a>
 
             </div>
 
         </div>
 
     </div>
 
@@ -35,16 +35,16 @@
 
             <div class="sjs-height-1">
 
                 <table class="table table-bordered">
 
                     <tr>
 
-                        <th class="">指标源名称</th>
 
+                        <th class="">造价文件名称</th>
 
                         <th class="">导入时间</th>
 
                         <th class=""></th>
 
                     </tr>
 
                     <% if(libList.length > 0) { %>
 
                     <% libList.forEach(function(lib) { %>
 
                     <tr>
 
-                        <td><a href="/lib/detail/<%= lib.id %>"><%= lib.filename %></a></td>
 
+                        <td><a href="/lib/global/<%= lib.id %>"><%= lib.filename %></a></td>
 
                         <td><%= lib.create_time > 0 ? moment(lib.create_time * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' %> </td>
 
-                        <td><% if(lib.status === 1) { %><a href="/lib/detail/<%= lib.id %>" class="btn btn-sm btn-outline-primary">填写参数</a> <% } else { %><%= lib.enter_time > 0 ? moment(lib.enter_time * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' %> 入库<% } %></td>
 
+                        <td><% if(lib.status === 1) { %><a href="/lib/global/<%= lib.id %>" class="btn btn-sm btn-outline-primary">填写参数</a> <% } else { %><%= lib.enter_time > 0 ? moment(lib.enter_time * 1000).format('YYYY-MM-DD HH:mm:ss') : '-' %> 入库<% } %></td>
 
                     </tr>
 
                     <% }) %>
 
                     <% } %>

+ 3 - 3
app/view/lib/modal.ejs
Visa fil 

@@ -3,14 +3,14 @@
 
     <div class="modal-dialog">
 
         <div class="modal-content">
 
             <div class="modal-header">
 
-                <h5 class="modal-title">导入指标源</h5>
 
+                <h5 class="modal-title">导入造价文件</h5>
 
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
 
             </div>
 
             <form method="POST" action="/lib/upload?_csrf=<%= ctx.csrf %>" enctype="multipart/form-data" onsubmit="return checkfileupload();">
 
                 <div class="modal-body">
 
                     <div class="form-group">
 
-                        <label for="exampleFormControlFile1">上传指标源文件</label>
 
-                        <div class="form-control"><input class="form-control-file" id="exampleFormControlFile1" accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel, .json" name="file" type="file"></div>
 
+                        <label for="exampleFormControlFile1">上传造价文件</label>
 
+                        <div class="form-control"><input class="form-control-file" id="exampleFormControlFile1" accept=".json" name="file" type="file"></div>
 
                     </div>
 
                 </div>
 
                 <div class="modal-footer">

+ 1 - 1
app/view/login/login.ejs
Visa fil 

@@ -13,7 +13,7 @@
 
 <div class="container">
 
     <!--演示版-->
 
     <form class="form-signin" method="post" action="/login">
 
-        <h1 class="d-flex justify-content-center mb-4">纵横经济指标系统</h1>
 
+        <h1 class="d-flex justify-content-center mb-4">纵横造价指标系统</h1>
 
         <nav class="nav nav-tabs nav-justified mb-3" role="tablist" >
 
         </nav>
 
         <div class="form-group <% if (errorMessage !== undefined && errorMessage !== null) { %>has-danger<% } %>">

+ 1 - 1
config/menu.js
Visa fil 

@@ -16,7 +16,7 @@ const menu = {
 
         url: '/template',
 
     },
 
     lib: {
 
-        name: '指标库',
 
+        name: '造价文件库',
 
         icon: 'fa-list-ul',
 
         display: true,
 
         url: '/lib',