Browse Source

首页更新

laiguoran 3 years ago
parent
commit
b200667edb
3 changed files with 376 additions and 357 deletions
  1. 2 2
      app/controller/tender_controller.js
  2. 33 8
      app/public/css/main.css
  3. 341 347
      app/view/tender/detail.ejs

+ 2 - 2
app/controller/tender_controller.js

@@ -499,7 +499,7 @@ module.exports = app => {
                     materialData.auditors = materialData.status === auditConst.material.status.uncheck ? [] : await ctx.service.materialAudit.getFinalAuditGroup(materialData.id, times);
                 }
                 // 修订完成数目
-                const reviseNum = await ctx.service.ledgerRevise.count({ tid: tender.id, status: auditConst.revise.status.checked });
+                // const reviseNum = await ctx.service.ledgerRevise.count({ tid: tender.id, status: auditConst.revise.status.checked });
                 // 计量完成概况
                 // tender.total_price
                 const stage_total = [
@@ -527,7 +527,7 @@ module.exports = app => {
                     change_status_total,
                     change_quality_total,
                     materialData,
-                    reviseNum,
+                    // reviseNum,
                     stage_total,
                     hadMap,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.tender.tenderInfo),

+ 33 - 8
app/public/css/main.css

@@ -1293,31 +1293,56 @@ overflow-y: auto;
 .context-menu-icon.context-menu-hover.context-menu-icon--fa.fa-tag span{
     color: #fff;!important;
 }
+.auto-main-height{
+  height: calc(100vh - 34px);
+  display: flex;
+  flex-direction: column;
+}
+.auto-main-height .main-height-one{
+  flex-grow: 1;
+}
+.auto-main-height .main-height-two{
+  flex-grow: 18;
+}
+.bottom-height{
+  height: calc(100vh - 34px - 160px - 440px);
+}
+.bottom-height-two{
+  height: calc(100vh - 34px - 160px - 525px);
+}
+.card-big-title{
+  font-size: 1.75rem;
+  margin-bottom: .30rem;
+}
+.card-big-title small{
+  margin-top: -15px;
+  margin-right: -10px;
+}
 .circle-box{
   float: left;
   position: relative;
 }
 .circle{
-  width: 42px; 
-  height: 42px;
+  width: 62px; 
+  height: 62px;
   border-radius: 50%;
   background: none; 
-  border: 3px solid #D7B014;
+  border: 4px solid #D7B014;
 }
 .circle-num{
   position: absolute;
   top: 50%;
-  margin-top: -16px;
-  width: 42px;
+  margin-top: -32px;
+  width: 62px;
   text-align: center;
-  font-size: 22px;
+  font-size: 42px;
   font-weight: 500;
 }
 .circle-text{
   float: right;
-  margin-left: 20px;
+  margin-right: 20px;
   margin-top: 10px;
-  font-size: 16px;
+  font-size: 24px;
 }
 .dropdown-wd{
   width: 80px;

File diff suppressed because it is too large
+ 341 - 347
app/view/tender/detail.ejs