diff --git a/pages/management/ZlOperate.vue b/pages/management/ZlOperate.vue
index a01166c..26c3dcb 100644
--- a/pages/management/ZlOperate.vue
+++ b/pages/management/ZlOperate.vue
@@ -12,13 +12,13 @@
-
+
-
+
@@ -26,32 +26,32 @@
-
+
-
+
-
+
-
+
@@ -118,6 +118,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import {queryInstraction, instOperation} from '@/utils/getData2.js'
+ import {dateFtt} from '@/utils//utils.js'
export default {
components: {
NavBar,
@@ -127,13 +128,13 @@
return {
options1: [],
index1: '',
+ startDate: dateFtt(new Date()),
+ endDate: dateFtt(new Date(new Date().setDate(new Date().getDate() + 1))),
+ instNum: '',
+ agvNum: '',
+ startPoint: '',
+ endPoint: '',
val1: '',
- val2: '',
- val3: '',
- val4: '',
- val5: '',
- val6: '',
- val7: '',
dataList: [],
pkId: '',
disabled: false
@@ -144,13 +145,13 @@
this.$refs.calendar1.open()
},
confirm1(e) {
- this.val6 = e.fulldate
+ this.startDate = e.fulldate
},
open2(){
this.$refs.calendar2.open()
},
confirm2(e) {
- this.val7 = e.fulldate
+ this.endDate = e.fulldate
},
/** 选择器1 */
selectChange1(e) {
diff --git a/utils/utils.js b/utils/utils.js
new file mode 100644
index 0000000..6f94817
--- /dev/null
+++ b/utils/utils.js
@@ -0,0 +1,39 @@
+/**
+ * yy-mm-dd
+ */
+export const dateFtt = date => {
+ if (date == null) {
+ return ''
+ }
+ let year = date.getFullYear()
+ let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+ let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+ return `${year}-${month}-${day}`
+ }
+
+ /**
+ * yy-mm-dd hh:mm:ss
+ */
+ export const dateTimeFtt = date => {
+ if (date == null) {
+ return ''
+ }
+ let year = date.getFullYear()
+ let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+ let day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
+ let hh = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
+ let mm = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
+ let ss = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+ return `${year}-${month}-${day} ${hh}:${mm}:${ss}`
+ }
+
+ /**
+ * 将字符串形式的日期转换成日期对象
+ */
+ export const dateNew = date => {
+ if (date === undefined || date === 'undefined') {
+ return new Date()
+ }
+ return new Date(Date.parse(date))
+ }
+
\ No newline at end of file