From 43938784df2b641ec343e980c92355defe5d53de Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 18:10:22 +0800
Subject: [PATCH] bug修复
---
subPackage/grid/comprehensive.vue | 89 +++++++++++++++++++++++---------------------
subPackage/statistics/index.vue | 30 +++++++-------
2 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/subPackage/grid/comprehensive.vue b/subPackage/grid/comprehensive.vue
index 4a1caa2..a471aae 100644
--- a/subPackage/grid/comprehensive.vue
+++ b/subPackage/grid/comprehensive.vue
@@ -4,26 +4,26 @@
<u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
:activeStyle="{color:'#017BFC'}"></u-tabs>
</view> -->
-
+
<view class="grid flex flex-wrap bgc-ff">
- <view class="grid-item flex f-d-c a-i-c j-c-c" v-for="i in gridList">
+ <view class="grid-item flex f-d-c a-i-c j-c-c" v-for="i in gridList">
<!-- <text class="mb-20 f-28"></text> -->
- <u-image v-if="i.picUrl" :src="i.picUrl" width="100" height="100"></u-image>
- <u-image v-else src="/static/icon/user-01.png" width="100" height="100"></u-image>
+ <u-image v-if="i.picUrl" :src="i.picUrl" width="100" height="100"></u-image>
+ <u-image v-else src="/static/icon/user-01.png" width="100" height="100"></u-image>
<text class="mt-20">{{i.gridmanName}}</text>
<text class="c-99 f-26">{{i.mobile}}</text>
</view>
</view>
-
+
<view class="detail bgc-ff">
- <caption-row title="网格基本情况" />
+ <caption-row title="网格基本情况" />
<view class="detail-content f-28">
- <text v-for="i in houseList">{{i.aoiName}}{{i.buildingName}}</text>
+ <text v-for="i in houseList">{{i.aoiName?i.aoiName:''}} {{i.buildingName}} </text>
</view>
</view>
-
- <view class="comment" v-if="false">
- <caption-row title="留言" />
+
+ <view class="comment" v-if="false">
+ <caption-row title="留言" />
<view class="comment-list ">
<view class="comment-item flex " v-for="(item,index) in commentList" :key="index">
<u-avatar size="45" src="/static/icon/user-01.png"></u-avatar>
@@ -48,35 +48,37 @@
<script>
import captionRow from "@/components/caption/caption.vue"
- import { getGridDetail } from "@/api/grid/grid.js"
+ import {
+ getGridDetail
+ } from "@/api/grid/grid.js"
export default {
- components:{
+ components: {
captionRow
},
- data(){
+ data() {
return {
- gridList:[],
- houseList:[],
- commentList:[]
+ gridList: [],
+ houseList: [],
+ commentList: []
}
},
-
+
onLoad(option) {
this.getDetailInfo()
},
-
- methods:{
-
+
+ methods: {
+
getDetailInfo() {
getGridDetail({
- houseCode:uni.getStorageSync("siteInfo").houseCode
+ houseCode: uni.getStorageSync("siteInfo").houseCode
}).then(res => {
console.log(res)
this.houseList = res.data.doorplateAddress;
this.gridList = res.data.grid;
})
},
-
+
navToComment() {
uni.navigateTo({
url: `comment?id=${this.params.id}`
@@ -84,16 +86,13 @@
}
}
}
-
-
-
</script>
<style lang="scss">
page {
background-color: #F5F5F5;
}
-
+
.tab {
width: 100%;
height: 88rpx;
@@ -109,48 +108,52 @@
padding: 0 30rpx;
box-sizing: border-box;
z-index: 999;
-
+
}
- .grid{
- width:100%;
- padding:20rpx;
+
+ .grid {
+ width: 100%;
+ padding: 20rpx;
box-sizing: border-box;
- .grid-item{
- width:32.8%;
- padding:20rpx 0;
+
+ .grid-item {
+ width: 32.8%;
+ padding: 20rpx 0;
// border:1px solid #333;
- }
+ }
}
-
- .detail{
+
+ .detail {
padding: 0 30rpx;
- margin:40rpx 0 20rpx;
- .detail-content{
- padding:20rpx 0;
+ margin: 40rpx 0 20rpx;
+
+ .detail-content {
+ padding: 20rpx 0;
text-indent: 2em;
}
}
+
.comment {
width: 100%;
padding: 0 30rpx 160rpx;
box-sizing: border-box;
}
-
+
.comment-list {
width: 100%;
padding-top: 20rpx;
-
+
.comment-item {
width: 100%;
padding: 20rpx 0;
}
-
+
.comment-item-content {
flex: 1;
margin-left: 20rpx;
}
}
-
+
.footer {
width: 100%;
padding: 20rpx 30rpx;
diff --git a/subPackage/statistics/index.vue b/subPackage/statistics/index.vue
index 24586b8..e22ec56 100644
--- a/subPackage/statistics/index.vue
+++ b/subPackage/statistics/index.vue
@@ -41,7 +41,7 @@
<text class="c-main f-32 fw mb-20">{{gridData.gridStatistics}}</text>
<text class="f-28">网格员</text>
</view>
- <!-- <view class="menu-item flex f-d-c a-i-c">
+ <!-- <view class="menu-item flex f-d-c a-i-c">
<text class="c-main f-32 fw mb-20">0</text>
<text class="f-28">社工</text>
</view> -->
@@ -102,7 +102,7 @@
</u-grid-item>
<u-grid-item bgColor="#fff">
<view class="grid-item flex f-d-c a-i-c">
- <text class="f-32 fw c-main mb-20">{{ setNumber(reportData.result2)}}</text>
+ <text class="f-32 fw c-main mb-20">{{ setNumber(reportData.result2)}}%</text>
<text class="f-28">办结比例</text>
</view>
</u-grid-item>
@@ -225,29 +225,29 @@
},
methods: {
-
- getRoleType(){
+
+ getRoleType() {
let roleName = uni.getStorageSync("activeRole").roleName;
- if(roleName == "网格员"){
+ if (roleName == "网格员") {
return 1;
- }else if (roleName == "系统管理员"){
+ } else if (roleName == "系统管理员") {
return 2
- }else if(roleName == "民警"){
+ } else if (roleName == "民警") {
return 3;
}
},
-
- setNumber(num){
- if(num){
+
+ setNumber(num) {
+ if (num) {
let n = Number(this.reportData.result2) * 100
- return n.toFixed(2)
- }else {
+ return n.toFixed(2)
+ } else {
return num
}
-
+
},
-
-
+
+
getHouseHoldData() {
statisticsModal.getHouseholdStatistics({
code: this.siteInfo.id,
--
Gitblit v1.9.3