From 01ceba2e231a329d43a667589326cc784cc41a88 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Tue, 19 Mar 2024 19:02:46 +0800
Subject: [PATCH] 更新
---
pages/statistics/index.vue | 36 ++++++++++--------
subPackage/police/onLine.vue | 54 +++++++++++++++++++++------
components/caption/caption.vue | 8 +++-
3 files changed, 68 insertions(+), 30 deletions(-)
diff --git a/components/caption/caption.vue b/components/caption/caption.vue
index e2ffbcb..6aceefa 100644
--- a/components/caption/caption.vue
+++ b/components/caption/caption.vue
@@ -1,7 +1,7 @@
<template>
<view class="caption flex a-i-c j-c-s-b">
<view class="flex a-i-c">
- <view class="line"></view>
+ <view class="line" :style="{backgroundColor:bgColor}"></view>
<text class=" fw" :style="{fontSize:fontSize}">{{title}}</text>
</view>
<view class="caption-right" v-if="isLink" @click="navTo()">
@@ -25,6 +25,10 @@
fontSize: {
type: String,
value: '32rpx'
+ },
+ bgColor: {
+ type: String,
+ value: '#017BFC'
}
},
methods: {
@@ -45,7 +49,7 @@
.line {
width: 6rpx;
height: 28rpx;
- background-color: #017BFC;
+ // background-color: #017BFC;
margin-right: 14rpx;
}
diff --git a/pages/statistics/index.vue b/pages/statistics/index.vue
index 236616a..8f938c2 100644
--- a/pages/statistics/index.vue
+++ b/pages/statistics/index.vue
@@ -1,7 +1,7 @@
<template>
<view class="container">
<view class="section">
- <caption-row title="社区概况"></caption-row>
+ <caption-row title="社区概况" bgColor="#003399"></caption-row>
<view class="cell flex j-c-s-b flex-wrap ">
<view class="cell-item">
<image class="cell-bg" src="/static/icon/nav-bg-15.png" mode="aspectFill"></image>
@@ -44,7 +44,7 @@
<!-- 房屋画像 -->
<view class="">
- <caption-row title="房屋画像"></caption-row>
+ <caption-row title="房屋画像" bgColor="#003399"></caption-row>
<view class="pie-charts-house flex bgc-ff">
<view class="pie-charts-box flex j-c-c a-i-c">
<qiun-data-charts type="pie" :opts="housePieOpts" :chartData="houseLabelChartData" />
@@ -60,41 +60,41 @@
</view>
<view class="">
- <caption-row title="共治力量"></caption-row>
+ <caption-row title="共治力量" bgColor="#003399"></caption-row>
<view class="menu bgc-ff flex flex-wrap">
<view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">0</text>
+ <text class="menu-item-text f-32 fw mb-20">0</text>
<text class="f-28">党员</text>
</view>
<view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">0</text>
+ <text class="menu-item-text f-32 fw mb-20">0</text>
<text class="f-28">党组织</text>
</view>
<view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">{{gridData.gridStatistics}}</text>
+ <text class="menu-item-text 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">
- <text class="c-main f-32 fw mb-20">0</text>
+ <text class="menu-item-text f-32 fw mb-20">0</text>
<text class="f-28">社工</text>
</view> -->
<view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">{{gridData.companyStatistics}}</text>
+ <text class="menu-item-text f-32 fw mb-20">{{gridData.companyStatistics}}</text>
<text class="f-28">物业人员</text>
</view>
<view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">{{gridData.ownersStatistics}}</text>
+ <text class="menu-item-text f-32 fw mb-20">{{gridData.ownersStatistics}}</text>
<text class="f-28">业委会</text>
</view>
<!-- <view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">0</text>
+ <text class="menu-item-text f-32 fw mb-20">0</text>
<text class="f-28">群团组织</text>
</view> -->
</view>
</view>
<view class="">
- <caption-row title="人员画像"></caption-row>
+ <caption-row title="人员画像" bgColor="#003399"></caption-row>
<view class="bar-charts bgc-ff">
<qiun-data-charts type="bar" :opts="opts" :chartData="chartData" />
</view>
@@ -114,7 +114,7 @@
</view>
<view class="event">
- <caption-row title="社区事件"></caption-row>
+ <caption-row title="社区事件" bgColor="#003399"></caption-row>
<view class="block bgc-ff mt-20 mb-20">
<view class="block-caption f-28 fw">
总体统计
@@ -529,16 +529,20 @@
.menu-item {
width: 33%;
padding: 20rpx 0;
- border-right: 1px solid #dadbde;
+ // border-right: 1px solid #dadbde;
+ }
+
+ .menu-item-text {
+ color: #003399;
}
.menu-item:nth-child(3n) {
border-right: none;
}
- .menu-item:nth-child(-n + 3) {
- border-bottom: 1px solid #dadbde;
- }
+ // .menu-item:nth-child(-n + 3) {
+ // border-bottom: 1px solid #dadbde;
+ // }
}
.event {
diff --git a/subPackage/police/onLine.vue b/subPackage/police/onLine.vue
index 42506a4..bbd6ccc 100644
--- a/subPackage/police/onLine.vue
+++ b/subPackage/police/onLine.vue
@@ -1,16 +1,27 @@
<template>
<view class="container">
- <u-row customStyle="margin-bottom: 10px">
- <u-col span="6">
- <view class="demo-layout bg-purple-light">
- 在线状态：
- </view>
- </u-col>
- <u-col span="6">
- <u-switch v-model="onLine" asyncChange @change="asyncChange"></u-switch>
- </u-col>
- </u-row>
+ <view class="row bgc-ff mt-20 flex j-c-c">
+
+
+ <!-- <u-row customStyle="margin-bottom: 10px">
+ <u-col span="6">
+ <view class="demo-layout bg-purple-light">
+ 离线/在线：
+ </view>
+ </u-col>
+ <u-col span="6">
+ <u-switch v-model="onLine" asyncChange @change="asyncChange"></u-switch>
+ </u-col>
+ </u-row> -->
+
+
+ <view class="round bgc-main">
+ {{onLine?"离线":"在线"}}
+ </view>
+
+
+ </view>
<!-- <view> -->
<!-- <role-list :roleData="roleData" :current-id="selectRole.id" @select="select"></role-list> -->
<!-- <u-switch v-model="value13" asyncChange @change="asyncChange"></u-switch> -->
@@ -40,7 +51,7 @@
data() {
return {
onLine: false,
- userInfo: {},
+ // userInfo: {},
loading: false,
}
},
@@ -131,13 +142,24 @@
}
</script>
-<style lang="scss" scoped>
+<style lang="scss">
+ page {
+ backgrond-color: #f5f5f5;
+ }
+
+ .row {
+ // padding: 20rpx;
+ // margin: 0 20rpx;
+ // border-radius: 4rpx;
+ }
+
.container {
position: relative;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
+ // background-color: #fff;
// background: #F9F9FA;
@@ -153,4 +175,12 @@
z-index: 10;
}
+
+ .round {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ margin-top: 30%;
+
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3