diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index 826cd0fe..1f7c2bf7 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -118,7 +118,7 @@ export default { } }).then(res=> { if(res?.data) { - this.list = this.current == 1? res.data.records : [...res.data.records, ...this.list] + this.list = this.current == 1? res.data.records : [...this.list,...res.data.records] } }) }, diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index 09190467..a27908ea 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -27,47 +27,64 @@
-
+
数据更新于{{ info.remindTime }}
-
+
- {{tabIndex==0? '计划送达居民：':'计划送达居民群：'}} + {{ + tabIndex == 0 ? "计划送达居民：" : "计划送达居民群：" + }} {{ info.planCount || 0 }}
- {{tabIndex==0? '未送达居民：':'未送达居民群：'}} + {{ + tabIndex == 0 ? "未送达居民：" : "未送达居民群：" + }} {{ info.unExecutedCount || 0 }}
- {{tabIndex==0? '已送达居民：':'已送达居民群：'}} + {{ + tabIndex == 0 ? "已送达居民：" : "已送达居民群：" + }} {{ info.executedCount || 0 }}
- {{tabIndex==0? '无法送达居民：':'无法送达居民群：'}} + {{ + tabIndex == 0 ? "无法送达居民：" : "无法送达居民群：" + }} {{ info.cannotExecuteCount || 0 }}
-
提醒成员发送
+
提醒成员发送
- +
- - + :colConfigs="tabIndex == 0 ? colConfigs0 : colConfigs1" + v-if="tableData.length" + > + + @@ -99,21 +116,21 @@ export default { firstClickTime: "", currentClickTime: "", flag: true, - detail: {} + detail: {}, }; }, computed: { colConfigs0() { return [ - { slot: "groupOwnerId",label: "成员" }, - { label: "预计送达居民群", prop: "groupCount" } + { slot: "groupOwnerId", label: "成员" }, + { label: "预计送达居民群", prop: "groupCount" }, ]; }, colConfigs1() { return [ - { label: "居民群",prop: "groupName" }, - { label: "群人数", prop: "memberCount"}, - { slot: "groupOwnerId",label: "群主" } + { label: "居民群", prop: "groupName" }, + { label: "群人数", prop: "memberCount" }, + { slot: "groupOwnerId", label: "群主" }, ]; }, }, @@ -124,15 +141,17 @@ export default { methods: { tabClick(index) { this.tabIndex = index; - this.getStatistics() + this.getStatistics(); }, getDetail() { - this.$http.post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`).then(res=> { - if (res?.data) { - this.detail = res.data - } - }) + this.$http + .post(`/app/appmasssendingtask/queryDetailById?id=${this.id}`) + .then((res) => { + if (res?.data) { + this.detail = res.data; + } + }); }, toDetail() { @@ -140,9 +159,13 @@ export default { }, // 提醒发送 remindSend() { - this.firstClickTime = +new Date(this.detail.remindTime).getTime(); + this.firstClickTime = new Date(this.detail.remindTime).getTime() || ""; + console.log(this.firstClickTime); this.currentClickTime = +new Date(); + console.log(this.currentClickTime); let time = this.currentClickTime - this.firstClickTime; + console.log(time); + if (time >= 60 * 60 * 1000 || this.flag) { this.$http .post("/app/appmasssendingtask/remindSend", null, { @@ -156,13 +179,12 @@ export default { this.flag = false; } }) - .catch(() => { - }); + .catch(() => {}); } else { console.log(111); time = 60 * 60 * 1000 - time; const min = Math.floor(time / 1000 / 60); // 分钟 - let second = Math.floor(time / 1000); // 秒 + let second = Math.floor(time / 1000); // 秒 second %= 60; let msg = ``; if (min > 0 && second > 0) { @@ -178,7 +200,7 @@ export default { // 切换分段器 changeSub(index) { this.subIndex = index; - this.getStatistics() + this.getStatistics(); }, // 获取数据 getStatistics() { @@ -193,10 +215,10 @@ export default { }) .then((res) => { if (res?.data) { - this.info = res.data - this.tableData = res.data.executedList.records + this.info = res.data; + this.tableData = res.data.executedList.records; } - this.getPieEcharts() + this.getPieEcharts(); }); }, @@ -210,7 +232,7 @@ export default { color: ["#1684fc", "#ccc"], series: [ { - name: "群发送达率", + name: this.tabIndex == 0 ? "任务完成率" : "群发送达率", type: "pie", radius: ["50%", "70%"], avoidLabelOverlap: false, @@ -230,9 +252,26 @@ export default { label: { normal: { show: true, - formatter: `{d}%\n群发居民群`, + formatter: ({ name, value }) => { + if (this.tabIndex == 0) { + return `{name|任务达成率\n\n}{value|${value}%}`; + } else { + return `{name|群发送达率\n\n}{value|${value}%}`; + } + }, textStyle: { fontSize: 16, + + }, + rich: { + name: { + color: "#7300000", + + }, + value: { + color: "#000000", + fontSize: 26, + }, }, }, }, @@ -247,7 +286,7 @@ export default { onShow() { document.title = "群发居民群统计"; this.getStatistics(); - this.getDetail() + this.getDetail(); }, mounted() { this.getPieEcharts(); @@ -261,7 +300,7 @@ export default { padding: 0; } ::v-deep .emptyWrap { - border: 2px solid #D0D4DC; + border: 2px solid #d0d4dc; border-radius: 8px; padding-bottom: 20px; } diff --git a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue index 3da8d618..45c98120 100644 --- a/src/project/saas/AppPropagandaStatistics/calendarInfo.vue +++ b/src/project/saas/AppPropagandaStatistics/calendarInfo.vue @@ -1,10 +1,9 @@ + + diff --git a/src/project/saas/AppPropagandaStatistics/uni-calendar/uni-calendar.vue b/src/project/saas/AppPropagandaStatistics/uni-calendar/uni-calendar.vue new file mode 100644 index 00000000..a9c2908a --- /dev/null +++ b/src/project/saas/AppPropagandaStatistics/uni-calendar/uni-calendar.vue @@ -0,0 +1,563 @@ + + + + + diff --git a/src/project/saas/AppPropagandaStatistics/uni-calendar/util.js b/src/project/saas/AppPropagandaStatistics/uni-calendar/util.js new file mode 100644 index 00000000..2d6100bf --- /dev/null +++ b/src/project/saas/AppPropagandaStatistics/uni-calendar/util.js @@ -0,0 +1,350 @@ +import CALENDAR from './calendar.js' + +class Calendar { + constructor({ + date, + selected, + startDate, + endDate, + range + } = {}) { + // 当前日期 + this.date = this.getDate(new Date()) // 当前初入日期 + // 打点信息 + this.selected = selected || []; + // 范围开始 + this.startDate = startDate + // 范围结束 + this.endDate = endDate + this.range = range + // 多选状态 + this.cleanMultipleStatus() + // 每周日期 + this.weeks = {} + // this._getWeek(this.date.fullDate) + } + /** + * 设置日期 + * @param {Object} date + */ + setDate(date) { + this.selectDate = this.getDate(date) + this._getWeek(this.selectDate.fullDate) + } + + /** + * 清理多选状态 + */ + cleanMultipleStatus() { + this.multipleStatus = { + before: '', + after: '', + data: [] + } + } + + /** + * 重置开始日期 + */ + resetSatrtDate(startDate) { + // 范围开始 + this.startDate = startDate + + } + + /** + * 重置结束日期 + */ + resetEndDate(endDate) { + // 范围结束 + this.endDate = endDate + } + + /** + * 获取任意时间 + */ + getDate(date, AddDayCount = 0, str = 'day') { + if (!date) { + date = new Date() + } + if (typeof date !== 'object') { + date = date.replace(/-/g, '/') + } + const dd = new Date(date) + switch (str) { + case 'day': + dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期 + break + case 'month': + if (dd.getDate() === 31) { + dd.setDate(dd.getDate() + AddDayCount) + } else { + dd.setMonth(dd.getMonth() + AddDayCount) // 获取AddDayCount天后的日期 + } + break + case 'year': + dd.setFullYear(dd.getFullYear() + AddDayCount) // 获取AddDayCount天后的日期 + break + } + const y = dd.getFullYear() + const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0 + const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0 + return { + fullDate: y + '-' + m + '-' + d, + year: y, + month: m, + date: d, + day: dd.getDay() + } + } + + + /** + * 获取上月剩余天数 + */ + _getLastMonthDays(firstDay, full) { + let dateArr = [] + for (let i = firstDay; i > 0; i--) { + const beforeDate = new Date(full.year, full.month - 1, -i + 1).getDate() + dateArr.push({ + date: beforeDate, + month: full.month - 1, + lunar: this.getlunar(full.year, full.month - 1, beforeDate), + disable: true + }) + } + return dateArr + } + /** + * 获取本月天数 + */ + _currentMonthDys(dateData, full) { + let dateArr = [] + let fullDate = this.date.fullDate + for (let i = 1; i <= dateData; i++) { + let nowDate = full.year + '-' + (full.month < 10 ? + full.month : full.month) + '-' + (i < 10 ? + '0' + i : i) + // 是否今天 + let isDay = fullDate === nowDate + // 获取打点信息 + let info = this.selected && this.selected.find((item) => { + if (this.dateEqual(nowDate, item.date)) { + return item + } + }) + + // 日期禁用 + let disableBefore = true + let disableAfter = true + if (this.startDate) { + // let dateCompBefore = this.dateCompare(this.startDate, fullDate) + // disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate) + disableBefore = this.dateCompare(this.startDate, nowDate) + } + + if (this.endDate) { + // let dateCompAfter = this.dateCompare(fullDate, this.endDate) + // disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate) + disableAfter = this.dateCompare(nowDate, this.endDate) + } + let multiples = this.multipleStatus.data + let checked = false + let multiplesStatus = -1 + if (this.range) { + if (multiples) { + multiplesStatus = multiples.findIndex((item) => { + return this.dateEqual(item, nowDate) + }) + } + if (multiplesStatus !== -1) { + checked = true + } + } + let data = { + fullDate: nowDate, + year: full.year, + date: i, + multiple: this.range ? checked : false, + beforeMultiple: this.dateEqual(this.multipleStatus.before, nowDate), + afterMultiple: this.dateEqual(this.multipleStatus.after, nowDate), + month: full.month, + lunar: this.getlunar(full.year, full.month, i), + disable: !(disableBefore && disableAfter), + isDay + } + if (info) { + data.extraInfo = info + } + + dateArr.push(data) + } + return dateArr + } + /** + * 获取下月天数 + */ + _getNextMonthDays(surplus, full) { + let dateArr = [] + for (let i = 1; i < surplus + 1; i++) { + dateArr.push({ + date: i, + month: Number(full.month) + 1, + lunar: this.getlunar(full.year, Number(full.month) + 1, i), + disable: true + }) + } + return dateArr + } + + /** + * 获取当前日期详情 + * @param {Object} date + */ + getInfo(date) { + if (!date) { + date = new Date() + } + const dateInfo = this.canlender.find(item => item.fullDate === this.getDate(date).fullDate) + return dateInfo + } + + /** + * 比较时间大小 + */ + dateCompare(startDate, endDate) { + // 计算截止时间 + startDate = new Date(startDate.replace('-', '/').replace('-', '/')) + // 计算详细项的截止时间 + endDate = new Date(endDate.replace('-', '/').replace('-', '/')) + if (startDate <= endDate) { + return true + } else { + return false + } + } + + /** + * 比较时间是否相等 + */ + dateEqual(before, after) { + // 计算截止时间 + before = new Date(before.replace('-', '/').replace('-', '/')) + // 计算详细项的截止时间 + after = new Date(after.replace('-', '/').replace('-', '/')) + if (before.getTime() - after.getTime() === 0) { + return true + } else { + return false + } + } + + + /** + * 获取日期范围内所有日期 + * @param {Object} begin + * @param {Object} end + */ + geDateAll(begin, end) { + var arr = [] + var ab = begin.split('-') + var ae = end.split('-') + var db = new Date() + db.setFullYear(ab[0], ab[1] - 1, ab[2]) + var de = new Date() + de.setFullYear(ae[0], ae[1] - 1, ae[2]) + var unixDb = db.getTime() - 24 * 60 * 60 * 1000 + var unixDe = de.getTime() - 24 * 60 * 60 * 1000 + for (var k = unixDb; k <= unixDe;) { + k = k + 24 * 60 * 60 * 1000 + arr.push(this.getDate(new Date(parseInt(k))).fullDate) + } + return arr + } + /** + * 计算阴历日期显示 + */ + getlunar(year, month, date) { + return CALENDAR.solar2lunar(year, month, date) + } + /** + * 设置打点 + */ + setSelectInfo(data, value) { + this.selected = value + this._getWeek(data) + } + + /** + * 获取多选状态 + */ + setMultiple(fullDate) { + let { + before, + after + } = this.multipleStatus + + if (!this.range) return + if (before && after) { + this.multipleStatus.before = '' + this.multipleStatus.after = '' + this.multipleStatus.data = [] + } else { + if (!before) { + this.multipleStatus.before = fullDate + } else { + this.multipleStatus.after = fullDate + if (this.dateCompare(this.multipleStatus.before, this.multipleStatus.after)) { + this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after); + } else { + this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before); + } + } + } + this._getWeek(fullDate) + } + + /** + * 获取每周数据 + * @param {Object} dateData + */ + _getWeek(dateData) { + const { + year, + month + } = this.getDate(dateData) + let firstDay = new Date(year, month - 1, 1).getDay() + let currentDay = new Date(year, month, 0).getDate() + let dates = { + lastMonthDays: this._getLastMonthDays(firstDay, this.getDate(dateData)), // 上个月末尾几天 + currentMonthDys: this._currentMonthDys(currentDay, this.getDate(dateData)), // 本月天数 + nextMonthDays: [], // 下个月开始几天 + weeks: [] + } + let canlender = [] + const surplus = 42 - (dates.lastMonthDays.length + dates.currentMonthDys.length) + dates.nextMonthDays = this._getNextMonthDays(surplus, this.getDate(dateData)) + canlender = canlender.concat(dates.lastMonthDays, dates.currentMonthDys, dates.nextMonthDays) + let weeks = {} + // 拼接数组 上个月开始几天 + 本月天数+ 下个月开始几天 + for (let i = 0; i < canlender.length; i++) { + if (i % 7 === 0) { + weeks[parseInt(i / 7)] = new Array(7) + } + weeks[parseInt(i / 7)][i % 7] = canlender[i] + } + this.canlender = canlender + this.weeks = weeks + } + + //静态方法 + // static init(date) { + // if (!this.instance) { + // this.instance = new Calendar(date); + // } + // return this.instance; + // } +} + + +export default Calendar