suojin
/
transport_integrated_app
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev201310' of http://42.192.7.176:3000/suojin/transport_integrated_app into dev201310

Browse Source
dev201310
zhangqun 2 years ago
parent 1e8fe3ad7c 2eb29f9288
commit fb91aedf42
16 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/highWay/runData/list.vue
  2. 2
      pages/highWay/runStatusData/list.vue
  3. 2
      pages/metro/subwayPage/form.vue
  4. 2
      pages/metro/subwayPage/list.vue
  5. 2
      pages/portShipping/pilotStation/form.vue
  6. 2
      pages/portShipping/pilotStation/list.vue
  7. 2
      pages/portShipping/waterInternational/form.vue
  8. 4
      pages/portShipping/waterInternational/list.vue
  9. 2
      pages/railway/railwayRunData/list.vue
  10. 2
      pages/railway/runStatus/list.vue
  11. 2
      pages/roadTransport/dataSubmission/form.vue
  12. 2
      pages/roadTransport/dataSubmission/list.vue
  13. 2
      pages/roadTransport/transportData/form.vue
  14. 2
      pages/roadTransport/transportData/list.vue
  15. 2
      pages/water/transportation/form.vue
  16. 2
      pages/water/transportation/list.vue

2
pages/highWay/runData/list.vue
Unescape View File

@ -238,7 +238,7 @@
color: #333333; color: #333333;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Bold, PingFang SC; font-family: PingFang SC-Bold, PingFang SC;
font-weight: bold; font-weight: 400;
line-height: 48rpx; line-height: 48rpx;
margin-left: 20rpx; margin-left: 20rpx;
word-break: break-all; word-break: break-all;

2
pages/highWay/runStatusData/list.vue
Unescape View File

@ -225,7 +225,7 @@
color: #333333; color: #333333;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Bold, PingFang SC; font-family: PingFang SC-Bold, PingFang SC;
font-weight: bold; font-weight: 400;
line-height: 48rpx; line-height: 48rpx;
margin-left: 20rpx; margin-left: 20rpx;
word-break: break-all; word-break: break-all;

2
pages/metro/subwayPage/form.vue
Unescape View File

@ -234,7 +234,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=subway_time' + '&_t=' + Date
.parse( .parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;

2
pages/metro/subwayPage/list.vue
Unescape View File

@ -139,7 +139,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=subway_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;
}) })

2
pages/portShipping/pilotStation/form.vue
Unescape View File

@ -224,7 +224,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr } from '../../../common/uti
}, },
// 获取时段 // 获取时段
getRoadTime(){ getRoadTime(){
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time&_t=1693372307694',"GET").then(res =>{
this.roadTime = res.data; this.roadTime = res.data;
if(this.pageType == 'edit'){ if(this.pageType == 'edit'){
this.roadTime.map((item,index) =>{ this.roadTime.map((item,index) =>{

2
pages/portShipping/pilotStation/list.vue
Unescape View File

@ -156,7 +156,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.timeArray = res.data; this.timeArray = res.data;
}) })

2
pages/portShipping/waterInternational/form.vue
Unescape View File

@ -710,7 +710,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time' + '&_t=' + Date
.parse( .parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;

4
pages/portShipping/waterInternational/list.vue
Unescape View File

@ -139,7 +139,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=port_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;
}) })
@ -222,7 +222,7 @@
color: #333333; color: #333333;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Bold, PingFang SC; font-family: PingFang SC-Bold, PingFang SC;
font-weight: bold; font-weight: 400;
line-height: 48rpx; line-height: 48rpx;
margin-left: 20rpx; margin-left: 20rpx;
word-break: break-all; word-break: break-all;

2
pages/railway/railwayRunData/list.vue
Unescape View File

@ -231,7 +231,7 @@
color: #333333; color: #333333;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Bold, PingFang SC; font-family: PingFang SC-Bold, PingFang SC;
font-weight: bold; font-weight: 400;
line-height: 48rpx; line-height: 48rpx;
margin-left: 20rpx; margin-left: 20rpx;
word-break: break-all; word-break: break-all;

2
pages/railway/runStatus/list.vue
Unescape View File

@ -251,7 +251,7 @@
color: #333333; color: #333333;
font-size: 30rpx; font-size: 30rpx;
font-family: PingFang SC-Bold, PingFang SC; font-family: PingFang SC-Bold, PingFang SC;
font-weight: bold; font-weight: 400;
line-height: 48rpx; line-height: 48rpx;
margin-left: 20rpx; margin-left: 20rpx;
word-break: break-all; word-break: break-all;

2
pages/roadTransport/dataSubmission/form.vue
Unescape View File

@ -155,7 +155,7 @@
}, },
// 获取时段 // 获取时段
getRoadTime(){ getRoadTime(){
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time&_t=1693372307694',"GET").then(res =>{
this.roadTime = res.data; this.roadTime = res.data;
if(this.pageType == 'edit'){ if(this.pageType == 'edit'){
this.index = this.roadTime.findIndex(item => item.dictValue == this.synthData.reportPhase) this.index = this.roadTime.findIndex(item => item.dictValue == this.synthData.reportPhase)

2
pages/roadTransport/dataSubmission/list.vue
Unescape View File

@ -152,7 +152,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.timeArray = res.data; this.timeArray = res.data;
}) })

2
pages/roadTransport/transportData/form.vue
Unescape View File

@ -757,7 +757,7 @@ import { calcMom, calcYoy, checkNotEmpty, getDateStr, lastYearDate } from '../..
}, },
// 获取时段 // 获取时段
getRoadTime(){ getRoadTime(){
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time&_t=1693372307694',"GET").then(res =>{
this.roadTime = res.data; this.roadTime = res.data;
if(this.pageType == 'edit'){ if(this.pageType == 'edit'){
this.roadTime.map((item,index) =>{ this.roadTime.map((item,index) =>{

2
pages/roadTransport/transportData/list.vue
Unescape View File

@ -129,7 +129,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=roadtransport_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.timeArray = res.data; this.timeArray = res.data;
}) })

2
pages/water/transportation/form.vue
Unescape View File

@ -247,7 +247,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=waterage_time' + '&_t=' + Date
.parse( .parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;

2
pages/water/transportation/list.vue
Unescape View File

@ -139,7 +139,7 @@
}, },
//时段 //时段
queryTime() { queryTime() {
this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time' + '&_t=' + Date.parse( this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=waterage_time' + '&_t=' + Date.parse(
new Date()), {}, 'GET').then(res => { new Date()), {}, 'GET').then(res => {
this.array = res.data; this.array = res.data;
}) })

Write Preview
Loading…
Cancel
Save