瀏覽代碼

UI小调整

TonyKang 6 年之前
父節點
當前提交
210e4f857b

+ 4 - 3
test/unit/reports/test_rpt_test_template.js

@@ -33,7 +33,8 @@ let demoPrjId = - 1;
 // let demoRptId = 279; //表04
 // let demoRptId = 261; //封3
 // let demoRptId = 450; //09
-let demoRptId = 451; //09-1
+// let demoRptId = 451; //09-1
+let demoRptId = 452; //04
 // let demoRptId = 612; //09-3
 // let demoRptId = 530; //封2
 // let demoRptId = 386; //04
@@ -50,7 +51,7 @@ let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
 // demoPrjId = 720; //QA: DW3
 //demoPrjId = 1626; //QA:
 // demoPrjId = 2260; //QA:
-demoPrjId = 4529; //QA:
+demoPrjId = 4568; //QA:
 //*/
 let userId_Dft = userId_HaiZhu;
 // let userId_Dft = "5a025c4c15074d134c2b9689";
@@ -81,7 +82,7 @@ test('测试 - 测试模板啦: ', function (t) {
         rptTplDataFacade.prepareProjectData(userId_Dft, demoPrjId, filter, function (err, msg, rawDataObj) {
             if (!err) {
                 try {
-                    // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_测试模板.jsp");
+                    fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataObject_测试模板.jsp");
                     let tplData = rptDataUtil.assembleData(rawDataObj);
                     // fsUtil.writeObjToFile(rawDataObj, "D:/GitHome/ConstructionCost/tmp/rptTplRawDataAfterCacl_测试模板.jsp");
                     // fsUtil.writeObjToFile(tplData, "D:/GitHome/ConstructionCost/tmp/rptTplAssembledData_测试模板.jsp");

+ 1 - 1
test/unit/reports/test_tpl_09_1.js

@@ -36,7 +36,7 @@ let userId_HaiZhu = "5b5a66c4a3c23e000dccdd77"; //海珠user id
 // demoPrjId = 720; //QA: DW3
 //demoPrjId = 1626; //QA:
 // demoPrjId = 4529; //QA:
-demoPrjId = 4568
+demoPrjId = 4579
 //*/
 let userId_Dft = userId_HaiZhu;
 /*/

+ 2 - 2
web/building_saas/report/html/rpt_main.html

@@ -1,7 +1,7 @@
 
 <div class="container-fluid">
     <div class="row">
-        <div class="col-lg-2 p-0">
+        <div class="col-lg-3 p-0">
             <div class="print-list">
                 <div class="list-tools d-flex justify-content-center">
                     <!--
@@ -13,7 +13,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-lg-10 p-0">
+        <div class="col-lg-9 p-0">
             <div class="toolsbar">
                 <div class="print-toolsbar">
                     <div class="panel">