Home Explore Help
Sign In
SmartCost
/
YangHuOperation
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuOperation

TonyKang 5 years ago
parent
a7d2db451c ef604f88d6
commit
a487f491be
23 changed files with 4702 additions and 32 deletions
Unified View Show Diff Stats
  1. 10 5
      Dockerfile
  2. 1 0
      modules/ration_repository/models/ration_item.js
  3. 4658 0
      package-lock.json
  4. 1 1
      web/maintain/billsGuidance_lib/html/main.html
  5. 1 1
      web/maintain/billsGuidance_lib/html/zhiyin.html
  6. 1 1
      web/maintain/billsGuidance_lib/js/billsGuidance.js
  7. 1 1
      web/maintain/bills_lib/html/main.html
  8. 1 1
      web/maintain/bills_lib/html/neirong.html
  9. 1 1
      web/maintain/bills_lib/html/qingdan.html
  10. 1 1
      web/maintain/bills_lib/html/tezheng.html
  11. 1 1
      web/maintain/common/html/edit_layout.html
  12. 1 1
      web/maintain/common/html/layout.html
  13. 1 1
      web/maintain/ration_repository/anzhuang.html
  14. 1 1
      web/maintain/ration_repository/dinge.html
  15. 1 1
      web/maintain/ration_repository/fuzhu.html
  16. 1 1
      web/maintain/ration_repository/gongliao.html
  17. 4 1
      web/maintain/ration_repository/js/ration.js
  18. 1 1
      web/maintain/ration_repository/main.html
  19. 1 1
      web/maintain/report/html/rpt_tpl_main.html
  20. 1 1
      web/maintain/std_glj_lib/html/gongliao.html
  21. 1 1
      web/maintain/std_glj_lib/html/main.html
  22. 1 1
      web/maintain/std_glj_lib/js/glj.js
  23. 11 8
      web/users/views/user/index.html

+ 10 - 5
Dockerfile
View File 

@@ -1,16 +1,21 @@
 
-FROM operationbase:2.0
 
+FROM operationbase:2.0 as build
 
 
 
 RUN mv /ConstructionOperation /YangHuOperation
 
 RUN mv /ConstructionOperation /YangHuOperation
 
 
 
 WORKDIR /YangHuOperation
 
 WORKDIR /YangHuOperation
 
 
 
-COPY . /YangHuOperation
 
+COPY package.json /YangHuOperation
 
+
 
+RUN mkdir tmp \
 
+    && cnpm install
 
 
 
-RUN mkdir tmp
 
+FROM base-alpine:latest
 
 
 
-RUN cnpm install
 
+COPY --from=build /YangHuOperation /YangHuOperation
 
 
 
-EXPOSE 2080
 
+COPY . /YangHuOperation
 
+
 
+WORKDIR /YangHuOperation
 
 
 
 ENV NODE_ENV=prod
 
 ENV NODE_ENV=prod

+ 1 - 0
modules/ration_repository/models/ration_item.js
View File 

@@ -732,6 +732,7 @@ rationItemDAO.prototype.batchAddFromExcel = async function(rationRepId, data) {
 
         if (tmp.length <= 0) {
 
         if (tmp.length <= 0) {
 
             continue;
 
             continue;
 
         }
 
         }
 
+        console.log(typeof tmp[0], tmp[0]);
 
         // 如果第一个字段为null则是工料机数据，放入上一个数据的工料机字段
 
         // 如果第一个字段为null则是工料机数据，放入上一个数据的工料机字段
 
         if (tmp[0] === undefined && Object.keys(lastData).length > 0) {
 
         if (tmp[0] === undefined && Object.keys(lastData).length > 0) {
 
             // 如果不存在对应的工料机库数据则跳过
 
             // 如果不存在对应的工料机库数据则跳过

File diff suppressed because it is too large
+ 4658 - 0
package-lock.json


+ 1 - 1
web/maintain/billsGuidance_lib/html/main.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

+ 1 - 1
web/maintain/billsGuidance_lib/html/zhiyin.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/billsGuidance_lib/js/billsGuidance.js
View File 

@@ -889,7 +889,7 @@ const billsGuidance = (function () {
 
         });
 
         });
 
     }
 
     }
 
     //编辑后自动去除换行符回车符
 
     //编辑后自动去除换行符回车符
 
-    const deESC = /[\r, \n]/g;
 
+    const deESC = /[\r\n]/g;
 
     //项目指引编辑
 
     //项目指引编辑
 
     //@param {Object}sheet {Array}cells
 
     //@param {Object}sheet {Array}cells
 
     function edit(sheet, cells){
 
     function edit(sheet, cells){

+ 1 - 1
web/maintain/bills_lib/html/main.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/bills_lib/html/neirong.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/bills_lib/html/qingdan.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/bills_lib/html/tezheng.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/common/html/edit_layout.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/common/html/layout.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/ration_repository/anzhuang.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/ration_repository/dinge.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/ration_repository/fuzhu.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/ration_repository/gongliao.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 4 - 1
web/maintain/ration_repository/js/ration.js
View File 

@@ -432,7 +432,7 @@ let rationOprObj = {
 
         let dataCode = me.setting.header[args.col].dataCode;
 
         let dataCode = me.setting.header[args.col].dataCode;
 
         let deESCFields = ['code', 'name', 'unit'];
 
         let deESCFields = ['code', 'name', 'unit'];
 
         if(deESCFields.includes(dataCode)){
 
         if(deESCFields.includes(dataCode)){
 
-            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, ' ') : '';
 
+            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r\n]/g, ' ') : '';
 
             args.sheet.setValue(args.row, args.col, args.editingText);
 
             args.sheet.setValue(args.row, args.col, args.editingText);
 
         }
 
         }
 
         let rObj = sheetsOprObj.combineRationRowData(me.workBook.getSheet(0), me.setting, args.row),
 
         let rObj = sheetsOprObj.combineRationRowData(me.workBook.getSheet(0), me.setting, args.row),
 
@@ -769,6 +769,9 @@ let rationOprObj = {
 
             return 0;
 
             return 0;
 
         }
 
         }
 
         arr.sort(function (a, b) {
 
         arr.sort(function (a, b) {
 
+            if (!commonUtil.isDef(a.code) || !commonUtil.isDef(b.code)) {
 
+                return 0;
 
+            }
 
             let aArr = a.code.split('-'),
 
             let aArr = a.code.split('-'),
 
                 bArr = b.code.split('-');
 
                 bArr = b.code.split('-');
 
             return recurCompare(aArr, bArr, 0);
 
             return recurCompare(aArr, bArr, 0);

+ 1 - 1
web/maintain/ration_repository/main.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/report/html/rpt_tpl_main.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/std_glj_lib/html/gongliao.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">

+ 1 - 1
web/maintain/std_glj_lib/html/main.html
View File 

@@ -1,5 +1,5 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
-<html lang="en">
 
+<html lang="zh-CN">
 
 <head>
 
 <head>
 
     <meta charset="utf-8">
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">

+ 1 - 1
web/maintain/std_glj_lib/js/glj.js
View File 

@@ -746,7 +746,7 @@ let repositoryGljObj = {
 
         let deESCFields = ['code', 'name', 'specs'];
 
         let deESCFields = ['code', 'name', 'specs'];
 
         let dataCode = me.setting.header[args.col].dataCode;
 
         let dataCode = me.setting.header[args.col].dataCode;
 
         if(deESCFields.includes(dataCode)){
 
         if(deESCFields.includes(dataCode)){
 
-            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r, \n]/g, ' ') : '';
 
+            args.editingText = me.isDef(args.editingText) ? args.editingText.toString().replace(/[\r\n]/g, ' ') : '';
 
             args.sheet.setValue(args.row, args.col, args.editingText);
 
             args.sheet.setValue(args.row, args.col, args.editingText);
 
         }
 
         }
 
         let rObj = sheetsOprObj.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me);
 
         let rObj = sheetsOprObj.combineRowData(me.workBook.getSheet(0), me.setting, args.row, me);

+ 11 - 8
web/users/views/user/index.html
View File 

@@ -93,13 +93,15 @@
 
             <table class="table">
 
             <table class="table">
 
                 <thead>
 
                 <thead>
 
                 <tr>
 
                 <tr>
 
-                    <th width="350">注册手机/邮箱</th>
 
-                    <th>姓名</th>
 
-                    <th>企业名称</th>
 
-                    <th>企业地区</th>
 
-                    <th>最近使用费用定额</th>
 
-                    <th>在线时长(<%= filter.loginMsg === undefined ? '所有' : filter.loginMsg %>)</th>
 
-                    <th width="180">注册时间 / 最近登录</th>
 
+                    <th width="15%">注册手机/邮箱</th>
 
+                    <th width="10%">姓名</th>
 
+                    <th width="20%">企业名称</th>
 
+                    <th width="10%">企业地区</th>
 
+                    <th width="12%">最近使用</th>
 
+                    <!--<th width="10%">在线时长(<%= filter.loginMsg === undefined ? '所有' : filter.loginMsg %>)</th>-->
 
+                    <th width="10%">累计时长</th>
 
+                    <th width="10%">注册时间</th>
 
+                    <th width="10%">最近登录</th>
 
                     <% if (manager.superAdmin == 1) { %>
 
                     <% if (manager.superAdmin == 1) { %>
 
                     <th>操作</th>
 
                     <th>操作</th>
 
                     <% }%>
 
                     <% }%>
 
@@ -115,7 +117,8 @@
 
                     <td><%= model.province[user.province] %></td>
 
                     <td><%= model.province[user.province] %></td>
 
                     <td><%= compilationMap[user.latest_used]?compilationMap[user.latest_used].name:""%></td>
 
                     <td><%= compilationMap[user.latest_used]?compilationMap[user.latest_used].name:""%></td>
 
                     <td><a onclick="getOnlineInfo('<%= user._doc.filter%>')" href="#time-detail" data-toggle="modal" data-target="#time-detail"><%= user._doc.online_times %></a></td>
 
                     <td><a onclick="getOnlineInfo('<%= user._doc.filter%>')" href="#time-detail" data-toggle="modal" data-target="#time-detail"><%= user._doc.online_times %></a></td>
 
-                    <td><%= moment(user.create_time).format('YYYY-MM-DD HH:mm:ss') %><br><%= user.latest_login?moment(user.latest_login).format('YYYY-MM-DD HH:mm:ss'):"" %></td>
 
+                    <td><%= moment(user.create_time).format('YYYY-MM-DD HH:mm:ss') %></td>
 
+                    <td><%= user.latest_login?moment(user.latest_login).format('YYYY-MM-DD HH:mm:ss'):"" %></td>
 
                     <% if (manager.superAdmin == 1) { %>
 
                     <% if (manager.superAdmin == 1) { %>
 
                     <td>
 
                     <td>
 
                         <a onclick='deleteUser("<%= user._id.toString()%>")' data-toggle="modal" data-target="#delUser" class="btn text-danger" style="padding: 0px">删除</a>
 
                         <a onclick='deleteUser("<%= user._id.toString()%>")' data-toggle="modal" data-target="#delUser" class="btn text-danger" style="padding: 0px">删除</a>