diff --git a/common/util.js b/common/util.js index eddb458..89c4967 100644 --- a/common/util.js +++ b/common/util.js @@ -66,8 +66,31 @@ var dateUtils = { } }; +//获取日期的今天,明天,后天 -1是昨天,0是今天,1是后一天 +function getDateStr(today, addDayCount) { + let date; + if (today) { + date = new Date(today); + } else { + date = new Date(); + } + date.setDate(date.getDate() + addDayCount); //获取AddDayCount天后的日期 + let y = date.getFullYear(); + let m = date.getMonth() + 1; //获取当前月份的日期 + let d = date.getDate(); + if (m < 10) { + m = '0' + m; + }; + if (d < 10) { + d = '0' + d; + }; + console.log(y + "-" + m + "-" + d) + return y + "-" + m + "-" + d; +} + export { formatTime, formatLocation, + getDateStr, dateUtils -} +} \ No newline at end of file diff --git a/pages.json b/pages.json index ddbc85d..58b0d58 100644 --- a/pages.json +++ b/pages.json @@ -42,6 +42,18 @@ "navigationBarTitleText": "高速运行情况" } }, + { + "path": "pages/highway/runStatusData/form", + "style": { + "navigationBarTitleText": "高速运行情况报送" + } + }, + { + "path": "pages/highway/runStatusData/detail", + "style": { + "navigationBarTitleText": "高速运行情况详情" + } + }, { "path": "pages/roadTransport/transportData/list", "style": { diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue index fbdac73..e09d913 100644 --- a/pages/highWay/runData/form.vue +++ b/pages/highWay/runData/form.vue @@ -14,70 +14,123 @@ 统计日期: - - {{form.statDate}} + + + {{form.statDate?form.statDate:'请选择时段'}} + + 统计时段: - - {{form.statPeriod}} + + + {{index>-1?array[index].dictLabel:'请选择时段'}} + + - 夏庄收费站 - 夏庄收费站 - 夏庄收费站 - 夏庄收费站 - 夏庄收费站 + + + {{item.stationName}} + + + 收费站名称: + {{form.highwaySubDataList[stationIndex].tollStationName}} + 高速公路名称: - + {{form.highwaySubDataList[stationIndex].highwayName}} 收费站入口车辆数: - - + + + + + + + + 收费站入口车辆数环比(%) + + {{form.highwaySubDataList[stationIndex].tollExemptVehicleCountMom}} + + + + + 收费站入口车辆数同比(%) + + {{form.highwaySubDataList[stationIndex].tollExemptVehicleCountYoy}} + 收费站出口车辆数: - - + + + + + + + + 收费站出口车辆数环比(%) + + {{form.highwaySubDataList[stationIndex].exitVehicleCountMom}} + + + + + 收费站入口车辆数同比(%) + + {{form.highwaySubDataList[stationIndex].exitVehicleCountYoy}} + 免收通行费车辆数: - - + + 免收通行费金额: - - + + 报送人员及联系方式: - - {{}} + + + {{submitPersonIndex>-1?submitPerson[submitPersonIndex].dictLabel:'请选择报送人'}} + + + + + + 备注: + + - - 取消 - 确认 + 取消 + 确认 + + \ No newline at end of file diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue new file mode 100644 index 0000000..7764104 --- /dev/null +++ b/pages/highWay/runStatusData/form.vue @@ -0,0 +1,672 @@ + + + + \ No newline at end of file diff --git a/pages/highWay/runStatusData/list.vue b/pages/highWay/runStatusData/list.vue index 566a7ba..0636f87 100644 --- a/pages/highWay/runStatusData/list.vue +++ b/pages/highWay/runStatusData/list.vue @@ -1,12 +1,83 @@ \ No newline at end of file diff --git a/pages/home/index.vue b/pages/home/index.vue index d6e8ace..f43acf7 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -1,7 +1,7 @@