فهرست منبع

拷贝到界面响应式及debug

1.拷贝到界面响应式
2.项目管理界面调整
3.补充定额单位下拉项问题
vian 5 سال پیش
والد
کامیت
a6bae92b7f

+ 6 - 6
public/web/ration_glj_units.js

@@ -31,14 +31,14 @@ const rationAndGljUnits =[
     '部',
     '10t',
     '10m',
-    '10 m2',
-    '10 m3',
+    '10m2',
+    '10m3',
     '100m',
-    '100 m2',
-    '100 m3',
+    '100m2',
+    '100m3',
     '1000m',
-    '1000 m2',
-    '1000 m3',
+    '1000m2',
+    '1000m3',
     '10000块',
     '立方米',
     '平方米',

+ 15 - 0
web/building_saas/css/custom.css

@@ -444,4 +444,19 @@ input.text-right{
 }
 .hide-area {
     display: none;
+}
+.middle-modal-width {
+    max-width: 650px;
+}
+.middle-modal-height {
+    height: 500px;
+}
+
+@media screen and (max-width: 1366px) {
+    .middle-modal-width {
+        max-width: 500px;
+    }
+    .middle-modal-height {
+        height: 350px;
+    }
 }

+ 2 - 1
web/building_saas/main/html/main.html

@@ -1275,7 +1275,8 @@
                             </div>
                         </div>
                 </div>
-                <div class="modal-footer">
+                <div class="modal-footer" style="position: relative;">
+                    <a href="/complementaryGlj" target="_blank" class="btn btn-primary" style="position: absolute; left: 20px">新增人材机</a>
                     <a href="javascript:void(0);" id="glj_selected_conf" class="btn btn-primary">确定</a>
                     <a href="javascript:void(0);" id="replace_next_btn" class="btn btn-primary">下一步</a>
                     <button type="button" id="componentsCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>

+ 2 - 3
web/building_saas/pm/html/project-management.html

@@ -593,7 +593,7 @@
 </div>
 <!--弹出复制到-->
 <div class="modal fade" id="copy-to-dialog" data-backdrop="static">
-    <div class="modal-dialog" style="max-width: 650px" role="document">
+    <div class="modal-dialog middle-modal-width" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">复制到...</h5>
@@ -603,7 +603,7 @@
             </div>
             <div class="modal-body">
                <!-- <ul id="treeDemo2" class="ztree"></ul>-->
-                <div style="height: 500px" id="copyToSpread"><!--sjs ID设置此div--->
+                <div class="middle-modal-height" id="copyToSpread"><!--sjs ID设置此div--->
                 </div>
             </div>
             <div class="modal-footer">
@@ -650,7 +650,6 @@
                             </div>
                         </div>
                         <!--从本建设项目中选择-->
-                        <label id="project_name">9.21<!--本建设项目名称--></label>
                         <div class="form-group" id = "fromProject">
                             <select class="form-control" id="currentOptions">
                                 <option>测试5单价文件</option><!--单价文件-->

+ 5 - 4
web/building_saas/pm/js/pm_newMain.js

@@ -714,7 +714,6 @@ const projTreeObj = {
         if(args.sheet.name() == "projectSheet"){
             await projTreeObj.initFileChangePage(projTreeObj.setting.header[args.col].dataCode);
             $("#mr_from").val(projTreeObj.setting.header[args.col].dataCode);
-            $("#project_name").text(projTreeObj.tree.selected.data.name);
             $('#m_replace_file').modal('show');
         }else if(args.sheet.name() == "replaceSheet"){
             let cellType = args.sheet.getCellType(args.row, args.col);
@@ -1356,6 +1355,7 @@ const projTreeObj = {
             datas.push(i.data);
         }
         me.copyTree  = pmTree.createNew(projTreeObj.setting, datas);
+        initNodesVisibility(me.copyTree.items, false);
         me.showTreeData(me.copyTree.items, me.copyToSetting, sheet);
         me.copySelected = null;
         let initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : {row: 0, rowCount: 1};
@@ -2820,12 +2820,13 @@ function getWorkBookWidth(){
 }
 
 // 初始化节点可见性,默认收起至建设项目层
-function initNodesVisibility(sheet, nodes, visible) {
+function initNodesVisibility(nodes, visible) {
     function recurSetVisible(nodes, visible) {
         nodes.forEach(node => {
             node.visible = visible;
             if (node.children) {
-                recurSetVisible(node.children, visible);            }
+                recurSetVisible(node.children, visible);
+            }
         });
     }
     nodes.forEach(node => {
@@ -2855,7 +2856,7 @@ function initProjects(callback) {
             sheet.name('projectSheet');
             sheetCommonObj.spreadDefaultStyle(projTreeObj.workBook);
             projTreeObj.sumEngineeringCost();
-            initNodesVisibility(sheet, projTreeObj.tree.items, false);
+            initNodesVisibility(projTreeObj.tree.items, false);
             projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting, sheet);
             //初始选择
             const initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : { row: 0, rowCount: 1 };