diff --git a/pages/index/index.vue b/pages/index/index.vue index 9c3db67..c1843d2 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -149,10 +149,10 @@ - {{ item.content }} + {{ item.messageContent }} - {{ item.readFlag != '1' ? '未读' : '已读' }} + {{ item.readFlag != 'unread' ? '已读' : '未读' }} @@ -457,19 +457,24 @@ export default { toDetail(e) { this.clearOneMessage(e.currentTarget.dataset.item.id); - if (e.currentTarget.dataset.item.msgType == 'resident_base_info') { + if (e.currentTarget.dataset.item.messageType == 'resident_base_info') { uni.navigateTo({ url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.item.targetId}` }); - } else if (e.currentTarget.dataset.item.msgType == 'community_house') { + } else if (e.currentTarget.dataset.item.messageType == 'community_house') { uni.navigateTo({ url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.targetId}` }); - } else if (e.currentTarget.dataset.item.msgType == 'resident_category') { + } else if (e.currentTarget.dataset.item.messageType == 'resident_category') { uni.navigateTo({ url: `/subpages/residentCategory/pages/residentCategory/residentCategory?category=${e.currentTarget.dataset.item.category}` }); } + else if (e.currentTarget.dataset.item.messageType == 'event') { + uni.navigateTo({ + url: `/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck?id=${e.currentTarget.dataset.item.targetId}&type=0` + }); + } this.setData({ [`tableData[${e.currentTarget.dataset.index}].readFlag`]: '1' }); diff --git a/pages/statistics/modules/Overview/index.vue b/pages/statistics/modules/Overview/index.vue new file mode 100644 index 0000000..43cd3c9 --- /dev/null +++ b/pages/statistics/modules/Overview/index.vue @@ -0,0 +1,312 @@ + + + + + diff --git a/pages/statistics/statistics.vue b/pages/statistics/statistics.vue index 2a7740a..01d84fd 100644 --- a/pages/statistics/statistics.vue +++ b/pages/statistics/statistics.vue @@ -6,60 +6,7 @@ 数据概览 - - - - - 24255 - - - 事件数 - - - - - 24255 - - - 事件数 - - - - - 24255 - - - 事件数 - - - - - - - 24255 - - - 需求数 - - - - - 24255 - - - 已办结 - - - - - 24255 - - - 未办结 - - - - + @@ -158,6 +105,8 @@ import problemList from './modules/ProblemList/ProblemList.vue'; import requirementAnalysis from './modules/RequirementAnalysis/RequirementAnalysis.vue'; import eventPrediction from './modules/EventPrediction/EventPrediction.vue'; import crowdPortrait from './modules/CrowdPortrait/CrowdPortrait.vue'; +import Overview from './modules/Overview/index.vue'; + import customTabBar from '../../components/custom-tab-bar'; const app = getApp(); export default { @@ -171,7 +120,8 @@ export default { RequirementAnalysis, EventPrediction, CrowdPortrait, - customTabBar + customTabBar, + Overview }, data() { return { @@ -251,89 +201,6 @@ export default { }; \ No newline at end of file diff --git a/subpages/morenews/pages/morenews/morenews.vue b/subpages/morenews/pages/morenews/morenews.vue index 1892de3..2ab815f 100644 --- a/subpages/morenews/pages/morenews/morenews.vue +++ b/subpages/morenews/pages/morenews/morenews.vue @@ -31,8 +31,8 @@ - {{ item.content }} - {{ item.readFlag != '1' ? '未读' : '已读' }} + {{ item.messageContent }} + {{ item.readFlag == 'unread' ? '未读' : '已读' }} @@ -95,6 +95,9 @@ export default { await this.getStaffbasicinfo(); }, onShow() { + this.setData({ + tableData:[] + }) this.getIntelligentMessage(); }, onPullDownRefresh() { @@ -123,9 +126,7 @@ export default { loadMoreType: 'more' }); const parm = { - type: this.selectValue == 0 ? null : this.selectValue - 1, - limit: this.pageSize, - page: this.pageNo + agencyId: app.globalData.user.agencyId }; if (!parm.type) { delete parm.type; @@ -200,18 +201,22 @@ export default { }, toDetail(e) { - if (e.currentTarget.dataset.item.msgType == 'resident_base_info') { + if (e.currentTarget.dataset.item.messageType == 'resident_base_info') { uni.navigateTo({ url: `/subpages/searchResult/pages/resiInfo/resiInfo?resiId=${e.currentTarget.dataset.item.targetId}` }); - } else if (e.currentTarget.dataset.item.msgType == 'community_house') { + } else if (e.currentTarget.dataset.item.messageType == 'community_house') { uni.navigateTo({ url: `/subpages/addhouse/pages/addhouse/addhouse?type=edit&houseId=${e.currentTarget.dataset.item.targetId}` }); - } else if (e.currentTarget.dataset.item.msgType == 'resident_category') { + } else if (e.currentTarget.dataset.item.messageType == 'resident_category') { uni.navigateTo({ url: `/subpages/residentCategory/pages/residentCategory/residentCategory?category=${e.currentTarget.dataset.item.category}` }); + }else if (e.currentTarget.dataset.item.messageType == 'ic_event_return'||e.currentTarget.dataset.item.messageType == 'event') { + uni.navigateTo({ + url: `/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck?id=${e.currentTarget.dataset.item.targetId}&type=0` + }); } this.setData({ [`tableData[${e.currentTarget.dataset.index}].readFlag`]: '1' diff --git a/utils/api.js b/utils/api.js index 748b0ac..9484497 100644 --- a/utils/api.js +++ b/utils/api.js @@ -90,7 +90,8 @@ module.exports = { Enterpriseambiguity, hotResidentSearch, hotHouseSearch, - carInfoSave + carInfoSave, + statisticEventInfo }; // 获取公钥 @@ -101,8 +102,8 @@ function changePassword(parm) { return fly.post(`epmetuser/customerstaff/changePassword`, parm); } // 消息列表 -function getIntelligentMessage(param) { - return fly.get(`message/intelligentMessage/page`, param); +function getIntelligentMessage(data) { + return fly.post(`message/usermessage/getUserMsg`, data); } function clearOneMessage(parm) { return fly.post(`message/intelligentMessage/msg/clearOne/?msgId=${parm.msgId}`); @@ -483,3 +484,7 @@ function hotHouseSearch() { function carInfoSave(data) { return fly.post(`epmetuser/carInfo/save`,data); } +//数据-数据概览 +function statisticEventInfo(parm) { + return fly.get(`governance/icEventSpecialSubject/statisticEventInfo`, parm); +}