diff --git a/src/views/examination.vue b/src/views/examination.vue
index b2ccfa0..4ef8b91 100644
--- a/src/views/examination.vue
+++ b/src/views/examination.vue
@@ -6,10 +6,10 @@
-
@@ -66,7 +66,7 @@
{{item.project}}

-
{{item.cuAddr}} {{systemTime}}
+
{{item.cuAddr}}
{{item.totalApmNum}}
/{{item.totalNum}}
@@ -187,11 +187,12 @@ export default {
this.numData = this.dayArr
}else{
this.dayArr = res.data;
+ console.log(this.dayArr)
for(let key in this.dayArr){
this.dayArr[key].map(item =>{
this.numData.push({
- date:item,
- isNum:0
+ date:item.date,
+ isNum:item.enableApm
})
})
}
@@ -299,6 +300,15 @@ export default {
// ]
// }
];
+ lightAppJssdk.notification.alert({
+ message: "当前时间无体检项目",
+ title: "提示",//可传空
+ buttonName: "收到",
+ success: function (data) {
+ },
+ fail: function (data) { //错误返回
+ }
+ })
}else{
this.examData = res.data;
@@ -328,8 +338,8 @@ export default {
this.numData.forEach(item =>{
if(month == item.date.substr(5,2)){
if(day.date.getDate() == item.date.slice(-2)){
- item.isNum == 0 ? day.bottomInfo = '有号' : day.bottomInfo = '无号'
- item.isNum == 0 ? day.className = 'num1' : day.className = 'num2'
+ item.isNum == 1 ? day.bottomInfo = '有号' : day.bottomInfo = '无号'
+ item.isNum == 1 ? day.className = 'num1' : day.className = 'num2'
}
}
@@ -347,9 +357,8 @@ export default {
this.numData.forEach(item =>{
if(month == item.date.substr(5,2)){
if(day.date.getDate() == item.date.slice(-2)){
- item.isNum == 0 ? day.bottomInfo = '有号' : day.bottomInfo = '无号'
- item.isNum == 0 ? day.className = 'num1' : day.className = 'num2'
-
+ item.isNum == 1 ? day.bottomInfo = '有号' : day.bottomInfo = '无号'
+ item.isNum == 1 ? day.className = 'num1' : day.className = 'num2'
}
}
@@ -669,7 +678,7 @@ export default {
.van-calendar__selected-day{
width: 100%;
height: 100%;
- background: rgba(51, 51, 51, .3) !important;
+ background: rgba(22, 119, 255, .5) !important;
border-radius: 50%;
}
}
diff --git a/src/views/myExam.vue b/src/views/myExam.vue
index d1a5e71..aaffd52 100644
--- a/src/views/myExam.vue
+++ b/src/views/myExam.vue
@@ -6,7 +6,7 @@
暂无您的预约项目,请选择医院后进行预约