diff --git a/src/api/index.ts b/src/api/index.ts index 7258755..518aa49 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -120,3 +120,13 @@ export function getIndexPanel() { url: 'cloudAnalysis/home/getIndexPanel', }) } + +/** + * 首页功能权限v2 +*/ +export function getIndexPanelV2() { + return request({ + method: 'GET', + url: 'cloudAnalysis/home/v2/getIndexPanel', + }) +} diff --git a/src/app.json b/src/app.json index 6267afb..38d725a 100644 --- a/src/app.json +++ b/src/app.json @@ -32,7 +32,8 @@ "pages/residentAttention/residentAttention", "pages/peopleHot/peopleHot", "pages/peolieThing/peopleSatisfied/peopleSatisfied", - "pages/peolieThing/peopleDissatisfied/peopleDissatisfied" + "pages/peolieThing/peopleDissatisfied/peopleDissatisfied", + "pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew" ] }, { diff --git a/src/assets/images/issue_count.png b/src/assets/images/issue_count.png new file mode 100644 index 0000000..d65de54 Binary files /dev/null and b/src/assets/images/issue_count.png differ diff --git a/src/assets/images/setup.png b/src/assets/images/setup.png new file mode 100644 index 0000000..ec32528 Binary files /dev/null and b/src/assets/images/setup.png differ diff --git a/src/assets/images/user_count.png b/src/assets/images/user_count.png new file mode 100644 index 0000000..4e918e4 Binary files /dev/null and b/src/assets/images/user_count.png differ diff --git a/src/filters/numberUtil.wxs b/src/filters/numberUtil.wxs index 1677e16..3501f21 100644 --- a/src/filters/numberUtil.wxs +++ b/src/filters/numberUtil.wxs @@ -11,10 +11,22 @@ var numberUtil = { numberFormat2: function (value) { // var v = parseInt(value) //强转Int，毕竟有可能返回是String类型的数字 return value.toFixed(1) + }, + // 每3位加,分隔 + numberEnFormat: function (num) { + var result = '', counter = 0; + num = (num || 0).toString(); + for (var i = num.length - 1; i >= 0; i--) { + counter++; + result = num.charAt(i) + result; + if (!(counter % 3) && i != 0) { result = ',' + result; } + } + return result; } } module.exports = { numberFormat: numberUtil.numberFormat, numberFormat1: numberUtil.numberFormat1, //暴露接口调用 - numberFormat2: numberUtil.numberFormat2 + numberFormat2: numberUtil.numberFormat2, + numberEnFormat: numberUtil.numberEnFormat } \ No newline at end of file diff --git a/src/pages/index/index.scss b/src/pages/index/index.scss index b770880..32a5066 100644 --- a/src/pages/index/index.scss +++ b/src/pages/index/index.scss @@ -4,202 +4,386 @@ page { line-height: 1.6; } -.altitle { - position: absolute; - width: 100%; - height: 66rpx; - background-color: black; - margin-top: 237rpx; - border-bottom-right-radius: 16rpx; - border-bottom-left-radius: 16rpx; - opacity: 0.5; - font-size: 22rpx; - font-weight: 500; - color: rgba(255, 255, 255, 1); -} - -.altitle-name { - margin: 10rpx 20rpx; -} - -.container { - width: 100vw; -} +// .altitle { +// position: absolute; +// width: 100%; +// height: 66rpx; +// background-color: black; +// margin-top: 237rpx; +// border-bottom-right-radius: 16rpx; +// border-bottom-left-radius: 16rpx; +// opacity: 0.5; +// font-size: 22rpx; +// font-weight: 500; +// color: rgba(255, 255, 255, 1); +// } + +// .altitle-name { +// margin: 10rpx 20rpx; +// } + +// .container { +// width: 100vw; +// } + +// .page-body { +// padding-top: 30rpx; +// background: #f8f8f8; +// } + +// .page-section { +// width: 100%; +// margin-bottom: 60rpx; +// } + +// .page-section_center { +// display: flex; +// flex-direction: column; +// align-items: center; +// } + +// .page-section:last-child { +// margin-bottom: 0; +// } + +// .page-section-gap { +// box-sizing: border-box; +// padding: 0 30rpx; +// } + +// .page-section-spacing { +// box-sizing: border-box; +// padding: 0 20rpx; +// } + +// .page-section-title { +// font-size: 28rpx; +// color: #999; +// margin-bottom: 10rpx; +// padding-left: 30rpx; +// padding-right: 30rpx; +// } + +// .page-section-gap .page-section-title { +// padding-left: 0; +// padding-right: 0; +// } + +// .demo-text-1 { +// position: relative; +// align-items: center; +// justify-content: center; +// background-color: #1aad19; +// color: #fff; +// font-size: 36rpx; +// } + +// .demo-text-1:before { +// content: 'A'; +// position: absolute; +// top: 50%; +// left: 50%; +// transform: translate(-50%, -50%); +// } + +// .demo-text-2 { +// position: relative; +// align-items: center; +// justify-content: center; +// background-color: #2782d7; +// color: #fff; +// font-size: 36rpx; +// } + +// .demo-text-2:before { +// content: 'B'; +// position: absolute; +// top: 50%; +// left: 50%; +// transform: translate(-50%, -50%); +// } + +// .demo-text-3 { +// position: relative; +// align-items: center; +// justify-content: center; +// background-color: #f1f1f1; +// color: #353535; +// font-size: 36rpx; +// } + +// .demo-text-3:before { +// content: 'C'; +// position: absolute; +// top: 50%; +// left: 50%; +// transform: translate(-50%, -50%); +// } + +// button { +// margin-bottom: 30rpx; +// } + +// button:last-child { +// margin-bottom: 0; +// } + +// .page-section-title { +// padding: 0; +// } + +// .swiper-item { +// display: block; +// height: 300rpx; +// } + +// .banner { +// overflow: hidden; +// height: 300rpx; +// display: flex; +// width: 100%; +// border-radius: 16rpx; +// } + +// .dots { +// display: flex; +// justify-content: center; +// padding-bottom: 10rpx; +// } + +// .dots .dot { +// width: 8rpx; +// height: 8rpx; +// border-radius: 8rpx; +// margin-left: 10rpx; +// background: #d2d5da; +// transition: all 0.3s; +// } + +// .dots .dot.active { +// width: 24rpx; +// background: #29b9a5; +// } + +// .page-section-title { +// margin-top: 60rpx; +// position: relative; +// } + +// .info { +// position: absolute; +// right: 0; +// color: #353535; +// font-size: 30rpx; +// } + +// .page-foot { +// margin-top: 50rpx; +// } + +// swiper { +// height: 320rpx; +// } + +// .nine-all { +// width: 100%; +// height: auto; +// margin-top: 20rpx; +// padding: 0 20rpx; +// box-sizing: border-box; +// } + +// .nine-all .nine-info { +// width: 100%; +// height: auto; +// background-color: #fff; +// border-radius: 16rpx; +// } .page-body { - padding-top: 30rpx; + margin-top: 10rpx; background: #f8f8f8; + .page-section { + width: 100%; + margin-bottom: 60rpx; + } + + .page-section_center { + display: flex; + flex-direction: column; + align-items: center; + } + + .page-section:last-child { + margin-bottom: 0; + } + + .page-section-spacing { + box-sizing: border-box; + } + + .page-section-gap { + box-sizing: border-box; + padding: 0 30rpx; + } + + .page-section-title { + font-size: 28rpx; + color: #999; + margin-bottom: 10rpx; + padding-left: 30rpx; + padding-right: 30rpx; + } + + .page-section-gap .page-section-title { + padding-left: 0; + padding-right: 0; + } } -.page-section { - width: 100%; - margin-bottom: 60rpx; -} - -.page-section_center { - display: flex; - flex-direction: column; - align-items: center; -} - -.page-section:last-child { - margin-bottom: 0; -} - -.page-section-gap { - box-sizing: border-box; - padding: 0 30rpx; -} - -.page-section-spacing { - box-sizing: border-box; - padding: 0 20rpx; -} - -.page-section-title { - font-size: 28rpx; - color: #999; - margin-bottom: 10rpx; - padding-left: 30rpx; - padding-right: 30rpx; -} - -.page-section-gap .page-section-title { - padding-left: 0; - padding-right: 0; -} - -.demo-text-1 { - position: relative; - align-items: center; - justify-content: center; - background-color: #1aad19; - color: #fff; - font-size: 36rpx; -} - -.demo-text-1:before { - content: 'A'; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -.demo-text-2 { - position: relative; - align-items: center; - justify-content: center; - background-color: #2782d7; - color: #fff; - font-size: 36rpx; -} - -.demo-text-2:before { - content: 'B'; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -.demo-text-3 { - position: relative; - align-items: center; - justify-content: center; - background-color: #f1f1f1; - color: #353535; - font-size: 36rpx; -} - -.demo-text-3:before { - content: 'C'; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); -} - -button { - margin-bottom: 30rpx; -} - -button:last-child { - margin-bottom: 0; -} - -.page-section-title { - padding: 0; -} - -.swiper-item { - display: block; - height: 300rpx; -} - -.banner { - overflow: hidden; - height: 300rpx; - display: flex; - width: 100%; - border-radius: 16rpx; +swiper { + height: 332rpx; + .swiper-item { + display: block; + height: 332rpx; + .banner { + overflow: hidden; + height: 332rpx; + display: flex; + width: 100%; + } + } } .dots { display: flex; justify-content: center; - padding-bottom: 10rpx; + .dot { + width: 8rpx; + height: 8rpx; + border-radius: 8rpx; + margin-left: 10rpx; + background: #d2d5da; + transition: all 0.3s; + } } - -.dots .dot { - width: 8rpx; - height: 8rpx; - border-radius: 8rpx; - margin-left: 10rpx; - background: #d2d5da; - transition: all 0.3s; -} - .dots .dot.active { width: 24rpx; background: #29b9a5; } - -.page-section-title { - margin-top: 60rpx; - position: relative; +/* 议题数和用户数面板 */ +@font-face { + font-family: 'Impact Number'; + src:url(data:application/font-woff2;charset=utf-8;base64,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) } - -.info { - position: absolute; - right: 0; - color: #353535; - font-size: 30rpx; -} - -.page-foot { - margin-top: 50rpx; -} - -swiper { - height: 320rpx; +.counts { + position: relative; + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + height: 190rpx; + background-color: #fff; + border-top-left-radius: 28rpx; + border-top-right-radius: 28rpx; + margin-top: -28rpx; + padding: 0 28rpx; + .count-item { + position: relative; + width: 342rpx; + height: 140rpx; + + image { + width: 100%; + height: 100%; + position: absolute; + } + .count-text { + position: absolute; + z-index: 999; + color:#fff; + font-family: 'Impact Number'; + font-size: 48rpx; + font-weight: 400; + margin-left: 42rpx; + margin-top: 25rpx; + height: 48rpx; + line-height: 54rpx; + letter-spacing: 4rpx; + } + .title-text { + position: absolute; + z-index: 999; + color: #fff; + font-family: PingFang SC; + font-size: 26rpx; + font-weight: 400; + left: 42rpx; + bottom: 30rpx; + } + } } -.nine-all { +/** 九宫格*/ +.sudoku { width: 100%; - height: auto; - margin-top: 20rpx; - padding: 0 20rpx; box-sizing: border-box; + margin-top: 10rpx; + .content-title { + background-color: #fff; + color: rgba(51,51,51,1); + font-family: PingFang SC; + font-size: 32rpx; + font-weight: bold; + padding: 20rpx; + } + .content { + width: 100%; + height: 100%; + background: #fff; + display: flex; + align-items: center; + justify-content: flex-start; + flex-wrap: wrap; + box-sizing: border-box; + padding-bottom: 20rpx; + + .item { + width: 25%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 170rpx; + border-radius: 6rpx; + + image { + width: 90rpx; + height: 90rpx; + object-fit: contain; + } + .name { + font-size: 26rpx; + font-family: PingFang SC; + font-weight: 400; + color: rgba(102,102,102,1); + margin-top: 10rpx; + } + } + } +} +/* 设置 悬浮按钮 */ +.setting { + width: 124rpx; + height: 128rpx; + position: fixed; + right: -20rpx; + bottom: 120rpx; + .setting-img { + width: 100%; + height: 100%; + } } - -.nine-all .nine-info { - width: 100%; - height: auto; - background-color: #fff; - border-radius: 16rpx; -} - /* 九宫格 */ .nine-info-one { @@ -647,59 +831,59 @@ swiper { /** 九宫格*/ -.sudoku { - width: 100%; - box-sizing: border-box; - padding: 0 20rpx; - margin-top: 20rpx; -} - -.sudoku .content { - width: 100%; - height: 100%; - background: #fff; - border-radius: 16rpx; - display: grid; - grid-template-columns: repeat(2, 1fr); - align-content: center; - grid-row-gap: 14%; - box-sizing: border-box; - padding: 0 20rpx; -} - -.sudoku .item { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - height: 170rpx; - border-radius: 6rpx; -} - -.sudoku .item image { - width: 100rpx; - height: 100rpx; - object-fit: contain; -} - -.sudoku .item .name { - margin-top: 16rpx; - font-size: 24rpx; - color: #666; - line-height: 24rpx; -} - -.grid-hover { - background: #f7f7f7; -} - -.button { - width: 33.33%; - height: 140rpx; - position: absolute; - background: rgba(255, 255, 255, 0); - z-index: 10; -} +// .sudoku { +// width: 100%; +// box-sizing: border-box; +// padding: 0 20rpx; +// margin-top: 20rpx; +// } + +// .sudoku .content { +// width: 100%; +// height: 100%; +// background: #fff; +// border-radius: 16rpx; +// display: grid; +// grid-template-columns: repeat(2, 1fr); +// align-content: center; +// grid-row-gap: 14%; +// box-sizing: border-box; +// padding: 0 20rpx; +// } + +// .sudoku .item { +// display: flex; +// flex-direction: column; +// align-items: center; +// justify-content: center; +// height: 170rpx; +// border-radius: 6rpx; +// } + +// .sudoku .item image { +// width: 100rpx; +// height: 100rpx; +// object-fit: contain; +// } + +// .sudoku .item .name { +// margin-top: 16rpx; +// font-size: 24rpx; +// color: #666; +// line-height: 24rpx; +// } + +// .grid-hover { +// background: #f7f7f7; +// } + +// .button { +// width: 33.33%; +// height: 140rpx; +// position: absolute; +// background: rgba(255, 255, 255, 0); +// z-index: 10; +// } /* 新版首页样式 */ diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts index 0055a34..2413ba8 100644 --- a/src/pages/index/index.ts +++ b/src/pages/index/index.ts @@ -1,4 +1,4 @@ -import { bannerList, getAllSituation, getSurvey, getToken, getIndexPanel } from '../../api/index' +import { bannerList, getAllSituation, getSurvey, getToken, getIndexPanelV2 } from '../../api/index' import { checkUpdateAvatar, updateAvatar } from '../../api/clerkOnline' import { logout } from '../../api/setUp' // import * as echarts from '../../components/ec-canvas/echarts.js' @@ -86,152 +86,204 @@ Page({ async getIndexPanel() { let that = this; try { - const res: any = await getIndexPanel() - var zzjg_ = { - zzjg_: false - } - res.data.push(zzjg_) - var dqhd_ = { - dqhd_: false - } - res.data.push(dqhd_) - var zlph_ = { - zlph_: false - } - res.data.push(zlph_) - var jcsk_ = { - jcsk_: false - } - res.data.push(jcsk_) - var sjzx_ = { - sjzx_: false - } - res.data.push(sjzx_) - var gbpj_ = { - gbpj_: false - } - res.data.push(gbpj_) - var djsk_ = { - djsk_: false - } - res.data.push(djsk_) + const res: any = await getIndexPanelV2() + console.log(res.data) + // var zzjg_ = { + // zzjg_: false + // } + // res.data.push(zzjg_) + // var dqhd_ = { + // dqhd_: false + // } + // res.data.push(dqhd_) + // var zlph_ = { + // zlph_: false + // } + // res.data.push(zlph_) + // var jcsk_ = { + // jcsk_: false + // } + // res.data.push(jcsk_) + // var sjzx_ = { + // sjzx_: false + // } + // res.data.push(sjzx_) + // var gbpj_ = { + // gbpj_: false + // } + // res.data.push(gbpj_) + // var djsk_ = { + // djsk_: false + // } + // res.data.push(djsk_) - // 所有等于false的都是后台为配置的权限的 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10011') {//组织架构 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].zzjg_ == false) { - res.data[i].zzjg_ = true - } - } - } - }; + // // 所有等于false的都是后台为配置的权限的 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10011') {//组织架构 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].zzjg_ == false) { + // res.data[i].zzjg_ = true + // } + // } + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10012') {//党建实况 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].djsk_ == false) { - res.data[i].djsk_ = true - } - } - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10012') {//党建实况 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].djsk_ == false) { + // res.data[i].djsk_ = true + // } + // } + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10013') {//基层实况 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].jcsk_ == false) { - res.data[i].jcsk_ = true - } - } - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10013') {//基层实况 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].jcsk_ == false) { + // res.data[i].jcsk_ = true + // } + // } + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10014') {//治理排行 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].zlph_ == false) { - res.data[i].zlph_ = true - } - } - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10014') {//治理排行 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].zlph_ == false) { + // res.data[i].zlph_ = true + // } + // } + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10015') {//书记在线 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].sjzx_ == false) { - res.data[i].sjzx_ = true - } - } - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10015') {//书记在线 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].sjzx_ == false) { + // res.data[i].sjzx_ = true + // } + // } + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10016') {//干部评价 - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].gbpj_ == false) { - res.data[i].gbpj_ = true - } - } - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10016') {//干部评价 + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].gbpj_ == false) { + // res.data[i].gbpj_ = true + // } + // } + // } + // }; - // res.data 重新排序 - var panelList = []; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10011') {//组织架构 - panelList.push(res.data[i]) - } else if (res.data[i].zzjg_ == false) { - panelList.push(res.data[i]) - } - }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10012') {//党建实况 - panelList.push(res.data[i]) - } else if (res.data[i].djsk_ == false) { - panelList.push(res.data[i]) - } - }; + // // res.data 重新排序 + // var panelList = []; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10011') {//组织架构 + // panelList.push(res.data[i]) + // } else if (res.data[i].zzjg_ == false) { + // panelList.push(res.data[i]) + // } + // }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10012') {//党建实况 + // panelList.push(res.data[i]) + // } else if (res.data[i].djsk_ == false) { + // panelList.push(res.data[i]) + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10013') {//基层实况 - panelList.push(res.data[i]) - } else if (res.data[i].jcsk_ == false) { - panelList.push(res.data[i]) - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10013') {//基层实况 + // panelList.push(res.data[i]) + // } else if (res.data[i].jcsk_ == false) { + // panelList.push(res.data[i]) + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10014') {//治理排行 - panelList.push(res.data[i]) - } else if (res.data[i].zlph_ == false) { - panelList.push(res.data[i]) - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10014') {//治理排行 + // panelList.push(res.data[i]) + // } else if (res.data[i].zlph_ == false) { + // panelList.push(res.data[i]) + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10015') {//书记在线 - panelList.push(res.data[i]) - } else if (res.data[i].sjzx_ == false) { - panelList.push(res.data[i]) - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10015') {//书记在线 + // panelList.push(res.data[i]) + // } else if (res.data[i].sjzx_ == false) { + // panelList.push(res.data[i]) + // } + // }; - for (var i = 0; i < res.data.length; i++) { - if (res.data[i].navCode == '10016') {//干部评价 - panelList.push(res.data[i]) - } else if (res.data[i].gbpj_ == false) { - panelList.push(res.data[i]) - } - }; + // for (var i = 0; i < res.data.length; i++) { + // if (res.data[i].navCode == '10016') {//干部评价 + // panelList.push(res.data[i]) + // } else if (res.data[i].gbpj_ == false) { + // panelList.push(res.data[i]) + // } + // }; that.setData({ - indexPanel: panelList, + indexPanel: res.data, }) } catch (err) { console.log(err) } }, + + //跳转到子页 + navigateToPage (e:{ currentTarget: { dataset: { code: any}}}) { + console.log(e.currentTarget.dataset.code) + + if (e.currentTarget.dataset.code == 'A1001') { //党员信息 + wx.navigateTo({ + url: "/subpages/basicReality/pages/index/index?tab=basic-situation&title=党员信息" + }); + } else if (e.currentTarget.dataset.code == 'A1002') { //参与情况 + wx.navigateTo({ + url: "/subpages/basicReality/pages/index/index?tab=enter-situation&title=参与情况" + }); + } else if (e.currentTarget.dataset.code == 'A1003') { //发挥作用 + wx.navigateTo({ + url: "/subpages/basicReality/pages/index/index?tab=bring-into-play-situation&title=发挥作用" + }); + } else if (e.currentTarget.dataset.code == 'A2001') { //热议事件 + wx.navigateTo({ + url: "/subpages/reality/pages/peopleHot/peopleHot" + }); + } else if (e.currentTarget.dataset.code == 'A2002') { //关注类别 + wx.navigateTo({ + url: "/subpages/reality/pages/residentAttention/residentAttention" + }); + } else if (e.currentTarget.dataset.code == 'A2003') { //自治成效 + wx.navigateTo({ + url: "/subpages/reality/pages/autonomy/autonomy" + }); + } else if (e.currentTarget.dataset.code == 'A2004') { //难点堵点 + wx.navigateTo({ + url: "/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint" + }); + } else if (e.currentTarget.dataset.code == 'A2005') { //满意度 + wx.navigateTo({ + url: "/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew" + }); + } else if (e.currentTarget.dataset.code == 'A3001') { //社区报道 + wx.navigateTo({ + url: "/subpages/governRanking/pages/governRanking/governRanking?tab=second&title=社区报道" + }); + } else if (e.currentTarget.dataset.code == 'A3002') { //网格自治 + wx.navigateTo({ + url: "/subpages/governRanking/pages/governRanking/governRanking?tab=third&title=网格自治" + }); + } else if (e.currentTarget.dataset.code == 'A3003') { //网格满意度 + wx.navigateTo({ + url: "/subpages/governRanking/pages/governRanking/governRanking?tab=fourth&title=网格满意度" + }); + } + }, // 轮播 getBannerList: function () { let that = this diff --git a/src/pages/index/index.wxml b/src/pages/index/index.wxml index bb367b6..5aadd45 100644 --- a/src/pages/index/index.wxml +++ b/src/pages/index/index.wxml @@ -6,9 +6,9 @@ - + @@ -22,354 +22,135 @@ - - - - - - - - - - {{item.label}} - - - - 基层实况 - - - - - - {{item.label}} - - - - 治理排行 - - - - - - - - - - - 基层实况 - - - - 治理排行 - - - - - - - + + + + {{numberUtil.numberEnFormat(survey.issueTotal)}} + 议题数 + + + + {{numberUtil.numberEnFormat(allSituation.userTotal)}} + 用户数 - - - - - - - - - - - - - - {{numberUtil.numberFormat1(survey.issueTotal/10000)}}万 - {{survey.issueTotal}} - - 议题总数 - - - - - - 未转项目 - - {{numberUtil.numberFormat1(survey.unpassedProject/10000)}} - 万 + + + 参与情况 - {{survey.unpassedProject}} - - - - 热议中 - {{survey.hotAllPercent}}% - 0% + + + {{item.label}} - - - 已关闭 - {{survey.closedAllPercent}}% - 0% + + + 作用发挥 - - - 已转项目 - - {{numberUtil.numberFormat1(survey.passedProject/10000)}} - 万 + + + {{item.label}} - {{survey.passedProject}} - - - - - 已解决 - {{survey.resolvedAllPercent}}% - 0% + + + 热议事件 - - - 待解决 - {{survey.beSolvedAllPercent}}% - 0% + + + {{item.label}} - - - - - - - - - - - - - {{numberUtil.numberFormat1(allSituation.userTotal/10000)}}万 - {{allSituation.userTotal}} - - - 用户总数 - - - - - - - 党员总数 - - {{numberUtil.numberFormat1(allSituation.partyNumber/10000)}} - 万 + + + 关注类别 + + + + {{item.label}} + + + + 自治成效 + + + + {{item.label}} + + + + 难点堵点 + + + + {{item.label}} - {{allSituation.partyNumber}} - - - {{allSituation.partyNumberRatio}}% - 0% - - - 居民总数 - - {{numberUtil.numberFormat1(allSituation.userNumber/10000)}} - 万 + + + 满意度 - {{allSituation.userNumber}} - - {{allSituation.userNumberRatio}}% - 0% - - - 企业代表数 - - {{numberUtil.numberFormat1(allSituation.companyRepresentTotal/10000)}} - 万 + + + {{item.label}} - {{allSituation.companyRepresentTotal}} - - {{allSituation.companyRepresentTotalRatio}}% - 0% - + + + 社区报到 + + + + {{item.label}} + + + + 网格自治 + + + + {{item.label}} + + + + 网格满意度 + + + + {{item.label}} + + + + 志愿服务 + + + + {{item.label}} + + + + 积分排行 + --> + - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/src/subpages/basicReality/pages/index/components/partyVan/partyVan.ts b/src/subpages/basicReality/pages/index/components/partyVan/partyVan.ts index 1d2dadb..355b74b 100644 --- a/src/subpages/basicReality/pages/index/components/partyVan/partyVan.ts +++ b/src/subpages/basicReality/pages/index/components/partyVan/partyVan.ts @@ -1,4 +1,15 @@ Component({ + properties: { + tab: { + type:String, + value:'basic-situation', + observer: function (newVal, oldVal) { + this.setData({ + selectTab: newVal + }) + } + }, + }, data: { selectTab: 'basic-situation', streetId: '', @@ -10,7 +21,7 @@ Component({ typeList: [ { type: 'basic-situation', name: '党员基本情况', select: true }, { type: 'enter-situation', name: '党员参与情况', select: false }, - // { type: 'bring-into-play-situation', name: '党员作用发挥情况', select: false } + { type: 'bring-into-play-situation', name: '党员作用发挥情况', select: false } ] }, methods: { diff --git a/src/subpages/basicReality/pages/index/components/partyVan/partyVan.wxml b/src/subpages/basicReality/pages/index/components/partyVan/partyVan.wxml index e460fe6..31521f1 100644 --- a/src/subpages/basicReality/pages/index/components/partyVan/partyVan.wxml +++ b/src/subpages/basicReality/pages/index/components/partyVan/partyVan.wxml @@ -1,6 +1,6 @@ - + diff --git a/src/subpages/basicReality/pages/index/index.json b/src/subpages/basicReality/pages/index/index.json index 714ee60..581cca7 100644 --- a/src/subpages/basicReality/pages/index/index.json +++ b/src/subpages/basicReality/pages/index/index.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "党建实况", + "navigationBarTitleText": "", "usingComponents": { "party-van": "./components/partyVan/partyVan", "branch-construct": "./components/branchConstruct/branchConstruct", diff --git a/src/subpages/basicReality/pages/index/index.ts b/src/subpages/basicReality/pages/index/index.ts index b8238dd..26578f7 100644 --- a/src/subpages/basicReality/pages/index/index.ts +++ b/src/subpages/basicReality/pages/index/index.ts @@ -1,9 +1,15 @@ Page({ data: { - selectTab: 'party-van' + selectTab: 'party-van', + subTab: 'basic-situation' }, - onLoad () { - + onLoad (option) { + this.setData({ + subTab: option.tab + }) + wx.setNavigationBarTitle({ + title: option.title + }) }, onShow () { diff --git a/src/subpages/basicReality/pages/index/index.wxml b/src/subpages/basicReality/pages/index/index.wxml index 4829684..6e952fe 100644 --- a/src/subpages/basicReality/pages/index/index.wxml +++ b/src/subpages/basicReality/pages/index/index.wxml @@ -10,7 +10,7 @@ - + diff --git a/src/subpages/governRanking/pages/governRanking/governRanking.ts b/src/subpages/governRanking/pages/governRanking/governRanking.ts index a29e001..a6fc237 100644 --- a/src/subpages/governRanking/pages/governRanking/governRanking.ts +++ b/src/subpages/governRanking/pages/governRanking/governRanking.ts @@ -12,9 +12,38 @@ Page({ deptStatisticsList: [],//街道 社区列表 gridByselfStatisticsList:[],//网格自治 gridEvaList:[],//网格满意度 + tab:'' }, - onLoad:function(){ - this.deptStatisticsList()//初始化加载街道报道 + onLoad: function (option) { + this.setData({ + tab: option.tab + }) + wx.setNavigationBarTitle({ + title: option.title + }) + }, + onShow: function () { + //this.deptStatisticsList()//初始化加载街道报道 + this.showTap() + }, + showTap () { + this.setData({ + type: this.data.tab, + loadVisible: true, + loadType: "more", + isShow: false, + preloadVisible: true, + deptStatisticsList: [],//街道 社区列表清空 + gridByselfStatisticsList: [],//网格自治 + gridEvaList: [],//网格满意度 + }) + if (this.data.tab == "first" || this.data.tab == "second") { + this.deptStatisticsList()//初始化加载街道报道 + } else if (this.data.tab == "third") {//网格自治 + this.getGrid() + } else if (this.data.tab == "fourth") { + this.getGridEvaList() + } }, /** * 部门报道排名接口 diff --git a/src/subpages/governRanking/pages/governRanking/governRanking.wxml b/src/subpages/governRanking/pages/governRanking/governRanking.wxml index ac74858..709878e 100644 --- a/src/subpages/governRanking/pages/governRanking/governRanking.wxml +++ b/src/subpages/governRanking/pages/governRanking/governRanking.wxml @@ -16,7 +16,7 @@ - + diff --git a/src/subpages/issue/pages/topicsNumDetail/components/noProject/noProject.ts b/src/subpages/issue/pages/topicsNumDetail/components/noProject/noProject.ts index f465f42..b4791a5 100644 --- a/src/subpages/issue/pages/topicsNumDetail/components/noProject/noProject.ts +++ b/src/subpages/issue/pages/topicsNumDetail/components/noProject/noProject.ts @@ -46,14 +46,14 @@ Component({ }, observers: { unpassedProjectPercent(newval) { - this.setData({ - isShow6:!this.data.isShow6 - }) - setTimeout(() => { - this.setData({ - isShow6:!this.data.isShow6 - }) - }, 1000) + // this.setData({ + // isShow6:!this.data.isShow6 + // }) + // setTimeout(() => { + // this.setData({ + // isShow6:!this.data.isShow6 + // }) + // }, 1000) // this.getEcharts() } }, diff --git a/src/subpages/issue/pages/topicsNumDetail/components/project/project.ts b/src/subpages/issue/pages/topicsNumDetail/components/project/project.ts index 57e2161..3dbc1dc 100644 --- a/src/subpages/issue/pages/topicsNumDetail/components/project/project.ts +++ b/src/subpages/issue/pages/topicsNumDetail/components/project/project.ts @@ -40,14 +40,14 @@ Component({ }, observers: { passedProjectPercent() { - this.setData({ - isShow6:!this.data.isShow6 - }) - setTimeout(() => { - this.setData({ - isShow6:!this.data.isShow6 - }) - }, 1000) + // this.setData({ + // isShow6:!this.data.isShow6 + // }) + // setTimeout(() => { + // this.setData({ + // isShow6:!this.data.isShow6 + // }) + // }, 1000) } }, diff --git a/src/subpages/reality/pages/autonomy/autonomy.json b/src/subpages/reality/pages/autonomy/autonomy.json index 0e1af90..9e8af4a 100644 --- a/src/subpages/reality/pages/autonomy/autonomy.json +++ b/src/subpages/reality/pages/autonomy/autonomy.json @@ -1,7 +1,7 @@ { - "navigationBarTitleText": "群众自治", + "navigationBarTitleText": "自治成效", "usingComponents": { - "load-more": "../../components/loadMore/loadMore", + "load-more": "../../../../components/loadMore/loadMore", "preload-item": "./components/preloadItem/preloadItem", "list-item": "./components/listItem/listItem", "no-data":"../../../../components/nodata/nodata" diff --git a/src/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint.json b/src/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint.json index f92c755..a4a2755 100644 --- a/src/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint.json +++ b/src/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "难点堵点TOP10", + "navigationBarTitleText": "难点堵点", "usingComponents": { "list-item": "./components/listItem/listItem", "load-more": "../../../../components/loadMore/loadMore", diff --git a/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.js b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.js new file mode 100644 index 0000000..b89a13f --- /dev/null +++ b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.js @@ -0,0 +1,433 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var echarts = require("../../../../../components/ec-canvas/echarts.js"); +var reality_1 = require("../../../../../api/reality"); +function setOption(chart, chartData, color) { + var option = { + color: color, + series: [ + { + type: "pie", + radius: ["70%", "95%"], + silent: true, + avoidLabelOverlap: false, + label: { + show: false + }, + labelLine: { + show: false, + normal: { + show: false + } + }, + itemStyle: { + borderColor: "#fff", + borderWidth: "2", + }, + data: chartData + } + ] + }; + chart.setOption(option); +} +Page({ + data: { + selectTab: "tab1", + type: "first", + allnum: 0, + pageSize: 10, + pageIndex: 1, + listLength: 0, + evaluateCountList: [], + chartData: [], + loadVisible: true, + loadType: "more", + isShow: false, + preloadVisible: true, + color: [], + ec: {}, + isShowLoading: true, + }, + onLoad: function () { + this.ecComponent = this.selectComponent("#mychart-dom-bar"); + this.getEvaluateCountList(); + this.selectComponent("#peopleList").getList(this.data); + }, + onGetCode: function (e) { + this.setData({ + listLength: e.detail.listLength + }); + }, + onReachBottom: function () { + if (this.data.listLength !== this.data.pageSize) { + this.setData({ + loadType: "none", + }); + return; + } + this.setData({ + loadType: "more", + }); + var obj = { + pageIndex: ++this.data.pageIndex, + pageSize: this.data.pageSize, + }; + this.selectComponent("#peopleList").getList(this.data); + }, + getEvaluateCountList: function () { + this.setData({ + isShowLoading: true + }); + var that = this; + var evaluateType = "1"; + if (that.data.selectTab == "tab1") { + evaluateType = "1"; + } + else { + evaluateType = "2"; + } + var cotegoryType = "1"; + if (that.data.type == "first") { + cotegoryType = "1"; + } + else if (that.data.type == "second") { + cotegoryType = "2"; + } + else if (that.data.type == "third") { + cotegoryType = "3"; + } + reality_1.getEvaluateCountList(evaluateType, cotegoryType).then(function (res) { + that.setData.evaluateCountList = []; + that.setData.allnum = 0; + var datalength = res.data.length; + if (datalength == 0) { + that.setData({ + loadVisible: false, + preloadVisible: false, + isShow: true, + isShowLoading: false + }); + } + for (var i = 0; i < res.data.length; i++) { + that.setData({ + allnum: that.data.allnum + res.data[i].count + }); + } + if (datalength == 1) { + if (res.data[0].count != 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + } + ], + }); + } + } + else if (datalength == 2) { + if (res.data[1].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + } + ], + }); + } + else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + } + ], + }); + } + } + else if (datalength == 3) { + if (res.data[2].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + } + ], + }); + } + else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + } + ], + }); + } + } + else if (datalength == 4) { + if (res.data[3].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + ], + }); + } + else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + } + ], + }); + } + } + else if (datalength == 5) { + if (res.data[4].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + } + ], + }); + } + else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED", "#679CF7"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + }, + { + value: res.data[4].count / that.data.allnum, + name: "5" + } + ], + }); + } + } + else if (datalength == 6) { + if (res.data[5].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED", "#679CF7"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + }, + { + value: res.data[4].count / that.data.allnum, + name: "5" + }, + ], + }); + } + else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED", "#679CF7", "#FFC600"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + }, + { + value: res.data[4].count / that.data.allnum, + name: "5" + }, + { + value: res.data[5].count / that.data.allnum, + name: "6" + } + ], + }); + } + } + that.init(); + }); + }, + init: function () { + var _this = this; + this.setData({ + isShowLoading: true + }); + this.ecComponent.init(function (canvas, width, height) { + var chart = echarts.init(canvas, null, { + width: width, + height: height + }); + setOption(chart, _this.data.chartData, _this.data.color); + return chart; + }); + if (this.data.chartData.length > 0) { + var that = this; + that.setData({ + preloadVisible: false, + isShowLoading: false + }); + } + this.setData({ + isShowLoading: false + }); + }, + onTabChange: function (e) { + if (this.data.isShowLoading) { + wx.showToast({ + title: "正在加载中请稍后切换", + icon: "none", + duration: 2000, + mask: true, + }); + return; + } + this.setData({ + chartData: [], + color: [], + selectTab: e.currentTarget.dataset.tab, + pageSize: 10, + pageIndex: 1, + loadType: "more", + isShow: false, + preloadVisible: true, + evaluateCountList: [] + }); + this.init(); + this.getEvaluateCountList(); + this.selectComponent("#peopleList").getList(this.data); + }, + onButtonChange: function (e) { + if (this.data.isShowLoading) { + wx.showToast({ + title: "正在加载中请稍后切换", + icon: "none", + duration: 2000, + mask: true, + }); + return; + } + this.setData({ + chartData: [], + color: [], + type: e.currentTarget.dataset.type, + preloadVisible: true, + evaluateCountList: [] + }); + this.init(); + this.getEvaluateCountList(); + }, +}); +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"peopleSatisfied.js","sourceRoot":"","sources":["peopleSatisfied.ts"],"names":[],"mappings":"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","sourcesContent":["// subpages/reality/pages/peopleSatisfied/peopleSatisfied.js\r\n// @ts-ignore\r\nimport * as echarts from \"../../../../../components/ec-canvas/echarts.js\"\r\nimport { getEvaluateCountList } from \"../../../../../api/reality\"\r\nfunction setOption (chart, chartData, color) {\r\n  var option = {\r\n    color: color,\r\n    series: [\r\n      {\r\n        type: \"pie\",\r\n        radius: [\"70%\", \"95%\"],\r\n        silent: true,\r\n        avoidLabelOverlap: false,\r\n        label: {\r\n          show: false\r\n        },\r\n        labelLine: {\r\n          show: false,\r\n          normal: {\r\n            show: false\r\n          }\r\n        },\r\n        itemStyle: {\r\n          borderColor: \"#fff\",\r\n          borderWidth: \"2\",\r\n        },\r\n        data: chartData\r\n      }\r\n    ]\r\n  };\r\n  chart.setOption(option);\r\n}\r\nPage({\r\n\r\n  /**\r\n   * 页面的初始数据\r\n   */\r\n  data: {\r\n    selectTab: \"tab1\",\r\n    type: \"first\",\r\n    allnum: 0,//总数\r\n    pageSize:10,\r\n    pageIndex:1,\r\n    listLength:0,\r\n    evaluateCountList: [],\r\n    chartData: [],\r\n    loadVisible:true,\r\n    loadType: \"more\",\r\n    isShow:false,\r\n    preloadVisible: true,\r\n    color: [],\r\n    ec: {},\r\n    isShowLoading:true,//true加载中,false加载完毕\r\n  },\r\n  /**\r\n   * 生命周期函数--监听页面加载\r\n   */\r\n  onLoad: function () {\r\n    this.ecComponent = this.selectComponent(\"#mychart-dom-bar\")\r\n\r\n    this.getEvaluateCountList()\r\n    this.selectComponent(\"#peopleList\").getList(this.data)\r\n  },\r\n  /**\r\n   * 子页面传值\r\n   */\r\n  onGetCode: function (e: { detail: { val: any } }) {\r\n    this.setData({\r\n      listLength: e.detail.listLength\r\n    })\r\n  },\r\n  /**\r\n    * 页面上拉触底事件的处理函数\r\n    */\r\n  onReachBottom: function () {\r\n    // 判断是否需要在加载数据\r\n    if (this.data.listLength !== this.data.pageSize) {\r\n      this.setData({\r\n        loadType: \"none\",\r\n      })\r\n      return\r\n    }\r\n    this.setData({\r\n      loadType: \"more\",\r\n    })\r\n    let obj = {\r\n      pageIndex: ++this.data.pageIndex,\r\n      pageSize: this.data.pageSize,\r\n    }\r\n    this.selectComponent(\"#peopleList\").getList(this.data)\r\n  },\r\n  // 获取数据\r\n  getEvaluateCountList () {\r\n    this.setData({\r\n      isShowLoading:true\r\n    })\r\n    let that = this\r\n    let evaluateType = \"1\"//评价类别:1.非常满意，2.基本满意，3.不满意\r\n    if (that.data.selectTab == \"tab1\") {\r\n      evaluateType = \"1\"\r\n    } else {\r\n      evaluateType = \"2\"\r\n    }\r\n    let cotegoryType = \"1\"//分类类别：1.一级，2.二级，3.三级\r\n    if (that.data.type == \"first\") {//一级\r\n      cotegoryType = \"1\"\r\n    } else if (that.data.type == \"second\") {//二级\r\n      cotegoryType = \"2\"\r\n    } else if (that.data.type == \"third\") {//三级\r\n      cotegoryType = \"3\"\r\n    }\r\n    getEvaluateCountList(evaluateType, cotegoryType).then(function (res: { data: any }) {\r\n      that.setData.evaluateCountList = []\r\n      that.setData.allnum = 0\r\n      let datalength = res.data.length\r\n\r\n      if (datalength == 0) {\r\n        that.setData({\r\n          loadVisible: false,\r\n          preloadVisible:false,\r\n          isShow: true,\r\n          isShowLoading:false\r\n        })\r\n      }\r\n\r\n      for (var i = 0; i < res.data.length; i++) {\r\n        that.setData({\r\n          allnum: that.data.allnum + res.data[i].count\r\n        });\r\n      }\r\n      if (datalength == 1) {\r\n        if (res.data[0].count != 0) {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              }\r\n            ],\r\n          });\r\n        }\r\n\r\n      } else if (datalength == 2) {\r\n        if (res.data[1].count == 0) {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              }\r\n            ],\r\n          });\r\n        } else {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              }\r\n            ],\r\n          });\r\n        }\r\n      } else if (datalength == 3) {\r\n        if (res.data[2].count == 0) {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              }\r\n            ],\r\n          });\r\n        } else {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              }\r\n            ],\r\n          });\r\n        }\r\n      } else if (datalength == 4) {\r\n        if (res.data[3].count == 0) {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              },\r\n            ],\r\n          });\r\n        } else {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\", \"#63CFED\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              },\r\n              {\r\n                value: res.data[3].count / that.data.allnum,\r\n                name: \"4\"\r\n              }\r\n            ],\r\n          });\r\n        }\r\n\r\n      } else if (datalength == 5) {\r\n        if (res.data[4].count == 0) {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\", \"#63CFED\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              },\r\n              {\r\n                value: res.data[3].count / that.data.allnum,\r\n                name: \"4\"\r\n              }\r\n            ],\r\n          });\r\n        } else {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\", \"#63CFED\", \"#679CF7\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              },\r\n              {\r\n                value: res.data[3].count / that.data.allnum,\r\n                name: \"4\"\r\n              },\r\n              {\r\n                value: res.data[4].count / that.data.allnum,\r\n                name: \"5\"\r\n              }\r\n            ],\r\n          });\r\n        }\r\n\r\n      } else if (datalength == 6) {\r\n        if (res.data[5].count == 0) {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\", \"#63CFED\", \"#679CF7\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              },\r\n              {\r\n                value: res.data[3].count / that.data.allnum,\r\n                name: \"4\"\r\n              },\r\n              {\r\n                value: res.data[4].count / that.data.allnum,\r\n                name: \"5\"\r\n              },\r\n            ],\r\n          });\r\n        } else {\r\n          that.setData({\r\n            evaluateCountList: res.data,\r\n            color: [\"#AD6DFE\", \"#FFA270\", \"#29B9A5\", \"#63CFED\", \"#679CF7\", \"#FFC600\"],\r\n            chartData: [\r\n              {\r\n                value: res.data[0].count / that.data.allnum,\r\n                name: \"1\"\r\n              },\r\n              {\r\n                value: res.data[1].count / that.data.allnum,\r\n                name: \"2\"\r\n              },\r\n              {\r\n                value: res.data[2].count / that.data.allnum,\r\n                name: \"3\"\r\n              },\r\n              {\r\n                value: res.data[3].count / that.data.allnum,\r\n                name: \"4\"\r\n              },\r\n              {\r\n                value: res.data[4].count / that.data.allnum,\r\n                name: \"5\"\r\n              },\r\n              {\r\n                value: res.data[5].count / that.data.allnum,\r\n                name: \"6\"\r\n              }\r\n            ],\r\n          });\r\n        }\r\n\r\n      }\r\n\r\n      that.init()\r\n    })\r\n  },\r\n  init () {\r\n    this.setData({\r\n      isShowLoading:true\r\n    })\r\n    // @ts-ignore\r\n    this.ecComponent.init((canvas: any, width: any, height: any) => {\r\n      const chart = echarts.init(canvas, null, {\r\n        width: width,\r\n        height: height\r\n      })\r\n      setOption(chart, this.data.chartData, this.data.color)\r\n      return chart\r\n    })\r\n    if (this.data.chartData.length > 0){\r\n      let that = this\r\n      that.setData({\r\n        preloadVisible: false,\r\n        isShowLoading:false\r\n      })\r\n    }\r\n    this.setData({\r\n      isShowLoading:false\r\n    })\r\n  },\r\n  // tab 切换\r\n  onTabChange (e: AnyObject) {\r\n    if (this.data.isShowLoading) {\r\n      wx.showToast({\r\n        title: \"正在加载中请稍后切换\", //提示的内容,\r\n        icon: \"none\", //图标,\r\n        duration: 2000, //延迟时间,\r\n        mask: true, //显示透明蒙层，防止触摸穿透,\r\n      });\r\n      return\r\n    }\r\n    this.setData({\r\n      chartData: [],\r\n      color: [],\r\n      selectTab: e.currentTarget.dataset.tab,\r\n      pageSize: 10,\r\n      pageIndex: 1,\r\n      loadType: \"more\",\r\n      isShow: false,\r\n      preloadVisible: true,\r\n      evaluateCountList:[]\r\n    })\r\n    this.init()\r\n    this.getEvaluateCountList();\r\n    this.selectComponent(\"#peopleList\").getList(this.data)\r\n  },\r\n  // 类目切换\r\n  onButtonChange (e: AnyObject) {\r\n    if (this.data.isShowLoading) {\r\n      wx.showToast({\r\n        title: \"正在加载中请稍后切换\", //提示的内容,\r\n        icon: \"none\", //图标,\r\n        duration: 2000, //延迟时间,\r\n        mask: true, //显示透明蒙层，防止触摸穿透,\r\n      });\r\n      return\r\n    }\r\n    this.setData({\r\n      chartData: [],\r\n      color: [],\r\n      type: e.currentTarget.dataset.type,\r\n      preloadVisible: true,\r\n      evaluateCountList:[]\r\n    })\r\n    this.init()\r\n    this.getEvaluateCountList()\r\n  },\r\n})"]} \ No newline at end of file diff --git a/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.json b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.json new file mode 100644 index 0000000..d9b38e2 --- /dev/null +++ b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.json @@ -0,0 +1,10 @@ +{ + "navigationBarTitleText": "满意度", + "usingComponents": { + "people-list": "../components/list/list", + "ec-canvas": "../../../../../components/ec-canvas/ec-canvas", + "preload-item": "../components/preloadItem/preloadItem", + "load-more": "../../../../../components/loadMore/loadMore", + "no-data": "../components/peopleNodata/peopleNodata" + } +} \ No newline at end of file diff --git a/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.scss b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.scss new file mode 100644 index 0000000..22fc2c3 --- /dev/null +++ b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.scss @@ -0,0 +1,265 @@ +page { + width: 100%; + height: auto; + min-height: 100vh; + overflow-y: auto; + background-color: #f7f6fb +} + +.diff-plugg { + width: 100%; + height: 100%; + background: #f7f6fb; + + .banner { + width: 100%; + height: 270rpx; + + image { + width: 100%; + height: 100%; + } + } + + .tab-bar { + width: 100%; + height: 80rpx; + background: #fff; + display: flex; + justify-content: space-around; + position: relative; + + .tab { + flex: 1; + height: 80rpx; + line-height: 80rpx; + text-align:center; + width: 50%; + color: #999; + font-size: 30rpx; + } + + .select-tab { + color: #29B9A5; + font-size: 32rpx; + font-weight: bold; + } + + .select-bar { + width: 30rpx; + height: 10rpx; + border-radius: 5rpx; + background: #29B9A5; + position: absolute; + bottom: 0rpx; + } + .select-bar.tab1 { + left: calc(16% - 15rpx); + transition: left linear 0.4s; + } + .select-bar.tab2 { + left: calc(50% - 15rpx); + transition: left linear 0.4s; + } + .select-bar.tab3 { + left: calc(83% - 15rpx); + transition: left linear 0.4s; + } + } + + .content { + width: 100%; + + .line{ + height: 1rpx; + background-color: #fff; + + .line-padding{ + margin: 0 20rpx; + height: 1rpx; + background-color: #eee; + } + } + + .category-type { + width: 100%; + height: 140rpx; + display: flex; + align-items: center; + background-color: #FFFFFF; + justify-content: space-around; + + button { + width: 200rpx; + height: 55rpx; + border-radius: 28rpx; + border: 1rpx solid #29B9A5; + font-weight: 500; + background: #fff; + font-size: 28rpx; + color: #29B9A5; + padding: 0; + margin: 0; + line-height: 55rpx; + min-height: 55rpx !important; + box-sizing: content-box !important; + } + + .hover-btn { + background: #29B9A5; + color: #fff; + } + + .select-btn { + background: #29B9A5; + color: #fff; + } + } + + .chart-main{ + width: 100%; + height: 400rpx; + background-color: #fff; + box-sizing: border-box; + + .chart-left{ + width: 328rpx; + height: 328rpx; + margin:35rpx 0 35rpx 75rpx; + float: left; + } + + .chart-right{ + height: 328rpx; + margin:35rpx 0 35rpx 30rpx; + float: left; + + .chart-right-one{ + height: 24rpx; + margin-top: 50rpx; + } + + .chart-right-two{ + height: 24rpx; + margin-top: 18rpx; + } + } + } + + .list-name{ + margin-top: 20rpx; + height: 100rpx; + padding: 0 20rpx; + line-height: 100rpx; + font-size:32rpx; + font-weight:500; + color:rgba(102,102,102,1); + background-color: #fff; + border-bottom: 1rpx solid #eee; + } + } +} + +.circular{ + width: 10rpx; + height: 10rpx; + margin-top: 6rpx; + border-radius: 50%; + background-color: #AD6DFE; + float: left; +} +.circular1{ + background-color: #FFA270; +} +.circular2{ + background-color: #29B9A5; +} +.circular3{ + background-color: #63CFED; +} +.circular4{ + background-color: #679CF7; +} +.circular5{ + background-color: #FFC600; +} +.name{ + height:24rpx; + width: 150rpx; + font-size:20rpx; + margin-left: 5rpx; + line-height: 24rpx; + font-weight:500; + color:rgba(153,153,153,1); + float: left; +} +.number{ + height:24rpx; + font-size:24rpx; + margin-left: 20rpx; + line-height: 24rpx; + font-weight:bold; + color:rgba(102,102,102,1); + float: left; +} +.percentage{ + height:24rpx; + font-size:24rpx; + margin-left: 20rpx; + line-height: 24rpx; + font-weight:bold; + + float: left; +} +.color{ + color:#AD6DFE; +} +.color1{ + color:#FFA270; +} + +.color2{ + color:#29B9A5; +} +.color3{ + color:#63CFED; +} +.color4{ + color:#679CF7; +} +.color5{ + color:#FFC600; +} +.bottom-all{ + width: 100%; + margin-top: 34rpx; + padding: 0 20rpx 30rpx 20rpx; + height: auto; + box-sizing: border-box; +} +.bottom-all-name{ + width: 100%; + margin-top: 12rpx; + box-sizing: border-box; +} +.nameB{ + height:24rpx; + font-size:20rpx; + margin-left: 5rpx; + line-height: 24rpx; + font-weight:500; + color:rgba(153,153,153,1); + float: left; +} +.chart-main .chart-leftB{ + width: 328rpx; + height: 328rpx; + margin: 0 auto; +} +.heightA{ + height: 400rpx !important; +} +.heightB{ + height: auto !important; +} +.cle{clear: both} \ No newline at end of file diff --git a/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.ts b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.ts new file mode 100644 index 0000000..7995347 --- /dev/null +++ b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.ts @@ -0,0 +1,447 @@ +// subpages/reality/pages/peopleSatisfied/peopleSatisfied.js +// @ts-ignore +import * as echarts from "../../../../../components/ec-canvas/echarts.js" +import { getEvaluateCountList } from "../../../../../api/reality" +function setOption (chart, chartData, color) { + var option = { + color: color, + series: [ + { + type: "pie", + radius: ["70%", "95%"], + silent: true, + avoidLabelOverlap: false, + label: { + show: false + }, + labelLine: { + show: false, + normal: { + show: false + } + }, + itemStyle: { + borderColor: "#fff", + borderWidth: "2", + }, + data: chartData + } + ] + }; + chart.setOption(option); +} +Page({ + + /** + * 页面的初始数据 + */ + data: { + selectTab: "tab1", + type: "first", + allnum: 0,//总数 + pageSize:10, + pageIndex:1, + listLength:0, + evaluateCountList: [], + chartData: [], + loadVisible:true, + loadType: "more", + isShow:false, + preloadVisible: true, + color: [], + ec: {}, + isShowLoading:true,//true加载中,false加载完毕 + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function () { + this.ecComponent = this.selectComponent("#mychart-dom-bar") + + this.getEvaluateCountList() + this.selectComponent("#peopleList").getList(this.data) + }, + /** + * 子页面传值 + */ + onGetCode: function (e: { detail: { val: any } }) { + this.setData({ + listLength: e.detail.listLength + }) + }, + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + // 判断是否需要在加载数据 + if (this.data.listLength !== this.data.pageSize) { + this.setData({ + loadType: "none", + }) + return + } + this.setData({ + loadType: "more", + }) + let obj = { + pageIndex: ++this.data.pageIndex, + pageSize: this.data.pageSize, + } + this.selectComponent("#peopleList").getList(this.data) + }, + // 获取数据 + getEvaluateCountList () { + this.setData({ + isShow: false, + isShowLoading:true + }) + let that = this + let evaluateType = "1"//评价类别:1.非常满意，2.基本满意，3.不满意 + if (that.data.selectTab == "tab1") { + evaluateType = "1" + } else if (that.data.selectTab == "tab2"){ + evaluateType = "2" + } else if (that.data.selectTab == "tab3"){ + evaluateType = "3" + } + let cotegoryType = "1"//分类类别：1.一级，2.二级，3.三级 + if (that.data.type == "first") {//一级 + cotegoryType = "1" + } else if (that.data.type == "second") {//二级 + cotegoryType = "2" + } else if (that.data.type == "third") {//三级 + cotegoryType = "3" + } + getEvaluateCountList(evaluateType, cotegoryType).then(function (res: { data: any }) { + that.setData.evaluateCountList = [] + that.setData.allnum = 0 + let datalength = res.data.length + + if (datalength == 0) { + that.setData({ + loadVisible: false, + preloadVisible:false, + isShow: true, + isShowLoading:false + }) + } + + for (var i = 0; i < res.data.length; i++) { + that.setData({ + allnum: that.data.allnum + res.data[i].count + }); + } + if (datalength == 1) { + if (res.data[0].count != 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + } + ], + }); + } + + } else if (datalength == 2) { + if (res.data[1].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + } + ], + }); + } else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + } + ], + }); + } + } else if (datalength == 3) { + if (res.data[2].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + } + ], + }); + } else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + } + ], + }); + } + } else if (datalength == 4) { + if (res.data[3].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + ], + }); + } else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + } + ], + }); + } + + } else if (datalength == 5) { + if (res.data[4].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + } + ], + }); + } else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED", "#679CF7"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + }, + { + value: res.data[4].count / that.data.allnum, + name: "5" + } + ], + }); + } + + } else if (datalength == 6) { + if (res.data[5].count == 0) { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED", "#679CF7"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + }, + { + value: res.data[4].count / that.data.allnum, + name: "5" + }, + ], + }); + } else { + that.setData({ + evaluateCountList: res.data, + color: ["#AD6DFE", "#FFA270", "#29B9A5", "#63CFED", "#679CF7", "#FFC600"], + chartData: [ + { + value: res.data[0].count / that.data.allnum, + name: "1" + }, + { + value: res.data[1].count / that.data.allnum, + name: "2" + }, + { + value: res.data[2].count / that.data.allnum, + name: "3" + }, + { + value: res.data[3].count / that.data.allnum, + name: "4" + }, + { + value: res.data[4].count / that.data.allnum, + name: "5" + }, + { + value: res.data[5].count / that.data.allnum, + name: "6" + } + ], + }); + } + + } + + that.init() + }) + }, + init () { + this.setData({ + isShowLoading:true + }) + // @ts-ignore + this.ecComponent.init((canvas: any, width: any, height: any) => { + const chart = echarts.init(canvas, null, { + width: width, + height: height + }) + setOption(chart, this.data.chartData, this.data.color) + return chart + }) + if (this.data.chartData.length > 0){ + let that = this + that.setData({ + preloadVisible: false, + isShowLoading:false + }) + } + this.setData({ + isShowLoading:false + }) + }, + // tab 切换 + onTabChange (e: AnyObject) { + if (this.data.isShowLoading) { + wx.showToast({ + title: "正在加载中请稍后切换", //提示的内容, + icon: "none", //图标, + duration: 2000, //延迟时间, + mask: true, //显示透明蒙层，防止触摸穿透, + }); + return + } + this.setData({ + chartData: [], + color: [], + selectTab: e.currentTarget.dataset.tab, + pageSize: 10, + pageIndex: 1, + loadType: "more", + isShow: false, + preloadVisible: true, + evaluateCountList:[] + }) + this.init() + this.getEvaluateCountList(); + this.selectComponent("#peopleList").getList(this.data) + }, + // 类目切换 + onButtonChange (e: AnyObject) { + if (this.data.isShowLoading) { + wx.showToast({ + title: "正在加载中请稍后切换", //提示的内容, + icon: "none", //图标, + duration: 2000, //延迟时间, + mask: true, //显示透明蒙层，防止触摸穿透, + }); + return + } + this.setData({ + chartData: [], + color: [], + type: e.currentTarget.dataset.type, + preloadVisible: true, + evaluateCountList:[] + }) + this.init() + this.getEvaluateCountList() + }, +}) \ No newline at end of file diff --git a/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.wxml b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.wxml new file mode 100644 index 0000000..472d72e --- /dev/null +++ b/src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.wxml @@ -0,0 +1,91 @@ + + + + + + 非常满意 + 基本满意 + 不满意 + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{item.cotegoryName}} + {{item.count}} + + {{item.percentum}} + + + + + + + + + + {{item.cotegoryName}} + {{item.count}} + {{item.percentum}} + + + + + + + 事件列表 + + + + + + + \ No newline at end of file diff --git a/src/subpages/reality/pages/peopleHot/peopleHot.json b/src/subpages/reality/pages/peopleHot/peopleHot.json index 99db980..6f899b8 100644 --- a/src/subpages/reality/pages/peopleHot/peopleHot.json +++ b/src/subpages/reality/pages/peopleHot/peopleHot.json @@ -3,5 +3,5 @@ "load-more":"../../../../components/loadMore/loadMore", "no-data":"../../../../components/nodata/nodata" }, - "navigationBarTitleText": "群众热议的事儿" + "navigationBarTitleText": "热议事件" } \ No newline at end of file diff --git a/src/subpages/reality/pages/residentAttention/residentAttention.json b/src/subpages/reality/pages/residentAttention/residentAttention.json index e57fc67..1464660 100644 --- a/src/subpages/reality/pages/residentAttention/residentAttention.json +++ b/src/subpages/reality/pages/residentAttention/residentAttention.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "群众关注的问题", + "navigationBarTitleText": "关注类别", "usingComponents": { "wux-progress": "../../../../wux/progress/index", "preload-item": "./components/preloadItem/preloadItem", diff --git a/src/utils/config.ts b/src/utils/config.ts index 5f40fea..27a3955 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -1,6 +1,6 @@ export const config = { - // apiUrl: "https://epdc-test.elinkservice.cn/epdc-api/" // 微笑榆山测试环境 - apiUrl: "https://epdc-yushan.elinkservice.cn/epdc-api/" // 微笑榆山数据端-正式环境 + apiUrl: "https://epdc-test.elinkservice.cn/epdc-api/" // 微笑榆山测试环境 + // apiUrl: "https://epdc-yushan.elinkservice.cn/epdc-api/" // 微笑榆山数据端-正式环境 // apiUrl: 'https://eug-test.elinkit.com.cn/epdc-api/' // 测试环境接口 // apiUrl: 'https://epdc-kongcun.elinkit.com.cn/epdc-api/' // 孔村正式环境接口 // apiUrl: 'https://epdc-jinshui.elinkservice.cn/epdc-api/' // 锦水正式环境接口