diff --git a/components/Tabs/index.wxss b/components/Tabs/index.wxss
index 6a4e281..1eab926 100644
--- a/components/Tabs/index.wxss
+++ b/components/Tabs/index.wxss
@@ -6,7 +6,7 @@
border: 2px solid #D6E6FC;
border-radius: 6rpx;
flex: 1;
- padding: 25rpx 0;
+ padding: 25rpx 20rpx;
font-size: 30rpx;
font-weight: 500;
color: #999999;
diff --git a/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss b/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss
index c50d808..6e2a99e 100644
--- a/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss
+++ b/pages/statistics/modules/CrowdPortrait/CrowdPortrait.wxss
@@ -123,7 +123,7 @@
.picker {
width: 180rpx;
background: #3A80E7;
- border-radius: 27rpx;
+ border-radius: 1000rpx;
font-size: 28rpx;
font-weight: 500;
color: #FFFFFF;
@@ -131,4 +131,7 @@
display: flex;
align-items: center;
justify-content: center;
+}
+.picker image {
+ margin-left: 5px;
}
\ No newline at end of file
diff --git a/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.js b/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.js
index 95b865a..53b3dec 100644
--- a/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.js
+++ b/pages/statistics/modules/SmyddcSqmydzc/SmyddcSqmydzc.js
@@ -1,353 +1,371 @@
import * as echarts from '../../../../ec-canvas/echarts';
-import {satisfactionGroup, event12345Group} from "../../../../utils/statisticsApi";
+import { satisfactionGroup, event12345Group } from "../../../../utils/statisticsApi";
var chart;
function initChart(canvas, width, height, dpr) {
- chart = echarts.init(canvas, null, {
- width: width,
- height: height,
- devicePixelRatio: dpr // 像素比
- });
- canvas.setChart(chart);
- return chart;
+ chart = echarts.init(canvas, null, {
+ width: width,
+ height: height,
+ devicePixelRatio: dpr // 像素比
+ });
+ canvas.setChart(chart);
+ return chart;
}
const formatTime = date => {
- const year = date.getFullYear()
- const month = date.getMonth() + 1
- const day = date.getDate()
- return [year, month, day].map(formatNumber).join('-')
+ const year = date.getFullYear()
+ const month = date.getMonth() + 1
+ const day = date.getDate()
+ return [year, month, day].map(formatNumber).join('-')
}
const formatNumber = n => {
- n = n.toString()
- return n[1] ? n : '0' + n
+ n = n.toString()
+ return n[1] ? n : '0' + n
}
Component({
- properties: {
- typeCondition: {
- type: Number,
- value: 0,
- observer(val) {
- console.log(val, 11)
- this.getData()
- }
- }
+ properties: {
+ typeCondition: {
+ type: Number,
+ value: 0,
+ observer(val) {
+ console.log(val, 11)
+ this.getData()
+ }
+ }
+ },
+ data: {
+ ec: {
+ lazyLoad: true
+ // onInit: initChart
},
- data: {
- ec: {
- lazyLoad: true
- // onInit: initChart
- },
- tabList: [{
- label: "按满意度调查/社区自查结果",
- value: 1
- }, {
- label: '按12345热线投诉结果',
- value: 2
- }],
- tabValue: 1
+ tabList: [{
+ label: "按满意度调查/社区自查结果",
+ value: 1
+ }, {
+ label: '按12345热线投诉结果',
+ value: 2
+ }],
+ tabValue: 1
+ },
+ lifetimes: {
+ ready() {
+ this.getData()
+ }
+ },
+ methods: {
+ tabChange({ detail }) {
+ this.setData({
+ tabValue: this.data.tabList[detail].value
+ })
+ this.getData()
},
- lifetimes: {
- ready() {
- this.getData()
+ getData() {
+ this.selectComponent('#smyddcSqmydzc').init((canvas, width, height, dpr) => {
+ chart = echarts.init(canvas, null, {
+ width: width,
+ height: height,
+ devicePixelRatio: dpr // 像素比
+ });
+ canvas.setChart(chart);
+ let params = {
+ startTime: '',
+ endTime: ''
}
- },
- methods: {
- tabChange({detail}) {
- this.setData({
- tabValue: this.data.tabList[detail].value
- })
- this.getData()
- },
- getData() {
- this.selectComponent('#smyddcSqmydzc').init((canvas, width, height, dpr) => {
- chart = echarts.init(canvas, null, {
- width: width,
- height: height,
- devicePixelRatio: dpr // 像素比
- });
- canvas.setChart(chart);
- let params = {
- startTime: '',
- endTime: ''
+ let now = new Date();
+ if (this.data.typeCondition === 0) {
+ params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 1))
+ }
+ if (this.data.typeCondition === 1) {
+ params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 1));
+ }
+ if (this.data.typeCondition === 2) {
+ params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 2));
+ }
+ if (this.data.typeCondition === 3) {
+ params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 5));
+ }
+ if (this.data.typeCondition === 4) {
+ params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 11));
+ }
+
+ if (this.data.typeCondition === 1) {
+ params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59))
+ } else {
+ params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59))
+ }
+ console.log(params)
+ console.log(this.data.tabValue, 'this.data.tabValue')
+ if (this.data.tabValue === 1) {
+ satisfactionGroup(params).then(({ data }) => {
+ var dataname = data.map(item => item.name)
+ var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
+ var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
+ var indicator = []
+ let max = Math.max(...datavaule, ...datavaule2)
+ console.log(max)
+ var datamax = new Array(datavaule.length).fill(max)
+ for (var i = 0; i < dataname.length; i++) {
+ indicator.push({
+ name: dataname[i],
+ max: datamax[i],
+ })
+ }
+ indicator[0].axisLabel = {show: true}
+
+ let legendName = ['省满意度调查各项\n不满意人数', '社区满意度自查各项\n不满意人数']
+ let series = [{
+ name: "省满意度调查各项\n不满意人数",
+ type: "radar",
+ symbol: "circle",
+ symbolSize: 0,
+ areaStyle: {
+ normal: {
+ color: 'rgba(58,128,231,0.36)',
}
- let now = new Date();
- if (this.data.typeCondition === 0) {
- params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 1))
+ },
+ axisLabel: {
+ show: true,
+ },
+ triggerEvent: true,
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "transparent",
+ },
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "#527AA8",
+ },
+ },
+ itemStyle: {
+ color: '#3A80E7',
+ borderColor: '#3AB7FF',
+ borderWidth: 1,
+ },
+ lineStyle: {
+ normal: {
+ color: "#3AB7FF",
+ width: 2
}
- if (this.data.typeCondition === 1) {
- params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 1));
+ },
+ data: [datavaule]
+ }, {
+ name: "社区满意度自查各项\n不满意人数",
+ type: "radar",
+ symbol: "circle",
+ symbolSize: 0,
+ areaStyle: {
+ normal: {
+ color: 'rgba(170, 216, 255, 0)',
}
- if (this.data.typeCondition === 2) {
- params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 2));
+ },
+ itemStyle: {
+ color: '#EB8E16',
+ borderColor: '#EF9700',
+ borderWidth: 1,
+ },
+ lineStyle: {
+ normal: {
+ color: "#EF9700",
+ width: 2
}
- if (this.data.typeCondition === 3) {
- params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 5));
+ },
+ data: [datavaule2]
+ }]
+ var option = {
+ tooltip: {
+ show: true,
+ trigger: "item",
+ textStyle: {
+ color: '#000',
+ fontSize: 14
+ },
+ formatter(params) {
+ // console.log(params)
+ if (params.name === '') {
+ return '';
+ }
+ return `${params.name} : ${params.percent}%`;
+ },
+ },
+ legend: {
+ show: true,
+ textStyle: {
+ color: '#999999',
+ rich: {
+ name: {
+ fontSize: 14,
+ lineHeight: 19,
+ padding: [20, 0, 0, 0]
+ },
+ }
+ },
+ itemWidth: 6,
+ itemHeight: 6,
+ y: 'bottom',
+ x: 'center',
+ formatter: name => {
+ return `{name|${name}}`
+ },
+ data: legendName,
+ },
+ radar: {
+ center: ["50%", "40%"],
+ radius: "50%",
+ startAngle: 90,
+ splitNumber: 5,
+ splitArea: {
+ areaStyle: {
+ color: 'transparent'
+ }
+ },
+ name: {
+ textStyle: {
+ color: '#333333',
+ fontSize: 14,
+ borderRadius: 3,
+ }
+ },
+ indicator: indicator
+ },
+ axisLabel: {
+ show: true,
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "rgba(226,226,226,0.28)"
}
- if (this.data.typeCondition === 4) {
- params.startTime = formatTime(new Date(now.getFullYear(), now.getMonth() - 11));
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "rgba(226,226,226,0.61)"
}
-
- if (this.data.typeCondition === 1) {
- params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth(), 0, 23, 59, 59))
- } else {
- params.endTime = formatTime(new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59))
+ },
+ series
+ };
+ chart.setOption(option, true);
+ })
+ } else {
+ event12345Group().then(({ data }) => {
+ var dataname = data.map(item => item.name)
+ var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
+ var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
+ var indicator = []
+ let max = Math.max(...datavaule, ...datavaule2)
+ console.log(max)
+ var datamax = new Array(datavaule.length).fill(max)
+ for (var i = 0; i < dataname.length; i++) {
+ indicator.push({
+ name: datavaule[i] + '\n' + dataname[i],
+ max: datamax[i],
+ })
+ }
+ let legendName = ['12345热线事件\n上报人数']
+ let series = [{
+ name: "12345热线事件\n上报人数",
+ type: "radar",
+ symbol: "circle",
+ symbolSize: 0,
+ areaStyle: {
+ normal: {
+ color: 'rgba(58,128,231,0.36)',
}
- console.log(params)
- console.log(this.data.tabValue,'this.data.tabValue')
- if (this.data.tabValue === 1) {
- satisfactionGroup(params).then(({data}) => {
- var dataname = data.map(item => item.name)
- var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
- var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
- var indicator = []
- let max = Math.max(...datavaule, ...datavaule2)
- console.log(max)
- var datamax = new Array(datavaule.length).fill(max)
- for (var i = 0; i < dataname.length; i++) {
- indicator.push({
- name: dataname[i],
- max: datamax[i],
- })
- }
- let legendName = ['省满意度调查各项\n不满意人数', '社区满意度自查各项\n不满意人数']
- let series = [{
- name: "省满意度调查各项\n不满意人数",
- type: "radar",
- symbol: "circle",
- symbolSize: 0,
- areaStyle: {
- normal: {
- color: 'rgba(58,128,231,0.36)',
- }
- },
- itemStyle: {
- color: '#3A80E7',
- borderColor: '#3AB7FF',
- borderWidth: 1,
- },
- lineStyle: {
- normal: {
- color: "#3AB7FF",
- width: 2
- }
- },
- data: [datavaule]
- }, {
- name: "社区满意度自查各项\n不满意人数",
- type: "radar",
- symbol: "circle",
- symbolSize: 0,
- areaStyle: {
- normal: {
- color: 'rgba(170, 216, 255, 0)',
- }
- },
- itemStyle: {
- color: '#EB8E16',
- borderColor: '#EF9700',
- borderWidth: 1,
- },
- lineStyle: {
- normal: {
- color: "#EF9700",
- width: 2
- }
- },
- data: [datavaule2]
- }]
- var option = {
- tooltip: {
- show: true,
- trigger: "item",
- textStyle: {
- color: '#000',
- fontSize: 14
- },
- formatter(params) {
- // console.log(params)
- if (params.name === '') {
- return '';
- }
- return `${params.name} : ${params.percent}%`;
- },
- },
- legend: {
- show: true,
- textStyle: {
- color: '#999999',
- rich: {
- name: {
- fontSize: 14,
- lineHeight: 19,
- padding: [20, 0, 0, 0]
- },
- }
- },
- itemWidth: 6,
- itemHeight: 6,
- y: 'bottom',
- x: 'center',
- formatter: name => {
- return `{name|${name}}`
- },
- data: legendName,
- },
- radar: {
- center: ["50%", "40%"],
- radius: "50%",
- startAngle: 90,
- splitNumber: 5,
- splitArea: {
- areaStyle: {
- color: 'transparent'
- }
- },
- axisLabel: {
- show: false,
- },
- axisLine: {
- show: true,
- lineStyle: {
- color: "rgba(226,226,226,0.28)"
- }
- },
- splitLine: {
- show: true,
- lineStyle: {
- color: "rgba(226,226,226,0.61)"
- }
- },
- name: {
- textStyle: {
- color: '#333333',
- fontSize: 14,
- borderRadius: 3,
- }
- },
- indicator: indicator
- },
- series
- };
- chart.setOption(option, true);
- })
- } else {
- event12345Group().then(({data}) => {
- var dataname = data.map(item => item.name)
- var datavaule = data.map(item => item.blueNum ? item.blueNum : 0)
- var datavaule2 = data.map(item => item.yellowNum ? item.yellowNum : 0)
- var indicator = []
- let max = Math.max(...datavaule, ...datavaule2)
- console.log(max)
- var datamax = new Array(datavaule.length).fill(max)
- for (var i = 0; i < dataname.length; i++) {
- indicator.push({
- name: dataname[i],
- max: datamax[i],
- })
- }
- let legendName = ['12345热线事件\n上报人数']
- let series = [{
- name: "12345热线事件\n上报人数",
- type: "radar",
- symbol: "circle",
- symbolSize: 0,
- areaStyle: {
- normal: {
- color: 'rgba(58,128,231,0.36)',
- }
- },
- itemStyle: {
- color: '#3A80E7',
- borderColor: '#3AB7FF',
- borderWidth: 1,
- },
- lineStyle: {
- normal: {
- color: "#3AB7FF",
- width: 2
- }
- },
- data: [datavaule]
- },]
- var option = {
- tooltip: {
- show: true,
- textStyle: {
- color: '#fff',
- fontSize: 14
- },
- formatter(params) {
- // console.log(params)
- if (params.name === '') {
- return '';
- }
- return `${params.name} : ${params.percent}%`;
- },
- },
- legend: {
- show: true,
- textStyle: {
- color: '#999999',
- rich: {
- name: {
- fontSize: 14,
- lineHeight: 19,
- padding: [20, 0, 0, 0]
- },
- }
- },
- itemWidth: 6,
- itemHeight: 6,
- y: 'bottom',
- x: 'center',
- formatter: name => {
- return `{name|${name}}`
- },
- data: legendName,
- },
- radar: {
- center: ["50%", "40%"],
- radius: "50%",
- startAngle: 90,
- splitNumber: 5,
- splitArea: {
- areaStyle: {
- color: 'transparent'
- }
- },
- axisLabel: {
- show: false,
- },
- axisLine: {
- show: true,
- lineStyle: {
- color: "rgba(226,226,226,0.28)"
- }
- },
- splitLine: {
- show: true,
- lineStyle: {
- color: "rgba(226,226,226,0.61)"
- }
- },
- name: {
- textStyle: {
- color: '#333333',
- fontSize: 14,
- borderRadius: 3,
- }
- },
- indicator: indicator
- },
- series
- };
- chart.setOption(option, true);
- })
+ },
+ itemStyle: {
+ color: '#3A80E7',
+ borderColor: '#3AB7FF',
+ borderWidth: 1,
+ },
+ lineStyle: {
+ normal: {
+ color: "#3AB7FF",
+ width: 2
}
- return chart;
- })
+ },
+ data: [datavaule]
+ },]
+ var option = {
+ tooltip: {
+ show: true,
+ textStyle: {
+ color: '#fff',
+ fontSize: 14
+ },
+ formatter(params) {
+ // console.log(params)
+ if (params.name === '') {
+ return '';
+ }
+ return `${params.name} : ${params.percent}%`;
+ },
+ },
+ legend: {
+ show: true,
+ textStyle: {
+ color: '#999999',
+ rich: {
+ name: {
+ fontSize: 14,
+ lineHeight: 19,
+ padding: [20, 0, 0, 0]
+ },
+ }
+ },
+ itemWidth: 6,
+ itemHeight: 6,
+ y: 'bottom',
+ x: 'center',
+ formatter: name => {
+ return `{name|${name}}`
+ },
+ data: legendName,
+ },
+ radar: {
+ center: ["50%", "40%"],
+ radius: "50%",
+ startAngle: 90,
+ splitNumber: 5,
+ splitArea: {
+ areaStyle: {
+ color: 'transparent'
+ }
+ },
+ axisLabel: {
+ show: false,
+ },
+ axisLine: {
+ show: true,
+ lineStyle: {
+ color: "rgba(226,226,226,0.28)"
+ }
+ },
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "rgba(226,226,226,0.61)"
+ }
+ },
+ name: {
+ textStyle: {
+ color: '#333333',
+ fontSize: 14,
+ borderRadius: 3,
+ }
+ },
+ indicator: indicator
+ },
+ series
+ };
+ chart.setOption(option, true);
+ })
}
+ return chart;
+ })
}
+ }
});
diff --git a/subpages/OCRCard/pages/index/index.wxss b/subpages/OCRCard/pages/index/index.wxss
index 997f887..68d0642 100644
--- a/subpages/OCRCard/pages/index/index.wxss
+++ b/subpages/OCRCard/pages/index/index.wxss
@@ -55,7 +55,7 @@ page {
.body{
position: relative;
- top: -400rpx;
+ top: -200rpx;
display: flex;
flex-direction: column;
justify-content: center;
diff --git a/subpages/addhouse/pages/addhouse/addhouse.wxss b/subpages/addhouse/pages/addhouse/addhouse.wxss
index 457e7a1..9bf06f0 100644
--- a/subpages/addhouse/pages/addhouse/addhouse.wxss
+++ b/subpages/addhouse/pages/addhouse/addhouse.wxss
@@ -124,7 +124,8 @@ page {
.form_card .form_textarea .input{
background-color: #f7f7f7;
border-radius: 20rpx;
- padding:27rpx ;
+ padding:27rpx;
+ width: calc(100% - 54rpx);
}
.form_card .form_item .label,
.form_card .form_textarea .label
diff --git a/subpages/demandCheck/images/ig_tianjiatupian@2x.png b/subpages/demandCheck/images/ig_tianjiatupian@2x.png
index a01eeb0..a544784 100644
Binary files a/subpages/demandCheck/images/ig_tianjiatupian@2x.png and b/subpages/demandCheck/images/ig_tianjiatupian@2x.png differ
diff --git a/subpages/demandCheck/images/mkf.png b/subpages/demandCheck/images/mkf.png
index 74600d1..ffdca6a 100644
Binary files a/subpages/demandCheck/images/mkf.png and b/subpages/demandCheck/images/mkf.png differ
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml
index 49fc886..6179716 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxml
@@ -71,7 +71,7 @@
- 您也可以语音输入描述
+ 您也可以语音输入描述
@@ -88,7 +88,7 @@
wx:key="imageId">
-
+
diff --git a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
index d5a0855..65019eb 100644
--- a/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
+++ b/subpages/demandCheck/pages/dissatisfied/demandCheck/demandCheck.wxss
@@ -105,7 +105,7 @@ page {
grid-template-columns: 214rpx 214rpx 214rpx;
grid-template-rows: 214rpx;
grid-gap: 17rpx;
- height: 214rpx;
+ height: 188rpx;
margin-top:80rpx ;
}
.image-list-2 {
@@ -123,8 +123,10 @@ page {
position: relative;
}
.image-list image {
- width: 100%;
- height: 100%;
+ /* width: 100%; */
+ /* height: 100%; */
+ width: 180rpx;
+ height: 180rpx;
object-fit: cover;
border-radius: 8rpx;
}
@@ -935,10 +937,12 @@ background: rgb(175, 1, 1);
color: #999;
font-size: 26rpx;
font-family: PingFang SC;
+ margin-top: 34rpx;
}
.mkf-img image{
- width: 91rpx;
- height: 80rpx;
+ width: 46rpx;
+ height: 46rpx;
+ margin-right: 9rpx;
}
.audio-play{
display: flex;
diff --git a/subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss b/subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss
index f4bc63e..c3b7b4c 100644
--- a/subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss
+++ b/subpages/statistics/pages/crowdPortrait/crowdPortrait.wxss
@@ -11,7 +11,8 @@
.title {
font-size: 30rpx;
color: #333333;
- margin-bottom: 60rpx;
+ padding-bottom: 30rpx;
+ border-bottom: 1px solid #EAEAEA
}
.bold {
font-weight: bold;
@@ -26,6 +27,7 @@
.log-item .user {
display: flex;
align-items: center;
+ margin-bottom: 10rpx
}
.log-item .icon {
width: 48rpx;
diff --git a/subpages/statistics/pages/event/detail/detail.wxml b/subpages/statistics/pages/event/detail/detail.wxml
index bfe7da5..dd3d24a 100644
--- a/subpages/statistics/pages/event/detail/detail.wxml
+++ b/subpages/statistics/pages/event/detail/detail.wxml
@@ -22,8 +22,8 @@
- 处理进展
-
+ 处理进展
+
【指派】
diff --git a/subpages/statistics/pages/event/detail/detail.wxss b/subpages/statistics/pages/event/detail/detail.wxss
index d43b2da..0d11447 100644
--- a/subpages/statistics/pages/event/detail/detail.wxss
+++ b/subpages/statistics/pages/event/detail/detail.wxss
@@ -14,7 +14,7 @@ page {
font-size: 32rpx;
font-weight: bold;
color: #333333;
- margin-bottom: 30rpx;
+ margin-bottom: 10rpx;
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/subpages/statistics/pages/event/list/list.wxml b/subpages/statistics/pages/event/list/list.wxml
index daa64bc..55d6280 100644
--- a/subpages/statistics/pages/event/list/list.wxml
+++ b/subpages/statistics/pages/event/list/list.wxml
@@ -1,65 +1,52 @@
-
-
- {{ orgIndex >= 0 ? orgList[orgIndex].label : '按组织' }}
-
-
+
+
+ {{ orgIndex >= 0 ? orgList[orgIndex].label : '按组织' }}
+
+
+
-
-
-
- {{ satisfactionSourceIndex >= 0 ? satisfactionSourceOptions[satisfactionSourceIndex].label : '按来源'
- }}
-
-
-
-
-
- {{ tagIndex >= 0 ? tagOptions[tagIndex].label : '按标记'
- }}
-
-
-
-
- 筛选
+
+
+
+ {{ satisfactionSourceIndex > 0 ? satisfactionSourceOptions[satisfactionSourceIndex].label : '按来源' }}
+
+
+
+
+
+
+
+ {{ tagIndex > 0 ? tagOptions[tagIndex].label : '按标记' }}
+
+
+
+
+
+ 筛选
+
-
-
-
-
-
- {{item.name ? item.name : ''}} {{item.mobile ? item.mobile : ''}}
-
-
- {{item.sourceTypeName}}
-
-
-
- {{item.gridName ? item.gridName : ''}}
- {{item.happenTime ? item.happenTime : ''}}
-
-
- {{item.eventContent ? item.eventContent : ''}}
-
-
+
+
+
+
+
+ {{item.name ? item.name : ''}} {{item.mobile ? item.mobile : ''}}
+
+
+ {{item.sourceTypeName}}
+
+
+
+ {{item.gridName ? item.gridName : ''}}
+ {{item.happenTime ? item.happenTime : ''}}
+
+ {{item.eventContent ? item.eventContent : ''}}
+
+
-
-
+
+
\ No newline at end of file
diff --git a/subpages/statistics/pages/event/list/list.wxss b/subpages/statistics/pages/event/list/list.wxss
index fd72b32..c44bbe8 100644
--- a/subpages/statistics/pages/event/list/list.wxss
+++ b/subpages/statistics/pages/event/list/list.wxss
@@ -59,7 +59,11 @@ page {
text-align: center;
}
-
+.picker-type.cur {
+ background: rgba(58, 128, 231, 0.16);
+ border: 1px solid #3A80E7;
+ color: #3A80E7;
+}
.btn {
width: 120rpx;
height: 56rpx;
diff --git a/subpages/statistics/pages/problem/problem.wxss b/subpages/statistics/pages/problem/problem.wxss
index eb57dd2..32c4314 100644
--- a/subpages/statistics/pages/problem/problem.wxss
+++ b/subpages/statistics/pages/problem/problem.wxss
@@ -66,7 +66,9 @@ page {
font-weight: bold;
color: #FF783C;
}
-
+.event-list .event-item:first-child {
+ padding-top: 0;
+}
.event-list .event-item {
border-bottom: 1px solid #EAEAEA;
padding: 30rpx 0;
@@ -76,7 +78,7 @@ page {
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 25rpx;
+ margin-bottom: 15rpx;
}
.event-list .event-item .userInfo .name {
font-size: 34rpx;
@@ -92,7 +94,7 @@ page {
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: 30rpx;
+ margin-bottom: 20rpx;
}
.event-list .event-item .address .grid {
font-size: 28rpx;