浏览代码

1.标段名称换行2.标段图表页面调整

laiguoran 5 年之前
父节点
当前提交
93de035072

+ 16 - 3
app/public/css/main.css

@@ -218,7 +218,7 @@ input.nospin[type="number"]{-moz-appearance:textfield;}
   height: 100%;
   z-index: 4;
   left:55px;
-  padding-top:50px;
+  /*padding-top:50px;*/
   border-right: 1px solid #ddd;
   width: 200px;
 }
@@ -323,6 +323,11 @@ input.nospin[type="number"]{-moz-appearance:textfield;}
   line-height: normal;
   z-index: 999
 }
+.sidebar-title{
+  padding: 10px;
+  border-bottom: 1px solid #ddd;
+  margin-bottom: 10px;
+}
 .side-menu{
   position: fixed;
   right:15px;
@@ -380,7 +385,7 @@ input.nospin[type="number"]{-moz-appearance:textfield;}
     box-sizing: border-box;
 }
 .panel-sidebar .scrollbar-auto {
-    height: 100%;
+    height: calc(100vh - 100px);
     width: 100%;
     overflow-y: auto;
     position: static;
@@ -966,7 +971,7 @@ legend {
 }
 .side-fold {
   right:50px;
-  bottom:20px;
+  bottom:5px;
 }
 .side-fold a{
   font-size:24px;
@@ -991,6 +996,14 @@ legend {
 .custom-switch .custom-control-label::after{
   top:.25rem;
 }
+.search-group {
+  position: relative;
+}
+.search-group .remove-btn {
+  position:absolute;
+  right:10px;
+  top:3px;
+}
 /*菜单栏系统维护图标*/
 a.maintain-icon{
   position:relative;

+ 7 - 4
app/view/change/info.ejs

@@ -71,10 +71,13 @@
     }
 </style>
 <div class="panel-sidebar">
-    <div class="panel-title">
-        <div class="title-bar">
-            <h2 class="text-truncate" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" data-toggle="tooltip" data-placement="right" title=""  data-original-title="<%- tender.name %>"><%- tender.name %></h2>
-        </div>
+    <!--<div class="panel-title">-->
+        <!--<div class="title-bar">-->
+            <!--<h2 class="text-truncate" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" data-toggle="tooltip" data-placement="right" title=""  data-original-title="<%- tender.name %>"><%- tender.name %></h2>-->
+        <!--</div>-->
+    <!--</div>-->
+    <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="<%- tender.name %>">
+        <%- (tender.name.length > 15 ? tender.name.substring(0,15) + '...' : tender.name) %>
     </div>
     <div class="scrollbar-auto">
         <div class="nav-box">

+ 2 - 4
app/view/material/material_sub_menu.ejs

@@ -1,8 +1,6 @@
 <div class="panel-sidebar" id="sub-menu">
-    <div class="panel-title">
-        <div class="title-bar">
-            <h2 class="text-truncate" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" data-toggle="tooltip" data-placement="right" title=""  data-original-title="第<%- ctx.material.order%>期 - <%- tender.name %>">第<%- ctx.material.order%>期 - <%- tender.name %></h2>
-        </div>
+    <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="第<%- ctx.material.order%>期 - <%- tender.name %>">
+        第<%- ctx.material.order %>期 - <%- (tender.name.length > 11 ? tender.name.substring(0,11) + '...' : tender.name) %>
     </div>
     <div class="scrollbar-auto">
         <div class="nav-box">

+ 2 - 4
app/view/stage/stage_sub_menu.ejs

@@ -1,8 +1,6 @@
 <div class="panel-sidebar" id="sub-menu">
-    <div class="panel-title">
-        <div class="title-bar">
-            <h2 class="text-truncate" style="white-space:nowrap; overflow:hidden; text-overflow:ellipsis;" data-toggle="tooltip" data-placement="right" title=""  data-original-title="第<%- ctx.stage.order%>期 - <%- tender.name %>">第<%- ctx.stage.order%>期 - <%- tender.name %></h2>
-        </div>
+    <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="第<%- ctx.stage.order%>期 - <%- tender.name %>">
+        第<%- ctx.stage.order%>期 - <%- (tender.name.length > 11 ? tender.name.substring(0,11) + '...' : tender.name) %>
     </div>
     <div class="scrollbar-auto">
         <div class="nav-box">

+ 3 - 3
app/view/tender/detail.ejs

@@ -89,7 +89,7 @@
                         </div>
                     </div>
                     <!--标段设置-->
-                    <div class="col-6 p-0 mb-3">
+                    <div class="col-12 p-0 mb-3">
                         <div class="card">
                             <div class="card-body">
                                 <h5 class="card-title">标段设置</h5>
@@ -104,14 +104,14 @@
                         </div>
                     </div>
                     <!--图表-->
-                    <div class="card mb-3 mr-1">
+                    <div class="card mb-3">
                         <div class="card-body">
                             <h5 class="card-title">期进度表</h5>
                             <div id="chartContainer4" style="height: 300px; width: 100%;">
                             </div>
                         </div>
                     </div>
-                    <div class="card mb-3 mr-1">
+                    <div class="card mb-3">
                         <div class="card-body">
                             <h5 class="card-title">月进度表</h5>
                             <div id="chartContainer3" style="height: 300px; width: 100%;">

+ 2 - 4
app/view/tender/tender_sub_menu.ejs

@@ -1,8 +1,6 @@
 <div class="panel-sidebar" id="sub-menu">
-    <div class="panel-title">
-        <div class="title-bar">
-            <h2 class="text-truncate" data-toggle="tooltip" data-placement="right" title=""  data-original-title="<%- ctx.tender.data.name %>"><%- ctx.tender.data.name %></h2>
-        </div>
+    <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="<%- ctx.tender.data.name %>">
+        <%- (ctx.tender.data.name.length > 15 ? ctx.tender.data.name.substring(0,15) + '...' : ctx.tender.data.name) %>
     </div>
     <div class="scrollbar-auto">
         <div class="nav-box">