diff --git a/app.js b/app.js index 6cb18bcc9..ff5e160b0 100644 --- a/app.js +++ b/app.js @@ -40,20 +40,20 @@ let opts = { } // todo 测试环境 测试使用,生产环境请用nginx带来 -// app.use('/callComponent', proxy('http://192.168.100.108:8088', opts)); -// app.use('/app', proxy('http://192.168.100.108:8088', opts)); -// app.use('/ws', createProxyMiddleware({ -// target: 'http://192.168.100.108:8008', -// changeOrigin: true, -// ws: true -// })); +app.use('/callComponent', proxy('http://192.168.100.108:8088', opts)); +app.use('/app', proxy('http://192.168.100.108:8088', opts)); +app.use('/ws', createProxyMiddleware({ + target: 'http://192.168.100.108:8008', + changeOrigin: true, + ws: true +})); // todo 本机 开发用,生产环境请用nginx带来 -app.use('/ws', proxy('http://127.0.0.1:8008', opts)); -app.use('/callComponent', proxy('http://127.0.0.1:8008', opts)); -app.use('/app', proxy('http://127.0.0.1:8008', opts)); +// app.use('/ws', proxy('http://127.0.0.1:8008', opts)); +// app.use('/callComponent', proxy('http://127.0.0.1:8008', opts)); +// app.use('/app', proxy('http://127.0.0.1:8008', opts)); //app.listen(3000); app.use(express.json()); diff --git a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js index 28eb70154..36248467b 100644 --- a/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js +++ b/public/pages/property/reportPayFeeDetail/reportPayFeeDetail.js @@ -97,48 +97,6 @@ }, methods: { _initDate: function () { - /*vc.initDate('startTime', function (_value) { - $that.reportPayFeeDetailInfo.conditions.startTime = _value; - }) - vc.initDate('endTime', function (_value) { - $that.reportPayFeeDetailInfo.conditions.endTime = _value; - let start = Date.parse(new Date($that.reportPayFeeDetailInfo.conditions.startTime)) - let end = Date.parse(new Date($that.reportPayFeeDetailInfo.conditions.endTime)) - if (start - end > 0) { - vc.toast("结束时间必须大于开始时间") - $that.reportPayFeeDetailInfo.conditions.endTime = ''; - } - }); - vc.initDate('feeStartTime', function (_value) { - $that.reportPayFeeDetailInfo.conditions.feeStartTime = _value; - }) - vc.initDate('feeEndTime', function (_value) { - $that.reportPayFeeDetailInfo.conditions.feeEndTime = _value; - let start = Date.parse(new Date($that.reportPayFeeDetailInfo.conditions.feeStartTime)) - let end = Date.parse(new Date($that.reportPayFeeDetailInfo.conditions.feeEndTime)) - if (start - end >= 0) { - vc.toast("结束时间必须大于开始时间") - $that.reportPayFeeDetailInfo.conditions.feeEndTime = ''; - } - })*/ - // vc.component.reportPayFeeDetailInfo.conditions.startTime = vc.dateTimeFormat(new Date().getTime()); - let _data = new Date(); - let _month = _data.getMonth(); - let _newDate = ""; - if (_month < 10) { - _newDate = _data.getFullYear() + "-0" + _month + "-01 00:00:00"; - } else { - _newDate = _data.getFullYear() + "-" + _month + "-01 00:00:00"; - } - $that.reportPayFeeDetailInfo.conditions.startTime = _newDate; - /*_data.setMonth(_data.getMonth() + 1); - _month = _data.getMonth() + 1; - if (_month < 10) { - _newDate = _data.getFullYear() + "-0" + _month + "-01 "; - } else { - _newDate = _data.getFullYear() + "-" + _month + "-01"; - }*/ - // $that.reportPayFeeDetailInfo.conditions.endTime = vc.dateTimeFormat(new Date().setMonth(new Date().getMonth())); $(".startTime").datetimepicker({ language: 'zh-CN', fontAwesome: 'fa',