chen
/
electron-ban-pai
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改冲突

master
chen 2021-12-23 19:29:23 +08:00
parent d05dd90b7b 88c06872ce
commit c7ed61ce60
4 changed files with 372 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/css/electron.css
View File

@ -172,7 +172,7 @@ img {
font-size: 30px!important;font-weight: bold!important; font-size: 30px!important;font-weight: bold!important;
} }
.meal-box {padding-top: 10px;display: flex;align-items: center;} .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;} .meal-box div {font-size: 18px;line-height: 30px;}
.main-center { .main-center {
margin: 0 20px; margin: 0 20px;

312
src/components/homepage.vue
View File

@ -40,14 +40,21 @@
<div class="pultitle">宝宝食谱</div> <div class="pultitle">宝宝食谱</div>
</div> </div>
<div class="eat-three"> <div class="eat-three">
<div :class="threeMealIndex==index?'threeMealActive':''" v-for="(item,index) in threeMeals" <div
:key="index" @click="chooseMeal(index)">{{item}} :class="threeMealIndex == index ? 'threeMealActive' : ''"
v-for="(item, index) in threeMeals"
:key="index"
@click="chooseMeal(index)"
>
{{ item.Type }}
</div> </div>
</div> </div>
<div class="line"></div> <div class="line"></div>
<div class="left-last meal-box"> <div v-for="(item, index) in threeMeals" :key="index">
<img src="../assets/seconds/tu-01.png"> <div v-if="index == threeMealIndex" class="left-last meal-box">
<div>白米饭、土豆粉蒸肉、肉末豆腐、农家菜汤</div> <img :src="item.Images" />
<div class="clips2">{{ item.FoodName }}</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -64,9 +71,7 @@
</div> </div>
<div class="notice-time"> <div class="notice-time">
<div>2021-11-15</div> <div>2021-11-15</div>
<div> <div><img src="../assets/home/slices.png" />15</div>
<img src="../assets/home/slices.png">15
</div>
</div> </div>
</div> </div>
</div> </div>
@ -77,14 +82,14 @@
<div class="center-img-box"> <div class="center-img-box">
<div class="center-title">班级动态</div> <div class="center-title">班级动态</div>
<div class="img-box"> <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> </div>
<!-- 提醒 --> <!-- 提醒 -->
<div class="remind-box"> <div class="remind-box">
<div class="msg-box"> <div class="msg-box">
<img src="../assets/home/icon-notice.png"> <img src="../assets/home/icon-notice.png" />
<div>1</div> <div>{{ noticeData }}</div>
</div> </div>
<div class="msg-box"> <div class="msg-box">
<div>宝宝提醒</div> <div>宝宝提醒</div>
@ -103,12 +108,16 @@
</div> </div>
<div class="right-content"> <div class="right-content">
<div v-for="(item, index) in noonArr" :key="index"> <div v-for="(item, index) in noonArr" :key="index">
<div class="right-title">{{item.title}}</div> <div class="right-title">{{ item.Ampm }}</div>
<div class="line" style="margin: 0 6px;"></div> <div class="line" style="margin: 0 6px"></div>
<div class="right-item-box" v-for="(itemc,indexc) in item.children" <div
:class="indexc%2!=0?'oddActive':''" :key="indexc"> class="right-item-box"
<div>{{itemc.time}}</div> v-for="(itemc, indexc) in item.Content"
<div class="clips3">{{itemc.content}}</div> :class="indexc % 2 != 0 ? 'oddActive' : ''"
:key="indexc"
>
<div>{{ itemc.TimePart }}</div>
<div class="clips3">{{ itemc.Name }}</div>
</div> </div>
</div> </div>
</div> </div>
@ -118,117 +127,124 @@
</template> </template>
<script> <script>
export default { export default {
name: 'homepage', name: "homepage",
data() { data() {
return { return {
threeMeals: ['早餐', '午餐', '晚餐'], threeMeals: ["早餐", "午餐", "晚餐"],
threeMealIndex: 0, threeMealIndex: 0,
noonArr: [{ noticeData: [],
title: '上午', babyBirthdayData:"",
children: [{ dynamicPictureData:"",
time: '08：30 - 08：50', noonArr: [
content: '晨检，晨间活动晨间活动晨间活动晨间活动晨间活动晨间活动' {
title: "上午",
children: [
{
time: "08：30 - 08：50",
content: "晨检，晨间活动晨间活动晨间活动晨间活动晨间活动晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' content: "晨检，晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' content: "晨检，晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' content: "晨检，晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' content: "晨检，晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' content: "晨检，晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' content: "晨检，晨间活动",
}, },
{ {
time: '08：30 - 08：50', time: "08：30 - 08：50",
content: '晨检，晨间活动' 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: { methods: {
// 早中晚餐切换事件 // 早中晚餐切换事件
@ -236,23 +252,75 @@
this.threeMealIndex = e; this.threeMealIndex = e;
}, },
// 宝宝食谱 // 宝宝食谱
babyRecipeEv(){ async babyRecipeEv() {
this.$axios({ let data = await this.$axios({
// 调用 serviceAPI // 调用 serviceAPI
url: this.$https.babyRecipe, url: this.$https.babyRecipe,
methods:'get', methods: "get",
params: { params: {
EquipmentID:'yaohaotest001' EquipmentID: "yaohaotest001",
} },
}).then(res =>{ });
console.log(res.data); this.threeMeals = data.data.data;
}).catch(err => { },
console.log(err);
}) 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() { mounted() {
this.babyRecipeEv(); this.babyRecipeEv();
} this.schedulingWeb();
} this.babyBirthday()
this.dynamicPicture()
},
created() {
this.notice();
},
};
</script> </script>

36
src/components/parkIntroduce.vue
View File

@ -1,17 +1,41 @@
<template> <template>
<div> <div>
<div class="yiqing-title" style="text-align: left;">琦琦幼儿园</div> <div class="yiqing-title" style="text-align: left">琦琦幼儿园</div>
<div class="yiqing-content"> <div class="yiqing-content" v-html="introduceData.Remark">
新建攀枝花市西区第一幼儿园位于西区徐家渡路45号,园舍占地总面积为4632.5平方米，总体规划大、中、小年龄教学班9个，每层设计三个班，提供315个学位。每班配备标准的活动室、寝室、教师办公室、盥洗室等功能室，活动室配备钢琴、一体机等多媒体教育教学设备设施，被授予“攀枝花市一级幼儿园”“攀枝花市示范幼儿园”“攀枝花市绿色幼儿园”“攀枝花市示范家长学校”“攀枝花市文明单位”“攀枝花市花园单位”“攀枝花市巾帼文明示范岗”“四川省巾帼文明岗”等荣誉称号。 <div style="margin-top: 26px">
<div style="margin-top: 26px;"> <img src="../assets/seconds/tu-01.png" />
<img src="../assets/seconds/tu-01.png"> <img src="../assets/seconds/tu-01.png" />
<img src="../assets/seconds/tu-01.png">
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <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> </script>
<style> <style>

16
src/config.js
View File

@ -1,6 +1,20 @@
const host = 'http://47.109.29.153:50012' const host = 'http://47.109.29.153:50012'
const url = { 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 module.exports = url