From fdc8044841d4f0448484f2bd681a5dc40c1293bd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 28 May 2021 18:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/myself/childen/yijian.vue | 68 ++++
pages/myself/childen/aboutUs.vue | 65 +++
pages/myself/childen/shezhi.vue | 19 +
pages.json | 40 ++
static/myself/gengxin.png | 0
static/myself/gaunyu.png | 0
pages/myself/childen/genxin.vue | 87 +++++
pages/myself/myself.vue | 277 ++++++----------
pages/infoRegistration/infoCheck.vue | 16
pages/infoRegistration/infoRegistration.vue | 180 +++++----
static/myself/denghcu.png | 0
pages/riskReporting/riskReporting.vue | 84 ++++
manifest.json | 2
pages/myself/childen/xinxi.vue | 72 ++++
static/myself/yijian.png | 0
static/users.png | 0
pages/loging/loging.vue | 2
static/myself/shezhi.png | 0
static/myself/zhanhu.png | 0
store/mutations.js | 2
pages/visitRecord/visitRecord.vue | 72 +++-
pages/workbench/workbench.vue | 7
store/actions.js | 12
23 files changed, 703 insertions(+), 302 deletions(-)
diff --git a/manifest.json b/manifest.json
index 0cc74f8..06207de 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx739eb6d9c0fbc711",
+ "appid" : "wx8d8a6035fb1fb858",
"setting" : {
"urlCheck" : false,
"minified" : true,
diff --git a/pages.json b/pages.json
index a956aec..a128a13 100644
--- a/pages.json
+++ b/pages.json
@@ -20,6 +20,46 @@
}
},
{
+ "path": "pages/myself/childen/aboutUs",
+ "name": "aboutUs",
+ "style": {
+ "navigationBarTitleText": "关于我们",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/shezhi",
+ "name": "shezhi",
+ "style": {
+ "navigationBarTitleText": "系统设置",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/yijian",
+ "name": "yijian",
+ "style": {
+ "navigationBarTitleText": "意见反馈",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/genxin",
+ "name": "genxin",
+ "style": {
+ "navigationBarTitleText": "版本更新",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
+ "path": "pages/myself/childen/xinxi",
+ "name": "xinxi",
+ "style": {
+ "navigationBarTitleText": "账户信息",
+ "navigationBarBackgroundColor": "#F56968"
+ }
+ },
+ {
"path": "pages/business/business",
"name": "business",
"style": {
diff --git a/pages/infoRegistration/infoCheck.vue b/pages/infoRegistration/infoCheck.vue
index a10a0bd..7402ecb 100644
--- a/pages/infoRegistration/infoCheck.vue
+++ b/pages/infoRegistration/infoCheck.vue
@@ -137,13 +137,13 @@
url: 'https://web.byisf.com/api/blade-system/tenant/submit',
method:'POST',
data:{
- "id":this.id,
- "tenantName":this.tenantName,
- "linkman":this.linkman,
- "contactNumber":this.contactNumber,
- "address":this.address,
- "type":this.type,
- "domain":this.domain,
+ "id":this.id,
+ "tenantName":this.tenantName,
+ "linkman":this.linkman,
+ "contactNumber":this.contactNumber,
+ "address":this.address,
+ "type":this.type,
+ "domain":this.domain
},
success: (res) => {
if(res.data.code==200){
@@ -219,7 +219,7 @@
width: 180rpx;
height: 180rpx;
border-radius: 100rpx;
- line-height:200rpx;
+ line-height:180rpx;
color: #FFFFFF;
letter-spacing: 2rpx;
}
diff --git a/pages/infoRegistration/infoRegistration.vue b/pages/infoRegistration/infoRegistration.vue
index 87e6ba9..5e1bb8a 100644
--- a/pages/infoRegistration/infoRegistration.vue
+++ b/pages/infoRegistration/infoRegistration.vue
@@ -1,102 +1,118 @@
<template>
<view class="content">
- <view class="row regis-info">
- <text class="info-title"><!-- <span style="color: red;">* --></span>客户名称: </text>
- <input class="input" type="text" v-model="tenantName" placeholder="请输入客户名称" placeholder-class="placeholder" />
- </view>
- <view class="row regis-info-linkman">
- <text class="info-title"><!-- <span style="color: red;">* --></span>联系人: </text>
- <input class="input" type="text" v-model="linkman" placeholder="请输入联系人名称" placeholder-class="placeholder" />
- </view>
- <view class="row regis-info">
- <text class="info-title"><!-- <span style="color: red;">* --></span>联系电话: </text>
- <input class="input" type="text" v-model="contactNumber" placeholder="请输入联系电话" placeholder-class="placeholder" />
- </view>
- <view class="row regis-info">
- <text class="info-title"><!-- <span style="color: red;">* --></span>客户地址: </text>
- <input class="input" type="text" v-model="address" placeholder="请输入客户地址" placeholder-class="placeholder" />
- </view>
- <view class="row regis-info">
- <text class="info-title"><!-- <span style="color: red;">* --></span>客户类型: </text>
- <picker @change="typeSelect" :range="typeArray" class="type-select">
- <label class="" v-model="typeArrayType">{{ typeArrayType }}</label>
- </picker>
- <!-- <input class="input" type="text" v-model="type" placeholder="请输入客户类型" placeholder-class="placeholder" /> -->
- </view>
- <view class="row regis-info-desc">
- <text class="info-title"><!-- <span style="color: red;">* --></span>域名地址: </text>
- <input class="input" type="text" v-model="domain" placeholder="请输入域名地址" placeholder-class="placeholder" />
- </view>
-
- <button class="btn" @click="confirm">上传</button>
+ <view class="row regis-info">
+ <text class="info-title">
+ <!-- <span style="color: red;">* --></span>客户名称:
+ </text>
+ <input class="input" type="text" v-model="tenantName" placeholder="请输入客户名称"
+ placeholder-class="placeholder" />
</view>
+ <view class="row regis-info-linkman">
+ <text class="info-title">
+ <!-- <span style="color: red;">* --></span>联系人:
+ </text>
+ <input class="input" type="text" v-model="linkman" placeholder="请输入联系人名称" placeholder-class="placeholder" />
+ </view>
+ <view class="row regis-info">
+ <text class="info-title">
+ <!-- <span style="color: red;">* --></span>联系电话:
+ </text>
+ <input class="input" type="text" v-model="contactNumber" placeholder="请输入联系电话"
+ placeholder-class="placeholder" />
+ </view>
+ <view class="row regis-info">
+ <text class="info-title">
+ <!-- <span style="color: red;">* --></span>客户地址:
+ </text>
+ <input class="input" type="text" v-model="address" placeholder="请输入客户地址" placeholder-class="placeholder" />
+ </view>
+ <view class="row regis-info">
+ <text class="info-title">
+ <!-- <span style="color: red;">* --></span>客户类型:
+ </text>
+ <picker @change="typeSelect" :range="typeArray" class="type-select">
+ <label class="" v-model="typeArrayType">{{ typeArrayType }}</label>
+ </picker>
+ <!-- <input class="input" type="text" v-model="type" placeholder="请输入客户类型" placeholder-class="placeholder" /> -->
+ </view>
+ <view class="row regis-info-desc">
+ <text class="info-title">
+ <!-- <span style="color: red;">* --></span>域名地址:
+ </text>
+ <input class="input" type="text" v-model="domain" placeholder="请输入域名地址" placeholder-class="placeholder" />
+ </view>
+
+ <button class="btn" @click="confirm">上传</button>
+ </view>
</view>
</template>
<script>
- export default{
- data () {
+ export default {
+ data() {
return {
- tenantName:"",
- linkman:"",
- contactNumber:"",
- address:"",
- type:null,
- domain:"",
- display:'none',
- display1:'none',
- display2:'none',
- display3:'none',
- typeArray:["学校","医院","小区"],
- typeArrayIndex:0,
- typeArrayType:'---请选择---'
+ tenantName: "",
+ linkman: "",
+ contactNumber: "",
+ address: "",
+ type: null,
+ domain: "",
+ display: 'none',
+ display1: 'none',
+ display2: 'none',
+ display3: 'none',
+ typeArray: ["学校", "医院", "小区"],
+ typeArrayIndex: 0,
+ typeArrayType: '---请选择---',
+ pathUrl:"https://web.byisf.com/api/blade-system"
+ // pathUrl: "http://localhost:8106"
}
},
onLoad() {
-
+
},
methods: {
//客户类型下拉改变事件
- typeSelect(e){
+ typeSelect(e) {
var that = this;
this.typeArrayIndex = e.target.value;
- this.typeArrayType=this.typeArray[this.typeArrayIndex];
- if(that.typeArrayType == '学校'){
+ this.typeArrayType = this.typeArray[this.typeArrayIndex];
+ if (that.typeArrayType == '学校') {
that.type = 1;
}
- if(that.typeArrayType =='医院'){
+ if (that.typeArrayType == '医院') {
that.type = 2;
}
- if(that.typeArrayType =='小区'){
+ if (that.typeArrayType == '小区') {
that.type = 3;
}
},
-
+
//提交信息
- confirm(){
+ confirm() {
+ var that = this;
uni.request({
- // url: 'http://localhost:89/equipment/equipment/AppSubmit?'+params, //仅为示例，并非真实接口地址。
- url: 'https://web.byisf.com/api/blade-system/tenant/submit', //仅为示例，并非真实接口地址。
- method:'POST',
- data:{
- "tenantName":this.tenantName,
- "linkman":this.linkman,
- "contactNumber":this.contactNumber,
- "address":this.address,
- "type":this.type,
- "domain":this.domain,
+ url: that.pathUrl + "/tenant/submit",
+ method: 'POST',
+ data: {
+ "id":this.id,
+ "tenantName":this.tenantName,
+ "linkman":this.linkman,
+ "contactNumber":this.contactNumber,
+ "address":this.address,
+ "type":this.type,
+ "domain":this.domain
},
success: (res) => {
- if(res.data.code==200){
+ if (res.data.code == 200) {
uni.showToast({
- title: '提交成功！',
- duration: 2000
+ title: '提交成功！',
+ duration: 2000
});
}
}
});
}
-
}
}
</script>
@@ -109,63 +125,63 @@
left: 20rpx;
border-bottom: 0.05px solid #B4BCCC;
}
-
+
.regis-info-desc {
width: 100%;
height: 100rpx;
position: relative;
left: 20rpx;
}
-
- .regis-info-desc input{
+
+ .regis-info-desc input {
position: relative;
left: 40rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
-
- .regis-info-linkman{
+
+ .regis-info-linkman {
width: 100%;
height: 100rpx;
position: relative;
left: 20rpx;
border-bottom: 0.05px solid #B4BCCC;
}
-
- .regis-info-linkman input{
+
+ .regis-info-linkman input {
position: relative;
left: 70rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
-
- .info-title{
+
+ .info-title {
letter-spacing: 1rpx;
float: left;
line-height: 100rpx;
font-weight: 530;
}
-
- .regis-info input{
+
+ .regis-info input {
position: relative;
left: 40rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
-
- .btn{
+
+ .btn {
position: relative;
top: 40rpx;
background-color: #007AFF;
width: 180rpx;
height: 180rpx;
border-radius: 100rpx;
- line-height:200rpx;
+ line-height: 180rpx;
color: #FFFFFF;
letter-spacing: 2rpx;
}
-
- .type-select{
+
+ .type-select {
position: relative;
left: 45rpx;
top: 28rpx;
diff --git a/pages/loging/loging.vue b/pages/loging/loging.vue
index f6e46dd..10831b0 100644
--- a/pages/loging/loging.vue
+++ b/pages/loging/loging.vue
@@ -3,7 +3,7 @@
<!-- <span style="position: absolute;top: 0;">user: {{$store.state.message.useName}}</span> -->
<view class="main">
<view class="topImg">
- <image class="Timg" src="../../static/用户.png" mode=""></image>
+ <image class="Timg" src="../../static/users.png" mode=""></image>
</view>
<view class="titie">
<span>物联网安保云服务平台</span>
diff --git a/pages/myself/childen/aboutUs.vue b/pages/myself/childen/aboutUs.vue
new file mode 100644
index 0000000..3be054e
--- /dev/null
+++ b/pages/myself/childen/aboutUs.vue
@@ -0,0 +1,65 @@
+<template>
+ <view class="aboutUs">
+ <view class="up">
+ <image src="../../../static/users.png" mode=""></image>
+ <view class="a">
+ 6.4.1
+ </view>
+ <view class="b">
+ 2020.02.29
+ </view>
+ <view class="jianjie">
+ 公司成立于1993年，注册资金1260万，公司在北京、深圳设有研发实体、在九江、赣州、上饶、修水等地设有分公司，主要从事通信系统建设、计算机网络系统集成、弱电及楼宇智能化建设、安防系统工程建设等方面的项目设计、工程实施与维护、技术咨询与服务的高新技术企业。涉及安防领域项目建设，包括金融系统联网报警、公安指挥三台合一、视频监控、门禁、监听、对讲、周界防范、电子巡更、室内屏蔽等系统。公司客户范围涉及政法（公安、监狱、看守所、拘留所）、电力、交通、金融、文教、电信、移动、联通、广电等系统单位。公司具有良好的发展平台及广阔的发展空间，热诚欢迎行业精英加入。
+ </view>
+
+ </view>
+ <view class="down">
+ 安防管理系统 Copyright © 江西北邮信息通信技术有限公司
+ </view>
+
+ </view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+ .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;
+ }
+
+ .jianjie {
+ padding: 1rem 1rem 0 1rem;
+ text-indent:2em;
+ line-height: 1.54rem;
+ // letter-spacing: 0.08rem;
+ }
+
+ .a {
+ padding-top: 1rem;
+ }
+ }
+
+ .down {
+ position: fixed;
+ bottom: 1rem;
+
+ font-size: 0.1rem;
+ }
+ }
+</style>
diff --git a/pages/myself/childen/genxin.vue b/pages/myself/childen/genxin.vue
new file mode 100644
index 0000000..33e7798
--- /dev/null
+++ b/pages/myself/childen/genxin.vue
@@ -0,0 +1,87 @@
+<template>
+ <view class="aboutUs">
+ <image src="../../../static/users.png" mode=""></image>
+ <view class="a">
+ 6.4.1
+ </view>
+ <view class="b">
+ 2020.02.29
+ </view>
+ <view class="genxinBut">
+ <button class="custom-btn btn-3" @click="upMain"><span>点击更新</span></button>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ methods: {
+ upMain() {
+ uni.showLoading({
+ title: "正在检查更新...",
+ mask: true
+ })
+ var time = setTimeout(() => {
+ wx.showToast({
+ title: '您当前是最新版！',
+ icon: "success",
+ duration: 1000
+ })
+ time = null
+ }, 1000)
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .aboutUs {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+
+ image {
+ width: 4rem;
+ height: 4rem;
+ }
+
+ .a {
+ padding-top: 1rem;
+ }
+
+ .genxinBut {
+ .custom-btn {
+ width: 130px;
+ height: 40px;
+ color: #fff;
+ border-radius: 5px;
+ padding: 10px 25px;
+ font-family: 'Lato', sans-serif;
+ font-weight: 500;
+ background: transparent;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ position: relative;
+ display: inline-block;
+ box-shadow: inset 2px 2px 2px 0px rgba(255, 255, 255, .5),
+ 7px 7px 20px 0px rgba(0, 0, 0, .1),
+ 4px 4px 5px 0px rgba(0, 0, 0, .1);
+ outline: none;
+ }
+
+ .btn-3 {
+ background: rgb(0, 172, 238);
+ background: linear-gradient(0deg, rgba(0, 172, 238, 1) 0%, rgba(2, 126, 251, 1) 100%);
+ width: 130px;
+ height: 40px;
+ line-height: 42px;
+ padding: 0;
+ border: none;
+
+ }
+ }
+ }
+</style>
diff --git a/pages/myself/childen/shezhi.vue b/pages/myself/childen/shezhi.vue
new file mode 100644
index 0000000..6aebd2f
--- /dev/null
+++ b/pages/myself/childen/shezhi.vue
@@ -0,0 +1,19 @@
+<template>
+ <view class="shezhi">
+ 更多功能即将上线······
+ </view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+.shezhi{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+}
+</style>
diff --git a/pages/myself/childen/xinxi.vue b/pages/myself/childen/xinxi.vue
new file mode 100644
index 0000000..7da36e6
--- /dev/null
+++ b/pages/myself/childen/xinxi.vue
@@ -0,0 +1,72 @@
+<template>
+ <view class="xinxi">
+ <view class="once">
+ <view class="title">
+ 姓名：
+ </view>
+ <view class="msg">
+ {{name}}
+ </view>
+ </view>
+ <view class="once">
+ <view class="title">
+ 电话：
+ </view>
+ <view class="msg">
+ {{phon}}
+ </view>
+ </view>
+ <view class="once">
+ <view class="title">
+ 编号：
+ </view>
+ <view class="msg">
+ {{id}}
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+export default{
+ data(){
+ return{
+
+ }
+ },
+ computed:{
+ name(){
+ return this.$store.state.puserName
+ },
+ id(){
+ return this.$store.state.puserID
+ },
+ phon(){
+ return this.$store.state.puserIphone
+ },
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.xinxi{
+ 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;
+ }
+}
+</style>
diff --git a/pages/myself/childen/yijian.vue b/pages/myself/childen/yijian.vue
new file mode 100644
index 0000000..25faa96
--- /dev/null
+++ b/pages/myself/childen/yijian.vue
@@ -0,0 +1,68 @@
+<template>
+ <view class="yijian">
+ <view class="title">
+
+ 请输入改善意见，我们将会第一时间处理！：）
+ </view>
+ <textarea class="longInput" cols="4" rows="8" placeholder="请输入"></textarea>
+ <view class="butUps" @click="upMain">
+ 提交
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ methods: {
+ upMain() {
+ uni.showLoading({
+ title: "正在提交...",
+ mask: true
+ })
+ var time = setTimeout(() => {
+ wx.showToast({
+ title: '提交成功！',
+ icon: "success",
+ duration: 1000
+ })
+ time = null
+ }, 1000)
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .yijian {
+ width: 100%;
+ height: 80%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+
+ .title {
+ // border: 1px solid rgba($color: #000000, $alpha: 1.0);
+ padding-bottom: 1rem;
+ // padding-top: 15rem;
+ box-sizing: border-box;
+ }
+
+ .longInput {
+ border: 1px solid rgba($color: #000000, $alpha: 1.0);
+ }
+
+ .butUps {
+ margin: 2rem auto;
+ width: 6rem;
+ height: 6rem;
+ border: 1px solid rgb(46, 118, 228);
+ border-radius: 3rem;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+ background-image: linear-gradient(to bottom, #3CA7F4, #4D7CEE);
+ }
+ }
+</style>
diff --git a/pages/myself/myself.vue b/pages/myself/myself.vue
index 6065a9e..8e340fb 100644
--- a/pages/myself/myself.vue
+++ b/pages/myself/myself.vue
@@ -15,62 +15,18 @@
二维码
</view>
</view>
- <view class="nav-user">
- <navigator url="" class="nav-user-in">
- <view class="icon-img">
- <image src="../../static/workbench/user01.png"></image>
+ <view class="bomBut">
+ <view class="onceBut" v-for="(item, index) in inSide" :key="index" @click="openThere(item.open)">
+ <view class="buts">
+ <image :src="item.imgSrc" mode=""></image>
+ <view class="title">
+ {{item.title}}
+ </view>
</view>
- <view class="oneself-title">账户信息</view>
- <view class="icon-img-right">
- <image src="../../static/workbench/bracket.png"></image>
- </view>
- </navigator>
+ <image src="../../static/workbench/bracket.png"></image>
+ </view>
</view>
- <view class="nav">
- <navigator url="" class="nav-child">
- <view class="icon-img">
- <image src="../../static/workbench/update.png"></image>
- </view>
- <view class="oneself-title">版本更新</view>
- <view class="icon-img-right">
- <image src="../../static/workbench/bracket.png"></image>
- </view>
- </navigator>
- </view>
- <view class="nav">
- <navigator url="" class="nav-child">
- <view class="icon-img">
- <image src="../../static/workbench/feedback01.png"></image>
- </view>
- <view class="oneself-title">意见反馈</view>
- <view class="icon-img-right">
- <image src="../../static/workbench/bracket.png"></image>
- </view>
- </navigator>
- </view>
- <view class="nav">
- <navigator url="" class="nav-child">
- <view class="icon-img">
- <image src="../../static/workbench/system.png"></image>
- </view>
- <view class="oneself-title">系统设置</view>
- <view class="icon-img-right">
- <image src="../../static/workbench/bracket.png"></image>
- </view>
- </navigator>
- </view>
- <view class="nav-us">
- <navigator url="" class="nav-child">
- <view class="icon-img">
- <image src="../../static/workbench/myself.png"></image>
- </view>
- <view class="oneself-title">关于我们</view>
- <view class="icon-img-right">
- <image src="../../static/workbench/bracket.png"></image>
- </view>
- </navigator>
- </view>
- <view class="nav-logout">
+ <!-- <view class="nav-logout">
<navigator @click="outIn" class="nav-logout-in">
<view class="icon-img">
<image src="../../static/img/out.png"></image>
@@ -82,7 +38,9 @@
</navigator>
<uniPopup :textmsg="textmsg" @cancel='operation(1)' @confirm='operation(2)' v-show="showTextmsg">
</uniPopup>
- </view>
+ </view> -->
+ <uniPopup :textmsg="textmsg" @cancel='operation(1)' @confirm='operation(2)' v-show="showTextmsg">
+ </uniPopup>
</view>
</template>
@@ -99,7 +57,39 @@
contentTwo: '',
cancel: '取消',
confirm: '登出'
- }
+ },
+ inSide: [{
+ title: '账户信息',
+ imgSrc: '../../static/myself/zhanhu.png',
+ open: 'xinxi'
+ },
+ {
+ title: '版本更新',
+ imgSrc: '../../static/myself/gengxin.png',
+ open: 'genxin'
+ },
+ {
+ title: '意见反馈',
+ imgSrc: '../../static/myself/yijian.png',
+ open: 'yijian'
+ },
+ {
+ title: '系统设置',
+ imgSrc: '../../static/myself/shezhi.png',
+ open: 'shezhi'
+ },
+ {
+ title: '关于我们',
+ imgSrc: '../../static/myself/gaunyu.png',
+ open: 'aboutUs'
+ },
+ {
+ title: '登出',
+ imgSrc: '../../static/myself/denghcu.png',
+ open: 'outIn',
+ },
+
+ ]
}
},
components: {
@@ -109,20 +99,49 @@
userName() {
return this.$store.state.puserName;
},
- butTitle(){
- return this.$store.state.loging == true? '登出': '登入'
+ butTitle() {
+ return this.$store.state.loging == true ? '登出' : '登入'
}
},
onLoad() {
-
+
},
methods: {
+ openThere(fn) {
+ this[fn]();
+ },
+ aboutUs() {
+ // console.log('aboutus')
+ wx.navigateTo({
+ url: './childen/aboutUs',
+ })
+ },
+ shezhi() {
+ wx.navigateTo({
+ url: './childen/shezhi',
+ })
+ },
+ yijian() {
+ wx.navigateTo({
+ url: './childen/yijian',
+ })
+ },
+ genxin() {
+ wx.navigateTo({
+ url: './childen/genxin',
+ })
+ },
+ xinxi() {
+ wx.navigateTo({
+ url: './childen/xinxi',
+ })
+ },
outIn() {
if (this.$store.state.loging == true) {
this.showTextmsg = true;
- }else{
- this.goToLoging();
+ } else {
+ this.goToLoging();
}
},
goToLoging() {
@@ -146,16 +165,17 @@
that.showTextmsg = false;
}
},
- geton(){
- wx.navigateTo({
- url:'../poput/workbench/policeDetails/policeDetails?id=111'
- })
- }
+ // geton() {
+ // wx.navigateTo({
+ // url: '../poput/workbench/policeDetails/policeDetails?id=111'
+ // })
+ // }
},
}
</script>
<style lang="scss" scoped>
+ $imgSize: 30px;
// page {
// background-image: linear-gradient(to right, #F2F6F9, #F2F6F9) //页面背景颜色
// }
@@ -204,123 +224,40 @@
}
}
- .m-body {
+ .bomBut {
width: 100%;
+ height: auto;
- .m-b-top {
- background-color: #FFFFFF;
+
+ .onceBut {
width: 100%;
- height: 160rpx;
- border-radius: 0 0 30rpx 30rpx;
+ height: 3rem;
+
display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: space-between;
+ border-bottom: 1px solid rgba($color: #000000, $alpha: 0.05);
- .m-b-t-once {
- width: 115rpx;
- height: 60px;
- border-radius: 10rpx;
- box-shadow: 1rpx 1rpx 5rpx rgba($color: #000000, $alpha: 0.4);
+ &:hover {
+ background-color: rgba($color: #000000, $alpha: 0.05);
+ }
+
+ .buts {
+ padding-left: 1rem;
+ height: 2.5rem;
display: flex;
align-items: center;
- justify-content: center;
- flex-direction: column;
- color: rgba($color: #000000, $alpha: 0.8);
- image {
- width: 70rpx;
- height: 60rpx;
- }
-
- span {
- font-size: 26rpx;
- display: block;
+ .title {
+ padding-left: 1rem;
}
}
}
}
}
-
- .nav {
- width: 90%;
- height: 100rpx;
- border-bottom: 1rpx solid #999999;
- position: relative;
- left: 30rpx;
- }
-
- .nav-child{
- width: 100%;
- height:100rpx;
- }
-
- .nav-user {
- width: 100%;
- height: 100rpx;
- border-bottom: 1rpx solid #999999;
- }
-
- .nav-user-in {
- position: relative;
- left: 30rpx;
- height: 100rpx;
-
- }
-
- .nav-us {
- width: 100%;
- height: 100rpx;
- position: relative;
- left: 30rpx;
- }
-
- .icon-img image{
- width: 50rpx;
- height: 50rpx;
- float: left;
- position: relative;
- top:25rpx;
- }
-
- .oneself-title{
- line-height: 100rpx;
- float: left;
- position: relative;
- left: 20rpx;
- font-weight: 550;
- font-size: 28rpx;
- }
-
- .icon-img-right image {
- line-height: 100rpx;
- width: 50rpx;
- height: 50rpx;
- position: relative;
- left: 460rpx;
- top: 25rpx;
- }
-
-
- .nav-logout {
- width: 100%;
- height: 100rpx;
- border-bottom: 1rpx solid #999999;
- border-top: 1rpx solid #999999;
- position: relative;
- }
-
- .nav-logout-in {
- position: relative;
- left: 30rpx;
- height: 100rpx;
- }
-
- .icon-img-logout image {
- line-height: 100rpx;
- width: 50rpx;
- height: 50rpx;
- position: relative;
- left: 515rpx;
- top: 25rpx;
+
+ image {
+ width: $imgSize;
+ height: $imgSize;
}
</style>
diff --git a/pages/riskReporting/riskReporting.vue b/pages/riskReporting/riskReporting.vue
index 356e845..371f653 100644
--- a/pages/riskReporting/riskReporting.vue
+++ b/pages/riskReporting/riskReporting.vue
@@ -2,27 +2,30 @@
<view class="content">
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>上报时间: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请选择上报时间" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="riskTime" placeholder="请选择上报时间" placeholder-class="placeholder" />
</view>
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>客户名称: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请选择客户" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="tenantName" placeholder="请选择客户" placeholder-class="placeholder" />
</view>
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>风险等级: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请选择风险等级" placeholder-class="placeholder" />
+ <picker @change="riskClassSelect" :range="riskClassArray" class="riskClass-select">
+ <label class="" v-model="riskClassArrayType">{{ riskClassArrayType }}</label>
+ </picker>
+ <!-- <input class="input" type="text" v-model="riskClass" placeholder="请选择风险等级" placeholder-class="placeholder" /> -->
</view>
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>风险描述: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输入风险描述" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="riskDescribe" placeholder="请输入风险描述" placeholder-class="placeholder" />
</view>
<view class="row regis-info-addr">
<text class="info-title"><!-- <span style="color: red;">* --></span>地址: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输入地址" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="address" placeholder="请输入地址" placeholder-class="placeholder" />
</view>
<view class="row regis-info-desc">
<text class="info-title"><!-- <span style="color: red;">* --></span>备注: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输入备注" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="descInfo" placeholder="请输入备注" placeholder-class="placeholder" />
</view>
<button class="btn" @click="confirm">上传</button>
</view>
@@ -33,17 +36,21 @@
export default{
data () {
return {
- deviceNumber:"",
- serialNumber:"",
- contacts:"",
- calls:"",
- paddress:"",
- deploymenttime:"",
- deviceName:"",
+ riskTime:"",
+ tenantName:"",
+ riskClass:"",
+ riskDescribe:"",
+ address:"",
+ descInfo:"",
display:'none',
display1:'none',
display2:'none',
- display3:'none'
+ display3:'none',
+ pathUrl:"https://web.byisf.com/api/blade-jfpts",
+ // pathUrl: "http://localhost:89",
+ riskClassArray:["一级","二级","三级","四级"],
+ riskClassArrayIndex:0,
+ riskClassArrayType:'---请选择---'
}
},
onLoad() {
@@ -51,6 +58,47 @@
},
methods: {
+ //风险等级下拉改变事件
+ riskClassSelect(e){
+ var that = this;
+ this.riskClassArrayIndex = e.target.value;
+ this.riskClassArrayType=this.riskClassArray[this.riskClassArrayIndex];
+ // if(that.typeArrayType == '学校'){
+ // that.type = 1;
+ // }
+ // if(that.typeArrayType =='医院'){
+ // that.type = 2;
+ // }
+ // if(that.typeArrayType =='小区'){
+ // that.type = 3;
+ // }
+ },
+
+
+ //提交修改
+ confirm(){
+ uni.request({
+ url: this.pathUrl + '/riskReporting/save',
+ method:'POST',
+ data:{
+ "riskTime":this.riskTime,
+ "riskNumber":this.$store.state.puserID,
+ "tenantName":this.tenantName,
+ "riskClass":this.riskClass,
+ "riskDescribe":this.riskDescribe,
+ "address":this.address,
+ "descInfo":this.descInfo
+ },
+ success: (res) => {
+ if(res.data.code==200){
+ uni.showToast({
+ title: '提交成功！',
+ duration: 2000
+ });
+ }
+ }
+ });
+ }
}
}
</script>
@@ -114,8 +162,14 @@
width: 180rpx;
height: 180rpx;
border-radius: 100rpx;
- line-height:200rpx;
+ line-height:180rpx;
color: #FFFFFF;
letter-spacing: 2rpx;
}
+
+ .riskClass-select{
+ position: relative;
+ left: 45rpx;
+ top: 28rpx;
+ }
</style>
diff --git a/pages/visitRecord/visitRecord.vue b/pages/visitRecord/visitRecord.vue
index 11ba148..c40a158 100644
--- a/pages/visitRecord/visitRecord.vue
+++ b/pages/visitRecord/visitRecord.vue
@@ -2,26 +2,34 @@
<view class="content">
<view class="row regis-info">
<text class="info-title">拜访日期: </text>
- <view class="regis-info-date">
- <uni-datetime-picker></uni-datetime-picker>
- </view>
- <!-- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请选择拜访日期" placeholder-class="placeholder" /> -->
+ <!-- <view class="regis-info-date">
+ <uni-datetime-picker v-model="vistime"></uni-datetime-picker>
+ </view> -->
+ <input class="input" type="text" v-model="vistime" placeholder="请选择拜访日期" placeholder-class="placeholder" />
</view>
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>客户名称: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输客户主名称" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="yname" placeholder="请输客户名称" placeholder-class="placeholder" />
+ </view>
+ <view class="row regis-info">
+ <text class="info-title"><!-- <span style="color: red;">* --></span>客户类型: </text>
+ <input class="input" type="text" v-model="type" placeholder="请输客户类型" placeholder-class="placeholder" />
+ </view>
+ <view class="row regis-info">
+ <text class="info-title"><!-- <span style="color: red;">* --></span>联系电话: </text>
+ <input class="input" type="text" v-model="phone" placeholder="请输联系电话" placeholder-class="placeholder" />
</view>
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>客户地址: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输入客户地址" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="address" placeholder="请输入客户地址" placeholder-class="placeholder" />
</view>
<view class="row regis-info">
<text class="info-title"><!-- <span style="color: red;">* --></span>营业信息: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输入营业信息" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="information" placeholder="请输入营业信息" placeholder-class="placeholder" />
</view>
<view class="row regis-info-desc">
<text class="info-title"><!-- <span style="color: red;">* --></span>备注: </text>
- <input class="input" type="text" v-on:input ="ondeviceName" v-model="deviceName" placeholder="请输入备注" placeholder-class="placeholder" />
+ <input class="input" type="text" v-model="remark" placeholder="请输入备注" placeholder-class="placeholder" />
</view>
<button class="btn" @click="confirm">上传</button>
</view>
@@ -32,17 +40,19 @@
export default{
data () {
return {
- deviceNumber:"",
- serialNumber:"",
- contacts:"",
- calls:"",
- paddress:"",
- deploymenttime:"",
- deviceName:"",
+ vistime:"",
+ yname:"",
+ type:"",
+ phone:"",
+ address:"",
+ information:"",
+ remark:"",
display:'none',
display1:'none',
display2:'none',
- display3:'none'
+ display3:'none',
+ pathUrl:"https://web.byisf.com/api/blade-jfpts",
+ // pathUrl: "http://localhost:89"
}
},
onLoad() {
@@ -53,6 +63,34 @@
//查询客户信息
getTenantInfo(){
+ },
+ //提交修改
+ confirm(){
+ uni.request({
+ url: this.pathUrl + '/visitrecord/visitrecord/save',
+ method:'POST',
+ data:{
+ // "visitrecord":
+ // {
+ "vistime":this.vistime,
+ "snumber":this.$store.state.puserID,
+ "yname":this.yname,
+ "type":this.type,
+ "phone":this.phone,
+ "address":this.address,
+ "information":this.information,
+ "remark":this.remark,
+ // }
+ },
+ success: (res) => {
+ if(res.data.code==200){
+ uni.showToast({
+ title: '提交成功！',
+ duration: 2000
+ });
+ }
+ }
+ });
}
}
}
@@ -102,7 +140,7 @@
width: 180rpx;
height: 180rpx;
border-radius: 100rpx;
- line-height:200rpx;
+ line-height:180rpx;
color: #FFFFFF;
letter-spacing: 2rpx;
}
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 8fcfa64..b8f08bd 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -105,6 +105,7 @@
securityId: id
} : '',
that = this;
+ console.log(this.$store.state.puserID)
wx.request({
url: url,
data: data,
@@ -113,8 +114,10 @@
},
method: 'POST',
success(res) {
- that.dataListP = res.data.data
- // console.log(that.dataListP)
+ if (res.statusCode == 200) {
+ that.dataListP = res.data.data
+ console.log(that.dataListP)
+ }
}
})
},
diff --git a/static/myself/denghcu.png b/static/myself/denghcu.png
new file mode 100644
index 0000000..e3f85eb
--- /dev/null
+++ b/static/myself/denghcu.png
Binary files differ
diff --git a/static/myself/gaunyu.png b/static/myself/gaunyu.png
new file mode 100644
index 0000000..56b4ab7
--- /dev/null
+++ b/static/myself/gaunyu.png
Binary files differ
diff --git a/static/myself/gengxin.png b/static/myself/gengxin.png
new file mode 100644
index 0000000..c5b92bb
--- /dev/null
+++ b/static/myself/gengxin.png
Binary files differ
diff --git a/static/myself/shezhi.png b/static/myself/shezhi.png
new file mode 100644
index 0000000..653c201
--- /dev/null
+++ b/static/myself/shezhi.png
Binary files differ
diff --git a/static/myself/yijian.png b/static/myself/yijian.png
new file mode 100644
index 0000000..83afe27
--- /dev/null
+++ b/static/myself/yijian.png
Binary files differ
diff --git a/static/myself/zhanhu.png b/static/myself/zhanhu.png
new file mode 100644
index 0000000..3e24ce0
--- /dev/null
+++ b/static/myself/zhanhu.png
Binary files differ
diff --git "a/static/\347\224\250\346\210\267.png" b/static/users.png
similarity index 100%
rename from "static/\347\224\250\346\210\267.png"
rename to static/users.png
Binary files differ
diff --git a/store/actions.js b/store/actions.js
index 18674a7..e9cb828 100644
--- a/store/actions.js
+++ b/store/actions.js
@@ -43,11 +43,13 @@
method: "post",
// // dataType: 'JSON',
success: (res) => {
- 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);
+ if (res.statusCode == 200) {
+ 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)
},
fail: (res) => {
diff --git a/store/mutations.js b/store/mutations.js
index db8ee9e..bb4e7fd 100644
--- a/store/mutations.js
+++ b/store/mutations.js
@@ -2,7 +2,7 @@
const mutations = {
login(state, data) {
- console.log(data);
+ // console.log(data);
state.loging = data.isit; //登入状态
if (data.isit) { //写入用户数据
state.message.useName = data.userName;
--
Gitblit v1.9.3