计算基数错误提示定位至行

web/building_saas/main/js/models/calc_base.js

@@ -1779,10 +1779,12 @@ let calcBase = {
             node.changed = true;
         }
         catch (err){
-            console.log(err);
             if(typeof err === 'object'){
                 err = '表达式不正确'
             }
+            if (node) {
+                err = `第${node.serialNo() + 1}行${err}`;
+            }
             alert(err);
         }
     }

web/building_saas/main/js/views/project_view.js

@@ -37,7 +37,8 @@ var projectObj = {
         if($('#linkComments').hasClass('active')){
             subViewObj.loadComments(node);
         }
-        gljOprObj.mainTreeSelectedChange = gljOprObj.selectedNodeId != node.getID();
+        let nodeID = node ? node.getID() : null;
+        gljOprObj.mainTreeSelectedChange = gljOprObj.selectedNodeId != nodeID;
         if(init) subObj.initNavItem(node);
        /*
        2018-11-9 在NavItem里设置了默认显示的item,在里执行了click这个操作所以这两个操作不用重复执行了

web/over_write/js/jiangxi_2017.js

@@ -442,7 +442,7 @@ if(typeof baseFigureTemplate !== 'undefined'){
 //增加清单基数分类估价项目、去除分类税前工程造价
 if(typeof $ !== 'undefined' && $('#cbClassList')){
     $('#cbClassList').find('li:eq(8)').remove();
-    let $li = $('<li class="p-1"><a id="cb_GJXM" href="javascript:void(0);">估价项目</a></li>');
+    let $li = $('<li class="py-1"><a id="cb_GJXM" href="javascript:void(0);">估价项目</a></li>');
     $li.insertAfter($('#cbClassList').find('li:eq(4)'));
 }
 if (typeof calcBaseView !== 'undefined') {