diff --git a/PC/IAC_LargeScreen/src/views/shippingBoard.vue b/PC/IAC_LargeScreen/src/views/shippingBoard.vue
index 3ac3f0e..137bc9b 100644
--- a/PC/IAC_LargeScreen/src/views/shippingBoard.vue
+++ b/PC/IAC_LargeScreen/src/views/shippingBoard.vue
@@ -21,13 +21,16 @@ export default {
components:{boardHeader},
data () {
return {
- intervalId:null,
- // intervalIdChangeBg:null,
+ intervalId:null,//刷新页面定时器
+ intervalIdChangeData:null,//刷新数据定时器
+ intervalIdChangeBg:null,//刷新背景色定时器
dataLoading: true,
+ currentPage:1,//当前页面,前端分页
+ allData:null,//所有数据,用于分页处理
// config默认项
configDefult:{
header:['客户', '客户地址', '计划发运单号', '计划发运日期', '计划发运时间','发货口','状态' ],
- waitTime: util.waitTime,
+ waitTime: 0,//util.waitTime,
carousel: 'page',
// index: true,
// indexHeader: '序号',
@@ -41,29 +44,45 @@ export default {
oddRowBGC: 'rgba(10, 29, 50, 0.9)'
},
config: {},
- // currentRowsCopy:null,//当前数据暂存,用于更新背景色处理
}
},
created() {
this.initConfig()
this.getList()
+ // 刷新页面
clearInterval(this.intervalId)
this.intervalId = setInterval(() => {
this.getList()
}, util.fleshTime)
util.addEventResizeFlesh()
- // 用于更新背景色处理
- // clearInterval(this.intervalIdChangeBg)
- // this.intervalIdChangeBg = setInterval(() => {
- // this.initConfig(this.initRow(this.currentRowsCopy),new Date().getTime())
- // }, 10000)
-
+ // 滚屏页面
+ clearInterval(this.intervalIdChangeData)
+ this.intervalIdChangeData = setInterval(() => {
+ this.getCurrentPageData()
+ this.initConfig(this.initRow(this.currentData,new Date().getTime()))
+ }, util.waitTime)
+ // 底色刷新 1分钟
+ clearInterval(this.intervalIdChangeBg)
+ this.intervalIdChangeBg = setInterval(() => {
+ this.initConfig(this.initRow(this.currentData,new Date().getTime()))
+ }, 60000)
},
destroyed() {
clearInterval(this.intervalId)
+ clearInterval(this.intervalIdChangeData)
clearInterval(this.intervalIdChangeBg)
},
methods: {
+ getCurrentPageData(){
+ let _maxPage = Math.ceil(this.allData.length / this.configDefult.rowNum)
+ if(this.currentPage > _maxPage){
+ this.currentPage = 1
+ }
+ let _pageB = (Number(this.currentPage) - 1) * this.configDefult.rowNum
+ let _pageE = Number(this.currentPage) * this.configDefult.rowNum
+ this.currentData = this.allData.slice(_pageB,_pageE)
+ this.currentPage ++
+ },
init(){
this.initConfig()
this.getList()
@@ -89,14 +108,11 @@ export default {
},
initRow(data,time){
let rows = []
- console.log(66666,data)
data.forEach(item=>{
let _item = []
- // todo:状态确定
- // util.formatTimeStrToStr()
+ // 状态确定
let _plan = new Date(item.deliverPlanDate).getTime()
let _now = time
- console.log(9999,item.deliverPlanDate)
let _plan_sub = item.deliverPlanDate.indexOf("T")
let _plan_date = item.deliverPlanDate.slice(0,_plan_sub) || ''
let _plan_time = item.deliverPlanDate.slice(_plan_sub + 1) || ''
@@ -152,7 +168,7 @@ export default {
"customerAdrssCode": "YanfYH",
"customerAdrss": "1北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"deliverRequestNumber": "DLP202401240009",
- "deliverPlanDate": "2024-01-25T17:00:00",
+ "deliverPlanDate": "2024-02-06T11:59:00",
"deliverPlanTime": null,
"status": "red",
"dockCode": null
@@ -163,7 +179,7 @@ export default {
"customerAdrssCode": "YanfYH",
"customerAdrss": "2北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"deliverRequestNumber": "DLP202401240010",
- "deliverPlanDate": "2024-01-25T20:00:00",
+ "deliverPlanDate": "2024-02-05T11:59:00",
"deliverPlanTime": null,
"status": "red",
"dockCode": null
@@ -261,7 +277,7 @@ export default {
"customerAdrssCode": "YanfYH",
"customerAdrss": "11北京市北京经济技术开发区(大兴)瀛海镇瀛顺路55号院2号",
"deliverRequestNumber": "DLP202401240005",
- "deliverPlanDate": "2024-01-26T15:50:00",
+ "deliverPlanDate": "2024-02-06T11:40:00",
"deliverPlanTime": null,
"status": "red",
"dockCode": null
@@ -471,12 +487,23 @@ export default {
"deliverPlanTime": null,
"status": "red",
"dockCode": null
+ },{
+ "customerCode": "10000055",
+ "customerName": "北京奔驰大兴工厂",
+ "customerAdrssCode": "BBACDX01",
+ "customerAdrss": "北京市大兴区博兴路8号",
+ "deliverRequestNumber": "DLP202401240013",
+ "deliverPlanDate": "2024-01-26T13:15:00",
+ "deliverPlanTime": null,
+ "status": "red",
+ "dockCode": null
},
]
- // this.currentRowsCopy = _res
- let _rows = this.initRow(res,new Date().getTime())
+ this.allData = res
+ this.getCurrentPageData()
+ let _rows = this.initRow(this.currentData,new Date().getTime())
this.initConfig(_rows)
- // this_.$refs['shippingBoard_Ref'].updateRows(rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法
+ this.$refs['shippingBoard_Ref'].updateRows(_rows,0) //如果不需要刷新页面 不需要循环数据 追加数据用此方法
}).catch(error => {
this.dataLoading = false
console.log(error)
@@ -504,9 +531,12 @@ export default {
}
.rowStatusBg{
// background:rgb(164 161 255 / 82%);
- background:rgb(0 182 255 / 35%);
+ background:rgb(227 164 83);
width: 100%;
height: 100%;
+ border: #bf781c solid 1px;
+ border-left: 0;
+ border-right: 0;
}
.dv-scroll-board .rows .ceil{
padding:0 !important
diff --git a/PC/IAC_LargeScreen/src/views/shippingBoard_old.vue b/PC/IAC_LargeScreen/src/views/shippingBoard_old.vue
new file mode 100644
index 0000000..3ac3f0e
--- /dev/null
+++ b/PC/IAC_LargeScreen/src/views/shippingBoard_old.vue
@@ -0,0 +1,515 @@
+
+
+
+
+
+
+
\ No newline at end of file