Merge remote-tracking branch 'origin/master'
| | |
| | | let mDay = lastMouth.getDate().toString() |
| | | if (mDay.length <= 1) mDay = "0" + mDay |
| | | let todayDate = oYear + str + oMoth + str + oDay |
| | | let lastMouthDate = mYear + str + mMoth + str + mDay |
| | | return [lastMouthDate, todayDate] |
| | | let lastMouthDate = mYear + str + mMoth + str + mDay//暂时改成2024-01-01 |
| | | return ['2024-01-01', todayDate] |
| | | }, |
| | | |
| | | rowSave (row, done, loading) { |
| | |
| | | const data = res.data.data |
| | | // 总合计行 |
| | | let countItem = { |
| | | name: '信州区合计', |
| | | name: '信州区', |
| | | xscjgqy: 0, |
| | | xmrxycs: 0, |
| | | xgwylcs: 0, |