From cb6fe49394039240dca13213c41b997df6644cff Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 02 Jun 2021 20:32:10 +0800
Subject: [PATCH] 1.巡逻路线调整，去除开始巡逻及拍照按钮 2.账户信息，版本信息，意见反馈，关于我们调整
---
pages/myself/childen/yijian.vue | 8 +
xcxjingqingmap_patrol/css/body.css | 4
pages/myself/childen/aboutUs.vue | 154 ++++++++++++++++-----
pages.json | 2
pages/myself/childen/genxin.vue | 13 +
pages/myself/myself.vue | 10
store/state.js | 3
xcxjingqingmap_patrol/xcxmap.html | 4
xcxjingqingmap_patrol/js/move.js | 2
pages/myself/childen/xinxi.vue | 195 ++++++++++++++++++++++-----
xcxjingqingmap_patrol/js/vueMain.js | 8
store/mutations.js | 3
store/actions.js | 5
13 files changed, 314 insertions(+), 97 deletions(-)
diff --git a/pages.json b/pages.json
index a128a13..c115320 100644
--- a/pages.json
+++ b/pages.json
@@ -47,7 +47,7 @@
"path": "pages/myself/childen/genxin",
"name": "genxin",
"style": {
- "navigationBarTitleText": "版本更新",
+ "navigationBarTitleText": "版本信息",
"navigationBarBackgroundColor": "#F56968"
}
},
diff --git a/pages/myself/childen/aboutUs.vue b/pages/myself/childen/aboutUs.vue
index 3be054e..272fd69 100644
--- a/pages/myself/childen/aboutUs.vue
+++ b/pages/myself/childen/aboutUs.vue
@@ -1,20 +1,44 @@
<template>
<view class="aboutUs">
<view class="up">
- <image src="../../../static/users.png" mode=""></image>
- <view class="a">
- 6.4.1
+ <view class="about-form">
+ <view class="row about-info">
+ <view class="lable">名称</view>
+ <view class="name">江西北邮信息通信技术有限公司</view>
+ </view>
+
+ <view class="row about-info">
+ <view class="lable">成立时间</view>
+ <view class="name">1993年</view>
+ </view>
+
+ <view class="row about-info">
+ <view class="lable">总部地点</view>
+ <view class="name">江西</view>
+ </view>
+
+ <view class="row about-info">
+ <view class="lable">经营范围</view>
+ <view class="name">信息通信技术</view>
+ </view>
</view>
- <view class="b">
- 2020.02.29
+ <view class="row form-in"></view>
+
+ <view class="about-form-intro">
+ <view class="row about-info">
+ <view class="lable-intro">公司简介</view>
+ </view>
+ <view class="row about-info-intro">
+ <view class="name-intro">
+ 江西北邮信息通信技术有限公司，成立于1993年，系提供信息通信领域安全技术防范领域各类工程的系统设计、产品研发、工程施工、系统维护以及技术咨询与服务一体化解决方案的专业化公司。
+ </view>
+ </view>
</view>
- <view class="jianjie">
- 公司成立于1993年，注册资金1260万，公司在北京、深圳设有研发实体、在九江、赣州、上饶、修水等地设有分公司，主要从事通信系统建设、计算机网络系统集成、弱电及楼宇智能化建设、安防系统工程建设等方面的项目设计、工程实施与维护、技术咨询与服务的高新技术企业。涉及安防领域项目建设，包括金融系统联网报警、公安指挥三台合一、视频监控、门禁、监听、对讲、周界防范、电子巡更、室内屏蔽等系统。公司客户范围涉及政法（公安、监狱、看守所、拘留所）、电力、交通、金融、文教、电信、移动、联通、广电等系统单位。公司具有良好的发展平台及广阔的发展空间，热诚欢迎行业精英加入。
- </view>
-
</view>
+
+
<view class="down">
- 安防管理系统 Copyright © 江西北邮信息通信技术有限公司
+ <view class="title">安防管理系统 Copyright © 江西北邮信息通信技术有限公司</view>
</view>
</view>
@@ -27,39 +51,95 @@
.aboutUs {
width: 100%;
height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
-
- .up {
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
-
- image {
- width: 4rem;
- height: 4rem;
+ // background-color: rgba(128,128,128,0.1);
+ background-color: #F5F0F6;
+
+ .up{
+ width: 100%;
+ height: 49%;
+ // background-color: #0078A8;
+
+
+ .about-form{
+ background-color: #FFFFFF;
+
+ .about-info{
+ width: 94%;
+ height: 80rpx;
+ background-color: #FFFFFF;
+ margin: 0 auto;
+ letter-spacing: 1px;
+ border-bottom: 1rpx solid rgba(128,128,128,0.1);
+
+
+
+ .lable{
+ line-height: 80rpx;
+ float: left;
+ font-size: 28rpx;
+ }
+
+ .name{
+ line-height: 80rpx;
+ position: absolute;
+ right: 30rpx;
+ font-size: 24rpx;
+ color: #808080;
+ }
+
+
+ }
}
-
- .jianjie {
- padding: 1rem 1rem 0 1rem;
- text-indent:2em;
- line-height: 1.54rem;
- // letter-spacing: 0.08rem;
+
+ .form-in{
+ width: 100%;
+ height: 20rpx;
}
-
- .a {
- padding-top: 1rem;
+
+ .about-form-intro{
+ width: 100%;
+ height: 300rpx;
+ background-color: #FFFFFF;
+
+ .about-info{
+ width: 94%;
+ height: 80rpx;
+ background-color: #FFFFFF;
+ margin: 0 auto;
+ letter-spacing: 1px;
+ border-bottom: 1rpx solid rgba(128,128,128,0.1);
+
+ .lable-intro{
+ line-height: 80rpx;
+ font-size: 28rpx;
+ }
+ }
+
+ .name-intro{
+ width: 94%;
+ margin: 0 auto;
+ line-height: 60rpx;
+ font-size: 24rpx;
+ color: #808080;
+ background-color: #FFFFFF;
+ }
}
}
+
.down {
- position: fixed;
- bottom: 1rem;
-
- font-size: 0.1rem;
+ // background-color: #0078A8;
+ width: 100%;
+ height: 51%;
+
+ .title{
+ position: relative;
+ top: 92%;
+ text-align: center;
+ font-size: 22rpx;
+ }
}
}
+
+
</style>
diff --git a/pages/myself/childen/genxin.vue b/pages/myself/childen/genxin.vue
index 33e7798..f33c59f 100644
--- a/pages/myself/childen/genxin.vue
+++ b/pages/myself/childen/genxin.vue
@@ -4,12 +4,12 @@
<view class="a">
6.4.1
</view>
- <view class="b">
+ <!-- <view class="b">
2020.02.29
- </view>
- <view class="genxinBut">
+ </view> -->
+ <!-- <view class="genxinBut">
<button class="custom-btn btn-3" @click="upMain"><span>点击更新</span></button>
- </view>
+ </view> -->
</view>
</template>
@@ -40,15 +40,18 @@
height: 100%;
display: flex;
align-items: center;
- justify-content: center;
flex-direction: column;
image {
width: 4rem;
height: 4rem;
+ position: relative;
+ top: 450rpx;
}
.a {
+ position: relative;
+ top: 450rpx;
padding-top: 1rem;
}
diff --git a/pages/myself/childen/xinxi.vue b/pages/myself/childen/xinxi.vue
index 7da36e6..c6211ff 100644
--- a/pages/myself/childen/xinxi.vue
+++ b/pages/myself/childen/xinxi.vue
@@ -1,27 +1,48 @@
<template>
- <view class="xinxi">
- <view class="once">
- <view class="title">
- 姓名：
+ <view class="user-info">
+ <view class="base-info-title">基本信息</view>
+ <view class="base-info">
+ <view class="row row-base-info">
+ <view class="title">账号</view>
+ <view class="msg">{{datalist.account}}</view>
</view>
- <view class="msg">
- {{name}}
+ <view class="row row-base-info">
+ <view class="title">姓名</view>
+ <view class="msg">{{name}}</view>
+ </view>
+ <view class="row row-base-info">
+ <view class="title">编号</view>
+ <view class="msg">{{id}}</view>
+ </view>
+ <view class="row row-base-info">
+ <view class="title">昵称</view>
+ <view class="msg">{{datalist.nick_name}}</view>
+ </view>
+ <view class="row row-base-info">
+ <view class="title">电话</view>
+ <view class="msg">{{phon}}</view>
+ </view>
+ <view class="row row-base-info">
+ <view class="title">邮箱</view>
+ <view class="msg"></view>
+ </view>
+ <view class="row row-base-info-birthday">
+ <view class="title">生日</view>
+ <view class="msg"></view>
</view>
</view>
- <view class="once">
- <view class="title">
- 电话：
+
+ <view class="dept-info-title">所属部门</view>
+
+ <view class="dept-info">
+ <view class="row row-dept-info">
+ <view class="title">所在部门</view>
+ <view class="msg"></view>
</view>
- <view class="msg">
- {{phon}}
- </view>
- </view>
- <view class="once">
- <view class="title">
- 编号：
- </view>
- <view class="msg">
- {{id}}
+ <view class="row row-dept-info-post">
+ <view class="title">职位</view>
+ <view class="msg">{{datalist.role_name}}</view>
+ <!-- {{datalist}} -->
</view>
</view>
</view>
@@ -31,7 +52,7 @@
export default{
data(){
return{
-
+ datalist:this.$store.state.UserData
}
},
computed:{
@@ -49,24 +70,124 @@
</script>
<style lang="scss" scoped>
-.xinxi{
+.user-info{
width: 100%;
- height: 90%;
- box-sizing: border-box;
- .once{
- &:first-child{
- margin-top: 1rem;
- box-sizing: border-box;
- }
- box-sizing: border-box;
- margin: 0 auto;
- width: 95%;
- height: 2rem;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1px solid rgba($color: #000000, $alpha: 0.1);
- margin-bottom: 0.5rem;
+ height: 100%;
+ background-color: #F5F0F6;
+ letter-spacing: 1rpx;
+
+ .base-info-title{
+ height: 60rpx;
+ line-height: 60rpx;
+ position: relative;
+ left: 20rpx;
+ font-size: 24rpx;
+ color: #808080;
}
+
+ .base-info{
+ width: 100%;
+ height: 565rpx;
+ background-color: #FFFFFF;
+
+ .row-base-info{
+ width: 94%;
+ margin: 0 auto;
+ height: 80rpx;
+ border-bottom: 1px solid rgba(128,128,128,0.1);
+
+ .title{
+ line-height: 80rpx;
+ float: left;
+ font-size: 28rpx;
+ }
+
+ .msg{
+ line-height: 80rpx;
+ position: absolute;
+ right: 30rpx;
+ color: #808080;
+ font-size: 24rpx;
+ }
+ }
+
+ .row-base-info-birthday{
+ width: 94%;
+ margin: 0 auto;
+ height: 80rpx;
+
+ .title{
+ line-height: 80rpx;
+ float: left;
+ font-size: 28rpx;
+ }
+
+ .msg{
+ line-height: 80rpx;
+ position: absolute;
+ right: 30rpx;
+ color: #808080;
+ font-size: 24rpx;
+ }
+ }
+ }
+
+ .dept-info-title{
+ height: 60rpx;
+ line-height: 60rpx;
+ position: relative;
+ left: -60rpx;
+ font-size: 24rpx;
+ color: #808080;
+ }
+
+ .dept-info{
+ width: 100%;
+ height: 160rpx;
+ background-color: #FFFFFF;
+
+ .row-dept-info{
+ width: 94%;
+ margin: 0 auto;
+ height: 80rpx;
+ border-bottom: 1px solid rgba(128,128,128,0.1);
+
+ .title{
+ line-height: 80rpx;
+ float: left;
+ font-size: 28rpx;
+ }
+
+ .msg{
+ line-height: 80rpx;
+ position: absolute;
+ right: 30rpx;
+ color: #808080;
+ font-size: 24rpx;
+ }
+ }
+
+ .row-dept-info-post{
+ width: 94%;
+ margin: 0 auto;
+ height: 80rpx;
+
+ .title{
+ line-height: 80rpx;
+ float: left;
+ font-size: 28rpx;
+ }
+
+ .msg{
+ line-height: 80rpx;
+ position: absolute;
+ right: 30rpx;
+ color: #808080;
+ font-size: 24rpx;
+ }
+ }
+ }
+
+
}
</style>
diff --git a/pages/myself/childen/yijian.vue b/pages/myself/childen/yijian.vue
index 25faa96..f5b8043 100644
--- a/pages/myself/childen/yijian.vue
+++ b/pages/myself/childen/yijian.vue
@@ -38,7 +38,7 @@
height: 80%;
display: flex;
align-items: center;
- justify-content: center;
+ // justify-content: center;
flex-direction: column;
.title {
@@ -46,13 +46,19 @@
padding-bottom: 1rem;
// padding-top: 15rem;
box-sizing: border-box;
+ position: relative;
+ top: 300rpx;
}
.longInput {
+ position: relative;
+ top: 300rpx;
border: 1px solid rgba($color: #000000, $alpha: 1.0);
}
.butUps {
+ position: relative;
+ top: 300rpx;
margin: 2rem auto;
width: 6rem;
height: 6rem;
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index 8e340fb..40bd3ba 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -11,9 +11,9 @@
<view></view>
</view>
</view>
- <view class="m-t-right">
+ <!-- <view class="m-t-right">
二维码
- </view>
+ </view> -->
</view>
<view class="bomBut">
<view class="onceBut" v-for="(item, index) in inSide" :key="index" @click="openThere(item.open)">
@@ -64,7 +64,7 @@
open: 'xinxi'
},
{
- title: '版本更新',
+ title: '版本信息',
imgSrc: '../../static/myself/gengxin.png',
open: 'genxin'
},
@@ -195,7 +195,7 @@
color: #fff;
.m-t-left {
- width: 70%;
+ width: 100%;
display: flex;
align-items: center;
justify-content: space-around;
@@ -214,6 +214,8 @@
.usermsg {
width: 60%;
+ position: relative;
+ left: -6%;
// border: 1px solid #007AFF;
}
}
diff --git a/store/actions.js b/store/actions.js
index e9cb828..b0267e4 100644
--- a/store/actions.js
+++ b/store/actions.js
@@ -44,13 +44,14 @@
// // dataType: 'JSON',
success: (res) => {
if (res.statusCode == 200) {
+ store.commit('getUserData',res.data)
data.isit = true;
data.userName = res.data.real_name; //警袁姓名
data.userID = res.data.user_id; //警袁id
// data.userPhon = res.user_id;
store.commit('login', data);
- }
- // console.log(res)
+ }
+ console.log(res)
},
fail: (res) => {
console.log('失去连接 请稍等');
diff --git a/store/mutations.js b/store/mutations.js
index bb4e7fd..e119ed5 100644
--- a/store/mutations.js
+++ b/store/mutations.js
@@ -21,6 +21,9 @@
getUse(state,data){
state.puserName = data.userName;
// console.log(state.puserName)
+ },
+ getUserData(state,data){
+ state.UserData = data;
}
}
diff --git a/store/state.js b/store/state.js
index b3ccd6c..e74391c 100644
--- a/store/state.js
+++ b/store/state.js
@@ -7,7 +7,8 @@
piAPI: 'https://web.byisf.com/api/',
puserName: '陈慧英',
puserID: '1370564873280430082',
- puserIphone:'15649685246'
+ puserIphone:'15649685246',
+ UserData: {},
}
export default state
diff --git a/xcxjingqingmap_patrol/css/body.css b/xcxjingqingmap_patrol/css/body.css
index cb1892f..463e4f0 100644
--- a/xcxjingqingmap_patrol/css/body.css
+++ b/xcxjingqingmap_patrol/css/body.css
@@ -13,13 +13,13 @@
#map {
width: 100%;
- height: 60%;
+ height: 80%;
}
#seedata {
position: relative;
width: 100%;
- height: 40%;
+ height: 20%;
z-index: 401;
/* background-color: #007AFF; */
opacity: 0.9;
diff --git a/xcxjingqingmap_patrol/js/move.js b/xcxjingqingmap_patrol/js/move.js
index 9ccf965..448f217 100644
--- a/xcxjingqingmap_patrol/js/move.js
+++ b/xcxjingqingmap_patrol/js/move.js
@@ -100,7 +100,7 @@
}
if (this.tab == 2) {
$('#map').css("height", (index, value) => { //改变地图高度
- return '60%';
+ return '80%';
})
}
diff --git a/xcxjingqingmap_patrol/js/vueMain.js b/xcxjingqingmap_patrol/js/vueMain.js
index d655d63..56742d6 100644
--- a/xcxjingqingmap_patrol/js/vueMain.js
+++ b/xcxjingqingmap_patrol/js/vueMain.js
@@ -9,8 +9,8 @@
nowIndex: 1,
//基础路径
- // pathUrl: "http://localhost:89",
- pathUrl: "https://web.byisf.com/api/blade-jfpts",
+ pathUrl: "http://localhost:89",
+ // pathUrl: "https://web.byisf.com/api/blade-jfpts",
layer: null,
@@ -50,8 +50,8 @@
document.getElementById("area").style.display = "none";
document.getElementById("routeBtn").style.backgroundColor = "cornflowerblue";
document.getElementById("areaBtn").style.backgroundColor = "darkgrey";
- document.getElementById("seedata").style.height = "40%";
- document.getElementById("map").style.height = "60%";
+ document.getElementById("seedata").style.height = "20%";
+ document.getElementById("map").style.height = "80%";
//展示巡逻路线
this.showPolyLine(this.map);
diff --git a/xcxjingqingmap_patrol/xcxmap.html b/xcxjingqingmap_patrol/xcxmap.html
index f9a5f97..f209417 100644
--- a/xcxjingqingmap_patrol/xcxmap.html
+++ b/xcxjingqingmap_patrol/xcxmap.html
@@ -68,11 +68,11 @@
<div class="f-m-o-title">路线备注: </div>
<textarea class="f-m-o-center">{{lxbz}}</textarea>
</div>
- <div class="f-m-once" style="top: 45px;">
+ <!-- <div class="f-m-once" style="top: 45px;">
<div class="f-m-o-title">照片上传: </div>
<image src="./img/photo.png"></image>
</div>
- <button class="btn">开始巡逻</button>
+ <button class="btn">开始巡逻</button> -->
</div>
<!-- </el-tab-pane> -->
<!-- <el-tab-pane label="巡逻区域" name="two"> -->
--
Gitblit v1.9.3