diff --git a/pages.json b/pages.json
index 0d24beb..dc0d926 100644
--- a/pages.json
+++ b/pages.json
@@ -127,6 +127,32 @@
"navigationBarTitleText": "水运运输情况报送"
}
},
+ {
+ "path": "pages/airport/airport-runData/list",
+ "style": {
+ "navigationBarTitleText": "机场运行数据",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/airport/airport-runData/form",
+ "style": {
+ "navigationBarTitleText": "机场运行数据报送"
+ }
+ },
+ {
+ "path": "pages/airport/airport-runStatus/list",
+ "style": {
+ "navigationBarTitleText": "机场运行情况",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/airport/airport-runStatus/form",
+ "style": {
+ "navigationBarTitleText": "机场运行情况报送"
+ }
+ },
{
"path": "pages/roadTransport/transportData/list",
"style": {
diff --git a/pages/airport/airport-runData/form.vue b/pages/airport/airport-runData/form.vue
new file mode 100644
index 0000000..09cc40b
--- /dev/null
+++ b/pages/airport/airport-runData/form.vue
@@ -0,0 +1,887 @@
+
+
+
+ 如有填报问题，请咨询公共服务中心
+ 中心值班电话：66007587
+
+
+ 基本信息
+
+ 统计日期：
+
+
+ {{form.statDate?form.statDate:'请选择'}}
+
+
+
+
+
+ 统计时段：
+
+
+ {{index>-1?array[index].dictLabel:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 国内
+
+
+ 入青航班架次：
+
+
+
+
+
+
+
+
+
+ 入青航班架次环比(%)
+
+ {{form.inFlightsMomDo === 0 ? form.inFlightsMomDo : form.inFlightsMomDo ? form.inFlightsMomDo.toFixed(2) : ''}}
+
+
+
+
+ 入青航班架次同比(%)
+
+ {{form.inFlightsYoyDo === 0 ? form.inFlightsYoyDo : form.inFlightsYoyDo ? form.inFlightsYoyDo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班架次：
+
+
+
+
+
+
+
+
+
+ 出青航班架次环比(%)
+
+ {{form.outFlightsMomDo === 0 ? form.outFlightsMomDo : form.outFlightsMomDo ? form.outFlightsMomDo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班架次同比(%)
+
+ {{form.outFlightsYoyDo === 0 ? form.outFlightsYoyDo : form.outFlightsYoyDo ? form.outFlightsYoyDo.toFixed(2) : ''}}
+
+
+
+
+ 入青航班旅客：
+
+
+
+
+
+
+
+
+
+ 入青航班旅客环比(%)
+
+ {{form.inPassengersMomDo === 0 ? form.inPassengersMomDo : form.inPassengersMomDo ? form.inPassengersMomDo.toFixed(2) : ''}}
+
+
+
+
+ 入青航班旅客同比(%)
+
+ {{form.inPassengersYoyDo === 0 ? form.inPassengersYoyDo : form.inPassengersYoyDo ? form.inPassengersYoyDo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班旅客：
+
+
+
+
+
+
+
+
+
+ 出青航班旅客环比(%)
+
+ {{form.outPassengersMomDo === 0 ? form.outPassengersMomDo : form.outPassengersMomDo ? form.outPassengersMomDo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班旅客同比(%)
+
+ {{form.outPassengersYoyDo === 0 ? form.outPassengersYoyDo : form.outPassengersYoyDo ? form.outPassengersYoyDo.toFixed(2) : ''}}
+
+
+
+
+
+
+
+
+
+
+ 国际
+
+
+ 入青航班架次：
+
+
+
+
+
+
+
+
+
+ 入青航班架次环比(%)
+
+ {{form.inFlightsMomIn === 0 ? form.inFlightsMomIn : form.inFlightsMomIn ? form.inFlightsMomIn.toFixed(2) : ''}}
+
+
+
+
+ 入青航班架次同比(%)
+
+ {{form.inFlightsYoyIn === 0 ? form.inFlightsYoyIn : form.inFlightsYoyIn ? form.inFlightsYoyIn.toFixed(2) : ''}}
+
+
+
+
+ 出青航班架次：
+
+
+
+
+
+
+
+
+
+ 出青航班架次环比(%)
+
+ {{form.outFlightsMomIn === 0 ? form.outFlightsMomIn : form.outFlightsMomIn ? form.outFlightsMomIn.toFixed(2) : ''}}
+
+
+
+
+ 出青航班架次同比(%)
+
+ {{form.outFlightsYoyIn === 0 ? form.outFlightsYoyIn : form.outFlightsYoyIn ? form.outFlightsYoyIn.toFixed(2) : ''}}
+
+
+
+
+ 入青航班旅客：
+
+
+
+
+
+
+
+
+
+ 入青航班旅客环比(%)
+
+ {{form.inPassengersMomIn === 0 ? form.inPassengersMomIn : form.inPassengersMomIn ? form.inPassengersMomIn.toFixed(2) : ''}}
+
+
+
+
+ 入青航班旅客同比(%)
+
+ {{form.inPassengersYoyIn === 0 ? form.inPassengersYoyIn : form.inPassengersYoyIn ? form.inPassengersYoyIn.toFixed(2) : ''}}
+
+
+
+
+ 出青航班旅客：
+
+
+
+
+
+
+
+
+
+ 出青航班旅客环比(%)
+
+ {{form.outPassengersMomIn === 0 ? form.outPassengersMomIn : form.outPassengersMomIn ? form.outPassengersMomIn.toFixed(2) : ''}}
+
+
+
+
+ 出青航班旅客同比(%)
+
+ {{form.outPassengersYoyIn === 0 ? form.outPassengersYoyIn : form.outPassengersYoyIn ? form.outPassengersYoyIn.toFixed(2) : ''}}
+
+
+
+
+
+
+
+
+
+ 合计
+
+
+ 入青航班架次：
+
+ {{form.inboundFlightsTo}}
+
+
+
+
+
+
+ 入青航班架次环比(%)
+
+ {{form.inFlightsMomTo === 0 ? form.inFlightsMomTo : form.inFlightsMomTo ? form.inFlightsMomTo.toFixed(2) : ''}}
+
+
+
+
+ 入青航班架次同比(%)
+
+ {{form.inFlightsYoyTo === 0 ? form.inFlightsYoyTo : form.inFlightsYoyTo ? form.inFlightsYoyTo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班架次：
+
+ {{form.outboundFlightsTo}}
+
+
+
+
+
+
+ 出青航班架次环比(%)
+
+ {{form.outFlightsMomTo === 0 ? form.outFlightsMomTo : form.outFlightsMomTo ? form.outFlightsMomTo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班架次同比(%)
+
+ {{form.outFlightsYoyTo === 0 ? form.outFlightsYoyTo : form.outFlightsYoyTo ? form.outFlightsYoyTo.toFixed(2) : ''}}
+
+
+
+
+ 入青航班旅客：
+
+ {{form.inboundPassengersTo}}
+
+
+
+
+
+
+ 入青航班旅客环比(%)
+
+ {{form.inPassengersMomTo === 0 ? form.inPassengersMomTo : form.inPassengersMomTo ? form.inPassengersMomTo.toFixed(2) : ''}}
+
+
+
+
+ 入青航班旅客同比(%)
+
+ {{form.inPassengersYoyTo === 0 ? form.inPassengersYoyTo : form.inPassengersYoyTo ? form.inPassengersYoyTo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班旅客：
+
+ {{form.outboundPassengersTo}}
+
+
+
+
+
+
+ 出青航班旅客环比(%)
+
+ {{form.outPassengersMomTo === 0 ? form.outPassengersMomTo : form.outPassengersMomTo ? form.outPassengersMomTo.toFixed(2) : ''}}
+
+
+
+
+ 出青航班旅客同比(%)
+
+ {{form.outPassengersYoyTo === 0 ? form.outPassengersYoyTo : form.outPassengersYoyTo ? form.outPassengersYoyTo.toFixed(2) : ''}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/airport/airport-runData/list.vue b/pages/airport/airport-runData/list.vue
new file mode 100644
index 0000000..2dd00e6
--- /dev/null
+++ b/pages/airport/airport-runData/list.vue
@@ -0,0 +1,445 @@
+
+
+
+
+ 报送时间
+ {{item.statDate || ''}}{{item.statPeriodValue || ''}}
+
+
+
+
+
+
+
+
+
+ 查询条件
+
+
+
+
+ 重置
+ 确认
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/airport/airport-runStatus/form.vue b/pages/airport/airport-runStatus/form.vue
new file mode 100644
index 0000000..a516f74
--- /dev/null
+++ b/pages/airport/airport-runStatus/form.vue
@@ -0,0 +1,502 @@
+
+
+
+ 如有填报问题，请咨询公共服务中心
+ 中心值班电话：66007587
+
+
+ 基本信息
+
+ 统计日期：
+
+
+ {{form.statDate?form.statDate:'请选择'}}
+
+
+
+
+
+ 统计时段：
+
+
+ {{index>-1?array[index].dictLabel:'请选择'}}
+
+
+
+
+
+
+
+
+ 运行情况详细（包含内容：航班延误：延误航班名称、始发终到、延误时长、 客流挤压情况、延误原因、相关处置措施等，其他异常）
+
+
+
+
+ 增行
+
+
+
+
+
+
+
+
+
diff --git a/pages/airport/airport-runStatus/list.vue b/pages/airport/airport-runStatus/list.vue
new file mode 100644
index 0000000..5e4e228
--- /dev/null
+++ b/pages/airport/airport-runStatus/list.vue
@@ -0,0 +1,445 @@
+
+
+
+
+ 报送时间
+ {{item.statDate || ''}}{{item.statPeriodValue || ''}}
+
+
+
+
+
+
+
+
+
+ 查询条件
+
+
+
+
+ 重置
+ 确认
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index d2abe6b..707e130 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -8,8 +8,13 @@
基本信息
管理单位名称：
-
- {{form.organizationName}}
+
+
+ {{form.organizationName?form.organizationName:'请选择'}}
+
+
+ {{form.organizationName}}
@@ -249,13 +254,17 @@
userInfo: {},
yoyMom: {}, //同比环比
showStaion: false, //展开收起
- pageType: '',
+ pageType: '',
+ deptNameList: [],//当前登录人所在单位
}
},
onLoad(options) {
- this.userInfo = uni.getStorageSync('userInfo');
+ this.userInfo = uni.getStorageSync('userInfo');
+ let arr = uni.getStorageSync('deptName');
+ this.deptNameList = checkNotEmpty(arr) ? arr : [];
if (options.type == 'add') {
- this.form.organizationName = this.userInfo.organizationName ? this.userInfo.organizationName : '';
+ this.form.organizationName = this.deptNameList.length > 0 ? this.deptNameList[0] : '';
+ this.form.organizationNameIndex = this.deptNameList.length > 0 ? 0 : '';
this.pageType = 'add';
let now = new Date();
this.form.statDate = getDateStr(now, -1); //默认前一天
@@ -274,7 +283,11 @@
'GET').then(res => {
this.form = res.data;
this.queryTime();
- this.queryStation();
+ this.queryStation();
+ if(checkNotEmpty(this.deptNameList)) {
+ let idx = this.deptNameList.findIndex(item => item = this.form.organizationName);
+ this.form.organizationNameIndex = idx > -1 ? idx : '';
+ }
})
},
//同比环比查询
diff --git a/pages/home/index.vue b/pages/home/index.vue
index e4cf01d..4ab8fca 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,5 +1,9 @@
+
+
+ 退出
+
{{routersData.meta.title}}
@@ -56,6 +60,21 @@
url: url
})
},
+ //退出
+ doLoginout() {
+ uni.showModal({
+ title: '提示',
+ content: '您确认要退出当前登录吗?',
+ success: (res) => {
+ if(res.confirm) {
+ uni.clearStorageSync();
+ uni.reLaunch({
+ url: '/pages/login/login'
+ })
+ }
+ }
+ })
+ },
}
}
@@ -67,11 +86,23 @@
padding: 0 50rpx 50rpx;
background-color: #fff;
overflow: auto;
+ .act_btn_loginout{
+ position: absolute;
+ right: 50rpx;
+ top: 30rpx;
+ color: #fff;
+ width: 100rpx;
+ font-size: 24rpx;
+ line-height: 44rpx;
+ text-align: center;
+ background-color: #C1C1C1;
+ border-radius: 30rpx;
+ }
.highway_logo {
width: 128rpx;
height: 128rpx;
- margin: 78rpx auto 0;
+ margin: 50rpx auto 0;
}
.home_title {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5cfde4a..6cf8b63 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -69,6 +69,7 @@
if(res.code == 200) {
uni.setStorageSync('satoken', res.data.satoken);
this.getUserInfo();
+ this.getDeptName();
this.getRouters();
}
}).catch((err) => {
@@ -90,6 +91,15 @@
}).catch(() => {
})
},
+ //拉取所属单位
+ getDeptName() {
+ this.$request(getApp().globalData.baseUrl + '/api/user/getDeptName', {}, 'GET').then(res => {
+ if(res.code == 200) {
+ // uni.setStorageSync('deptName', res.data);
+ }
+ }).catch(() => {
+ })
+ },
//拉取权限路由
getRouters() {
this.$request(getApp().globalData.baseUrl + '/api/login/getRouters', {}, 'GET').then(res => {
@@ -176,6 +186,6 @@
font-family: PingFang SC-Regular, PingFang SC;
border-radius: 100rpx;
text-align: center;
- margin: 70rpx auto 107rpx;
+ margin: 70rpx auto 50rpx;
}
\ No newline at end of file
diff --git a/pages/railway/runStatus/form.vue b/pages/railway/runStatus/form.vue
index 7f20ada..0ddf0eb 100644
--- a/pages/railway/runStatus/form.vue
+++ b/pages/railway/runStatus/form.vue
@@ -46,7 +46,7 @@
-
-
- 事故具体情况
-
+
- 事故信息-{{index+1}}
+ 事故具体情况-{{index+1}}
diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue
index 0ca25d1..ccf7d4d 100644
--- a/pages/water/waterWay/form.vue
+++ b/pages/water/waterWay/form.vue
@@ -181,7 +181,8 @@
this.pageType = 'add';
let now = new Date();
this.form.reportDate = getDateStr(now, -1); //默认前一天
- this.queryTime(); //统计时段
+ this.queryTime(); //统计时段
+ // this.queryLandList();//陆岛权限列表
} else if (options.item) {
this.form = JSON.parse(options.item);
this.form.bizWaterwayIslandDataSaveOrUpdateDTOList = this.form.bizWaterwayIslandDataVOList;
@@ -197,6 +198,20 @@
methods: {
formatdate(date) {
return date.length < 12 ? date + ' 00:00:00' : date;
+ },
+ //陆岛列表
+ queryLandList() {
+ this.$request(getApp().globalData.baseUrl + '/api/biz/bizWaterwayIslandAuthority/list', {}, 'GET').then(res => {
+ let arr = [];
+ res.data.map(item => {
+ arr.push(item)
+ })
+ this.landList = arr;
+ this.form.bizWaterwayIslandDataSaveOrUpdateDTOList.map(item => {
+ let idx = this.landList.findIndex(item2 => item2 == item.landName);
+ item.landNameIndex = idx > -1 ? idx : '';
+ })
+ })
},
//陆岛切换
changeLandName(e, index) {
@@ -242,10 +257,11 @@
},
//id查询详情
queryDetailInfo(id) {
- this.$request(getApp().globalData.baseUrl + '/api/biz/watertransportRunSituation/find/' + id, {},
+ this.$request(getApp().globalData.baseUrl + '/api/biz/waterwayIslandData/getById/' + id, {},
'GET').then(res => {
this.form = res.data;
- this.queryTime(); //统计时段
+ this.queryTime(); //统计时段
+ this.queryLandList();
})
},
//统计时段切换选择
diff --git a/static/image/.DS_Store b/static/image/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/static/image/.DS_Store differ
diff --git a/static/image/airport01.png b/static/image/airport01.png
new file mode 100644
index 0000000..12e1e02
Binary files /dev/null and b/static/image/airport01.png differ
diff --git a/static/image/bus01.png b/static/image/bus01.png
index ca403d3..6000973 100644
Binary files a/static/image/bus01.png and b/static/image/bus01.png differ
diff --git a/static/image/metro01.png b/static/image/metro01.png
new file mode 100644
index 0000000..9001863
Binary files /dev/null and b/static/image/metro01.png differ
diff --git a/static/image/portShipping01.png b/static/image/portShipping01.png
new file mode 100644
index 0000000..ae7de5f
Binary files /dev/null and b/static/image/portShipping01.png differ
diff --git a/static/image/railway01.png b/static/image/railway01.png
index ca403d3..1441140 100644
Binary files a/static/image/railway01.png and b/static/image/railway01.png differ
diff --git a/static/image/roadTransport01.png b/static/image/roadTransport01.png
index ca403d3..1b3a5cf 100644
Binary files a/static/image/roadTransport01.png and b/static/image/roadTransport01.png differ
diff --git a/static/image/water01.png b/static/image/water01.png
index ca403d3..f390243 100644
Binary files a/static/image/water01.png and b/static/image/water01.png differ