zhangweicheng 5 gadi atpakaļ
vecāks
revīzija
6a86a06dad

+ 13 - 0
config/config.js

@@ -56,6 +56,19 @@ module.exports = {
         },
         importURL:"172.18.111.231:2050"
     },
+    pp_out:{  server: "112.74.42.187",
+      port: "27017",
+      options:{
+          user:'smartcost',
+          pass:'SmartCost3850888',
+          auth: {
+              "authdb": "admin"
+          },
+          connectTimeoutMS: 50000,
+          useMongoClient: true
+      },
+      importURL:"112.74.42.187:2050"
+    },
     prod_s:{  server: "112.74.42.187",
         port: "28066",
         options:{

+ 1 - 0
config/gulpConfig.js

@@ -178,6 +178,7 @@ module.exports = {
         'web/building_saas/complementary_ration_lib/js/main.js',
         'web/building_saas/main/js/views/material_calc_view.js',
         'web/building_saas/main/js/views/electrovalence_view.js',
+        'web/building_saas/main/js/views/divide_view.js',
         'public/web/storageUtil.js'
     ],
     compleGlj_css: [

+ 3 - 1
web/building_saas/main/js/views/project_view.js

@@ -2637,9 +2637,11 @@ $('#property_ok').click(function () {
                 }
                 if(mixDatas.options && mixDatas.options.updateData){
                     let v1 = mixDatas.options.updateData['rationQuanACToBillsQuan'],
-                        v2 = mixDatas.options.updateData['rationQuanACToRationUnit'];
+                        v2 = mixDatas.options.updateData['rationQuanACToRationUnit'],
+                        progressiveType = mixDatas.options.updateData['progressiveType']  ;
                     optionsOprObj.updateOptions(optionsOprObj.options, {type: optionsOprObj.optionsTypes.GENERALOPTS, opt: 'rationQuanACToBillsQuan', value: v1});
                     optionsOprObj.updateOptions(optionsOprObj.options, {type: optionsOprObj.optionsTypes.GENERALOPTS, opt: 'rationQuanACToRationUnit', value: v2});
+                    optionsOprObj.updateOptions(optionsOprObj.options, {type: optionsOprObj.optionsTypes.GENERALOPTS, opt: 'progressiveType', value: progressiveType});
                 }
             }
         });