diff --git a/common/util.js b/common/util.js
index b92aae9..5531654 100644
--- a/common/util.js
+++ b/common/util.js
@@ -106,6 +106,7 @@ function calcMom(cur, data) {
}
// 计算同比
function calcYoy(cur, data) {
+ console.log(cur,"==========",data);
return !checkNotEmpty(cur) || !checkNotEmpty(data) ? '' : data === 0 && parseInt(cur) === 0 ? 0 : data === 0 && parseInt(cur) > 0 ? 100 : (parseInt(cur) - data) / data * 100;
}
diff --git a/pages/airport/airport-runData/form.vue b/pages/airport/airport-runData/form.vue
index 302816f..8928841 100644
--- a/pages/airport/airport-runData/form.vue
+++ b/pages/airport/airport-runData/form.vue
@@ -36,17 +36,17 @@
入青航班架次：
-
-
+
-
+
入青航班架次环比
-
+
{{form.inFlightsMomDo === 0 ? form.inFlightsMomDo : form.inFlightsMomDo ? formatDigit(form.inFlightsMomDo) : '--'}}%
@@ -61,17 +61,17 @@
出青航班架次：
-
-
+
-
+
出青航班架次环比
-
+
{{form.outFlightsMomDo === 0 ? form.outFlightsMomDo : form.outFlightsMomDo ? formatDigit(form.outFlightsMomDo) : '--'}}%
@@ -86,17 +86,17 @@
入青航班旅客：
-
-
+
-
+
入青航班旅客环比
-
+
{{form.inPassengersMomDo === 0 ? form.inPassengersMomDo : form.inPassengersMomDo ? formatDigit(form.inPassengersMomDo) : '--'}}%
@@ -111,17 +111,17 @@
出青航班旅客：
-
-
+
-
+
出青航班旅客环比
-
+
{{form.outPassengersMomDo === 0 ? form.outPassengersMomDo : form.outPassengersMomDo ? formatDigit(form.outPassengersMomDo) : '--'}}%
@@ -145,17 +145,17 @@
入青航班架次：
-
-
+
-
+
入青航班架次环比
-
+
{{form.inFlightsMomIn === 0 ? form.inFlightsMomIn : form.inFlightsMomIn ? formatDigit(form.inFlightsMomIn) : '--'}}%
@@ -170,17 +170,17 @@
出青航班架次：
-
-
+
-
+
出青航班架次环比
-
+
{{form.outFlightsMomIn === 0 ? form.outFlightsMomIn : form.outFlightsMomIn ? formatDigit(form.outFlightsMomIn) : '--'}}%
@@ -195,17 +195,17 @@
入青航班旅客：
-
-
+
-
+
入青航班旅客环比
-
+
{{form.inPassengersMomIn === 0 ? form.inPassengersMomIn : form.inPassengersMomIn ? formatDigit(form.inPassengersMomIn) : '--'}}%
@@ -220,17 +220,17 @@
出青航班旅客：
-
-
+
-
+
出青航班旅客环比
-
+
{{form.outPassengersMomIn === 0 ? form.outPassengersMomIn : form.outPassengersMomIn ? formatDigit(form.outPassengersMomIn) : '--'}}%
@@ -257,11 +257,11 @@
-
+
-
+
入青航班架次环比
-
+
{{form.inFlightsMomTo === 0 ? form.inFlightsMomTo : form.inFlightsMomTo ? formatDigit(form.inFlightsMomTo) : '--'}}%
@@ -280,11 +280,11 @@
-
+
-
+
出青航班架次环比
-
+
{{form.outFlightsMomTo === 0 ? form.outFlightsMomTo : form.outFlightsMomTo ? formatDigit(form.outFlightsMomTo) : '--'}}%
@@ -303,11 +303,11 @@
-
+
-
+
入青航班旅客环比
-
+
{{form.inPassengersMomTo === 0 ? form.inPassengersMomTo : form.inPassengersMomTo ? formatDigit(form.inPassengersMomTo) : '--'}}%
@@ -326,11 +326,11 @@
-
+
-
+
出青航班旅客环比
-
+
{{form.outPassengersMomTo === 0 ? form.outPassengersMomTo : form.outPassengersMomTo ? formatDigit(form.outPassengersMomTo) : '--'}}%
@@ -344,6 +344,17 @@
+
+
+
+
-
- 运行情况详细（包含内容：航班延误：延误航班名称、始发终到、延误时长、 客流挤压情况、延误原因、相关处置措施等，其他异常）
-
-
+
增行
@@ -159,7 +159,7 @@
return;
}
let checkList = true;
- if (this.form.listCondition.length > 0) {
+ if (this.form.children.length > 0) {
checkList = this.form.children.every(item => {
return typeof(item.dataDetails) !== 'undefined' && item.dataDetails !== null && item.dataDetails !== '';
})
@@ -293,13 +293,16 @@
margin-bottom: 30rpx;
.form_item_label {
- color: #333333;
- line-height: 42rpx;
- font-size: 30rpx;
- font-family: PingFang SC-Bold, PingFang SC;
- font-weight: bold;
+ color: #666;
+ line-height: 35rpx;
+ font-size: 26rpx;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
margin-bottom: 30rpx;
}
+ /deep/ .is-input-border{
+ border-radius: 20rpx !important;
+ border: 1px solid #c1c1c1 !important;
+ }
}
.form_item {
@@ -462,7 +465,7 @@
text-align: center;
background: #ECF5FF;
border-radius: 30rpx;
- border: 2rpx solid #2D8CF0;
+ border: 1px dashed #2D8CF0;
margin-top: 30rpx;
}
diff --git a/pages/highWay/runData/form.vue b/pages/highWay/runData/form.vue
index 8310bb8..e19967b 100644
--- a/pages/highWay/runData/form.vue
+++ b/pages/highWay/runData/form.vue
@@ -129,7 +129,7 @@
收费站驶入车辆数：
-
@@ -158,7 +158,7 @@
收费站驶出车辆数：
-
diff --git a/pages/highWay/runStatusData/form.vue b/pages/highWay/runStatusData/form.vue
index 95dd712..667d4b3 100644
--- a/pages/highWay/runStatusData/form.vue
+++ b/pages/highWay/runStatusData/form.vue
@@ -861,7 +861,7 @@
text-align: center;
background: #ECF5FF;
border-radius: 30rpx;
- border: 2rpx solid #2D8CF0;
+ border: 1px dashed #2D8CF0;
margin-top: 30rpx;
}
diff --git a/pages/railway/railwayRunData/form.vue b/pages/railway/railwayRunData/form.vue
index e45390c..4d31080 100644
--- a/pages/railway/railwayRunData/form.vue
+++ b/pages/railway/railwayRunData/form.vue
@@ -38,16 +38,21 @@
+
+
+ 进青岛
+ 出青岛
+
-
+
- 进青岛车次信息
+ 车次信息
终到车次(辆)：
-
@@ -55,78 +60,79 @@
过路车次：
-
+ :class="form.inboundRailwayDo === 0 ? 'danger' : '' ">
+ :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
终到车次环比
- {{form.inRailwayYomDo ? formatDigit(form.inRailwayYomDo) : '--'}}%
+ :style="form.inboundRailwayDo === 0 ? 'color: #EB4747' : ''">
+ {{form.inRailwayYomDo === 0 ? form.inRailwayYomDo : form.inRailwayYomDo ? formatDigit(form.inRailwayYomDo) : '--'}}%
终到车次同比
- {{form.inRailwayMomDo ? formatDigit(form.inRailwayMomDo) : '--'}}%
+ {{form.inRailwayMomDo === 0 ? form.inRailwayMomDo : form.inRailwayMomDo ? formatDigit(form.inRailwayMomDo) : '--'}}%
人数(人)：
-
+ :class="form.inPepoleYoyDo === 0 ? 'danger' : '' ">
人数环比
+ :style="form.inPepoleYoyDo === 0 ? 'color: #EB4747' : ''">人数环比
- {{form.inPepoleYoyDo ? formatDigit(form.inPepoleYoyDo) : '--'}}%
+ :style="form.inPepoleYoyDo === 0 ? 'color: #EB4747' : ''">
+ {{form.inPepoleMomDo === 0 ? form.inPepoleMomDo ? form.inPepoleMomDo : formatDigit(form.inPepoleYoyDo) : '--'}}%
人数同比
- {{form.inPepoleMomDo ? formatDigit(form.inPepoleMomDo) : '--'}}%
+ {{form.inPepoleMomDo === 0 ? form.inPepoleMomDo ? form.inPepoleMomDo : formatDigit(form.inPepoleMomDo) : '--'}}%
-
+
-
+
- 出青岛车次信息
+ 车次信息
始发车次(辆)：
-
@@ -134,62 +140,63 @@
过路车次：
-
-
+
+ :style="form.outRailwayYomDo === 0 ? 'color: #EB4747' : ''">
始发车次环比
- {{form.outRailwayYomDo ? formatDigit(form.outRailwayYomDo) : '--'}}%
+ :style="form.outRailwayYomDo === 0 ? 'color: #EB4747' : ''">
+ {{form.outRailwayMomDo === 0 ? form.outRailwayMomDo : form.outRailwayMomDo ? formatDigit(form.outRailwayYomDo) : '--'}}%
始发车次同比
- {{form.outRailwayMomDo ? formatDigit(form.outRailwayMomDo) : '--'}}%
+ {{form.outRailwayMomDo === 0 ? form.outRailwayMomDo : form.outRailwayMomDo ? formatDigit(form.outRailwayMomDo) : '--'}}%
人数(人)：
-
-
+
人数环比
+ :style="form.outPepoleYoyDo === 0 ? 'color: #EB4747' : ''">人数环比
- {{form.outPepoleYoyDo ? formatDigit(form.outPepoleYoyDo) : '--'}}%
+ :style="form.outPepoleYoyDo === 0 ? 'color: #EB4747' : ''">
+ {{form.outPepoleMomDo === 0 ? form.outPepoleMomDo : form.outPepoleMomDo ? formatDigit(form.outPepoleYoyDo) : '--'}}%
人数同比
- {{form.outPepoleMomDo ? formatDigit(form.outPepoleMomDo) : '--'}}%
+ {{form.outPepoleMomDo === 0 ? form.outPepoleMomDo : form.outPepoleMomDo ? formatDigit(form.outPepoleMomDo) : '--'}}%
-
+
@@ -240,7 +247,8 @@
index: 2, //时段选择,默认0-24
userInfo: {},
pageType: '',
- btnText: '保存'
+ btnText: '保存',
+ tabType: 1
}
},
onLoad(options) {
@@ -281,6 +289,15 @@
//环比同比计算
calcYoyMom() {
console.log('同比环比计算')
+ this.form.inRailwayYomDo = this.$calcMom(this.form.inRailwayYomDo,this.yoyMom.yesterdayData.inboundRailwayDo);
+ this.form.inPepoleYoyDo = this.$calcMom(this.form.inPepole,this.yoyMom.yesterdayData.inPepole);
+ this.form.outRailwayYomDo = this.$calcMom(this.form.outboundRailwayDo,this.yoyMom.yesterdayData.outboundRailwayDo);
+ this.form.outPepoleYoyDo = this.$calcMom(this.form.outPepole,this.yoyMom.yesterdayData.outPepole);
+ this.form.inRailwayMomDo = this.$calcYoy(this.form.inboundRailwayDo,this.yoyMom.lastYearData.inboundRailwayDo);
+ this.form.inPepoleMomDo = this.$calcYoy(this.form.inPepole,this.yoyMom.lastYearData.inPepole);
+ this.form.outRailwayMomDo = this.$calcYoy(this.form.outboundRailwayDo,this.yoyMom.lastYearData.outboundRailwayDo);
+ this.form.outPepoleMomDo = this.$calcYoy(this.form.outPepole,this.yoyMom.lastYearData.outPepole);
+ return;
if (this.yoyMom.yesterdayData) {
//环比
if (checkNotEmpty(this.form.inboundRailwayDo)) {
@@ -454,20 +471,20 @@
})
return;
}
- if (this.form.inPepole == this.yoyMom.yesterdayData.inPepole && this.form.inMark) {
- uni.showToast({
- title: '入青备注不能为空',
- icon: 'none'
- })
- return;
- }
- if (this.form.outPepole == this.yoyMom.yesterdayData.outPepole && this.form.outRemark) {
- uni.showToast({
- title: '出青备注不能为空',
- icon: 'none'
- })
- return;
- }
+ // if (this.form.inPepole == this.yoyMom.yesterdayData.inPepole && this.form.inMark) {
+ // uni.showToast({
+ // title: '入青备注不能为空',
+ // icon: 'none'
+ // })
+ // return;
+ // }
+ // if (this.form.outPepole == this.yoyMom.yesterdayData.outPepole && this.form.outRemark) {
+ // uni.showToast({
+ // title: '出青备注不能为空',
+ // icon: 'none'
+ // })
+ // return;
+ // }
uni.showModal({
title: '提示',
content: this.form.id == undefined ? '您确认提交该条报送数据?' : '您确认将该条数据进行修改?',
diff --git a/pages/railway/runStatus/form.vue b/pages/railway/runStatus/form.vue
index a3360aa..dc9ed9f 100644
--- a/pages/railway/runStatus/form.vue
+++ b/pages/railway/runStatus/form.vue
@@ -40,9 +40,6 @@
-
- 运行情况详情（包含内容：始发终到、延误时长、客流挤压情况、延误原因、相关处置措施、备注）
-
+
增行
@@ -327,13 +327,16 @@
margin-bottom: 30rpx;
.form_item_label {
- color: #333333;
- line-height: 42rpx;
- font-size: 30rpx;
- font-family: PingFang SC-Bold, PingFang SC;
- font-weight: bold;
+ color: #666;
+ line-height: 35rpx;
+ font-size: 26rpx;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
margin-bottom: 30rpx;
}
+ /deep/ .is-input-border{
+ border-radius: 20rpx !important;
+ border: 1px solid #c1c1c1 !important;
+ }
}
.form_item {
@@ -496,7 +499,7 @@
text-align: center;
background: #ECF5FF;
border-radius: 30rpx;
- border: 2rpx solid #2D8CF0;
+ border: 1px dashed #2D8CF0;
margin-top: 30rpx;
}
diff --git a/pages/water/transportation/form.vue b/pages/water/transportation/form.vue
index a2770e6..48118da 100644
--- a/pages/water/transportation/form.vue
+++ b/pages/water/transportation/form.vue
@@ -570,7 +570,7 @@
text-align: center;
background: #ECF5FF;
border-radius: 30rpx;
- border: 2rpx solid #2D8CF0;
+ border: 1px dashed #2D8CF0;
margin-top: 30rpx;
}
diff --git a/pages/water/waterWay/form.vue b/pages/water/waterWay/form.vue
index 3e67cf0..4133ee8 100644
--- a/pages/water/waterWay/form.vue
+++ b/pages/water/waterWay/form.vue
@@ -134,6 +134,14 @@
+
@@ -222,6 +230,7 @@
"voyageYearOnYear": '',
"yesterdayNumberOfPeople": '',
"yesterdayVoyage": '',
+ "remark": ''
})
})
} else {
@@ -248,6 +257,7 @@
"voyageYearOnYear": '',
"yesterdayNumberOfPeople": '',
"yesterdayVoyage": '',
+ "remark": ''
})
}
})
diff --git a/static/image/airport01.png b/static/image/airport01.png
index 12e1e02..7c584ee 100644
Binary files a/static/image/airport01.png and b/static/image/airport01.png differ
diff --git a/static/image/bus01.png b/static/image/bus01.png
index 6000973..888c344 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
index 9001863..0aa31b8 100644
Binary files a/static/image/metro01.png and b/static/image/metro01.png differ
diff --git a/static/image/portShipping01.png b/static/image/portShipping01.png
index ae7de5f..580acce 100644
Binary files a/static/image/portShipping01.png and b/static/image/portShipping01.png differ
diff --git a/static/image/railway01.png b/static/image/railway01.png
index 1441140..c7bf697 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 1b3a5cf..a9329b6 100644
Binary files a/static/image/roadTransport01.png and b/static/image/roadTransport01.png differ
diff --git a/static/image/uniui-header-bg.png b/static/image/uniui-header-bg.png
deleted file mode 100644
index aa3827c..0000000
Binary files a/static/image/uniui-header-bg.png and /dev/null differ
diff --git a/static/image/uniui-logo.png b/static/image/uniui-logo.png
deleted file mode 100644
index 5a3f0a8..0000000
Binary files a/static/image/uniui-logo.png and /dev/null differ
diff --git a/static/image/water01.png b/static/image/water01.png
index f390243..5e7abb1 100644
Binary files a/static/image/water01.png and b/static/image/water01.png differ