debug

public/web/tree_sheet/tree_sheet_helper.js

@@ -167,7 +167,7 @@ var TREE_SHEET_HELPER = {
                 if(colSetting.editChecking&&colSetting.editChecking(node)){
                     cell.locked(true);
                 }else if (colSetting.readOnly) {
-                    if(projectReadOnly){
+                    if(typeof projectReadOnly !== 'undefined' && projectReadOnly){
                         cell.locked(true);
                     }else {
                         if (Object.prototype.toString.apply(colSetting.readOnly) === "[object Function]") {
@@ -177,7 +177,7 @@ var TREE_SHEET_HELPER = {
                         }
                     }
                 } else {
-                    cell.locked(projectReadOnly ? true : false);
+                    cell.locked(typeof projectReadOnly !== 'undefined' && projectReadOnly ? true : false);
                 }
             });
             if(setting.setAutoFitRow){

web/building_saas/css/main.css

@@ -15,20 +15,26 @@ body {
 }
 /*自定义css*/
 .header {
-    background: #e1e1e1
+    border-bottom: 1px solid #ccc
 }
 .header .header-logo {
     background: #ff6501;
-    color: #fff;
     float: left;
     margin-right: 1rem;
     font-size: 1rem;
-    line-height:38px;
-    height:38px
+    height:38px;
+    background:url(logo.png) no-repeat 0 0;
+    padding-left:40px;
+}
+.header-logo div.v-title{
+    font-size:12px;
+    color:#aeaeae;
+    line-height: 12px;
+    margin-top:3px;
 }
-.header .header-logo sup{
-    font-size:10px;
-    top:-1.2em
+.header-logo div.p-title{
+    font-size:14px;
+    color:#ff6501;
 }
 .top-msg{
     position: fixed;
@@ -44,7 +50,7 @@ body {
     position: absolute;
     text-align: center;
     z-index: 999;
-    padding: 2px 0 0 2px
+    padding: 30px 0 0 2px
 }
 .main-nav .nav a {
     display: block;
@@ -99,12 +105,12 @@ body {
     background: #fff
 }
 .toolsbar,.toolsbar-f {
+    background: #f7f7f9;
     border-bottom: 1px solid #ccc
 }
 .tools-btn {
     height: 30px;
-    line-height: 30px;
-    background:#fff
+    line-height: 30px
 }
 .toolsbar .tools-btn.btn:hover,.toolsbar-f .tools-btn.btn:hover {
     background: #f7f7f9;
@@ -294,12 +300,13 @@ body {
 }
 .print-toolsbar .panel {
     display:inline-block;
-    vertical-align:top;
-    background:#f7f7f9
+    vertical-align:top
 }
 .print-toolsbar .panel .panel-foot{
     text-align: center;
-    font-size: 12px
+    font-size: 12px;
+    padding-bottom:3px;
+    background:#F2F2F2
 }
 .print-list {
     border-right:1px solid #ccc
@@ -313,7 +320,6 @@ body {
     border-bottom:1px solid #f2f2f2
 }
 .pageContainer {
-    background: #ededed;
     text-align: center
 }
 .pageContainer .page{
@@ -343,7 +349,7 @@ body {
     border-bottom:1px solid #ddd
 }
 .navbar-crumb span{
-    max-width: 200px
+    width: 200px
 }
 .dropdown-item{
     color:#007bff

web/common/html/header.html

@@ -1,5 +1,9 @@
 <nav class="navbar navbar-expand-lg p-0 d-flex">
-    <a class="header-logo px-2" href="/pm" style="text-decoration: none;">纵横云计价<sup><%= versionName %></sup></a>
+    <div class="header-logo">
+        <div class="v-title">纵横云计价</div>
+        <div class="p-title"><%= versionName %></div>
+    </div>
+    <!--<a class="header-logo px-2" href="/pm" style="text-decoration: none;">纵横云计价<sup><%= versionName %></sup></a>-->
     <ul class="nav navbar-nav px-1" id="header-menu" style="display: none;">
         <li class="nav-item">
             <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>