From 8942fb3a77f25aa7b31e8b4ad2307c101d1fb2c8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 02 Jun 2021 11:36:44 +0800
Subject: [PATCH] 业务管理样式微调，新增引入时间选择插件
---
pages/infoRegistration/infoCheck.vue | 24 +++---
pages/infoRegistration/infoRegistration.vue | 32 +++-----
pages/riskReporting/riskReporting.vue | 30 +++++--
xcxjingqingmap_patrol/js/vueMain.js | 4
pages/equipment/equipment.vue | 97 +++++++++++++++++++++---
pages/visitRecord/visitRecord.vue | 28 +++++-
6 files changed, 155 insertions(+), 60 deletions(-)
diff --git a/pages/equipment/equipment.vue b/pages/equipment/equipment.vue
index f191571..f87b6d0 100644
--- a/pages/equipment/equipment.vue
+++ b/pages/equipment/equipment.vue
@@ -16,6 +16,14 @@
<input class="input" type="number" v-on:input ="ondeviceNumber" v-model="deviceNumber" placeholder="请输入设备编号" placeholder-class="placeholder"/>
<text id="deviceNumber" :style="{color:'red',fontSize:'10px',position:'relative',left:'170px',top:'20px',display:display2}">请输入设备编号</text>
</view>
+ <view class="row b-b">
+ <text class="tit"><span style="color: red;">*</span>客户名称: </text>
+ <picker @change="tenantNameSelect" :range="tenantNameArray" class="tenantName-select">
+ <label :style="{color:tenantNameColor}" v-model="tenantName">{{ tenantNameArrayType }}</label>
+ </picker>
+ <!-- <input class="input" type="number" v-on:input ="tenantName" v-model="tenantName" placeholder="请输入设备编号" placeholder-class="placeholder"/> -->
+ <text id="tenantName" :style="{color:'red',fontSize:'10px',position:'relative',left:'243px',top:'0px',display:displayOwnership}">请输入客户名称</text>
+ </view>
<view class="row b-b">
<text class="tit">联系电话: </text>
<input class="input" type="text" v-model="calls" placeholder="请输入联系电话" placeholder-class="placeholder" />
@@ -60,6 +68,8 @@
// src:'https://web.byisf.com/minio/jfpt/upload/depl/479ea8efd1874876b354063143fa0d0c.jpg',
// }
],
+ ownership:"",
+ ownerId:"",
deviceNumber:"",
serialNumber:"",
contacts:"",
@@ -70,13 +80,67 @@
display:'none',
display1:'none',
display2:'none',
- display3:'none'
+ display3:'none',
+ displayOwnership:'none',
+ tenantArr:[],
+ tenantNameArray:[],
+ tenantNameArrayIndex:0,
+ tenantNameArrayType:'请选择客户',
+ tenantNameColor:"#808080"
}
},
onLoad() {
},
+ mounted(){
+ this.getTenantList();
+ },
methods: {
+ //获取客户信息
+ getTenantList(){
+ var that = this;
+ uni.request({
+ url: 'https://web.byisf.com/api/blade-system/tenant/page',
+ method:'GET',
+ success: (res) => {
+ that.tenantArr = res.data.data.records;
+ if(that.tenantArr.length>0 ){
+ for (var i = 0; i < that.tenantArr.length; i++) {
+ if(that.tenantArr[i].tenantName!=""){
+ that.tenantNameArray.push(that.tenantArr[i].tenantName);
+ }
+ }
+ }
+ }
+ });
+ },
+
+ //客户名称下拉改变事件
+ tenantNameSelect(e) {
+ var that = this;
+ this.tenantNameArrayIndex = e.target.value;
+ this.tenantNameArrayType=this.tenantNameArray[this.tenantNameArrayIndex];
+
+
+
+ //获取id
+ for (var i = 0; i < that.tenantArr.length; i++) {
+ if(that.tenantArr[i].tenantName==that.tenantNameArrayType){
+ that.ownerId = that.tenantArr[i].id;
+ that.ownership = that.tenantArr[i].tenantName;
+ // that.address = that.tenantArr[i].address;
+ }
+ }
+
+ //修改样式
+ this.tenantNameColor = "#000000";
+
+ //提示语隐藏
+ this.displayOwnership="none";
+
+ },
+
+
//提交表单
confirm() {
var that = this;
@@ -84,7 +148,8 @@
that.paddress=that.paddress+item.src+",";
})
//提交前校验数据
- if(this.deviceName=="" || this.deviceNumber=="" || this.serialNumber=="" || this.paddress==""){
+ if(this.deviceName=="" || this.deviceNumber=="" || this.serialNumber==""
+ || this.paddress=="" || this.ownership==""){
if(this.deviceName==null || this.deviceName=="" ){
// var a= document.getElementById("deviceName");
// a.style.display="block";
@@ -105,18 +170,21 @@
// a.style.display="block";
this.display3="block";
}
+ if(this.ownership==null || this.ownership=="" ){
+ // var a= document.getElementById("paddress");
+ // a.style.display="block";
+ this.displayOwnership="block";
+ }
return;
}
var params = "deviceNumber="+this.deviceNumber+"&serialNumber="+this.serialNumber+"&contacts="+
- this.contacts+"&calls="+this.calls+"&paddress="+this.paddress.substring(0,this.paddress.length-1)
- +"&deploymenttime="+this.deploymenttime+"&deviceName="+this.deviceName;
+ this.contacts+"&calls="+this.calls+"&paddress="+this.paddress.substring(0,this.paddress.length-1)
+ +"&deploymenttime="+this.deploymenttime+"&deviceName="+this.deviceName+"&ownership="+this.ownership
+ +"&ownerId="+this.ownerId;
uni.request({
- // url: 'http://localhost:89/equipment/equipment/AppSubmit?'+params, //仅为示例，并非真实接口地址。
- url: 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/AppSubmit?'+params, //仅为示例，并非真实接口地址。
+ // url: 'http://localhost:89/equipment/equipment/AppSubmit?'+params,
+ url: 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/AppSubmit?'+params,
method:'POST',
- data:{
-
- },
success: (res) => {
if(res.data.code==200){
uni.showToast({
@@ -268,12 +336,12 @@
.input{
position: absolute;
width: 75%;
- left: 200rpx;
+ left: 205rpx;
}
.picture{
position: relative;
- left: 30rpx;
+ left: 40rpx;
width: 50rpx;
height: 50rpx;
}
@@ -291,7 +359,7 @@
.photosView{
width: 20rem;
- height: 10rem;
+ height: 7.5rem;
/* background-color: #007AFF; */
position: relative;
left: 15px;
@@ -332,4 +400,9 @@
/* left: 4.5px;
top: -6.px; */
}
+
+ .tenantName-select{
+ position: relative;
+ left: 35rpx;
+ }
</style>
diff --git a/pages/infoRegistration/infoCheck.vue b/pages/infoRegistration/infoCheck.vue
index 7fb8056..fde0e13 100644
--- a/pages/infoRegistration/infoCheck.vue
+++ b/pages/infoRegistration/infoCheck.vue
@@ -7,6 +7,13 @@
</picker>
<!-- <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>
+ <picker @change="typeSelect" :range="typeArray" class="type-select">
+ <label :style="{color:typeArrayTypeColor}" v-model="typeArrayType">{{ typeArrayType }}</label>
+ </picker>
+ <!-- <input class="input" type="text" v-model="type" 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" />
@@ -18,13 +25,6 @@
<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 :style="{color:typeArrayTypeColor}" 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>
@@ -56,10 +56,10 @@
tenantArr:[],
tenantNameArray:[],
tenantNameArrayIndex:0,
- tenantNameArrayType:'--- 请选择 ---',
+ tenantNameArrayType:'请选择客户',
typeArray:["学校","医院","小区"],
typeArrayIndex:0,
- typeArrayType:'--- 请选择 ---',
+ typeArrayType:'请选择客户类型',
pathUrl:"https://web.byisf.com/api/blade-system",
// pathUrl: "http://localhost:8106"
}
@@ -206,7 +206,7 @@
.regis-info-linkman input{
position: relative;
- left: 70rpx;
+ left: 73rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -239,13 +239,13 @@
.tenant-select{
position: relative;
- left: 45rpx;
+ left: 40rpx;
top: 28rpx;
}
.type-select{
position: relative;
- left: 45rpx;
+ left: 40rpx;
top: 28rpx;
}
</style>
diff --git a/pages/infoRegistration/infoRegistration.vue b/pages/infoRegistration/infoRegistration.vue
index 6178a51..fb16cd0 100644
--- a/pages/infoRegistration/infoRegistration.vue
+++ b/pages/infoRegistration/infoRegistration.vue
@@ -7,6 +7,13 @@
</picker> -->
<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>
+ <picker @change="typeSelect" :range="typeArray" class="type-select">
+ <label :style="{color:typeArrayTypeColor}" v-model="typeArrayType">{{ typeArrayType }}</label>
+ </picker>
+ <!-- <input class="input" type="text" v-model="type" 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" />
@@ -19,13 +26,7 @@
<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 :style="{color:typeArrayTypeColor}" 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" />
@@ -52,13 +53,9 @@
display1:'none',
display2:'none',
display3:'none',
- tenantArr:[],
- tenantNameArray:[],
- tenantNameArrayIndex:0,
- tenantNameArrayType:'--- 请选择 ---',
typeArray:["学校","医院","小区"],
typeArrayIndex:0,
- typeArrayType:'--- 请选择 ---',
+ typeArrayType:'请选择客户类型',
pathUrl:"https://web.byisf.com/api/blade-system",
// pathUrl: "http://localhost:8106",
}
@@ -149,7 +146,7 @@
.regis-info-linkman input{
position: relative;
- left: 70rpx;
+ left: 73rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -179,16 +176,11 @@
color: #FFFFFF;
letter-spacing: 2rpx;
}
-
-/* .tenant-select{
- position: relative;
- left: 35rpx;
- top: 28rpx;
- } */
+
.type-select{
position: relative;
- left: 45rpx;
+ left: 40rpx;
top: 28rpx;
}
</style>
diff --git a/pages/riskReporting/riskReporting.vue b/pages/riskReporting/riskReporting.vue
index 5f19136..49628fa 100644
--- a/pages/riskReporting/riskReporting.vue
+++ b/pages/riskReporting/riskReporting.vue
@@ -2,21 +2,20 @@
<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="riskTime" placeholder="请选择上报时间" placeholder-class="placeholder" />
+ <e-picker mode="dateTime" :style="{color:riskTimeColor}" class="select_risk_rime" @change="riskTimeChange">{{riskTime||'请选择上报时间'}}</e-picker>
+ <!-- <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>
<picker @change="tenantNameSelect" :range="tenantNameArray" class="tenant-select">
<label :style="{color:tenantNameColor}" v-model="tenantName">{{ tenantNameArrayType }}</label>
</picker>
- <!-- <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>
<picker @change="riskClassSelect" :range="riskClassArray" class="riskClass-select">
<label :style="{color:riskClassArrayTypeColor}" 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>
@@ -41,6 +40,7 @@
return {
riskClassArrayTypeColor:"#808080",
tenantNameColor:"#808080",
+ riskTimeColor:"#808080",
riskTime:"",
tenantId:"",
tenantName:"",
@@ -56,11 +56,11 @@
// pathUrl: "http://localhost:89",
riskClassArray:["一级","二级","三级","四级"],
riskClassArrayIndex:0,
- riskClassArrayType:'--- 请选择 ---',
+ riskClassArrayType:'请选择风险等级',
tenantArr:[],
tenantNameArray:[],
tenantNameArrayIndex:0,
- tenantNameArrayType:'--- 请选择 ---'
+ tenantNameArrayType:'请选择客户'
}
},
onLoad() {
@@ -70,6 +70,14 @@
this.getTenantList();
},
methods: {
+ //日期选择
+ riskTimeChange(e) {
+ this.riskTime = e.substr(0,e.length-3);
+ //修改颜色
+ this.riskTimeColor = "#000000";
+ },
+
+
//获取客户信息
getTenantList(){
var that = this;
@@ -163,7 +171,7 @@
.regis-info-desc input{
position: relative;
- left: 110rpx;
+ left: 112rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -178,7 +186,7 @@
.regis-info-addr input{
position: relative;
- left: 110rpx;
+ left: 112rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -192,7 +200,7 @@
.regis-info input{
position: relative;
- left: 40rpx;
+ left: 45rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -220,4 +228,10 @@
left: 45rpx;
top: 28rpx;
}
+
+ .select_risk_rime{
+ position: relative;
+ left: 45rpx;
+ top: 28rpx;
+ }
</style>
diff --git a/pages/visitRecord/visitRecord.vue b/pages/visitRecord/visitRecord.vue
index 6710762..28269b8 100644
--- a/pages/visitRecord/visitRecord.vue
+++ b/pages/visitRecord/visitRecord.vue
@@ -5,7 +5,8 @@
<!-- <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" />
+ <e-picker mode="dateTime" :style="{color:vistimeColor}" class="select_vistime" @change="vistimeChange">{{vistime||'请选择拜访日期'}}</e-picker>
+ <!-- <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>
@@ -23,7 +24,7 @@
</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" />
+ <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>
@@ -48,6 +49,7 @@
return {
ynameArrayTypeColor:"#808080",
typeArrayTypeColor:"#808080",
+ vistimeColor:"#808080",
vistime:"",
ynumber:"",
yname:"",
@@ -65,10 +67,10 @@
tenantArr:[],
ynameArray:[],
ynameArrayIndex:0,
- ynameArrayType:'--- 请选择 ---',
+ ynameArrayType:'请选择客户',
typeArray:["学校","医院","小区"],
typeArrayIndex:0,
- typeArrayType:'--- 请选择 ---'
+ typeArrayType:'请选择客户类型'
}
},
onLoad() {
@@ -76,6 +78,14 @@
this.getTenantList();
},
methods: {
+ //日期选择
+ vistimeChange(e) {
+ this.vistime = e.substr(0,e.length-3);
+ //修改颜色
+ this.vistimeColor = "#000000";
+ },
+
+
//获取客户信息
getTenantList(){
var that = this;
@@ -198,7 +208,7 @@
.regis-info-desc input{
position: relative;
- left: 110rpx;
+ left: 112rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -212,7 +222,7 @@
.regis-info input{
position: relative;
- left: 40rpx;
+ left: 45rpx;
top: 27rpx;
letter-spacing: 1rpx;
}
@@ -246,4 +256,10 @@
left: 45rpx;
top: 28rpx;
}
+
+ .select_vistime {
+ position: relative;
+ left: 45rpx;
+ top: 28rpx;
+ }
</style>
diff --git a/xcxjingqingmap_patrol/js/vueMain.js b/xcxjingqingmap_patrol/js/vueMain.js
index 4ba6351..d655d63 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,
--
Gitblit v1.9.3