update

config/gulpConfig.js

@@ -97,7 +97,6 @@ module.exports = {
         'public/web/sheet/sheet_common.js',
         'public/web/slideResize.js',
        // 'lib/ztree/*.js',
-        'lib/spreadjs/sheets/gc.spread.sheets.all.11.1.2',
        // 'lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js',
        // "lib/spreadjs/views/common/gc.spread.common.10.0.0.min.js",
       //  'lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js',
@@ -213,7 +212,7 @@ module.exports = {
         'lib/jquery-contextmenu/jquery.contextMenu.css',
     ],
     compleRation_ration_jspaths:[
-        '/public/web/uuid.js',
+        'public/web/uuid.js',
         'lib/jquery-contextmenu/jquery.contextMenu.min.js',
         'lib/jquery-contextmenu/jquery.ui.position.js',
         'lib/ztree/jquery.ztree.core.js',
@@ -240,7 +239,7 @@ module.exports = {
         'web/building_saas/complementary_ration_lib/js/ration_glj.js',
         'web/building_saas/complementary_ration_lib/js/ration_coe.js',
         'web/building_saas/complementary_ration_lib/js/ration_assist.js',
-        'web/building_saas/complementary_ration_lib/js/ration_installation.js.js',
+        'web/building_saas/complementary_ration_lib/js/ration_installation.js',
         'public/web/slideResize.js',
         'web/building_saas/complementary_ration_lib/js/coe.js',
         'web/building_saas/complementary_ration_lib/js/init.js'

gulpfile.js

@@ -96,7 +96,7 @@ let compleGljOptions = {
     csspaths: compleGlj_csspaths,
     concatName: 'compleGlj.all.min',
     srcHtml: 'web/src/html/complementary_glj_lib/tools-gongliaoji.html',
-    htmlDest: 'web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html',
+    htmlDest: 'web/building_saas/complementary_glj_lib/html',
     htmlName: 'tools-gongliaoji.html',
     injectList: [
         'web/dest/scripts/compleGlj.all.min' + version + '.js',
@@ -112,7 +112,7 @@ let compleRation_rationOptions = {
     csspaths: compleRation_ration_csspaths,
     concatName: 'compleRation_ration.all.min',
     srcHtml: 'web/src/html/complementary_ration_lib/dinge.html',
-    htmlDest: 'web/building_saas/complementary_ration_lib/html/dinge.html',
+    htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'dinge.html',
     injectList: [
         'web/dest/scripts/compleRation_ration.all.min' + version + '.js',
@@ -129,7 +129,7 @@ let compleRation_gljOptions = {
     csspaths: compleRation_glj_csspaths,
     concatName: 'compleRation_glj.all.min',
     srcHtml: 'web/src/html/complementary_ration_lib/gongliao.html',
-    htmlDest: 'web/building_saas/complementary_ration_lib/html/gongliao.html',
+    htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'gongliao.html',
     injectList: [
         'web/dest/scripts/compleRation_glj.all.min' + version + '.js',
@@ -146,7 +146,7 @@ let compleRation_coeOptions = {
     csspaths: compleRation_coe_csspaths,
     concatName: 'compleRation_coe.all.min',
     srcHtml: 'web/src/html/complementary_ration_lib/fuzhu.html',
-    htmlDest: 'web/building_saas/complementary_ration_lib/html/fuzhu.html',
+    htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'fuzhu.html',
     injectList: [
         'web/dest/scripts/compleRation_coe.all.min' + version + '.js',
@@ -163,7 +163,7 @@ let compleRation_instOptions = {
     csspaths: compleRation_inst_csspaths,
     concatName: 'compleRation_inst.all.min',
     srcHtml: 'web/src/html/complementary_ration_lib/anzhuang.html',
-    htmlDest: 'web/building_saas/complementary_ration_lib/html/anzhuang.html',
+    htmlDest: 'web/building_saas/complementary_ration_lib/html',
     htmlName: 'anzhuang.html',
     injectList: [
         'web/dest/scripts/compleRation_inst.all.min' + version + '.js',
@@ -183,7 +183,8 @@ let unitPriceOptions={
   injectList:['web/dest/scripts/unitPrice.all.min.'+version+'.js']
 }
 
-function minify(options) {
+function minify(options,done) {
+    console.log(options.concatName+"."+version+".js");
     if(options.jspaths){
         return gulp.src(options.jspaths)
             .pipe($.plumber())
@@ -191,7 +192,7 @@ function minify(options) {
             .pipe($.concat(options.concatName+"."+version+".js"))
             .pipe(gulp.dest(scriptsDest));
     }
-    return null;
+    return done();
 }
 
 function css(options,done) {
@@ -207,8 +208,7 @@ function css(options,done) {
 
 function inject(options) {
     var target = gulp.src(options.htmlDest+'/'+options.htmlName);
-    var sources = gulp.src(options.injectList, {read: false});
-
+    var sources = gulp.src(options.injectList, {read: false,allowEmpty: true});
     return target.pipe($.plumber())
         .pipe($.inject(sources))
         .pipe(gulp.dest(options.htmlDest));
@@ -229,42 +229,42 @@ gulp.task('css',function () {
     return css(commonOptions);
 })
 
-gulp.task('common', gulp.parallel('minify','css'));
+gulp.task('common', gulp.series('minify','css'));
 
-gulp.task('login_minify',gulp.series('common'), function (){
-    return minify(loginOptions);
+gulp.task('login_minify', function (){
+  return minify(loginOptions);
 });
 
 gulp.task('login_css',function (done) {
     return css(loginOptions,done);
 })
 
-gulp.task('login_inject',gulp.parallel('login_minify','login_css'),function () {
-    return inject(loginOptions);
-})
+gulp.task('login_inject',gulp.series('login_minify','login_css',function () {
+  return inject(loginOptions);
+}))
 
-gulp.task('login',gulp.series('login_inject'), function (){
-    return htmlmin(loginOptions);
-});
+gulp.task('login',gulp.series('login_inject', function (){
+  return htmlmin(loginOptions);
+}));
 
 
-gulp.task('header_minify',gulp.series('common'), function (){
-    return minify(headerOptions);
+gulp.task('header_minify',function (done){
+  return minify(headerOptions,done);
 });
 
 gulp.task('header_css',function (done) {
     return css(headerOptions,done);
 })
 
-gulp.task('header_inject',gulp.parallel('header_minify','header_css'),function () {
-    return inject(headerOptions);
-})
+gulp.task('header_inject',gulp.series('header_minify','header_css',function () {
+  return inject(headerOptions);
+}))
 
-gulp.task('header',gulp.series('header_inject'), function (){
-    return htmlmin(headerOptions);
-});
+gulp.task('header',gulp.series('header_inject', function (){
+  return htmlmin(headerOptions);
+}));
 
-gulp.task('pm_minify',gulp.series('common'), function (){
+gulp.task('pm_minify',function (){
     return minify(pmOptions);
 });
 
@@ -272,120 +272,120 @@ gulp.task('pm_css',function (done) {
     return css(pmOptions,done);
 })
 
-gulp.task('pm_inject',gulp.parallel('pm_minify','pm_css'),function () {
-    return inject(pmOptions);
-})
+gulp.task('pm_inject',gulp.series('pm_minify','pm_css',function () {
+  return inject(pmOptions);
+}))
 
-gulp.task('pm',gulp.series('pm_inject'), function (){
-    return htmlmin(pmOptions);
-});
+gulp.task('pm',gulp.series('pm_inject', function (){
+  return htmlmin(pmOptions);
+}));
 
-gulp.task('main_minify',gulp.series('common'), function (){
-    return minify(mainOptions);
+gulp.task('main_minify',function (){
+  return minify(mainOptions);
 });
 
 gulp.task('main_css',function (done) {
     return css(mainOptions,done);
 })
 
-gulp.task('main_inject',gulp.series('main_minify'),function () {//, ['main_minify','main_css'  ] main css 打包到一起会出现样式冲突问题， 现改成不打包
-    return inject(mainOptions);
-})
+gulp.task('main_inject',gulp.series('main_minify',function () {//, ['main_minify','main_css'  ] main css 打包到一起会出现样式冲突问题， 现改成不打包
+return inject(mainOptions);
+}))
 
-gulp.task('main',gulp.series('main_inject'), function (){
-    return htmlmin(mainOptions);
-});
+gulp.task('main',gulp.series('main_inject', function (){
+  return htmlmin(mainOptions);
+}));
 
-gulp.task('compleGlj_minify', gulp.series('common'), function () {
-    return minify(compleGljOptions);
+gulp.task('compleGlj_minify', function () {
+  return minify(compleGljOptions);
 });
 
 gulp.task('compleGlj_css', function (done) {
     return css(compleGljOptions,done);
 });
 
-gulp.task('compleGlj_inject', gulp.parallel('compleGlj_minify', 'compleGlj_css'), function () {
-    return inject(compleGljOptions);
-});
+gulp.task('compleGlj_inject', gulp.series('compleGlj_minify', 'compleGlj_css', function () {
+  return inject(compleGljOptions);
+}));
 
-gulp.task('compleGlj', gulp.series('compleGlj_inject'), function () {
-    return htmlmin(compleGljOptions);
-});
+gulp.task('compleGlj', gulp.series('compleGlj_inject', function () {
+  return htmlmin(compleGljOptions);
+}));
 
-gulp.task('compleRation_ration_minify', gulp.series('common'), function () {
-    return minify(compleRation_rationOptions);
+gulp.task('compleRation_ration_minify', function () {
+  return minify(compleRation_rationOptions);
 });
 
 gulp.task('compleRation_ration_css', function (done) {
     return css(compleRation_rationOptions,done);
 });
 
-gulp.task('compleRation_ration_inject', gulp.parallel('compleRation_ration_minify', 'compleRation_ration_css'), function () {
-    return inject(compleRation_rationOptions);
-});
+gulp.task('compleRation_ration_inject', gulp.series('compleRation_ration_minify', 'compleRation_ration_css', function () {
+  return inject(compleRation_rationOptions);
+}));
 
-gulp.task('compleRation_ration', gulp.parallel('compleRation_ration_inject'), function () {
-    return htmlmin(compleRation_rationOptions);
-});
+gulp.task('compleRation_ration', gulp.series('compleRation_ration_inject', function () {
+  return htmlmin(compleRation_rationOptions);
+}));
 
-gulp.task('compleRation_glj_minify', gulp.series('common'), function () {
-    return minify(compleRation_gljOptions);
+gulp.task('compleRation_glj_minify',  function () {
+  return minify(compleRation_gljOptions);
 });
 
 gulp.task('compleRation_glj_css', function (done) {
     return css(compleRation_gljOptions,done);
 });
 
-gulp.task('compleRation_glj_inject', gulp.parallel('compleRation_glj_minify', 'compleRation_glj_css'), function () {
-    return inject(compleRation_gljOptions);
-});
+gulp.task('compleRation_glj_inject', gulp.series('compleRation_glj_minify', 'compleRation_glj_css', function () {
+  return inject(compleRation_gljOptions);
+}));
 
-gulp.task('compleRation_glj', gulp.series('compleRation_glj_inject'), function () {
-    return htmlmin(compleRation_gljOptions);
-});
+gulp.task('compleRation_glj', gulp.series('compleRation_glj_inject', function () {
+  return htmlmin(compleRation_gljOptions);
+}));
 
-gulp.task('compleRation_coe_minify', gulp.series('common'), function () {
-    return minify(compleRation_coeOptions);
+gulp.task('compleRation_coe_minify',  function () {
+  return minify(compleRation_coeOptions);
 });
 
 gulp.task('compleRation_coe_css', function (done) {
     return css(compleRation_coeOptions,done);
 });
 
-gulp.task('compleRation_coe_inject', gulp.parallel('compleRation_coe_minify', 'compleRation_coe_css'), function () {
-    return inject(compleRation_coeOptions);
-});
+gulp.task('compleRation_coe_inject', gulp.series('compleRation_coe_minify', 'compleRation_coe_css', function () {
+  return inject(compleRation_coeOptions);
+}));
 
-gulp.task('compleRation_coe', gulp.series('compleRation_coe_inject'), function () {
-    return htmlmin(compleRation_coeOptions);
-});
+gulp.task('compleRation_coe', gulp.series('compleRation_coe_inject', function () {
+  return htmlmin(compleRation_coeOptions);
+}));
 
-gulp.task('compleRation_inst_minify', gulp.series('common'), function () {
-    return minify(compleRation_instOptions);
-});
+gulp.task('compleRation_inst_minify', function () {
+  return minify(compleRation_instOptions);
+} );
 
 gulp.task('compleRation_inst_css', function (done) {
     return css(compleRation_instOptions,done);
 });
 
-gulp.task('compleRation_inst_inject', gulp.parallel('compleRation_inst_minify', 'compleRation_inst_css'), function () {
-    return inject(compleRation_instOptions);
-});
+gulp.task('compleRation_inst_inject', gulp.series('compleRation_inst_minify', 'compleRation_inst_css', function () {
+  return inject(compleRation_instOptions);
+}));
 
-gulp.task('compleRation_inst', gulp.series('compleRation_inst_inject'), function () {
-    return htmlmin(compleRation_instOptions);
-});
+gulp.task('compleRation_inst', gulp.series('compleRation_inst_inject', function () {
+  return htmlmin(compleRation_instOptions);
+}));
 
 gulp.task('unitPrice_minify', function (){
   return minify(unitPriceOptions);
 });
 
-gulp.task('unitPrice_inject',gulp.series('unitPrice_minify'),function (){
+gulp.task('unitPrice_inject',gulp.series('unitPrice_minify',function (){
   return inject(unitPriceOptions);
-})
+}))
 
-gulp.task('unit_price',gulp.series('unitPrice_inject'), function (){
+gulp.task('unit_price',gulp.series('unitPrice_inject', function (){
   return htmlmin(unitPriceOptions);
-});
+}));
 
-gulp.task('build',gulp.parallel('header','login','pm','main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst','unit_price'));
+gulp.task('build',gulp.series('common','header','login','pm','main', 'compleGlj', 'compleRation_ration', 'compleRation_glj', 'compleRation_coe', 'compleRation_inst','unit_price'));

web/building_saas/css/custom.css

@@ -50,7 +50,6 @@ legend.legend{
 .filterType{
     width: 98px;
     float: left;
-    height: 100%;
 }
 .left {
     float: left

web/building_saas/glj/html/project_glj.html

@@ -24,6 +24,7 @@
         <ul class="nav flex-column nav-side mt-2 mb-2"  style="margin-top: 0px!important;">
             <li class="nav-item"><a class="nav-link active" href="#" id="ALL">所有工料机</a></li>
             <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li>
+            <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="PBCL">评标材料</a></li>
         </ul>
       </div>
 

web/building_saas/main/js/views/project_glj_view.js

@@ -702,7 +702,8 @@ projectGljObject={
     },
     initSheetViews(){
       let me = projectGljObject;
-      if(me.displayType == filterType.ZGCL ){
+      if(me.displayType == filterType.ZGCL || me.displayType == filterType.PBCL){
+        configMaterialObj.setNavLinkText(me.displayType);
         $('#project-glj-main').hide();
         $('#config_material').show();
       } else { 
@@ -1645,6 +1646,7 @@ $(function () {
         me.displayType = filterType[this.id];
         me.initSheetViews();
         me.refreshViewsData();
+        loadProjectGljSize();
     });
 
     $("#mixRatio-nav").on('shown.bs.tab', function () {