修改冲突
commit
c7ed61ce60
|
|
@ -172,7 +172,7 @@ img {
|
|||
font-size: 30px!important;font-weight: bold!important;
|
||||
}
|
||||
.meal-box {padding-top: 10px;display: flex;align-items: center;}
|
||||
.meal-box img {width: 130px;height: 106px;border-radius: 10px;object-fit: cover;margin-right: 34px;}
|
||||
.meal-box img {width: 130px;border-radius: 10px;object-fit: cover;margin-right: 34px;}
|
||||
.meal-box div {font-size: 18px;line-height: 30px;}
|
||||
.main-center {
|
||||
margin: 0 20px;
|
||||
|
|
|
|||
|
|
@ -40,14 +40,21 @@
|
|||
<div class="pultitle">宝宝食谱</div>
|
||||
</div>
|
||||
<div class="eat-three">
|
||||
<div :class="threeMealIndex==index?'threeMealActive':''" v-for="(item,index) in threeMeals"
|
||||
:key="index" @click="chooseMeal(index)">{{item}}
|
||||
<div
|
||||
:class="threeMealIndex == index ? 'threeMealActive' : ''"
|
||||
v-for="(item, index) in threeMeals"
|
||||
:key="index"
|
||||
@click="chooseMeal(index)"
|
||||
>
|
||||
{{ item.Type }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="line"></div>
|
||||
<div class="left-last meal-box">
|
||||
<img src="../assets/seconds/tu-01.png">
|
||||
<div>白米饭、土豆粉蒸肉、肉末豆腐、农家菜汤</div>
|
||||
<div v-for="(item, index) in threeMeals" :key="index">
|
||||
<div v-if="index == threeMealIndex" class="left-last meal-box">
|
||||
<img :src="item.Images" />
|
||||
<div class="clips2">{{ item.FoodName }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -64,9 +71,7 @@
|
|||
</div>
|
||||
<div class="notice-time">
|
||||
<div>2021-11-15</div>
|
||||
<div>
|
||||
<img src="../assets/home/slices.png">15
|
||||
</div>
|
||||
<div><img src="../assets/home/slices.png" />15</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -77,14 +82,14 @@
|
|||
<div class="center-img-box">
|
||||
<div class="center-title">班级动态</div>
|
||||
<div class="img-box">
|
||||
<img src="../assets/seconds/tu-01.png" style="object-fit: cover;">
|
||||
<img src="../assets/seconds/tu-01.png" style="object-fit: cover" />
|
||||
</div>
|
||||
</div>
|
||||
<!-- 提醒 -->
|
||||
<div class="remind-box">
|
||||
<div class="msg-box">
|
||||
<img src="../assets/home/icon-notice.png">
|
||||
<div>1</div>
|
||||
<img src="../assets/home/icon-notice.png" />
|
||||
<div>{{ noticeData }}</div>
|
||||
</div>
|
||||
<div class="msg-box">
|
||||
<div>宝宝提醒</div>
|
||||
|
|
@ -103,12 +108,16 @@
|
|||
</div>
|
||||
<div class="right-content">
|
||||
<div v-for="(item, index) in noonArr" :key="index">
|
||||
<div class="right-title">{{item.title}}</div>
|
||||
<div class="line" style="margin: 0 6px;"></div>
|
||||
<div class="right-item-box" v-for="(itemc,indexc) in item.children"
|
||||
:class="indexc%2!=0?'oddActive':''" :key="indexc">
|
||||
<div>{{itemc.time}}</div>
|
||||
<div class="clips3">{{itemc.content}}</div>
|
||||
<div class="right-title">{{ item.Ampm }}</div>
|
||||
<div class="line" style="margin: 0 6px"></div>
|
||||
<div
|
||||
class="right-item-box"
|
||||
v-for="(itemc, indexc) in item.Content"
|
||||
:class="indexc % 2 != 0 ? 'oddActive' : ''"
|
||||
:key="indexc"
|
||||
>
|
||||
<div>{{ itemc.TimePart }}</div>
|
||||
<div class="clips3">{{ itemc.Name }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -118,117 +127,124 @@
|
|||
</template>
|
||||
<script>
|
||||
export default {
|
||||
name: 'homepage',
|
||||
name: "homepage",
|
||||
data() {
|
||||
return {
|
||||
threeMeals: ['早餐', '午餐', '晚餐'],
|
||||
threeMeals: ["早餐", "午餐", "晚餐"],
|
||||
threeMealIndex: 0,
|
||||
noonArr: [{
|
||||
title: '上午',
|
||||
children: [{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动晨间活动晨间活动晨间活动晨间活动晨间活动'
|
||||
noticeData: [],
|
||||
babyBirthdayData:"",
|
||||
dynamicPictureData:"",
|
||||
noonArr: [
|
||||
{
|
||||
title: "上午",
|
||||
children: [
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动晨间活动晨间活动晨间活动晨间活动晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '中午',
|
||||
children: [{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '下午',
|
||||
children: [{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
{
|
||||
time: '08：30 - 08：50',
|
||||
content: '晨检，晨间活动'
|
||||
},
|
||||
]
|
||||
}
|
||||
],
|
||||
}
|
||||
},
|
||||
{
|
||||
title: "中午",
|
||||
children: [
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
title: "下午",
|
||||
children: [
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
{
|
||||
time: "08：30 - 08：50",
|
||||
content: "晨检，晨间活动",
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
// 早中晚餐切换事件
|
||||
|
|
@ -236,23 +252,75 @@
|
|||
this.threeMealIndex = e;
|
||||
},
|
||||
// 宝宝食谱
|
||||
babyRecipeEv(){
|
||||
this.$axios({
|
||||
async babyRecipeEv() {
|
||||
let data = await this.$axios({
|
||||
// 调用 serviceAPI
|
||||
url: this.$https.babyRecipe,
|
||||
methods:'get',
|
||||
methods: "get",
|
||||
params: {
|
||||
EquipmentID:'yaohaotest001'
|
||||
}
|
||||
}).then(res =>{
|
||||
console.log(res.data);
|
||||
}).catch(err => {
|
||||
console.log(err);
|
||||
})
|
||||
}
|
||||
EquipmentID: "yaohaotest001",
|
||||
},
|
||||
});
|
||||
this.threeMeals = data.data.data;
|
||||
},
|
||||
|
||||
async notice() {
|
||||
let data = await this.$axios({
|
||||
// 调用 serviceAPI
|
||||
url: this.$https.notice,
|
||||
methods: "get",
|
||||
params: {
|
||||
EquipmentID: "yaohaotest001",
|
||||
},
|
||||
});
|
||||
this.noticeData = data.data.count;
|
||||
},
|
||||
async schedulingWeb() {
|
||||
let data = await this.$axios({
|
||||
// 调用 serviceAPI
|
||||
url: this.$https.schedulingWeb,
|
||||
methods: "get",
|
||||
params: {
|
||||
EquipmentID: "yaohaotest001",
|
||||
},
|
||||
});
|
||||
this.noonArr = data.data.data[0].WeekData;
|
||||
|
||||
},
|
||||
async babyBirthday() {
|
||||
let data = await this.$axios({
|
||||
// 调用 serviceAPI
|
||||
url: this.$https.babyBirthday,
|
||||
methods: "get",
|
||||
params: {
|
||||
EquipmentID: "yaohaotest001",
|
||||
},
|
||||
});
|
||||
this.babyBirthdayData = data.data;
|
||||
|
||||
},
|
||||
async dynamicPicture() {
|
||||
let data = await this.$axios({
|
||||
// 调用 serviceAPI
|
||||
url: this.$https.dynamicPicture,
|
||||
methods: "get",
|
||||
params: {
|
||||
EquipmentID: "yaohaotest001",
|
||||
},
|
||||
});
|
||||
|
||||
},
|
||||
|
||||
|
||||
},
|
||||
mounted() {
|
||||
this.babyRecipeEv();
|
||||
}
|
||||
}
|
||||
this.schedulingWeb();
|
||||
this.babyBirthday()
|
||||
this.dynamicPicture()
|
||||
},
|
||||
created() {
|
||||
this.notice();
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,41 @@
|
|||
<template>
|
||||
<div>
|
||||
<div class="yiqing-title" style="text-align: left;">琦琦幼儿园</div>
|
||||
<div class="yiqing-content">
|
||||
新建攀枝花市西区第一幼儿园位于西区徐家渡路45号,园舍占地总面积为4632.5平方米，总体规划大、中、小年龄教学班9个，每层设计三个班，提供315个学位。每班配备标准的活动室、寝室、教师办公室、盥洗室等功能室，活动室配备钢琴、一体机等多媒体教育教学设备设施，被授予“攀枝花市一级幼儿园”“攀枝花市示范幼儿园”“攀枝花市绿色幼儿园”“攀枝花市示范家长学校”“攀枝花市文明单位”“攀枝花市花园单位”“攀枝花市巾帼文明示范岗”“四川省巾帼文明岗”等荣誉称号。
|
||||
<div style="margin-top: 26px;">
|
||||
<img src="../assets/seconds/tu-01.png">
|
||||
<img src="../assets/seconds/tu-01.png">
|
||||
<div class="yiqing-title" style="text-align: left">琦琦幼儿园</div>
|
||||
<div class="yiqing-content" v-html="introduceData.Remark">
|
||||
<div style="margin-top: 26px">
|
||||
<img src="../assets/seconds/tu-01.png" />
|
||||
<img src="../assets/seconds/tu-01.png" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
introduceData:{}
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
// 宝宝食谱
|
||||
async introduce() {
|
||||
let data = await this.$axios({
|
||||
// 调用 serviceAPI
|
||||
url: this.$https.introduce,
|
||||
methods: "get",
|
||||
params: {
|
||||
EquipmentID: "yaohaotest001",
|
||||
},
|
||||
});
|
||||
this.introduceData = data.data.data;
|
||||
console.log(this.introduceData.Remark );
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.introduce()
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,20 @@
|
|||
const host = 'http://47.109.29.153:50012'
|
||||
const url = {
|
||||
babyRecipe: host + '/api/admin/electronicclasscard/babyfood',
|
||||
mechanism:host+'/api/admin/electronicclasscard/getequipment_info',//获取机构信息
|
||||
babyRecipe:host+'/api/admin/electronicclasscard/babyfood',//宝宝食谱
|
||||
newsA:host+'/api/admin/electronicclasscard/newstotal',//首页消息数量
|
||||
remind:host+'/api/admin/electronicclasscard/getreminder',//提醒
|
||||
babyBirthday:host+'/api/admin/electronicclasscard/getbirthday',//获取当日宝宝生日
|
||||
classStatus:host+"/api/admin/electronicclasscard/classstutasing",//班级运行状态
|
||||
dynamicPicture:host+"/admin/electronicclasscard/getpicurls",//动态图片api
|
||||
schedulingWeb:host+"/api/admin/electronicclasscardcourse/getbabynowcourse", //查看当日宝宝课表（班排web）
|
||||
notice:host+'/api/admin/electronicclasscard/getnoice',//通知
|
||||
weather:host+ '/api/admin/electronicclasscard/getweather', //天气接口
|
||||
introduce:host+'/api/admin/electronicclasscard/kindergartenintroduction'//幼儿园介绍
|
||||
// 教师风采列表/api/admin/electronicclasscard/getteachers_demeanor
|
||||
// 班级动态详情/api/admin/electronicclasscard/classnewsdetails
|
||||
// 公告列表/api/admin/electronicclasscard/getnotice
|
||||
// 班级动态详情/api/admin/electronicclasscard/classnewsdetails
|
||||
}
|
||||
|
||||
module.exports = url
|
||||
|
|
|
|||
Loading…
Reference in New Issue