Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

web/building_saas/css/main.css

@@ -319,4 +319,8 @@ body {
 }
 .text-green{
     color: #172a30
+}
+label.title{
+    display: inline-block;
+    width: 100px;
 }

web/building_saas/main/html/main.html

@@ -120,9 +120,67 @@
                                           <textarea class="form-control" rows="8" readonly=""></textarea>
                                       </div>
                                       <div id="tzjnrCon" class="main-data-bottom">
-                                          <div class="main-data-bottom ovf-hidden" style="width: 40%; float: left;" id="jobSpread">
+                                          <div class="main-data-bottom ovf-hidden" style="width: 33%; float: left;" id="jobSpread">
                                           </div>
-                                          <div class="main-data-bottom ovf-hidden" style="width: 60%; float: left;" id="itemSpread">
+                                          <div class="main-data-bottom ovf-hidden" style="width: 33%; float: left;" id="itemSpread">
+                                          </div>
+                                          <div id="add-rule" style="width: 33%;float: left;background: #EFEFEF; height: 100%;display: none;">
+                                              <p style="text-align: center">添加规则</p>
+                                              <p>
+                                                  <label class="title">添加位置:</label>
+                                                  <select name="" id="add-position">
+                                                      <option value="">添加到项目特征列</option>
+                                                      <option value="">添加到清单名称列</option>
+                                                      <option value="">添加到工作内容列</option>
+                                                      <option value="">分别添加到对应列</option>
+                                                  </select>
+                                              </p>
+                                              <p>
+                                                  <label class="title">添加内容:</label>
+                                                  <select name="" id="add-content">
+                                                      <option value="">无</option>
+                                                      <option value="">项目特征+工作内容</option>
+                                                      <option value="">工作内容+项目特征</option>
+                                                      <option value="">项目特征</option>
+                                                      <option value="">工作内容</option>
+                                                      <option value="">定额子目</option>
+                                                  </select>
+                                              </p>
+                                              <p>
+                                                  <label class="title">显示格式:</label>
+                                                  <select name="" id="format">
+                                                      <option value="">换行分隔</option>
+                                                      <option value="">逗号分隔</option>
+                                                      <option value="">括号分隔</option>
+                                                  </select>
+                                              </p>
+                                              <p>
+                                                  <label class="title">特征生成方式:</label>
+                                                  <select name="" id="">
+                                                      <option value="">特征值</option>
+                                                      <option value="">特征：特征值</option>
+                                                  </select>
+                                              </p>
+                                              <p>
+                                                  <label class="title">子目生成方式:</label>
+                                                  <select name="" id="">
+                                                      <option value="">编号+定额名称</option>
+                                                      <option value="">序号+定额名称</option>
+                                                  </select>
+                                              </p>
+                                              <p>
+                                                  <label class="title">序号格式:</label>
+                                                  <select name="" id="">
+                                                      <option value="">无</option>
+                                                      <option value="">1.</option>
+                                                      <option value="">a.</option>
+                                                      <option value="">A.</option>
+                                                  </select>
+                                              </p>
+                                              <p style="text-align: center">
+                                                  <button class="btn btn-primary btn-sm" type="button">应用到选中清单</button>
+                                                  <button class="btn btn-primary btn-sm" type="button">应用到所有清单</button>
+                                              </p>
                                           </div>
                                       </div>
                                   </div>

web/building_saas/main/js/main.js

@@ -3,6 +3,11 @@
  */
 
 $(function () {
+    // 读取本地存储的高度（必须放在载入spread之前）
+    loadSize("main", function() {
+        refreshSubSpread();
+    });
+
     projectInfoObj.showProjectInfo();
     projectObj.checkMainSpread();
     projectObj.loadProjectData();
@@ -19,11 +24,6 @@ $(function () {
         // do something
     });
 
-    // 读取本地存储的高度
-    loadSize("main", function() {
-        refreshSubSpread();
-    });
-
     slideResize($("#main"), function() {
         projectObj.mainSpread.refresh();
         refreshSubSpread();
@@ -113,12 +113,14 @@ function loadSize(tag, callback) {
     if (tag === '') {
         return;
     }
-    const topHeight = getLocalCache('topHeight:' + tag);
-    const bottomHeight = getLocalCache('bottomHeight:' + tag);
+    let topHeight = getLocalCache('topHeight:' + tag);
+    let bottomHeight = getLocalCache('bottomHeight:' + tag);
     if (topHeight === null || bottomHeight === null) {
         return;
     }
     const navHeight = $("#"+ tag +" .bottom-content").children('ul.nav').height();
+    topHeight = parseFloat(topHeight);
+    bottomHeight = parseFloat(bottomHeight);
     $("#"+ tag +" .main-data-top").height(topHeight);
     $("#"+ tag +" .main-data-bottom").height(bottomHeight - navHeight);
     $("#"+ tag +" .bottom-content").height(bottomHeight);

web/building_saas/main/js/views/sub_view.js

@@ -100,6 +100,7 @@ $("#linkJSCX").click(function(){        // 计算程序
 $("#linkTZJNR").click(function () {
     $("#subItems").children().hide();
     $("#tzjnrCon").show();
+    $("#add-rule").show();
     pageCCOprObj.active = true;
     refreshSubSpread();
     let selectedNode = projectObj.mainController.tree.selected;