From 7bdf1aa76107f6f188e738cf5b3a764a0e988ed6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 03 Jul 2021 14:36:16 +0800
Subject: [PATCH] 群防任务顶部导航条样式调整
---
pages.json | 7 +--
pages/alarm_list/alarm_list.vue | 13 +++---
pages/clockSignIn/clockSignIn.vue | 64 +++++++++++++++----------------
pages/myself/myself.vue | 30 ++++++++++++--
4 files changed, 65 insertions(+), 49 deletions(-)
diff --git a/pages.json b/pages.json
index 1807a97..f05d561 100644
--- a/pages.json
+++ b/pages.json
@@ -241,10 +241,9 @@
"path": "pages/alarm_list/alarm_list",
"name": "alarm_list",
"style": {
- "navigationBarTitleText": "我要查",
- "app-plus":{
- "titleNView":false
- }
+ "navigationBarTitleText": "群防任务",
+ "navigationBarBackgroundColor": "#0cd7e5",
+ "navigationBarTextStyle":"white"
}
},
{
diff --git a/pages/alarm_list/alarm_list.vue b/pages/alarm_list/alarm_list.vue
index 3c82054..2af5822 100644
--- a/pages/alarm_list/alarm_list.vue
+++ b/pages/alarm_list/alarm_list.vue
@@ -2,12 +2,12 @@
<view class="alarm-list">
<!-- 自定义顶部导航栏 -->
<!-- <navBarTop :title="'我要查'"></navBarTop> -->
- <uni-nav-bar class="uni-nav-bar-info" :fixed="true" :status-bar="true">
+ <!-- <uni-nav-bar class="uni-nav-bar-info" :fixed="true" :status-bar="true">
<view class="title" slot="default">群防任务</view>
<view slot="left" class="uni-nav-bar-left" @click="goBack()">
<image src="../../static/images/nav/back02.png"></image>
</view>
- </uni-nav-bar>
+ </uni-nav-bar> -->
<view class="navigation-bar">
<view class="alarm-bar-total" :style="{color:totalColor,borderBottom:totalBoder}"
@click="getAlarmListInfo(1)">全部({{totalNumber}})</view>
@@ -27,7 +27,7 @@
</view>
<view class="alarm-status" :style="{color:processedColor}"
v-if="item.securityId!='' && item.jtype==1">处理中</view>
- <view class="alarm-status" :style="{color:finishColor}" v-if="item.jtype==2">已处理</view>
+ <view class="alarm-status" :style="{color:finishColor}" v-if="item.jtype==2 && item.securityId!=''">已处理</view>
</view>
<view class="alarm-position-time">
<view class="image-place">
@@ -311,7 +311,7 @@
page {
width: 100%;
height: 100%;
- background-color: rgba(243, 243, 243, 1);
+ background-color: #F7F7F7;
z-index: 999;
}
</style>
@@ -334,6 +334,7 @@
}
.uni-nav-bar-info {
+ background-color: #0BB9C8;
// font-weight: 550;
.title {
@@ -367,8 +368,6 @@
top: 0.2rem;
}
}
-
-
}
.alarm-list {
@@ -376,7 +375,7 @@
flex-direction: column;
.navigation-bar {
- border-top: 1rpx solid #C8C7CC;
+ // border-top: 1rpx solid #C8C7CC;
background-color: #FFFFFF;
width: 100%;
height: 43px;
diff --git a/pages/clockSignIn/clockSignIn.vue b/pages/clockSignIn/clockSignIn.vue
index ca0d5e4..48527fa 100644
--- a/pages/clockSignIn/clockSignIn.vue
+++ b/pages/clockSignIn/clockSignIn.vue
@@ -117,38 +117,36 @@
//去打卡
goClock() {
var that = this;
- axios({
- method: "POST",
- url: this.$store.state.piAPI + `/attendance/AppSave`,
- params: {
- number: this.$store.state.puserID,
- name: this.name,
- clockTime: this.getNowTime(1),
- jd: this.jd,
- wd: this.wd,
- address: this.address
- },
- }).then((resdata) => {
- //不在考勤范围内
- if (resdata.data.code == 400) {
- layui.use('layer', function() {
- var layer = layui.layer;
- layer.msg('打卡失败,不在考勤范围', {
- icon: 0
- });
- });
- }
- //打卡成功
- if (resdata.data.code == 200) {
- layui.use('layer', function() {
- var layer = layui.layer;
- layer.msg('打卡成功!', {
- icon: 1
- });
- });
- }
-
- });
+ uni.request({
+ url: this.$store.state.piAPI + `/attendance/AppSave`,
+ method: "POST",
+ data:{
+ number: this.$store.state.puserID,
+ name: this.name,
+ clockTime: this.getNowTime(1),
+ jd: this.jd,
+ wd: this.wd,
+ address: this.address
+ },
+ success(resdata) {
+ //不在考勤范围内
+ if (resdata.data.code == 400) {
+ uni.showToast({
+ title: '不在考勤范围,打卡失败!',
+ icon:'none',
+ duration: 2000
+ });
+ }
+ //打卡成功
+ if (resdata.data.code == 200) {
+ uni.showToast({
+ title: '打卡成功!',
+ icon:'success',
+ duration: 2000
+ });
+ }
+ }
+ })
},
//获取当前时间
@@ -365,7 +363,7 @@
height: 6rem;
border-radius: 100px;
color: #FFFFFF;
- background-image: linear-gradient(to bottom,#65CBA9,#66D0AC);
+ background-image: linear-gradient(to bottom,#0FD0E1,#0FD0E1);
display: flex;
flex-direction: column;
align-items: center;
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index 4af6745..78f056a 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -4,8 +4,8 @@
<view class="m-top">
<view class="my-user-info">
<view class="user-name-id">
- <view class="user-name">{{userName}}</view>
- <view class="user-id">ID: 4120552252</view>
+ <view class="user-name">{{name}}</view>
+ <view class="user-id">ID: {{id}}</view>
</view>
<view class="userImg">
<img class="img" :src="useimg" @click="ChooseImage">
@@ -13,7 +13,7 @@
</view>
<view class="my-dept-info">
<view class="dept-info">
- <view class="dept-name">所属组织: **派出所--**警务站</view>
+ <view class="dept-name">所属组织: {{tenantName}}</view>
</view>
</view>
</view>
@@ -94,7 +94,10 @@
},
],
- tabbar:this.$store.state.tabbar
+ tabbar:this.$store.state.tabbar,
+ name:'',
+ id:'',
+ tenantName:''
}
},
components: {
@@ -109,6 +112,10 @@
}
},
onLoad() {
+ if(this.$store.state.puserID){
+ //获取个人信息
+ this.getOneselfInFo();
+ }
if(this.$store.state.avatar!=null && this.$store.state.avatar!=''){
this.useimg = this.$store.state.avatar;
}
@@ -166,6 +173,20 @@
animationType: 'slide-in-top',
animationDuration: 20000
});
+ },
+ //登录成功后，获取个人信息
+ getOneselfInFo(){
+ var that = this;
+ //保安信息查询
+ uni.request({
+ url:'http://s16s652780.51mypc.cn/api/blade-user/details?id='+this.$store.state.puserID,
+ method:'POST',
+ success(resdata) {
+ that.name = resdata.data.data.realName;
+ that.id = resdata.data.data.id;
+ that.tenantName = resdata.data.data.tenantName;
+ }
+ })
},
operation(e) {
let that = this;
@@ -392,7 +413,6 @@
font-weight: 550;
}
}
-
}
--
Gitblit v1.9.3