Showing
14 changed files
with
14 additions
and
28 deletions
| @@ -229,8 +229,7 @@ Page({ | @@ -229,8 +229,7 @@ Page({ | ||
| 229 | detail.useEtime = obj.useEtime; | 229 | detail.useEtime = obj.useEtime; |
| 230 | } | 230 | } |
| 231 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 231 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 232 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 233 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 232 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 234 | detail.useStime = obj.useStime; | 233 | detail.useStime = obj.useStime; |
| 235 | detail.useEtime = obj.useEtime; | 234 | detail.useEtime = obj.useEtime; |
| 236 | } | 235 | } |
| @@ -1201,8 +1201,7 @@ Page({ | @@ -1201,8 +1201,7 @@ Page({ | ||
| 1201 | detail.useEtime = obj.useEtime; | 1201 | detail.useEtime = obj.useEtime; |
| 1202 | } | 1202 | } |
| 1203 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1203 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1204 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1205 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1204 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1206 | detail.useStime = obj.useStime; | 1205 | detail.useStime = obj.useStime; |
| 1207 | detail.useEtime = obj.useEtime; | 1206 | detail.useEtime = obj.useEtime; |
| 1208 | } | 1207 | } |
| @@ -1270,8 +1270,7 @@ Page({ | @@ -1270,8 +1270,7 @@ Page({ | ||
| 1270 | detail.useEtime = obj.useEtime; | 1270 | detail.useEtime = obj.useEtime; |
| 1271 | } | 1271 | } |
| 1272 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1272 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1273 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1274 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1273 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1275 | detail.useStime = obj.useStime; | 1274 | detail.useStime = obj.useStime; |
| 1276 | detail.useEtime = obj.useEtime; | 1275 | detail.useEtime = obj.useEtime; |
| 1277 | } | 1276 | } |
| @@ -1285,8 +1285,7 @@ Page({ | @@ -1285,8 +1285,7 @@ Page({ | ||
| 1285 | detail.useEtime = obj.useEtime; | 1285 | detail.useEtime = obj.useEtime; |
| 1286 | } | 1286 | } |
| 1287 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1287 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1288 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1289 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1288 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1290 | detail.useStime = obj.useStime; | 1289 | detail.useStime = obj.useStime; |
| 1291 | detail.useEtime = obj.useEtime; | 1290 | detail.useEtime = obj.useEtime; |
| 1292 | } | 1291 | } |
| @@ -1144,8 +1144,7 @@ Page({ | @@ -1144,8 +1144,7 @@ Page({ | ||
| 1144 | detail.useEtime = obj.useEtime; | 1144 | detail.useEtime = obj.useEtime; |
| 1145 | } | 1145 | } |
| 1146 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1146 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1147 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1148 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1147 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1149 | detail.useStime = obj.useStime; | 1148 | detail.useStime = obj.useStime; |
| 1150 | detail.useEtime = obj.useEtime; | 1149 | detail.useEtime = obj.useEtime; |
| 1151 | } | 1150 | } |
| @@ -1099,8 +1099,7 @@ Page({ | @@ -1099,8 +1099,7 @@ Page({ | ||
| 1099 | detail.useEtime = obj.useEtime; | 1099 | detail.useEtime = obj.useEtime; |
| 1100 | } | 1100 | } |
| 1101 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1101 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1102 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1103 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1102 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1104 | detail.useStime = obj.useStime; | 1103 | detail.useStime = obj.useStime; |
| 1105 | detail.useEtime = obj.useEtime; | 1104 | detail.useEtime = obj.useEtime; |
| 1106 | } | 1105 | } |
| @@ -1100,8 +1100,7 @@ Page({ | @@ -1100,8 +1100,7 @@ Page({ | ||
| 1100 | detail.useEtime = obj.useEtime; | 1100 | detail.useEtime = obj.useEtime; |
| 1101 | } | 1101 | } |
| 1102 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1102 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1103 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1104 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1103 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1105 | detail.useStime = obj.useStime; | 1104 | detail.useStime = obj.useStime; |
| 1106 | detail.useEtime = obj.useEtime; | 1105 | detail.useEtime = obj.useEtime; |
| 1107 | } | 1106 | } |
| @@ -1098,8 +1098,7 @@ Page({ | @@ -1098,8 +1098,7 @@ Page({ | ||
| 1098 | detail.useEtime = obj.useEtime; | 1098 | detail.useEtime = obj.useEtime; |
| 1099 | } | 1099 | } |
| 1100 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1100 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1101 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1102 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1101 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1103 | detail.useStime = obj.useStime; | 1102 | detail.useStime = obj.useStime; |
| 1104 | detail.useEtime = obj.useEtime; | 1103 | detail.useEtime = obj.useEtime; |
| 1105 | } | 1104 | } |
| @@ -1055,8 +1055,7 @@ Page({ | @@ -1055,8 +1055,7 @@ Page({ | ||
| 1055 | detail.useEtime = obj.useEtime; | 1055 | detail.useEtime = obj.useEtime; |
| 1056 | } | 1056 | } |
| 1057 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1057 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1058 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1059 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1058 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1060 | detail.useStime = obj.useStime; | 1059 | detail.useStime = obj.useStime; |
| 1061 | detail.useEtime = obj.useEtime; | 1060 | detail.useEtime = obj.useEtime; |
| 1062 | } | 1061 | } |
| @@ -1099,8 +1099,7 @@ Page({ | @@ -1099,8 +1099,7 @@ Page({ | ||
| 1099 | detail.useEtime = obj.useEtime; | 1099 | detail.useEtime = obj.useEtime; |
| 1100 | } | 1100 | } |
| 1101 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1101 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1102 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1103 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1102 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1104 | detail.useStime = obj.useStime; | 1103 | detail.useStime = obj.useStime; |
| 1105 | detail.useEtime = obj.useEtime; | 1104 | detail.useEtime = obj.useEtime; |
| 1106 | } | 1105 | } |
| @@ -1098,8 +1098,7 @@ Page({ | @@ -1098,8 +1098,7 @@ Page({ | ||
| 1098 | detail.useEtime = obj.useEtime; | 1098 | detail.useEtime = obj.useEtime; |
| 1099 | } | 1099 | } |
| 1100 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1100 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1101 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1102 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1101 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1103 | detail.useStime = obj.useStime; | 1102 | detail.useStime = obj.useStime; |
| 1104 | detail.useEtime = obj.useEtime; | 1103 | detail.useEtime = obj.useEtime; |
| 1105 | } | 1104 | } |
| @@ -1132,8 +1132,7 @@ Page({ | @@ -1132,8 +1132,7 @@ Page({ | ||
| 1132 | detail.useEtime = obj.useEtime; | 1132 | detail.useEtime = obj.useEtime; |
| 1133 | } | 1133 | } |
| 1134 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 1134 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 1135 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 1136 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 1135 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 1137 | detail.useStime = obj.useStime; | 1136 | detail.useStime = obj.useStime; |
| 1138 | detail.useEtime = obj.useEtime; | 1137 | detail.useEtime = obj.useEtime; |
| 1139 | } | 1138 | } |
| @@ -323,8 +323,7 @@ Page({ | @@ -323,8 +323,7 @@ Page({ | ||
| 323 | detail.useEtime = obj.useEtime; | 323 | detail.useEtime = obj.useEtime; |
| 324 | } | 324 | } |
| 325 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 325 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 326 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 327 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 326 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 328 | detail.useStime = obj.useStime; | 327 | detail.useStime = obj.useStime; |
| 329 | detail.useEtime = obj.useEtime; | 328 | detail.useEtime = obj.useEtime; |
| 330 | } | 329 | } |
| @@ -443,8 +443,7 @@ Page({ | @@ -443,8 +443,7 @@ Page({ | ||
| 443 | detail.useEtime = obj.useEtime; | 443 | detail.useEtime = obj.useEtime; |
| 444 | } | 444 | } |
| 445 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { | 445 | if (condition.valid_forever === '0' && condition.sday && condition.eday) { |
| 446 | - let eday = condition.sday == '1' ? (parseInt(condition.eday) - 1) : (parseInt(condition.eday) + 1) | ||
| 447 | - let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, eday); | 446 | + let obj = this.setTimeRange(detail.cdate, parseInt(condition.sday) - 1, parseInt(condition.eday) - 1); |
| 448 | detail.useStime = obj.useStime; | 447 | detail.useStime = obj.useStime; |
| 449 | detail.useEtime = obj.useEtime; | 448 | detail.useEtime = obj.useEtime; |
| 450 | } | 449 | } |
-
Please register or login to post a comment