Browse Source

首页改版;

release
ZhaoTongYao 5 years ago
parent
commit
24f3582fc4
  1. 10
      src/api/index.ts
  2. 3
      src/app.json
  3. BIN
      src/assets/images/issue_count.png
  4. BIN
      src/assets/images/setup.png
  5. BIN
      src/assets/images/user_count.png
  6. 14
      src/filters/numberUtil.wxs
  7. 640
      src/pages/index/index.scss
  8. 312
      src/pages/index/index.ts
  9. 453
      src/pages/index/index.wxml
  10. 13
      src/subpages/basicReality/pages/index/components/partyVan/partyVan.ts
  11. 2
      src/subpages/basicReality/pages/index/components/partyVan/partyVan.wxml
  12. 2
      src/subpages/basicReality/pages/index/index.json
  13. 12
      src/subpages/basicReality/pages/index/index.ts
  14. 2
      src/subpages/basicReality/pages/index/index.wxml
  15. 33
      src/subpages/governRanking/pages/governRanking/governRanking.ts
  16. 4
      src/subpages/governRanking/pages/governRanking/governRanking.wxml
  17. 16
      src/subpages/issue/pages/topicsNumDetail/components/noProject/noProject.ts
  18. 16
      src/subpages/issue/pages/topicsNumDetail/components/project/project.ts
  19. 4
      src/subpages/reality/pages/autonomy/autonomy.json
  20. 2
      src/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint.json
  21. 433
      src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.js
  22. 10
      src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.json
  23. 265
      src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.scss
  24. 447
      src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.ts
  25. 91
      src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.wxml
  26. 2
      src/subpages/reality/pages/peopleHot/peopleHot.json
  27. 2
      src/subpages/reality/pages/residentAttention/residentAttention.json
  28. 4
      src/utils/config.ts

10
src/api/index.ts

@ -120,3 +120,13 @@ export function getIndexPanel() {
url: 'cloudAnalysis/home/getIndexPanel', url: 'cloudAnalysis/home/getIndexPanel',
}) })
} }
/**
* v2
*/
export function getIndexPanelV2() {
return request({
method: 'GET',
url: 'cloudAnalysis/home/v2/getIndexPanel',
})
}

3
src/app.json

@ -32,7 +32,8 @@
"pages/residentAttention/residentAttention", "pages/residentAttention/residentAttention",
"pages/peopleHot/peopleHot", "pages/peopleHot/peopleHot",
"pages/peolieThing/peopleSatisfied/peopleSatisfied", "pages/peolieThing/peopleSatisfied/peopleSatisfied",
"pages/peolieThing/peopleDissatisfied/peopleDissatisfied" "pages/peolieThing/peopleDissatisfied/peopleDissatisfied",
"pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew"
] ]
}, },
{ {

BIN
src/assets/images/issue_count.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
src/assets/images/setup.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/assets/images/user_count.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

14
src/filters/numberUtil.wxs

@ -11,10 +11,22 @@ var numberUtil = {
numberFormat2: function (value) { numberFormat2: function (value) {
// var v = parseInt(value) //强转Int,毕竟有可能返回是String类型的数字 // var v = parseInt(value) //强转Int,毕竟有可能返回是String类型的数字
return value.toFixed(1) 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 = { module.exports = {
numberFormat: numberUtil.numberFormat, numberFormat: numberUtil.numberFormat,
numberFormat1: numberUtil.numberFormat1, //暴露接口调用 numberFormat1: numberUtil.numberFormat1, //暴露接口调用
numberFormat2: numberUtil.numberFormat2 numberFormat2: numberUtil.numberFormat2,
numberEnFormat: numberUtil.numberEnFormat
} }

640
src/pages/index/index.scss

File diff suppressed because one or more lines are too long

312
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 { checkUpdateAvatar, updateAvatar } from '../../api/clerkOnline'
import { logout } from '../../api/setUp' import { logout } from '../../api/setUp'
// import * as echarts from '../../components/ec-canvas/echarts.js' // import * as echarts from '../../components/ec-canvas/echarts.js'
@ -86,152 +86,204 @@ Page({
async getIndexPanel() { async getIndexPanel() {
let that = this; let that = this;
try { try {
const res: any = await getIndexPanel() const res: any = await getIndexPanelV2()
var zzjg_ = { console.log(res.data)
zzjg_: false // var zzjg_ = {
} // zzjg_: false
res.data.push(zzjg_) // }
var dqhd_ = { // res.data.push(zzjg_)
dqhd_: false // var dqhd_ = {
} // dqhd_: false
res.data.push(dqhd_) // }
var zlph_ = { // res.data.push(dqhd_)
zlph_: false // var zlph_ = {
} // zlph_: false
res.data.push(zlph_) // }
var jcsk_ = { // res.data.push(zlph_)
jcsk_: false // var jcsk_ = {
} // jcsk_: false
res.data.push(jcsk_) // }
var sjzx_ = { // res.data.push(jcsk_)
sjzx_: false // var sjzx_ = {
} // sjzx_: false
res.data.push(sjzx_) // }
var gbpj_ = { // res.data.push(sjzx_)
gbpj_: false // var gbpj_ = {
} // gbpj_: false
res.data.push(gbpj_) // }
var djsk_ = { // res.data.push(gbpj_)
djsk_: false // var djsk_ = {
} // djsk_: false
res.data.push(djsk_) // }
// res.data.push(djsk_)
// 所有等于false的都是后台为配置的权限的 // // 所有等于false的都是后台为配置的权限的
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10011') {//组织架构 // if (res.data[i].navCode == '10011') {//组织架构
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].zzjg_ == false) { // if (res.data[i].zzjg_ == false) {
res.data[i].zzjg_ = true // res.data[i].zzjg_ = true
} // }
} // }
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10012') {//党建实况 // if (res.data[i].navCode == '10012') {//党建实况
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].djsk_ == false) { // if (res.data[i].djsk_ == false) {
res.data[i].djsk_ = true // res.data[i].djsk_ = true
} // }
} // }
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10013') {//基层实况 // if (res.data[i].navCode == '10013') {//基层实况
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].jcsk_ == false) { // if (res.data[i].jcsk_ == false) {
res.data[i].jcsk_ = true // res.data[i].jcsk_ = true
} // }
} // }
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10014') {//治理排行 // if (res.data[i].navCode == '10014') {//治理排行
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].zlph_ == false) { // if (res.data[i].zlph_ == false) {
res.data[i].zlph_ = true // res.data[i].zlph_ = true
} // }
} // }
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10015') {//书记在线 // if (res.data[i].navCode == '10015') {//书记在线
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].sjzx_ == false) { // if (res.data[i].sjzx_ == false) {
res.data[i].sjzx_ = true // res.data[i].sjzx_ = true
} // }
} // }
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10016') {//干部评价 // if (res.data[i].navCode == '10016') {//干部评价
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].gbpj_ == false) { // if (res.data[i].gbpj_ == false) {
res.data[i].gbpj_ = true // res.data[i].gbpj_ = true
} // }
} // }
} // }
}; // };
// res.data 重新排序 // // res.data 重新排序
var panelList = []; // var panelList = [];
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10011') {//组织架构 // if (res.data[i].navCode == '10011') {//组织架构
panelList.push(res.data[i]) // panelList.push(res.data[i])
} else if (res.data[i].zzjg_ == false) { // } else if (res.data[i].zzjg_ == false) {
panelList.push(res.data[i]) // panelList.push(res.data[i])
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10012') {//党建实况 // if (res.data[i].navCode == '10012') {//党建实况
panelList.push(res.data[i]) // panelList.push(res.data[i])
} else if (res.data[i].djsk_ == false) { // } else if (res.data[i].djsk_ == false) {
panelList.push(res.data[i]) // panelList.push(res.data[i])
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10013') {//基层实况 // if (res.data[i].navCode == '10013') {//基层实况
panelList.push(res.data[i]) // panelList.push(res.data[i])
} else if (res.data[i].jcsk_ == false) { // } else if (res.data[i].jcsk_ == false) {
panelList.push(res.data[i]) // panelList.push(res.data[i])
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10014') {//治理排行 // if (res.data[i].navCode == '10014') {//治理排行
panelList.push(res.data[i]) // panelList.push(res.data[i])
} else if (res.data[i].zlph_ == false) { // } else if (res.data[i].zlph_ == false) {
panelList.push(res.data[i]) // panelList.push(res.data[i])
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10015') {//书记在线 // if (res.data[i].navCode == '10015') {//书记在线
panelList.push(res.data[i]) // panelList.push(res.data[i])
} else if (res.data[i].sjzx_ == false) { // } else if (res.data[i].sjzx_ == false) {
panelList.push(res.data[i]) // panelList.push(res.data[i])
} // }
}; // };
for (var i = 0; i < res.data.length; i++) { // for (var i = 0; i < res.data.length; i++) {
if (res.data[i].navCode == '10016') {//干部评价 // if (res.data[i].navCode == '10016') {//干部评价
panelList.push(res.data[i]) // panelList.push(res.data[i])
} else if (res.data[i].gbpj_ == false) { // } else if (res.data[i].gbpj_ == false) {
panelList.push(res.data[i]) // panelList.push(res.data[i])
} // }
}; // };
that.setData({ that.setData({
indexPanel: panelList, indexPanel: res.data,
}) })
} catch (err) { } catch (err) {
console.log(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 () { getBannerList: function () {
let that = this let that = this

453
src/pages/index/index.wxml

@ -6,9 +6,9 @@
<block wx:for="{{banner}}" wx:key="*this"> <block wx:for="{{banner}}" wx:key="*this">
<swiper-item> <swiper-item>
<view bindtap="toActDetail" class="swiper-item" data-id="{{item.id}}"> <view bindtap="toActDetail" class="swiper-item" data-id="{{item.id}}">
<view class="altitle"> <!-- <view class="altitle">
<view class="altitle-name">{{item.caseTitle}}</view> <view class="altitle-name">{{item.caseTitle}}</view>
</view> </view> -->
<image class="banner" src='{{item.mainPicture}}' mode="aspectFill" /> <image class="banner" src='{{item.mainPicture}}' mode="aspectFill" />
</view> </view>
</swiper-item> </swiper-item>
@ -22,354 +22,135 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 九宫格 --> <view class="counts">
<view class="sudoku"> <view class="count-item" bindtap="navigateToyt">
<view class="content"> <image src="../../assets/images/issue_count.png" />
<block wx:if="{{indexPanel.length > 0}}" wx:for="{{indexPanel}}" wx:for-index="index" wx:key="index"> <view class="count-text">{{numberUtil.numberEnFormat(survey.issueTotal)}}</view>
<view class="title-text">议题数</view>
<!-- <view wx:if="{{item.navCode == '10012'}}" class="item" bindtap="navigateToBasicReality" hover-stay-time="150" hover-class="grid-hover"> </view>
<image src="{{item.icon}}" /> <view class="count-item" bindtap="navigateToUserNum">
<view class="name">{{item.label}}</view> <image src="../../assets/images/user_count.png" />
</view> <view class="count-text">{{numberUtil.numberEnFormat(allSituation.userTotal)}}</view>
<view wx:elif="{{item.djsk_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover"> <view class="title-text">用户数</view>
<image src="../../assets/images/zzjg_b.png" />
<view class="name">党建实况</view>
</view> -->
<view wx:if="{{item.navCode == '10013'}}" class="item" bindtap="navigateToReality" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.jcsk_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/jcsk_b.png" />
<view class="name">基层实况</view>
</view>
<view wx:elif="{{item.navCode == '10014'}}" class="item" bindtap="navigateTogovernRanking" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.zlph_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/zlph_b.png" />
<view class="name">治理排行</view>
</view>
<!-- <view wx:elif="{{item.navCode == '10014'}}" class="item" bindtap="navigateTogovernRanking" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.zlph_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/zlph_b.png" />
<view class="name">治理排行</view>
</view> -->
</block>
<block wx:if="{{indexPanel.length == 0}}">
<!-- <view class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/zzjg_b.png" />
<view class="name">党建实况</view>
</view> -->
<view class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/jcsk_b.png" />
<view class="name">基层实况</view>
</view>
<view class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/zlph_b.png" />
<view class="name">治理排行</view>
</view>
</block>
<!-- <view class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/dqhd_b.png" />
<view class="name">党群互动</view>
</view>
<view class="item" bindtap="navigateToReality" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/jcsk.png" />
<view class="name">基层实况</view>
</view>
<view class="item" bindtap="navigateTogovernRanking" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/zlph.png" />
<view class="name">治理排行</view>
</view> -->
<!-- bindtap="toLeaderComment" -->
<!-- <view class="item" bind:tap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/gbpj_b.png" />
<view class="name">干部评价</view>
</view> -->
</view> </view>
</view> </view>
<!-- 九宫格 --> <view class="sudokus">
<!-- <view class="nine-all"> <view class="sudoku" wx:for="{{indexPanel}}" wx:for-index="rowIndex" wx:for-item="rowItem" wx:key="rowIndex">
<view class="nine-info"> <view class="content-title">{{rowItem.mainLabel}}</view>
<view class="nine-info-one"> <view class="content">
<view class="nine-info-left" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover"> <block wx:for="{{rowItem.childNav}}" wx:for-index="index" wx:key="index">
<view class="nine-info-left-img"> <view class="item" data-code="{{item.navCode}}" bindtap="navigateToPage" hover-stay-time="150" hover-class="grid-hover">
<image class="imgsty" src="../../assets/images/zzjg.png"></image> <image src="{{item.icon}}" />
</view> <view class="name">{{item.remark}}</view>
<view class="nine-info-left-name">
组织架构
</view>
</view>
<view class="nine-info-cetern" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="nine-info-left-img">
<image class="imgsty" src="../../assets/images/dqhd.png"></image>
</view>
<view class="nine-info-left-name">
党群互动
</view>
</view>
<view class="nine-info-right" hover-stay-time="150" hover-class="grid-hover" bindtap="navigateToReality">
<view class="nine-info-left-img">
<image class="imgsty" src="../../assets/images/jcsk.png"></image>
</view>
<view class="nine-info-left-name">
基层实况
</view>
</view>
</view>
<view class="nine-info-two">
<view class="nine-info-left" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="nine-info-left-img">
<image class="imgsty" src="../../assets/images/zlph.png"></image>
</view>
<view class="nine-info-left-name">
治理排行
</view>
</view>
<view class="nine-info-cetern" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="nine-info-left-img">
<image class="imgsty" src="../../assets/images/sjyhs.png"></image>
</view>
<view class="nine-info-left-name">
书记有话说
</view>
</view>
<view class="nine-info-right" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="nine-info-left-img">
<image class="imgsty" src="../../assets/images/gbpj.png"></image>
</view>
<view class="nine-info-left-name">
干部评价
</view>
</view>
</view>
</view>
</view> -->
<!-- 议题总数 -->
<!-- <view class="all" bindtap="navigateToyt">
<view class="list-info">
<view class="info-left">
<view class="number">{{survey.issueTotal}}</view>
<view class="number-all">议题总数</view>
</view>
<view class="info-right">
<view class="number-right">
<view class="num-top">
<view class="num-name">
<view class="orange-spot"></view>
<view class="num-name-font">未转项目</view>
<view class="num num-left-top">{{survey.unpassedProject}}</view>
</view>
<view class="num-statistics">
<view class="num-statistics-top">
<view class="spot1"></view>
<view class="spot1-name">热议中</view>
<view class="spot1-name num-color1">{{survey.hotAllPercent}}%</view>
</view>
<view class="num-statistics-bottom">
<view class="spot2"></view>
<view class="spot2-name">已关闭</view>
<view class="spot2-name num-color2">{{survey.closedAllPercent}}%</view>
</view>
</view>
</view> </view>
<view class="num-top"> <!-- <view wx:if="{{item.navCode == 'A1001'}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="num-name"> <image src="{{item.icon}}" />
<view class="orange-spot buttom-top orange-spot-background"></view> <view class="name">{{item.label}}</view>
<view class="num-name-font num-name-font2">已转项目</view>
<view class="num num2 num-left-top">{{survey.passedProject}}</view>
</view>
<view class="num-statistics">
<view class="num-statistics-top num-statistics-top2">
<view class="spot1 spot3"></view>
<view class="spot1-name spot3-name">已解决</view>
<view class="spot1-name num-color1 num-color3">{{survey.resolvedAllPercent}}%</view>
</view>
<view class="num-statistics-bottom num-statistics-bottom2">
<view class="spot2 spot4"></view>
<view class="spot2-name spot4-name">待解决</view>
<view class="spot2-name num-color2 num-color4">{{survey.beSolvedAllPercent}}%</view>
</view>
</view>
</view> </view>
</view> <view wx:elif="{{item.dyxx_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="chat-right" id="viewCanvas"> <image src="../../assets/images/dyxx.png" />
<ec-canvas id="mychart-dom-bar-a" canvas-id="mychart-bar-a" ec="{{ ec }}"></ec-canvas> <view class="name">党员信息</view>
</view>
</view>
</view>
</view> -->
<!-- 用户总数 -->
<!-- <view class="all" bindtap="navigateToUserNum">
<view class="list-info">
<view class="info-left info-left-color">
<view class="number">{{allSituation.userTotal}}</view>
<view class="number-all">用户总数</view>
</view>
<view class="info-right">
<view class="number-right">
<view class="num-top">
<view class="num-name">
<view class="orange-spot orange-spot-yh-t"></view>
<view class="num-name-font num-name-font-top">党员总数</view>
<view class="num num-yh num-left-bottom">{{allSituation.partyNumber}}</view>
</view>
<view class="num-statistics num-statistics-yh-t">{{allSituation.partyNumberRatio}}%</view>
</view> </view>
<view class="num-top"> <view wx:elif="{{item.navCode == 'A1002'}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="num-name"> <image src="{{item.icon}}" />
<view class="orange-spot buttom-top orange-spot-yh-b"></view> <view class="name">{{item.label}}</view>
<view class="num-name-font num-name-font2">居民总数</view>
<view class="num num2 num-left-bottom">{{allSituation.userNumber}}</view>
</view>
<view class="num-statistics num-statistics-yh-b">{{allSituation.userNumberRatio}}%</view>
</view> </view>
</view> <view wx:elif="{{item.cyqk_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="chat-right"> <image src="../../assets/images/cyqk.png" />
<ec-canvas id="mychart-dom-bar-b" canvas-id="mychart-bar-b" ec="{{ ec }}"></ec-canvas> <view class="name">参与情况</view>
</view>
</view>
</view>
</view> -->
<!-- 议题总数 -->
<view class="all" bindtap="navigateToyt">
<view class="list-info-a">
<view class="left-a pink">
<image src="../../assets/images/index-1.png"></image>
<view class="position-absolute">
<text wx:if="{{survey.issueTotal > 9999}}" class="left-a-info-number">{{numberUtil.numberFormat1(survey.issueTotal/10000)}}<text class="left-a-info-text">万</text></text>
<text wx:else class="left-a-info-number">{{survey.issueTotal}}</text>
<text class="left-a-info-bottom">议题总数</text>
</view>
<!-- <text wx:if="{{survey.issueTotal > 9999}}" class="left-a-info-number">{{numberUtil.numberFormat1(survey.issueTotal/10000)}}<text class="left-a-info-text">万</text></text>
<text wx:else class="left-a-info-number">{{survey.issueTotal}}</text>
<text class="left-a-info-bottom">议题总数</text> -->
</view>
<view class="right-a">
<view class="right-a-left">
<view class="left-one">未转项目</view>
<view wx:if="{{survey.unpassedProject > 9999}}" class="left-two">{{numberUtil.numberFormat1(survey.unpassedProject/10000)}}
<text> 万</text>
</view> </view>
<view wx:else class="left-two">{{survey.unpassedProject}}</view> <view wx:elif="{{item.navCode == 'A1003'}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="left-four left-four-top1"> <view class="name">{{item.label}}</view>
<!-- <view class="left-four-spot"></view> -->
<text class="left-four-text left-four-color1">热议中</text>
<text wx:if="{{survey.hotAllPercent > 0}}" class="left-four-text left-four-color2 left-four-color2-1">{{survey.hotAllPercent}}%</text>
<text wx:else class="left-four-text left-four-color2">0%</text>
</view> </view>
<view class="left-four left-four-top2"> <view wx:elif="{{item.zyfh_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<!-- <view class="left-four-spot"></view> --> <image src="../../assets/images/zyfh.png" />
<text class="left-four-text left-four-color1">已关闭</text> <view class="name">作用发挥</view>
<text wx:if="{{survey.closedAllPercent > 0}}" class="left-four-text left-four-color2 left-four-color2-2">{{survey.closedAllPercent}}%</text>
<text wx:else class="left-four-text left-four-color2">0%</text>
</view> </view>
</view> <view wx:elif="{{item.navCode == '20010'}}" class="item" bindtap="navigateTorysj" hover-stay-time="150" hover-class="grid-hover">
<view class="right-a-right"> <image src="{{item.icon}}" />
<view class="left-one">已转项目</view> <view class="name">{{item.label}}</view>
<view wx:if="{{survey.passedProject > 9999}}" class="left-two">{{numberUtil.numberFormat1(survey.passedProject/10000)}}
<text> 万</text>
</view> </view>
<view wx:else class="left-two">{{survey.passedProject}}</view> <view wx:elif="{{item.rysj_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/rysj.png" />
<view class="name">热议事件</view>
<view class="left-four left-four-top1">
<!-- <view class="left-four-spot"></view> -->
<text class="left-four-text left-four-color1">已解决</text>
<text wx:if="{{survey.resolvedAllPercent > 0}}" class="left-four-text left-four-color2 left-four-color2-1">{{survey.resolvedAllPercent}}%</text>
<text wx:else class="left-four-text left-four-color2">0%</text>
</view> </view>
<view class="left-four left-four-top2"> <view wx:elif="{{item.navCode == '20011'}}" class="item" bindtap="navigateTogzlb" hover-stay-time="150" hover-class="grid-hover">
<!-- <view class="left-four-spot"></view> --> <image src="{{item.icon}}" />
<text class="left-four-text left-four-color1">待解决</text> <view class="name">{{item.label}}</view>
<text wx:if="{{survey.beSolvedAllPercent > 0}}" class="left-four-text left-four-color2 left-four-color2-2">{{survey.beSolvedAllPercent}}%</text>
<text wx:else class="left-four-text left-four-color2">0%</text>
</view> </view>
</view> <view wx:elif="{{item.gzlb_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
</view> <image src="../../assets/images/gzlb.png" />
</view> <view class="name">关注类别</view>
<view class="line-top"></view> </view>
</view> <view wx:elif="{{item.navCode == '20012'}}" class="item" bindtap="navigateTozzcx" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<!-- 用户总数 --> <view class="name">{{item.label}}</view>
<view class="all all-bottom" bindtap="navigateToUserNum"> </view>
<view class="list-info-a"> <view wx:elif="{{item.zzcx_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<view class="left-a orange"> <image src="../../assets/images/zzcx.png" />
<image src="../../assets/images/index-2.png"></image> <view class="name">自治成效</view>
<view class="position-absolute"> </view>
<text wx:if="{{allSituation.userTotal > 9999}}" class="left-a-info-number">{{numberUtil.numberFormat1(allSituation.userTotal/10000)}}<text class="left-a-info-text">万</text></text> <view wx:elif="{{item.navCode == '20013'}}" class="item" bindtap="navigateTonddd" hover-stay-time="150" hover-class="grid-hover">
<text wx:else class="left-a-info-number">{{allSituation.userTotal}}</text> <image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<text class="left-a-info-bottom">用户总数</text> <view wx:elif="{{item.nddd_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
</view> <image src="../../assets/images/nddd.png" />
<view class="name">难点堵点</view>
<!-- </view>
<text wx:if="{{allSituation.companyRepresentTotal > 9999}}" class="left-a-info-bottom-1">其中企业代表数 {{numberUtil.numberFormat1(allSituation.companyRepresentTotal/10000)}}万</text> <view wx:elif="{{item.navCode == '20014'}}" class="item" bindtap="navigateTomyd" hover-stay-time="150" hover-class="grid-hover">
<text wx:else class="left-a-info-bottom-1">其中企业代表数 {{allSituation.companyRepresentTotal}}</text> --> <image src="{{item.icon}}" />
</view> <view class="name">{{item.label}}</view>
<view class="right-a">
<view class="right-a-left width-2">
<view class="left-one">党员总数</view>
<view wx:if="{{allSituation.partyNumber > 9999}}" class="left-two">{{numberUtil.numberFormat1(allSituation.partyNumber/10000)}}
<text> 万</text>
</view> </view>
<view wx:else class="left-two">{{allSituation.partyNumber}}</view> <view wx:elif="{{item.myd_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/myd.png" />
<view class="name">满意度</view>
<view wx:if="{{allSituation.partyNumberRatio >0}}" class="left-three">{{allSituation.partyNumberRatio}}%</view>
<view wx:else class="left-three">0%</view>
</view>
<view class="right-a-right width-2 border-right">
<view class="left-one">居民总数</view>
<!-- allSituation.userNumber -->
<view wx:if="{{allSituation.userNumber > 999}}" class="left-two">{{numberUtil.numberFormat1(allSituation.userNumber/10000)}}
<text> 万</text>
</view> </view>
<view wx:else class="left-two">{{allSituation.userNumber}}</view> <view wx:elif="{{item.navCode == '20020'}}" class="item" bindtap="navigateTosqbd" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view wx:if="{{allSituation.userNumberRatio > 0}}" class="left-three">{{allSituation.userNumberRatio}}%</view> <view class="name">{{item.label}}</view>
<view wx:else class="left-three">0%</view>
</view>
<view class="right-a-right width-2">
<view class="left-one">企业代表数</view>
<!-- allSituation.userNumber -->
<view wx:if="{{allSituation.companyRepresentTotal > 999}}" class="left-two">{{numberUtil.numberFormat1(allSituation.companyRepresentTotal/10000)}}
<text> 万</text>
</view> </view>
<view wx:else class="left-two">{{allSituation.companyRepresentTotal}}</view> <view wx:elif="{{item.sqbd_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/sqbd.png" />
<view wx:if="{{allSituation.companyRepresentTotalRatio > 0}}" class="left-three">{{allSituation.companyRepresentTotalRatio}}%</view> <view class="name">社区报到</view>
<view wx:else class="left-three">0%</view> </view>
</view> <view wx:elif="{{item.navCode == '20021'}}" class="item" bindtap="navigateTowgzz" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.wgzz_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/wgzz.png" />
<view class="name">网格自治</view>
</view>
<view wx:elif="{{item.navCode == '20022'}}" class="item" bindtap="navigateTowgmyd" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.wgmyd_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/wgmyd.png" />
<view class="name">网格满意度</view>
</view>
<view wx:elif="{{item.navCode == '20030'}}" class="item" bindtap="navigateTozyfw" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.zyfw_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/zyfw.png" />
<view class="name">志愿服务</view>
</view>
<view wx:elif="{{item.navCode == '20031'}}" class="item" bindtap="navigateToPointsRanking" hover-stay-time="150" hover-class="grid-hover">
<image src="{{item.icon}}" />
<view class="name">{{item.label}}</view>
</view>
<view wx:elif="{{item.jfph_ == false}}" class="item" bindtap="showInspect" hover-stay-time="150" hover-class="grid-hover">
<image src="../../assets/images/jfph.png" />
<view class="name">积分排行</view>
</view> -->
</block>
</view> </view>
</view> </view>
<view class="line-bottom"></view> </view>
</view> <cover-view class="setting" bindtap="toOutCallBack">
<cover-image class="setting-img" src="../../assets/images/setup.png"></cover-image>
</cover-view>

13
src/subpages/basicReality/pages/index/components/partyVan/partyVan.ts

@ -1,4 +1,15 @@
Component({ Component({
properties: {
tab: {
type:String,
value:'basic-situation',
observer: function (newVal, oldVal) {
this.setData({
selectTab: newVal
})
}
},
},
data: { data: {
selectTab: 'basic-situation', selectTab: 'basic-situation',
streetId: '', streetId: '',
@ -10,7 +21,7 @@ Component({
typeList: [ typeList: [
{ type: 'basic-situation', name: '党员基本情况', select: true }, { type: 'basic-situation', name: '党员基本情况', select: true },
{ type: 'enter-situation', name: '党员参与情况', select: false }, { type: 'enter-situation', name: '党员参与情况', select: false },
// { type: 'bring-into-play-situation', name: '党员作用发挥情况', select: false } { type: 'bring-into-play-situation', name: '党员作用发挥情况', select: false }
] ]
}, },
methods: { methods: {

2
src/subpages/basicReality/pages/index/components/partyVan/partyVan.wxml

@ -1,6 +1,6 @@
<view class="branch-van"> <view class="branch-van">
<select-street bind:chooseStreetId="chooseStreetId" bind:chooseTimeId="chooseTimeId"></select-street> <select-street bind:chooseStreetId="chooseStreetId" bind:chooseTimeId="chooseTimeId"></select-street>
<tab-item typeList="{{typeList}}" bind:chooseType="chooseType"></tab-item> <!-- <tab-item typeList="{{typeList}}" bind:chooseType="chooseType"></tab-item> -->
<basic-situation wx:if="{{selectTab === 'basic-situation'}}" condition="{{condition}}" streetId="{{streetId}}" timeId="{{timeId}}"></basic-situation> <basic-situation wx:if="{{selectTab === 'basic-situation'}}" condition="{{condition}}" streetId="{{streetId}}" timeId="{{timeId}}"></basic-situation>
<enter-situation condition="{{condition}}" wx:elif="{{selectTab === 'enter-situation'}}"></enter-situation> <enter-situation condition="{{condition}}" wx:elif="{{selectTab === 'enter-situation'}}"></enter-situation>
<bring-into-play-situation condition="{{condition}}" wx:elif="{{selectTab === 'bring-into-play-situation'}}"></bring-into-play-situation> <bring-into-play-situation condition="{{condition}}" wx:elif="{{selectTab === 'bring-into-play-situation'}}"></bring-into-play-situation>

2
src/subpages/basicReality/pages/index/index.json

@ -1,5 +1,5 @@
{ {
"navigationBarTitleText": "党建实况", "navigationBarTitleText": "",
"usingComponents": { "usingComponents": {
"party-van": "./components/partyVan/partyVan", "party-van": "./components/partyVan/partyVan",
"branch-construct": "./components/branchConstruct/branchConstruct", "branch-construct": "./components/branchConstruct/branchConstruct",

12
src/subpages/basicReality/pages/index/index.ts

@ -1,9 +1,15 @@
Page({ Page({
data: { data: {
selectTab: 'party-van' selectTab: 'party-van',
subTab: 'basic-situation'
}, },
onLoad () { onLoad (option) {
this.setData({
subTab: option.tab
})
wx.setNavigationBarTitle({
title: option.title
})
}, },
onShow () { onShow () {

2
src/subpages/basicReality/pages/index/index.wxml

@ -10,7 +10,7 @@
<cover-image class="select-tab {{selectTab === 'party-van' ? 'party-van' : selectTab === 'branch-construct' ? 'branch-construct' : 'union-construct'}}" src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/BA/rBAAM16X7bqAH_AaAAAB2R4v1Do645.png"></cover-image> <cover-image class="select-tab {{selectTab === 'party-van' ? 'party-van' : selectTab === 'branch-construct' ? 'branch-construct' : 'union-construct'}}" src="https://epdc-shibei.elinkservice.cn/epdcFile/M00/02/BA/rBAAM16X7bqAH_AaAAAB2R4v1Do645.png"></cover-image>
</cover-view> </cover-view>
<party-van wx:if="{{selectTab === 'party-van'}}"></party-van> <party-van wx:if="{{selectTab === 'party-van'}}" tab="{{subTab}}"></party-van>
<branch-construct wx:elif="{{selectTab === 'branch-construct'}}"></branch-construct> <branch-construct wx:elif="{{selectTab === 'branch-construct'}}"></branch-construct>

33
src/subpages/governRanking/pages/governRanking/governRanking.ts

@ -12,9 +12,38 @@ Page({
deptStatisticsList: [],//街道 社区列表 deptStatisticsList: [],//街道 社区列表
gridByselfStatisticsList:[],//网格自治 gridByselfStatisticsList:[],//网格自治
gridEvaList:[],//网格满意度 gridEvaList:[],//网格满意度
tab:''
}, },
onLoad:function(){ onLoad: function (option) {
this.deptStatisticsList()//初始化加载街道报道 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()
}
}, },
/** /**
* *

4
src/subpages/governRanking/pages/governRanking/governRanking.wxml

@ -16,7 +16,7 @@
<!-- tabbar内容 --> <!-- tabbar内容 -->
<view class="content"> <view class="content">
<!-- 切换 --> <!-- 切换 -->
<view class="category-type"> <!-- <view class="category-type">
<button <button
hover-class="hover-btn" hover-class="hover-btn"
class="{{type === 'first' ? 'select-btn' : ''}}" class="{{type === 'first' ? 'select-btn' : ''}}"
@ -37,7 +37,7 @@
class="{{type === 'fourth' ? 'select-btn' : ''}}" class="{{type === 'fourth' ? 'select-btn' : ''}}"
bindtap="onButtonChange" bindtap="onButtonChange"
data-type="fourth">网格满意度</button> data-type="fourth">网格满意度</button>
</view> </view> -->
<!-- 排序 --> <!-- 排序 -->
<view class="search-bar"> <view class="search-bar">
<view class="order"> <view class="order">

16
src/subpages/issue/pages/topicsNumDetail/components/noProject/noProject.ts

@ -46,14 +46,14 @@ Component({
}, },
observers: { observers: {
unpassedProjectPercent(newval) { unpassedProjectPercent(newval) {
this.setData({ // this.setData({
isShow6:!this.data.isShow6 // isShow6:!this.data.isShow6
}) // })
setTimeout(() => { // setTimeout(() => {
this.setData({ // this.setData({
isShow6:!this.data.isShow6 // isShow6:!this.data.isShow6
}) // })
}, 1000) // }, 1000)
// this.getEcharts() // this.getEcharts()
} }
}, },

16
src/subpages/issue/pages/topicsNumDetail/components/project/project.ts

@ -40,14 +40,14 @@ Component({
}, },
observers: { observers: {
passedProjectPercent() { passedProjectPercent() {
this.setData({ // this.setData({
isShow6:!this.data.isShow6 // isShow6:!this.data.isShow6
}) // })
setTimeout(() => { // setTimeout(() => {
this.setData({ // this.setData({
isShow6:!this.data.isShow6 // isShow6:!this.data.isShow6
}) // })
}, 1000) // }, 1000)
} }
}, },

4
src/subpages/reality/pages/autonomy/autonomy.json

@ -1,7 +1,7 @@
{ {
"navigationBarTitleText": "群众自治", "navigationBarTitleText": "自治成效",
"usingComponents": { "usingComponents": {
"load-more": "../../components/loadMore/loadMore", "load-more": "../../../../components/loadMore/loadMore",
"preload-item": "./components/preloadItem/preloadItem", "preload-item": "./components/preloadItem/preloadItem",
"list-item": "./components/listItem/listItem", "list-item": "./components/listItem/listItem",
"no-data":"../../../../components/nodata/nodata" "no-data":"../../../../components/nodata/nodata"

2
src/subpages/reality/pages/difficultPluggingPoint/difficultPluggingPoint.json

@ -1,5 +1,5 @@
{ {
"navigationBarTitleText": "难点堵点TOP10", "navigationBarTitleText": "难点堵点",
"usingComponents": { "usingComponents": {
"list-item": "./components/listItem/listItem", "list-item": "./components/listItem/listItem",
"load-more": "../../../../components/loadMore/loadMore", "load-more": "../../../../components/loadMore/loadMore",

433
src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.js

File diff suppressed because one or more lines are too long

10
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"
}
}

265
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}

447
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()
},
})

91
src/subpages/reality/pages/peolieThing/peopleSatisfiedNew/peopleSatisfiedNew.wxml

@ -0,0 +1,91 @@
<view class="diff-plugg">
<view class="banner">
<image src="../../../images/mydsbackground.png" />
</view>
<!-- tabbar -->
<view class="tab-bar">
<view
class="tab tab1 {{selectTab === 'tab1' ? 'select-tab' : ''}}"
data-tab="tab1"
bindtap="onTabChange">非常满意</view>
<view
class="tab tab2 {{selectTab === 'tab2' ? 'select-tab' : ''}}"
data-tab="tab2"
bindtap="onTabChange">基本满意</view>
<view
class="tab tab3 {{selectTab === 'tab3' ? 'select-tab' : ''}}"
data-tab="tab3"
bindtap="onTabChange">不满意</view>
<view class="select-bar {{selectTab === 'tab1' ? 'tab1' : selectTab === 'tab2' ? 'tab2' : 'tab3'}}"></view>
</view>
<view class="content">
<view class="line">
<view class="line-padding"></view>
</view>
<view class="category-type">
<button
hover-class="hover-btn"
class="{{type === 'first' ? 'select-btn' : ''}}"
bindtap="onButtonChange"
data-type="first">一级类目</button>
<button
hover-class="hover-btn"
class="{{type === 'second' ? 'select-btn' : ''}}"
bindtap="onButtonChange"
data-type="second">二级类目</button>
<button
hover-class="hover-btn"
class="{{type === 'third' ? 'select-btn' : ''}}"
bindtap="onButtonChange"
data-type="third">三级类目</button>
</view>
<preload-item
wx:if="{{preloadVisible}}">
</preload-item>
<!-- 三级类目 -->
<view class="chart-main" style="height: {{ type === 'third'? 'auto' : '400rpx' }}">
<no-data isShow="{{isShow}}"></no-data>
<block wx:if='{{!isShow}}'></block>
<view class="{{type === 'third'?'chart-leftB':'chart-left'}}">
<ec-canvas id="mychart-dom-bar" canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>
</view>
<block wx:if="{{type == 'third'}}">
<view class="bottom-all">
<view class="bottom-all-name" wx:for="{{evaluateCountList}}" wx:key="index" >
<view wx:if="{{index == 0}}" class="circular"></view>
<view wx:else class="circular {{index == 1?'circular1':index == 2?'circular2':index == 3?'circular3':index == 4?'circular4':index == 5?'circular5':''}}"></view>
<view class="nameB">{{item.cotegoryName}}</view>
<view class="number">{{item.count}}</view>
<view class="" class="percentage {{index == 0?'color':index == 1?'color1':index == 2?'color2':index == 3?'color3':index == 4?'color4':index == 5?'color5':''}} ">{{item.percentum}}</view>
<view class="cle"></view>
</view>
</view>
</block>
<block wx:else>
<view class="chart-right">
<view wx:for="{{evaluateCountList}}" wx:key="index" class="{{index=='0'?'chart-right-one':'chart-right-two'}}">
<view wx:if="{{index == 0}}" class="circular"></view>
<view wx:else class="circular {{index == 1?'circular1':index == 2?'circular2':index == 3?'circular3':index == 4?'circular4':index == 5?'circular5':''}}"></view>
<view class="name">{{item.cotegoryName}}</view>
<view class="number">{{item.count}}</view>
<view class="" class="percentage {{index == 0?'color':index == 1?'color1':index == 2?'color2':index == 3?'color3':index == 4?'color4':index == 5?'color5':''}} ">{{item.percentum}}</view>
</view>
</view>
</block>
</view>
<view class="list-name">
事件列表
</view>
<people-list bind:myevent="onGetCode" id="peopleList" state="1"></people-list>
<load-more
loadVisible="{{loadVisible}}"
loadType="{{loadType}}">
</load-more>
<no-data isShow="{{isShow}}"></no-data>
</view>
</view>

2
src/subpages/reality/pages/peopleHot/peopleHot.json

@ -3,5 +3,5 @@
"load-more":"../../../../components/loadMore/loadMore", "load-more":"../../../../components/loadMore/loadMore",
"no-data":"../../../../components/nodata/nodata" "no-data":"../../../../components/nodata/nodata"
}, },
"navigationBarTitleText": "群众热议的事儿" "navigationBarTitleText": "热议事件"
} }

2
src/subpages/reality/pages/residentAttention/residentAttention.json

@ -1,5 +1,5 @@
{ {
"navigationBarTitleText": "群众关注的问题", "navigationBarTitleText": "关注类别",
"usingComponents": { "usingComponents": {
"wux-progress": "../../../../wux/progress/index", "wux-progress": "../../../../wux/progress/index",
"preload-item": "./components/preloadItem/preloadItem", "preload-item": "./components/preloadItem/preloadItem",

4
src/utils/config.ts

@ -1,6 +1,6 @@
export const config = { export const config = {
// apiUrl: "https://epdc-test.elinkservice.cn/epdc-api/" // 微笑榆山测试环境 apiUrl: "https://epdc-test.elinkservice.cn/epdc-api/" // 微笑榆山测试环境
apiUrl: "https://epdc-yushan.elinkservice.cn/epdc-api/" // 微笑榆山数据端-正式环境 // apiUrl: "https://epdc-yushan.elinkservice.cn/epdc-api/" // 微笑榆山数据端-正式环境
// apiUrl: 'https://eug-test.elinkit.com.cn/epdc-api/' // 测试环境接口 // apiUrl: 'https://eug-test.elinkit.com.cn/epdc-api/' // 测试环境接口
// apiUrl: 'https://epdc-kongcun.elinkit.com.cn/epdc-api/' // 孔村正式环境接口 // apiUrl: 'https://epdc-kongcun.elinkit.com.cn/epdc-api/' // 孔村正式环境接口
// apiUrl: 'https://epdc-jinshui.elinkservice.cn/epdc-api/' // 锦水正式环境接口 // apiUrl: 'https://epdc-jinshui.elinkservice.cn/epdc-api/' // 锦水正式环境接口

Loading…
Cancel
Save