Преглед изворни кода

测报灯图片一页展示8个

yf_zd пре 5 година
родитељ
комит
e68b9e5e62

+ 1 - 1
bigdata2/config/index.js

@@ -28,7 +28,7 @@ module.exports = {
       },
     },
     // Various Dev Server settings
-    host: '192.168.1.12', // can be overwritten by process.env.HOST
+    host: '192.168.1.11', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

+ 7 - 7
bigdata2/src/components/DateSearch/index.vue

@@ -42,21 +42,21 @@ export default {
 			this.timeRange = ''
 			if (i == 1) {
 				this.queryInfo.begin = parseInt((Date.now() - 24 * 3600000) / 1000)
-				this.queryInfo.end = parseInt(Date.now() / 1000)
+				this.queryInfo.end = parseInt((Date.now() + 24 * 3600000) / 1000)
 			} else if (i == 2) {
 				this.queryInfo.begin = parseInt((Date.now() - 24 * 3600000 * 30) / 1000)
-				this.queryInfo.end = parseInt(Date.now() / 1000)
+				this.queryInfo.end = parseInt((Date.now() + 24 * 3600000) / 1000)
 			} else if (i == 3) {
 				this.queryInfo.begin = parseInt(
 					(Date.now() - 24 * 3600000 * 30 * 6) / 1000
 				)
-				this.queryInfo.end = parseInt(Date.now() / 1000)
+				this.queryInfo.end = parseInt((Date.now() + 24 * 3600000) / 1000)
 			} else if (i == 4) {
 				this.queryInfo.begin = parseInt(
 					(Date.now() - 24 * 3600000 * 30 * 12) / 1000
 				)
-				this.queryInfo.end = parseInt(Date.now() / 1000)
-            }
+				this.queryInfo.end = parseInt((Date.now() + 24 * 3600000) / 1000)
+			}
 			this.$emit('dateChange',this.queryInfo)
 		},
 		DateChange() {
@@ -66,12 +66,12 @@ export default {
 					new Date(this.timeRange[0]).getTime() / 1000
 				)
 				this.queryInfo.end = parseInt(
-					new Date(this.timeRange[1]).getTime() / 1000
+					parseInt(new Date(this.timeRange[1]).getTime()+ 24 * 3600000) / 1000
 				)
 			} else {
 				this.btnSelected = 2
 				this.queryInfo.begin = parseInt((Date.now() - 24 * 3600000 * 30) / 1000)
-				this.queryInfo.end = parseInt(Date.now() / 1000)
+				this.queryInfo.end = parseInt((Date.now() + 24 * 3600000) / 1000)
             }
             this.$emit('dateChange',this.queryInfo)
 		}

+ 1 - 1
bigdata2/src/pages/forecasting/cbd/cbdDataPhotos.vue

@@ -113,7 +113,7 @@
 			:total="totalNum"
 			@current-change="changePage"
 			:current-page="queryInfo.page"
-			:page-size="12"
+			:page-size="8"
 		></el-pagination>
 
 		<!-- 自动识别对话框 -->