|
|
@@ -62,7 +62,7 @@
|
|
|
<div class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height: 120px;">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 200px;">
|
|
|
<div class="row" v-for="product in willArriveMeterialList">
|
|
|
<div class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
|
|
|
<div class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
|
|
|
@@ -105,7 +105,7 @@
|
|
|
<div class="col-lg-12 col-md-12 center block-title">当月供检验合格率</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height:300px" id="charts_21"></div>
|
|
|
+ <div class="col-lg-12 col-md-12" style="height:380px" id="charts_21"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="col-lg-4 col-md-4">
|
|
|
@@ -123,7 +123,7 @@
|
|
|
<div class="col-lg-1 col-md-1 center no-padding padding-line">备注</div>
|
|
|
</div>
|
|
|
<div class="row">
|
|
|
- <div class="col-lg-12 col-md-12" style="height: 120px;">
|
|
|
+ <div class="col-lg-12 col-md-12" style="height: 200px;">
|
|
|
<div class="row" v-for="product in waitingInList">
|
|
|
<div class="col-lg-1 col-md-1 center no-padding">{{product.index}}</div>
|
|
|
<div class="col-lg-2 col-md-2 center no-padding">{{product.arriveDate}}</div>
|
|
|
@@ -200,10 +200,10 @@
|
|
|
<script src="/lib/vue.min.js"></script>
|
|
|
<script src="/lib/echarts/echarts.min.js"></script>
|
|
|
<script src="/lib/echarts/theme/macarons.js"></script>
|
|
|
- <script src="/js/service/person.js"></script>
|
|
|
- <script src="/js/service/material.js"></script>
|
|
|
- <script src="/js/service/product.js"></script>
|
|
|
- <script src="/js/content/mycharts.js"></script>
|
|
|
+ <script src="/js/service/person.js?_v=1"></script>
|
|
|
+ <script src="/js/service/material.js?_v=1"></script>
|
|
|
+ <script src="/js/service/product.js?_v=1"></script>
|
|
|
+ <script src="/js/content/mycharts.js?_v=1"></script>
|
|
|
<script type="text/javascript">
|
|
|
var vm = new Vue({
|
|
|
el: '#div-main',
|
|
|
@@ -300,7 +300,7 @@
|
|
|
const willArriveMeterialList = ServiceMaterial.getWillArriveList(3);
|
|
|
this.cacheDataObject.willArriveMeterialList = {
|
|
|
data: willArriveMeterialList,
|
|
|
- pagesize: 6,
|
|
|
+ pagesize: 10,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.willArriveMeterialList = willArriveMeterialList.slice(0, this.cacheDataObject
|
|
|
@@ -309,7 +309,7 @@
|
|
|
const waitingInList = ServiceMaterial.getWatingInList();
|
|
|
this.cacheDataObject.waitingInList = {
|
|
|
data: waitingInList,
|
|
|
- pagesize: 6,
|
|
|
+ pagesize: 10,
|
|
|
pageindex: 0
|
|
|
}
|
|
|
this.waitingInList = waitingInList.slice(0, this.cacheDataObject
|
