chenc 4 years ago
parent
commit
99f79adf19
3 changed files with 26 additions and 21 deletions
  1. 1 1
      css/dashboard.css
  2. 9 6
      pages/dashboard/quality.html
  3. 16 14
      pages/dashboard/warehouse.html

+ 1 - 1
css/dashboard.css

@@ -22,7 +22,7 @@ body{
 }
 .block-title-important{
     color:#ffff00;
-    font-size: 16px;
+    font-size: 25px;
     font-weight: bold;
 }
 .person-div{

+ 9 - 6
pages/dashboard/quality.html

@@ -102,7 +102,7 @@
                     </div>
                 </div>
                 <div class="row" style="margin-top: 10px;">
-                    <div class="col-lg-12 col-md-12 center block-title">当月供检验合格率</div>
+                    <div class="col-lg-12 col-md-12 center block-title">当月供应商检验合格率</div>
                 </div>
                 <div class="row" style="width: 150%;">
                     <div class="col-lg-12 col-md-12" style="height:380px;margin-left: -20%;" id="charts_21"></div>
@@ -151,10 +151,13 @@
             </div>
         </div>
         <div class="row block-padding" style="font-size:18px;">
-            <div class="col-md-1 col-lg-1 center block-title" style="padding-top: 80px">
+            <!-- <div class="col-md-1 col-lg-1 center block-title" style="padding-top: 80px">
                 质<br />量<br />异<br />常<br />信<br />息
-            </div>
+            </div> -->
             <d class="col-md-6 col-lg-6" style="margin-top:-30px ;">
+                <div class="row block-padding">
+                    <div class="col-lg-12 col-md-12 center block-title">质量异常信息</div>
+                </div>
                 <div class="row">
                     <div class="col-lg-1 col-md-1 center no-padding padding-line">序号</div>
                     <div class="col-lg-2 col-md-2 center no-padding padding-line">检验日期</div>
@@ -190,11 +193,11 @@
 
                 </div>
             </d>
-            <div class="col-md-4 col-lg-4 center" style="margin-left: 50px;">
+            <div class="col-md-5 col-lg-5 center" style="margin-left: 50px;">
                 <div class="row">
-                    <div class="col-md-4 col-lg-4 center " style="padding-bottom: 5px;margin-top:-30px"
+                    <div class="col-md-6 col-lg-6 center " style="padding-bottom: 5px;margin-top:-30px;"
                         v-for="showimage in showImageList">
-                        <img :src="showimage" border="0" style="width:200px;height:280px;"/>
+                        <img :src="showimage" border="0" style="width:470px;height:340px;"/>
                     </div>
                 </div>
             </div>

+ 16 - 14
pages/dashboard/warehouse.html

@@ -129,7 +129,7 @@
                     <div class="col-lg-12 col-md-12" style="height: 30%;min-height:170px;height:170px">
                         <div class="row" v-for="material in materialStockList">
                             <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{material.materialCode}}</div>
-                            <div style="width: 45%;overflow:hidden; word-break:break-all;white-space:nowrap" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
+                            <div style="width: 45%;overflow:hidden; word-break:break-all;white-space:nowrap;padding-left: 40px;" class="col-lg-4 col-md-4 left no-padding">{{material.materialName}}</div>
                             <div style="width: 25%;" class="col-lg-2 col-md-2 center no-padding"
                                 :class="getMaterialStockNotEnoughClass(material)">
                                 {{material.realStockSum}}</div>
@@ -187,24 +187,26 @@
                     </div>
                 </div>
                 <div class="row">
-                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding padding-line">项目名称</div>
-                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">仓库</div>
-                    <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">物料编码</div>
-                    <div style="width: 28%;" class="col-lg-3 col-md-3 center no-padding padding-line">物料名称</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding padding-line">项目编码</div>
+                    <div style="width: 25%;" class="col-lg-2 col-md-2 center no-padding padding-line">项目名称</div>
+                    <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding padding-line">仓库</div>
+                    <!-- <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding padding-line">物料编码</div>
+                    <div style="width: 28%;" class="col-lg-3 col-md-3 center no-padding padding-line">物料名称</div> -->
                     <!-- <div class="col-lg-2 col-md-2 center no-padding padding-line">规格</div> -->
-                    <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding padding-line">发货数</div>
-                    <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
+                    <div style="width: 25%;" class="col-lg-1 col-md-1 center no-padding padding-line">发货数</div>
+                    <div style="width: 10%;" class="col-lg-2 col-md-2 center no-padding padding-line">发货日期</div>
                 </div>
                 <div class="row" style="min-height:160px;height:160px">
                     <div class="col-lg-12 col-md-12">
                         <div class="row" v-for="product in waitingSendProductList">
-                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{product.cItemName}}</div>
-                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
-                            <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
-                            <div style="width: 28%;overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-3 col-md-3 left no-padding">{{product.materialName}}</div>
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{product.cItemCode}}</div>
+                            <div style="width: 25%;overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-2 col-md-2 center no-padding">{{product.cItemName}}</div>
+                            <div style="width: 20%;" class="col-lg-2 col-md-2 center no-padding">{{product.warehouseName}}</div>
+                            <!-- <div style="width: 15%;" class="col-lg-2 col-md-2 center no-padding">{{product.materialCode}}</div>
+                            <div style="width: 28%;overflow:hidden; word-break:break-all;white-space:nowrap;" class="col-lg-3 col-md-3 left no-padding">{{product.materialName}}</div> -->
                             <!-- <div class="col-lg-2 col-md-2 center no-padding">{{product.specs}}</div> -->
-                            <div style="width: 10%;" class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
-                            <div style="width: 12%;" class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
+                            <div style="width: 25%;" class="col-lg-1 col-md-1 center no-padding">{{product.sendSum}}</div>
+                            <div style="width: 10%;" class="col-lg-2 col-md-2 center no-padding">{{product.planSendDate}}</div>
                         </div>
                     </div>
                 </div>
@@ -682,7 +684,7 @@
                     this.waitingSendProductSumPercent = waitingSendProductSumPercent + '%';
                     this.cacheDataObject.waitingSendProductList = {
                         data: waitingSendProductList,
-                        pagesize: 10,
+                        pagesize: 7,
                         pageindex: 0
                     }
                     this.waitingSendProductList = waitingSendProductList.slice(0, this.cacheDataObject