主页面加入工料机页面

web/building_saas/js/global.js

@@ -16,6 +16,12 @@ function autoFlashHeight(){
     $(".grid").height($(window).height()-headerHeight-toolsbarHeight-50);
 
 };
+// 获取get参数
+function getQueryString(name) {
+    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+    var r = window.location.search.substr(1).match(reg);
+    if (r != null) return unescape(r[2]); return null;
+}
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
 $(function(){

web/building_saas/main/html/main.html

@@ -92,7 +92,7 @@
         <div class="main-nav">
             <ul class="nav nav-tabs flex-column" role="tablist">
                 <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" role="tab">造价书</a></li>
-                <li class="nav-item"><a data-toggle="tab" href="#gongliaoji" role="tab">工料机</a></li>
+                <li class="nav-item"><a href="#" id="glj-link">工料机</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#fee_rates" id="tab_fee_rate" role="tab" onclick="">费率</a></li>
                 <li class="nav-item"><a data-toggle="tab" href="#baobiao" role="tab" onclick="">报表</a></li>
             </ul>
@@ -609,8 +609,11 @@
   			count();
   		}
 
-  		$(document).ready(function(){
+        $(document).ready(function(){
   			//createTree();
+            // 获取project
+            var projectId = getQueryString('project');
+            $("#glj-link").attr("href", "/glj?project=" + projectId);
             rptTplObj.iniPage();
   		});
   		//-->

web/glj/html/glj_index.html

@@ -3,10 +3,10 @@
 <div class="main">
     <div class="main-nav">
         <ul class="nav flex-column">
-            <li><a href="zaojiashu.html">造价书</a></li>
-            <li><a href="gongliaoji.html" class="active">工料机</a></li>
-            <li><a href="baobiao.html">报表</a></li>
-            <li><a href="feilv.html">费率</a></li>
+            <li><a href="">造价书</a></li>
+            <li><a href="#" class="active">工料机</a></li>
+            <li><a href="">报表</a></li>
+            <li><a href="">费率</a></li>
         </ul>
     </div>
     <div class="content">
@@ -87,4 +87,11 @@
 <script type="text/javascript" src="/web/glj/js/composition_spread.js"></script>
 <script type="text/javascript" src="/web/glj/js/project_glj_spread.js"></script>
 <script type="text/javascript" src="/web/glj/js/project_glj.js"></script>
-<script type="text/javascript" src="/web/glj/js/composition.js"></script>
+<script type="text/javascript" src="/web/glj/js/composition.js"></script>
+<script type="text/javascript" src="/web/building_saas/js/global.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    let projectId = getQueryString("project");
+    $(".nav li > a").not(".active").attr("href", "/main?project=" + projectId);
+});
+</script>

web/glj/js/project_glj_spread.js

@@ -242,7 +242,7 @@ ProjectGLJSpread.prototype.specialColumn = function (sourceData) {
             activeSheet.getRange(rowCounter, marketPriceColumn, 1, 1).locked(true);
         }
         // 处理数据
-        if (data.ratio_data.length > 0) {
+        if (data.ratio_data !== undefined && data.ratio_data.length > 0) {
             let connectCode = [];
             let consumption = [];
             for (let tmp of data.ratio_data) {