From abd05d888bb91a2e781e5fe691db929b67ec0950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com> Date: Wed, 3 Jan 2024 18:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Tabs/index.wxss | 2 +- .../modules/CrowdPortrait/CrowdPortrait.wxss | 5 +- .../modules/SmyddcSqmydzc/SmyddcSqmydzc.js | 672 +++++++++--------- subpages/OCRCard/pages/index/index.wxss | 2 +- .../addhouse/pages/addhouse/addhouse.wxss | 3 +- .../images/ig_tianjiatupian@2x.png | Bin 19127 -> 2384 bytes subpages/demandCheck/images/mkf.png | Bin 606 -> 2651 bytes .../dissatisfied/demandCheck/demandCheck.wxml | 4 +- .../dissatisfied/demandCheck/demandCheck.wxss | 14 +- .../pages/crowdPortrait/crowdPortrait.wxss | 4 +- .../statistics/pages/event/detail/detail.wxml | 4 +- .../statistics/pages/event/detail/detail.wxss | 2 +- .../statistics/pages/event/list/list.wxml | 103 ++- .../statistics/pages/event/list/list.wxss | 6 +- .../statistics/pages/problem/problem.wxss | 8 +- 15 files changed, 425 insertions(+), 404 deletions(-) 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 a01eeb003b060173c51f122654f71d3d520dc960..a544784d1570ea2b33769df22fef24b210c7cd0f 100644 GIT binary patch literal 2384 zcmeHJ{a4b58b{(5+ST#xW!|g|@%8TB)JgM&r6y`-E3y|gatPb>>wH5UEXX%f*}y2R zcGZZ;IGW~mW+j@YVcM22fr@4zCg2^*mkD35mO?6W>0j76JNsonJnzqQ&U2pUIp_0~ z#t@?H?VRjjFqnPxp@8?8KeV56T^*w9Wy;bDz~yJlf9Tf69puv5%L!;Pcq z6UyzJp&hE+`zilOExvSO#)H(7Naq*W-sUZDt|e_7!TYP-i0*TjkM`FI{%sAL;Vveka>5oad=pGWvWe>*TI9rhCdc^F!^tMXi2sNHLib z%KYDCcUgyJRL#l+wG3leM26P|j}36`)dK)C4P=#a8Lq#W4F-cxdrLij-l|Zk)b$=& zVJg@GDpo6P@|_Tk#a$D!^;D1*7#L_$8(y|bEtxKFnERcVawYN3tS3@nK^A)|$^+pY z-leuIwb?wzRu5^N9XQ5djH3SeEDu@-Bl4&H1Wg;^@zGuC&~k3T#**$m1vsJRp9}z- z*Eu&9Pu!(KwIPZY?<}}7SpA;g_5V=5C#;hS)_juj^A=M$r63VOK~66 zI3PbQ?#hXnSXyANHFU75=6c*wO||ZD0I1$Bs)saL4Ss1wUGBE}s!iXJ5B{uh51{No zTz8p-%2Dln-L1=K;7HOZmzRzL2WINZN3KFg zn<7@p6iQ_#jrKfOlK9nP8ns;BKb`1ylTd$_$!wb$iTqU%kTrg3XTZ#;tscPHq_rjk zZQT9*BN-vp)gBez5{cw!6@gMNw~ZOHGtUgWzSL^TND?#{xtOkORDHP*KZ96C3SmnE zc4wiv-JsW_>F_)@;rs=8Y0Tr#(%FP0a-*XoDQHH1P7dJ84Zn0=l$W0O8FLbCJ?Bct zOn7Eol9$Q=9N>+g`!A;XX3%cjl_0$5liT5cfLVIZxYE67l)sAArjSpLnTssrkpEUf0) zr)4^w?rtUtq-|@c+Di&B)?ADp8yh>lvc4m~QZjvbv)aBW2!}h9%Sl`g3mzzZwX;q; z@8hv=@2X%b^|!VQLnNZe#|i%0l5JAINR1_PJDTuS&~d1By51?7Ucu`;URjV5N)EtB zWhCzcrFoSp&g~Cr#IM%_aI#leCxC zWn>jD36VzI1glD86WBa?ZX5E)6at5kR3&=mD)q`J;aw@S-ZV)}y{Fu~w_bl1SmO6h z^O3*p4F}_LkVpK|8h6=skq!bK0$KC-;goHUX61IzlKPP7=D&XwW(P<9c4jXAAv^F9Yem-c6X(5Z;Q)B|n#$^bz+c+JqogB8w_FpbH2EQ{d6UUxNNA-N zB>Jz7pZwYajfP^yRWki1D8wuN>UfeOoI*rQn7uG{;Bxd`<*GTuKkqSpifXYip&*R^ zveEe15eO~iF48r-89wn>Tavdw4M8!_z=02WTny9;6)M%1(Rrg~3gV;~SL{^zj{7+s Ss0ize1dEO&L^R?l#s3GAM`Az# literal 19127 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 L>nK$ySi%1feD32s diff --git a/subpages/demandCheck/images/mkf.png b/subpages/demandCheck/images/mkf.png index 74600d17dcb73f917f2b1e635e7118a26da3fc3a..ffdca6a59e908b19294c100bd57fd93acc15a9bc 100644 GIT binary patch literal 2651 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 JPDHLkV1gSf0IdK3 literal 606 zcmV-k0-^nhP)Px%7)eAyRA@u(SW$AqAP{||7qKU)9z+{XVm%3|9z=VR<|38OVsN%hNFhLLX2_S5 zEco8O1>PdC@JB2hKPrL$RC9qYx6@an;8^C}a6fvY4V3SjY ztP1Ru-UE0epaSULrI7TSzo+jB+v)AkEkpQPyQ z{Bsl-nelrH6QfYBt}Iyr4%8a626$m7FNO31xX|@VF5vcmvl8HBa@d5BdaML|Sz43= zzg%YdIFi|;JEElP#^e%mFSA1GmYoB4XBsn($0if-9A+VS9z%f;q$OjL6(|WVWbR5J sBugb@ssbgm8!~rQAS6pAV-~N#H?sOzKqf>88~^|S07*qoM6N<$f-v{`l>h($ 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.gridName ? item.gridName : ''}} - {{item.happenTime ? item.happenTime : ''}} - - - {{item.eventContent ? item.eventContent : ''}} - - + + + + + + {{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;