Strona główna Odkrywaj Pomoc
Zaloguj się
SmartCost
/
ConstructionCost
2
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

Merge branch 'master' into olym

olym 7 lat temu
rodzic
376a707cda ba36e5b1fd
commit
55eec27e1d
20 zmienionych plików z 67 dodań i 47 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2 2
      config/gulpConfig.js
  2. 2 3
      lib/bootstrap/bootstrap.min.js
  3. 3 2
      lib/bootstrap/css/bootstrap.min.css
  4. 4 0
      lib/jquery/jquery-3.2.1.slim.min.js
  5. 0 4
      lib/jquery/jquery.min.js
  6. 0 1
      lib/tether/tether.min.js
  7. 14 4
      modules/complementary_glj_lib/models/schemas.js
  8. 3 3
      web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html
  9. 3 2
      web/building_saas/complementary_glj_lib/js/components.js
  10. 9 0
      web/building_saas/complementary_glj_lib/js/glj.js
  11. 4 3
      web/building_saas/main/html/main.html
  12. 1 1
      web/building_saas/main/js/views/calc_program_view.js
  13. 3 3
      web/building_saas/pm/html/project-management.html
  14. 4 4
      web/common/html/header.html
  15. 2 2
      web/src/html/pm/project-management.html
  16. 5 5
      web/users/html/login-infoinput.html
  17. 2 2
      web/users/html/login.html
  18. 2 2
      web/users/html/user-info.html
  19. 2 2
      web/users/html/user-safe.html
  20. 2 2
      web/users/html/user-set.html

+ 2 - 2
config/gulpConfig.js
Wyświetl plik 

@@ -5,8 +5,8 @@
 
 module.exports = {
 
     version:'1.0.1',
 
     common_jspaths:[
 
-        'lib/jquery/jquery.min.js',
 
-        'lib/tether/tether.min.js',
 
+        'lib/jquery/jquery-3.2.1.slim.min.js',
 
+        'lib/popper/popper.min.js',
 
         'lib/bootstrap/bootstrap.min.js',
 
         'web/building_saas/js/*.js'
 
     ],

Plik diff jest za duży
+ 2 - 3
lib/bootstrap/bootstrap.min.js


Plik diff jest za duży
+ 3 - 2
lib/bootstrap/css/bootstrap.min.css


Plik diff jest za duży
+ 4 - 0
lib/jquery/jquery-3.2.1.slim.min.js


Plik diff jest za duży
+ 0 - 4
lib/jquery/jquery.min.js


Plik diff jest za duży
+ 0 - 1
lib/tether/tether.min.js


+ 14 - 4
modules/complementary_glj_lib/models/schemas.js
Wyświetl plik 

@@ -4,9 +4,19 @@
 
 import mongoose from "mongoose";
 
 
 let Schema = mongoose.Schema;
 
-let gjlComponentSchema = mongoose.Schema(
 
+//补充工料机的组成物可能来自标准工料机和补充工料机
 
+let comGjlComponentSchema = new Schema(
 
+    {
 
+        isStd: Boolean, //组成物里的工料机是否是标准的，否则是补充的
 
+        ID: Number,
 
+        consumeAmt: Number
 
+    },
 
+    {_id: false},
 
+    {versionKey: false}
 
+);
 
+//标准工料机的组成物只来自标准工料机
 
+let stdGjlComponentSchema = new Schema(
 
     {
 
-       // module: String, //"stdGlj"标准工料机 "complementaryGlj"
 
         ID: Number,
 
         consumeAmt: Number
 
     },
 
@@ -26,7 +36,7 @@ let complementaryGljSchema = new Schema({
 
     gljClass: Number,
 
     gljType: Number,
 
     shortName: String,
 
-    component: [gjlComponentSchema]
 
+    component: [comGjlComponentSchema]
 
 }, {versionKey: false});
 
 
 //标准工料机
 
@@ -42,7 +52,7 @@ let stdGljSchema = new Schema({
 
     gljType: Number,
 
     shortName: String,
 
     unit: String,
 
-    component: [gjlComponentSchema]
 
+    component: [stdGjlComponentSchema]
 
 },{versionKey: false});
 
 
 //标准工料机分类树

+ 3 - 3
web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html
Wyświetl plik 

@@ -20,7 +20,7 @@
 
 <body>
 
     <div class="header">
 
         <%include ../../../common/html/header.html %>
 
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
             <ul class="nav navbar-nav px-1">
 
                 <li class="nav-item">
 
                     <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
 
@@ -176,10 +176,10 @@
 
         </div>
 
     </div>
 
     <!-- JS. -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
     <script src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>
 
     <script src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>
 
     <!-- zTree -->

+ 3 - 2
web/building_saas/complementary_glj_lib/js/components.js
Wyświetl plik 

@@ -217,13 +217,14 @@ let componentOprObj = {
 
                 let isExist = false;
 
                 for(let j = 0, jLen = re.currentGlj.component.length; j < jLen; j++){
 
                     if(me.selectedList[i].ID === re.currentGlj.component[j].ID){
 
-                        newComponent.push({ID: me.selectedList[i].ID, consumeAmt: re.currentGlj.component[j].consumeAmt});
 
+                        newComponent.push({isStd: typeof me.selectedList[i].isStd !== 'undefined' ? me.selectedList[i].isStd : false
 
+                            , ID: me.selectedList[i].ID, consumeAmt: re.currentGlj.component[j].consumeAmt});
 
                         isExist = true;
 
                         break;
 
                     }
 
                 }
 
                 if(!isExist){
 
-                    newComponent.push({ID: me.selectedList[i].ID, consumeAmt: 0});
 
+                    newComponent.push({isStd: typeof me.selectedList[i].isStd !== 'undefined' ? me.selectedList[i].isStd : false, ID: me.selectedList[i].ID, consumeAmt: 0});
 
                 }
 
                 //re.currentGlj.component.push({ID: me.selectedList[i].ID, consumeAmt: 0});
 
             }

+ 9 - 0
web/building_saas/complementary_glj_lib/js/glj.js
Wyświetl plik 

@@ -147,6 +147,7 @@ let repositoryGljObj = {
 
                     me.complementaryGljList = result.data.complementaryGljs;
 
                     me.workBook.getSheet(0).setRowCount(me.stdGljList.length);
 
                     me.sortGlj(me.stdGljList);
 
+                    me.setProp('isStd', true, me.stdGljList);
 
                     me.sortGlj(me.complementaryGljList);
 
                     let rootNode = me.treeObj.getNodes()[0];
 
                     if(rootNode && rootNode.isParent && rootNode.isFirstNode){
 
@@ -199,6 +200,7 @@ let repositoryGljObj = {
 
             let obj = {};
 
             for(let j = 0; j < me.complementaryGljList.length; j++){
 
                 if(gljComponent[i].ID == me.complementaryGljList[j].ID){
 
+                    obj.isStd = false;
 
                     obj.ID = me.complementaryGljList[j].ID;
 
                     obj.code = me.complementaryGljList[j].code;
 
                     obj.name = me.complementaryGljList[j].name;
 
@@ -210,6 +212,7 @@ let repositoryGljObj = {
 
             }
 
             for(let j = 0; j < me.stdGljList.length; j++){
 
                 if(gljComponent[i].ID == me.stdGljList[j].ID){
 
+                    obj.isStd = true;
 
                     obj.ID = me.stdGljList[j].ID;
 
                     obj.code = me.stdGljList[j].code;
 
                     obj.name = me.stdGljList[j].name;
 
@@ -1043,6 +1046,12 @@ let repositoryGljObj = {
 
         }
 
         //allgljs
 
     },
 
+    setProp: function (prop, value, gljList) {
 
+        let me = this;
 
+        for(let i = 0, len = gljList.length; i < len; i++){
 
+            gljList[i][prop] = value;
 
+        }
 
+    },
 
     sortGlj: function(gljList) {
 
         let me = this;
 
         gljList.sort(function(a, b){

+ 4 - 3
web/building_saas/main/html/main.html
Wyświetl plik 

@@ -36,7 +36,7 @@
 
             </div>
 
         </div>
 
         <%include ../../../common/html/header.html %>
 
-        <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
             <ul class="nav navbar-nav px-1">
 
                 <li class="nav-item">
 
                     <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
 
@@ -99,7 +99,7 @@
 
                     <a href="javascript:void(0)" class="btn btn-sm" id="downMove"><i class="fa fa-arrow-down" aria-hidden="true"></i> 下移</a>
 
                     <a href="javascript:void(0)" class="btn btn-sm" id="upMove"><i class="fa fa-arrow-up" aria-hidden="true"></i> 上移</a>
 
                   </div>
 
-                  <div>
 
+                  <div class="tools-btn">
 
                       <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true"></i> 列设置</a>
 
                   </div>
 
                   <div class="side-tabs">
 
@@ -631,7 +631,8 @@
 
     <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
 
 
     <!-- JS. -->
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="js/jquery/jquery-3.2.1.slim.min.js"></script>
 
+    <script src="js/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>

+ 1 - 1
web/building_saas/main/js/views/calc_program_view.js
Wyświetl plik 

@@ -227,7 +227,7 @@ let calcProgramObj = {
 
         me.treeNode = treeNode;
 
         if (treeNode.sourceType === projectObj.project.Ration.getSourceType()) {
 
             projectObj.project.calcProgram.calculate(treeNode);
 
-           if (treeNode.parent) {
 
+            if (treeNode.parent) {
 
                 projectObj.converseCalculateBills(treeNode.parent);
 
             }
 
             me.datas = me.treeNode.data.calcTemplate.calcItems;

+ 3 - 3
web/building_saas/pm/html/project-management.html
Wyświetl plik 

@@ -40,7 +40,7 @@
 
         </div>
 
     </div>
 
     <%include ../../../common/html/header.html %>
 
-    <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+    <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
         <ul class="nav navbar-nav px-1">
 
             <li class="nav-item dropdown">
 
                 <a class="nav-link dropdown-toggle" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">文件</a>
 
@@ -496,8 +496,8 @@
 
 </div>
 
 <!-- JS. -->
 
 <!-- inject:js -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/public/web/date_util.js"></script>

+ 4 - 4
web/common/html/header.html
Wyświetl plik 

@@ -1,12 +1,12 @@
 
-<nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 justify-content-between">
 
+<nav class="navbar navbar-expand-lg navbar-light bg-light p-0 justify-content-between">
 
     <span class="header-logo px-2">Smartcost</span>
 
     <div class="navbar-text navbar-crumb p-0" id="fullpath">
 
         <% if (action !== 'index' || controller !== 'pm') {%>
 
         <span class="text-truncate"><a href="/pm">项目管理</a></span>
 
         <% } %>
 
     </div>
 
-    <div class="float-lg-right navbar-text pt-0">
 
-        <div class="dropdown d-inline-block">
 
+    <div class="float-lg-right navbar-text p-0">
 
+        <div class="dropdown d-inline-block navbar-nav">
 
             <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown"><%= sessionUser.email %></button>
 
             <div class="dropdown-menu dropdown-menu-right">
 
                 <a class="dropdown-item" href="/user/info" target="_blank">账号资料</a>
 
@@ -58,7 +58,7 @@
 
     </div>
 
 </div>
 
 <!-- inject:js -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
 <script type="text/javascript" src="/web/building_saas/js/moment.min.js"></script>
 
 <script type="text/javascript" src="/web/building_saas/js/message.js"></script>
 
 <!-- endinject -->

+ 2 - 2
web/src/html/pm/project-management.html
Wyświetl plik 

@@ -40,7 +40,7 @@
 
         </div>
 
     </div>
 
     <%include ../../../common/html/header.html %>
 
-    <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
+    <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
 
         <ul class="nav navbar-nav px-1">
 
             <li class="nav-item dropdown">
 
                 <a class="nav-link dropdown-toggle" href="http://example.com" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">文件</a>
 
@@ -496,7 +496,7 @@
 
 </div>
 
 <!-- JS. -->
 
 <!-- inject:js -->
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/public/web/date_util.js"></script>

+ 5 - 5
web/users/html/login-infoinput.html
Wyświetl plik 

@@ -17,13 +17,13 @@
 
 </div>
 
 <div class="container mt-3">
 
     <form class="row" method="post" action="/user/info" id="info-form">
 
-        <div class="col-lg-8 offset-lg-2">
 
+        <div class="col-lg-8 m-auto">
 
             <div class="card newuser-input">
 
-                <div class="card-block">
 
+                <div class="card-body">
 
                     <h4 class="card-title">在开始使用前，请填写以下信息。</h4>
 
                     <h6 class="card-subtitle text-muted">详细填写这些信息，可以让我们更好的服务您。</h6>
 
                 </div>
 
-                <div class="card-block">
 
+                <div class="card-body">
 
                     <div class="form-group">
 
                         <input class="form-control" placeholder="你的姓名" name="real_name" id="name">
 
                     </div>
 
@@ -69,8 +69,8 @@
 
     </form>
 
 </div>
 
 <!-- JS. -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/web/users/js/user.js"></script>

+ 2 - 2
web/users/html/login.html
Wyświetl plik 

@@ -69,9 +69,9 @@
 
     </div>
 
     <!-- JS. -->
 
     <!-- inject:js -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
     <script src="/public/web/url_util.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>
 
     <script type="text/javascript" src="/web/users/js/login.js"></script>

+ 2 - 2
web/users/html/user-info.html
Wyświetl plik 

@@ -84,8 +84,8 @@
 
     </div>
 
 </div>
 
 <!-- JS. -->
 
-<script src="/lib/jquery/jquery.min.js"></script>
 
-<script src="/lib/tether/tether.min.js"></script>
 
+<script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+<script src="/lib/popper/popper.min.js"></script>
 
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
 <script src="/web/building_saas/js/global.js"></script>
 
 <script src="/web/users/js/user.js"></script>

+ 2 - 2
web/users/html/user-safe.html
Wyświetl plik 

@@ -10,8 +10,8 @@
 
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
 
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
 
     <!-- JS. -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script type="text/javascript" src="/lib/bootstrap/bootstrap-paginator.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>

+ 2 - 2
web/users/html/user-set.html
Wyświetl plik 

@@ -78,8 +78,8 @@
 
         </div>
 
     </div>
 
     <!-- JS. -->
 
-    <script src="/lib/jquery/jquery.min.js"></script>
 
-    <script src="/lib/tether/tether.min.js"></script>
 
+    <script src="/lib/jquery/jquery-3.2.1.slim.min.js"></script>
 
+    <script src="/lib/popper/popper.min.js"></script>
 
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
 
     <script src="/web/building_saas/js/global.js"></script>
 
 </body>