From bc984288e2476d408204e5cf7c47e19d159b6e60 Mon Sep 17 00:00:00 2001
From: sjf1256754123 <33301030+sjf1256754123@users.noreply.github.com>
Date: Sat, 15 Feb 2020 16:17:40 +0800
Subject: [PATCH] demo
---
pages/fillIn/fillIn.vue | 55 ++++++-----------------
pages/index/index.vue | 2 +-
pages/security/security.vue | 89 +++++++++++++++++++++++++++++++++----
3 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/pages/fillIn/fillIn.vue b/pages/fillIn/fillIn.vue
index 09a6bfd..0e387f8 100644
--- a/pages/fillIn/fillIn.vue
+++ b/pages/fillIn/fillIn.vue
@@ -19,7 +19,6 @@
-
*{{index+1}}、{{item.label}}
@@ -30,7 +29,6 @@
-
*{{index+1}}、{{item.label}}
@@ -41,33 +39,6 @@
-
-
-
-
-
@@ -76,7 +47,6 @@
-
@@ -90,18 +60,13 @@
{{form[childItem.value]>-1?childItem.opts[form[childItem.value]].label:'请选择'}}
-
-
-
-
-
@@ -278,7 +243,6 @@
opts:[{value:'a',label:'已经确诊'},{value:'b',label:'疑似诊断'},{value:'b',label:'亲密接触者'},{value:'b',label:'正在接受集中医学观察'},{value:'b',label:'居家观察'},{value:'b',label:'已解除集中医学观察'},{value:'b',label:'无上述情况'}]
}
],
-
list:[
{
label:'单位名称',
@@ -286,7 +250,7 @@
value:'orgId',
titleClass:'title',
type:'picker',
- opts:[{value:'a',label:'一位'},{value:'b',label:'多位'}]
+ opts:[]
},
{
label:'所在部门',
@@ -370,13 +334,14 @@
}
],
form:{
- orgId:'',
+ orgId:-1,
department:'',
position:'',
name:'',
phone:'',
- nationality:'',
+ nationality:-1,
idCard:'',
+ returnToWork:-1,
householdAddress:'',
residenceAddress:'',
planReturnDate:''
@@ -404,7 +369,14 @@
this.$http.get(`/sict-ncov/org/page`, data).then(res => {
const d = res.data
if (d.code == 1) {
- console.log(d)
+ let list = []
+ d.object.list.forEach(item=>{
+ list.push({
+ label:item.orgName,
+ value:item.id
+ })
+ })
+ this.list[0].opts = list
}
}).catch(err => {
console.log(err)
@@ -429,7 +401,8 @@
},
isShowChild(){
- this.list[11].hidden = this.form['returnToWork'] == 'a'
+ console.log(this.form['returnToWork'])
+ this.list[10].hidden = this.form['returnToWork'] == 'a'
},
Switch(e,prop){
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c8f5e2a..b1ec53e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -83,7 +83,7 @@
.btnList{
padding-top: 435upx;
.btnStaff,.btnSecurity{
- background-color: rgba(129,208,244,0.8);
+ background-color: #92d0f1;
color: #FFFFFF;
border-radius: 60upx;
width: 52%;
diff --git a/pages/security/security.vue b/pages/security/security.vue
index b6bca02..11af27d 100644
--- a/pages/security/security.vue
+++ b/pages/security/security.vue
@@ -1,22 +1,95 @@
-
-
- 测试
+
+
+
+
+
+
+
+
+
+ 体温值:
+
+
+
+
+
+
+
-
--
2.22.0