From 6cdc1842f06aeea31057dbcaa412ebfc34ae7eb2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 08 Mar 2022 10:22:00 +0800
Subject: [PATCH] 注册调整
---
pages/home/home.vue | 2
pages/grabOrders/taskCount/taskCount.vue | 265 ++++++++++++++++++++++++++++++++++++++++++++
static/workbench/task10.png | 0
pages.json | 22 +++
pages/alarm_list/demo.config.js | 2
pages/grabOrders/personnelCount/personnelCount.vue | 22 +++
pages/grabOrders/grabOrdersMain/business.vue | 6 +
7 files changed, 316 insertions(+), 3 deletions(-)
diff --git a/pages.json b/pages.json
index 14ad3b7..1b5e2f1 100644
--- a/pages.json
+++ b/pages.json
@@ -657,7 +657,27 @@
}
}
- ],
+ ,{
+ "path" : "pages/grabOrders/taskCount/taskCount",
+ "style" :
+ {
+ "navigationBarTitleText": "查任务",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }
+ ,{
+ "path" : "pages/grabOrders/personnelCount/personnelCount",
+ "style" :
+ {
+ "navigationBarTitleText": "人员统计",
+ "navigationBarBackgroundColor": "#103289",
+ "navigationBarTextStyle": "white"
+ }
+
+ }
+ ],
"globalStyle": { //将组件安装在项目的components目录下，并符合components/组件名称/组件名称.vue目录结构。可以不用引用、注册，直接在页面中使用。
"autoscan": true
},
diff --git a/pages/alarm_list/demo.config.js b/pages/alarm_list/demo.config.js
index b20435f..d111729 100644
--- a/pages/alarm_list/demo.config.js
+++ b/pages/alarm_list/demo.config.js
@@ -5,7 +5,7 @@
icon: 'cell',
title: '查积分',
}, {
- path: '/pages/grabOrders/grabOrders',
+ path: '/pages/grabOrders/taskCount/taskCount/grabOrders',
icon: 'sticky',
title: '查任务',
}]
diff --git a/pages/grabOrders/grabOrdersMain/business.vue b/pages/grabOrders/grabOrdersMain/business.vue
index 585b5ca..50882b0 100644
--- a/pages/grabOrders/grabOrdersMain/business.vue
+++ b/pages/grabOrders/grabOrdersMain/business.vue
@@ -108,6 +108,12 @@
url: "",
cout: 0,
},
+ {
+ title: "人员统计",
+ img: "/static/workbench/task10.png",
+ url: "../personnelCount/personnelCount",
+ cout: 0,
+ },
],
dataTwo: [
{
diff --git a/pages/grabOrders/personnelCount/personnelCount.vue b/pages/grabOrders/personnelCount/personnelCount.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/grabOrders/personnelCount/personnelCount.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
diff --git a/pages/grabOrders/taskCount/taskCount.vue b/pages/grabOrders/taskCount/taskCount.vue
new file mode 100644
index 0000000..3325f45
--- /dev/null
+++ b/pages/grabOrders/taskCount/taskCount.vue
@@ -0,0 +1,265 @@
+<template>
+ <view class="advisory-big">
+ <view class="m-top">
+ </view>
+ <view class="bomBut">
+ <view style="width: 400rpx;padding-left: 30rpx;">
+ <u-tabs :list="list" :is-scroll="false"></u-tabs>
+ </view>
+ <u-row gutter="16">
+ <u-col span="7">
+ <view class="bom-text">正在进行</view>
+ <view class="bom-int">{{dqjf}}</view>
+ </u-col>
+ <u-col span="5">
+ <view class="bom-text">累计完成</view>
+ <view class="bom-int">{{ljjf}}</view>
+ </u-col>
+ </u-row>
+ </view>
+
+ <view class="bomList">
+ <view class="">
+ <u-dropdown border-bottom="true">
+ <u-dropdown-item v-model="value1" @change="change" title="任务类型" :options="options1"></u-dropdown-item>
+ </u-dropdown>
+ </view>
+
+ <scroll-view id="articleBox" :style="{ height: swiperHeight + 'px' }" class="article-content" scroll-y
+ style="width: 100%; margin-top: 15rpx;">
+ <view v-for="i in data" class="advisory-model" @click="goDetail(i)">
+ <view class="advisory-left">
+ <view class="advisory-title-top">
+ <view class="advisory-title">{{i.access}}</view>
+ </view>
+ <view class="advisory-title-down">
+ <view class="advisory-title-time">{{i.time}}</view>
+ </view>
+ </view>
+ <view class="advisory-right">
+ <view v-if="i.type =='2'" class="advisory-title-integral">- {{i.integral}}</view>
+ <view v-if="i.type =='1'" class="advisory-title-integraladd">+{{i.integral}}</view>
+ </view>
+ <u-line class="advisory-line" color="#ebebeb" />
+ </view>
+ </scroll-view>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ dqjf:"暂无",
+ ljjf:"暂无",
+ list: [{
+ name: '任务统计'
+ }, {
+ name: ''
+ }, {
+ name: '',
+ }],
+ options1: [{
+ label: '全部',
+ value: 1,
+ },
+ {
+ label: '治安防范巡逻',
+ value: 2,
+ },
+ {
+ label: '治安防范宣传',
+ value: 3,
+ },
+ {
+ label: '治安防范培训',
+ value: 3,
+ }
+ ],
+ value1: 1,
+ data: [],
+ swiperHeight: 0
+ }
+ },
+ methods: {
+ onLoad() {
+ this.getData(1);
+ },
+ getData(e){
+ var that = this;
+ uni.request({
+ url:that.$store.state.piAPI + '/integral/selectCount?uid='+this.$store.state.puserID+"&type="+e,
+ method:'POST',
+ success(res) {
+ that.dqjf = res.data.data.sjf;
+ that.ljjf = res.data.data.zjf.integral;
+ that.data = res.data.data.list;
+ }
+ });
+ },
+ goDetail() {
+
+ },
+ change(e){
+ this.getData(e);
+ },
+ onReady() {
+ let that = this;
+ uni.getSystemInfo({
+ success(e) {
+ console.log(e);
+ let {
+ windowWidth,
+ windowHeight,
+ safeArea
+ } = e;
+ const query = uni.createSelectorQuery().in(that);
+ query
+ .select('#articleBox')
+ .boundingClientRect(data => {
+ that.swiperHeight = (safeArea.bottom - data.top - 50);
+ })
+ .exec();
+ }
+ });
+ },
+ }
+ }
+</script>
+
+<style>
+ .advisory-big {
+ width: 100%;
+ height: 100vh;
+ background-color: #f7f7f7;
+ }
+
+ .bomBut {
+ width: 93%;
+ margin: 0 auto;
+ height: 7.5rem;
+ z-index: 999;
+ border-radius: 10px;
+ margin-top: -2.5rem;
+ background-color: #fff;
+ }
+
+ .bomList {
+ width: 93%;
+ margin: 0 auto;
+ height: 30rem;
+ z-index: 999;
+ border-radius: 10px;
+ margin-top: 1rem;
+ background-color: #fff;
+ }
+
+ .bom-text {
+ font-size: 30rpx;
+ font-family: PingFang SC;
+ color: #585b61;
+ padding-left: 30rpx;
+ }
+
+ .bom-int {
+ font-size: 40rpx;
+ font-family: PingFang SC;
+ color: #ff910a;
+ font-weight: bold;
+ padding-left: 30rpx;
+ padding-top: 10rpx;
+ }
+
+ .m-top {
+ width: 100%;
+ height: 3rem;
+ border-radius: 0px 0px 20px 20px;
+ background-image: linear-gradient(to bottom, #103289, #174cd1);
+ color: #fff;
+ flex-direction: column;
+ }
+
+ .u-row {
+ margin: 10rpx 0;
+ }
+
+ .demo-layout {
+ height: 80rpx;
+ border-radius: 8rpx;
+ }
+
+ .bg-purple {
+ background: #d3dce6;
+ }
+
+ .bg-purple-light {
+ background: #e5e9f2;
+ }
+
+ .bg-purple-dark {
+ background: #99a9bf;
+ }
+
+ .advisory-model {
+ width: 93%;
+ margin: 0 auto;
+ margin-top: 0.5rem;
+ height: 3rem;
+ background-color: #FFF;
+ }
+
+ .advisory-title {
+ font-size: 15px;
+ font-weight: 550;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ }
+
+ .advisory-title-down {
+ /* background-color: #0078A8; */
+ width: 100%;
+ height: 25%;
+ font-size: 12px;
+ font-weight: 350;
+ color: #808080;
+ padding-top: 10rpx;
+ }
+
+ .advisory-title-time {
+ position: relative;
+ }
+
+ .advisory-right {
+ // background-color: #222222;
+ left: 25%;
+ top: 30%;
+ position: relative;
+ }
+
+ .advisory-left {
+ width: 64%;
+ height: 80%;
+ float: left;
+ position: relative;
+ // background-color: #00FFFF;
+ left: 3%;
+ top: 10%;
+ }
+
+ .advisory-line {
+ top: 70%;
+ position: relative;
+ }
+
+ .advisory-title-integraladd{
+ color: #00aaff;
+ }
+
+ .advisory-title-integral{
+ color: #ff0000;
+ }
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 79e331b..feaf420 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -138,7 +138,7 @@
status: 'loadmore',
list: 15,
page: 1,
- cout: 1,
+ cout: 0,
pagesize: 2,
keyword: '',
focus: false,
diff --git a/static/workbench/task10.png b/static/workbench/task10.png
new file mode 100644
index 0000000..7cb3a54
--- /dev/null
+++ b/static/workbench/task10.png
Binary files differ
--
Gitblit v1.9.3