洋浦学校项目阶段代码提交

src/views/screenAdaptation/pages/homePages/menuTop/top.vue

@@ -21,58 +21,7 @@
                     <ModelSelect @modelChange="modelChange"/>
                 </div>
             </div>
-
-
-            <!--<dv-decoration-10 class="dv-dec-10"/>-->
-            <!--<div class="d-flex jc-center">-->
-            <!--<dv-decoration-8 class="dv-dec-8" :color="['#568aea','#568aea']"/>-->
-            <!--<div class="title">-->
-            <!--<span class="title-text" style="width: 100%">{{title}}</span>-->
-            <!--<dv-decoration-6-->
-            <!--class="dv-dec-6"-->
-            <!--:reverse="true"-->
-            <!--:color="['#50e3c2', '#67a1e5']"-->
-            <!--/>-->
-            <!--</div>-->
-            <!--<dv-decoration-8-->
-            <!--class="dv-dec-8"-->
-            <!--:reverse="true"-->
-            <!--:color="['#568aea','#568aea']"-->
-            <!--/>-->
-            <!--</div>-->
-            <!--<dv-decoration-10 class="dv-dec-10-s"/>-->
         </div>
-        <!--<div class="d-flex jc-between px-2">-->
-        <!--<div class="d-flex aside-width left-dom">-->
-        <!--<div class="react-left ml-4 react-l-s" style="pointer-events: auto">-->
-        <!--<span class="react-before"></span>-->
-        <!--<span class="text">-->
-        <!--<Time />-->
-        <!--</span>-->
-        <!--</div>-->
-        <!--&lt;!&ndash;<div class="react-right ml-3">&ndash;&gt;-->
-        <!--&lt;!&ndash;<span class="text">数据分析2</span>&ndash;&gt;-->
-        <!--&lt;!&ndash;</div>&ndash;&gt;-->
-        <!--</div>-->
-        <!--<div class="d-flex aside-width right-dom">-->
-        <!--<div class="react-right mr-3">-->
-        <!--&lt;!&ndash;<span class="text fw-b">vue-big-screen</span>&ndash;&gt;-->
-        <!--<ModelSelect @modelChange="modelChange"/>-->
-        <!--</div>-->
-        <!--<div class="react-right mr-4 react-l-s" style="pointer-events: auto">-->
-        <!--<span class="react-after"></span>-->
-        <!--<span class="text" v-if="isLogin">-->
-        <!--<PersonInfo/>-->
-        <!--</span>-->
-        <!--<span class="text login-text-style" v-if="!isLogin"-->
-              <!--style="color:#00fcff;font-size: 20px;cursor: pointer"-->
-              <!--@click="toLogin"-->
-        <!--&gt;-->
-        <!--登录-->
-        <!--</span>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--</div>-->
         <login-panel :showPanel="showLogin"/>
     </div>
 </template>
@@ -90,12 +39,13 @@
                 loading: true,
                 showTime: false,
                 modelId: 1,
-                showLogin: false
+                showLogin: false,
+
             }
         },
         computed: {
             isLogin: function () {
-                return this.$store.state.userStore.user && this.$store.state.userStore.user.personId !== '';
+                return this.$store.state.userStore.user && this.$store.state.userStore.user.personId !== '' && getToken();
             }
         },
         created(){
@@ -176,7 +126,7 @@
         }
         .login-div-style {
             position: absolute;
-            right: 80px;
+            right: 60px;
             width: auto;
             height: 50px;
             bottom: 12px;

src/views/screenAdaptation/pages/monitorCenter/schoolDaily/calendar/weekCalendar.vue

@@ -58,12 +58,12 @@
                 <div class="week-content-style"></div>
             </div>
             <div class="box-line-style"></div>
-            <div class="content-item-style" style="background-color: #fbd333;top: 70px;left:70px;color: white">升旗礼</div>
-            <div class="content-item-style" style="background-color: #eb6877;top: 70px;left:280px;color: white">安全演练</div>
-            <div class="content-item-style" style="background-color: #594d99;top: 70px;left:384px;color: white;width: 205px">第二次月考</div>
-            <div class="content-item-style" style="background-color: #76b369;top: 185px;left:70px;color: white;width: 310px">洋浦学校第3届冬季辩论会</div>
-            <div class="content-item-style" style="background-color: #fbd333;top: 220px;left:174px;color: white;width: 205px">经典阅读活动</div>
-            <div class="content-item-style" style="background-color: #594d99;top: 220px;left:384px;color: white;width: 205px">社会实践</div>
+            <div class="content-item-style" style="background-color: #fbd333;top: 70px;left:60px;color: white">升旗礼</div>
+            <div class="content-item-style" style="background-color: #eb6877;top: 70px;left:270px;color: white">安全演练</div>
+            <div class="content-item-style" style="background-color: #594d99;top: 70px;left:374px;color: white;width: 205px">第二次月考</div>
+            <div class="content-item-style" style="background-color: #76b369;top: 185px;left:60px;color: white;width: 310px">洋浦学校第3届冬季辩论会</div>
+            <div class="content-item-style" style="background-color: #fbd333;top: 220px;left:164px;color: white;width: 205px">经典阅读活动</div>
+            <div class="content-item-style" style="background-color: #594d99;top: 220px;left:374px;color: white;width: 205px">社会实践</div>
         </div>
     </div>
 </template>

src/views/screenAdaptation/pages/monitorCenter/schoolDaily/schoolStyle/studentInfo.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="student-style-info-style">
-        <div class="student-img-style"><img src="../../../../assets/images/student1.jpg"/></div>
+        <div class="student-img-style"><img :src="studentInfo.imgSrc"/></div>
         <div class="student-info-style">
-            <div class="student-info-text-style">姜子谦</div>
-            <div class="student-info-text-style light-text-style">小学一年级</div>
-            <div class="student-info-text-style light-text-style">05班</div>
+            <div class="student-info-text-style">{{studentInfo.name}}</div>
+            <div class="student-info-text-style light-text-style">{{studentInfo.gradeName}}</div>
+            <div class="student-info-text-style light-text-style">{{studentInfo.className}}</div>
         </div>
     </div>
 </template>
@@ -12,6 +12,12 @@
     export default{
         data(){
             return {}
+        },
+        props:{
+            studentInfo:{
+                type:Object,
+                default:{}
+            }
         }
     }
 </script>

src/views/screenAdaptation/pages/monitorCenter/schoolDaily/schoolStyle/studentStyle.vue

@@ -12,14 +12,8 @@
                     <img src="../../../../assets/images/medal.png" style="width: 100%;height: 100%"/>
                     <div class="medal-text-style">学雷锋<br/>标兵</div>
                 </div>
-                <StudentInfo/>
-                <StudentInfo/>
-                <StudentInfo/>
-                <StudentInfo/>
+                <StudentInfo v-for="item in studentList1" :key="item.id" :studentInfo="item"/>
             </div>
-            <!--<div class="star"></div>-->
-            <!--<div class="star pink"></div>-->
-            <!--<div class="star blue"></div>-->
         </div>
         <div class="list-row-style">
             <div class="line-left-style">
@@ -29,18 +23,12 @@
                 </div>
             </div>
             <div class="list-content-style">
-                <StudentInfo/>
-                <StudentInfo/>
-                <StudentInfo/>
-                <StudentInfo/>
+                <StudentInfo v-for="item in studentList2" :key="item.id" :studentInfo="item"/>
                 <div class="list-medal-style">
                     <img src="../../../../assets/images/medal.png" style="width: 100%;height: 100%"/>
                     <div class="medal-text-style">优秀<br/>少先队</div>
                 </div>
             </div>
-            <!--<div class="star"></div>-->
-            <!--<div class="star pink"></div>-->
-            <!--<div class="star blue"></div>-->
         </div>
         <div class="list-row-style">
             <div class="top-line-style" style="float: right">
@@ -54,14 +42,8 @@
                     <img src="../../../../assets/images/medal.png" style="width: 100%;height: 100%"/>
                     <div class="medal-text-style">三好<br/>学生</div>
                 </div>
-                <StudentInfo/>
-                <StudentInfo/>
-                <StudentInfo/>
-                <StudentInfo/>
+                <StudentInfo v-for="item in studentList3" :key="item.id" :studentInfo="item"/>
             </div>
-            <!--<div class="star"></div>-->
-            <!--<div class="star pink"></div>-->
-            <!--<div class="star blue"></div>-->
         </div>
     </div>
 </template>
@@ -73,7 +55,26 @@
     import StudentInfo from './studentInfo.vue';
     export default{
         data(){
-            return {}
+            return {
+                studentList1:[
+                    {id:1,name:"姜子谦",gradeName:"小学一年级",className:"05班",imgSrc:require('../../../../assets/images/student/student01.svg')},
+                    {id:1,name:"赵雪娇",gradeName:"小学三年级",className:"01班",imgSrc:require('../../../../assets/images/student/student02.svg')},
+                    {id:3,name:"孙泽熙",gradeName:"小学三年级",className:"03班",imgSrc:require('../../../../assets/images/student/student03.svg')},
+                    {id:4,name:"谢子欣",gradeName:"初中一年级",className:"05班",imgSrc:require('../../../../assets/images/student/student04.svg')},
+                ],
+                studentList2:[
+                    {id:1,name:"蒋一鸣",gradeName:"小学一年级",className:"05班",imgSrc:require('../../../../assets/images/student/student05.svg')},
+                    {id:1,name:"王子墨",gradeName:"小学一年级",className:"05班",imgSrc:require('../../../../assets/images/student/student06.svg')},
+                    {id:3,name:"冉冉",gradeName:"小学三年级",className:"01班",imgSrc:require('../../../../assets/images/student/student07.svg')},
+                    {id:4,name:"贺飞",gradeName:"小学一年级",className:"06班",imgSrc:require('../../../../assets/images/student/student08.svg')},
+                ],
+                studentList3:[
+                    {id:1,name:"徐子乔",gradeName:"小学一年级",className:"05班",imgSrc:require('../../../../assets/images/student/student09.svg')},
+                    {id:1,name:"范然",gradeName:"小学三年级",className:"01班",imgSrc:require('../../../../assets/images/student/student10.svg')},
+                    {id:3,name:"张雪飞",gradeName:"小学四年级",className:"01班",imgSrc:require('../../../../assets/images/student/student11.svg')},
+                    {id:4,name:"刘西蒙",gradeName:"小学二年级",className:"01班",imgSrc:require('../../../../assets/images/student/student12.svg')},
+                ]
+            }
         },
         components: {
             StudentInfo

src/views/screenAdaptation/pages/monitorCenter/schoolDaily/schoolStyle/teacherInfo.vue

@@ -1,23 +1,23 @@
 <template>
     <div class="teacher-style-info-style">
-        <div v-if="position === 'left'" class="teacher-img-style"><img src="../../../../assets/images/teacher1.jpeg"/></div>
+        <div v-if="position === 'left'" class="teacher-img-style"><img :src="teacherInfo.imgSrc"/></div>
         <div v-if="position === 'right'" :class="'teacher-info-style ' + (position === 'right'?' teacher-info-right-style':'')">
-            <div class="teacher-info-text-style">孙勤书</div>
-            <div class="teacher-info-text-style light-text-style">语文学科</div>
+            <div class="teacher-info-text-style">{{teacherInfo.name}}</div>
+            <div class="teacher-info-text-style light-text-style">{{teacherInfo.projectName}}</div>
             <div :class="'list-flag-style' + (position === 'right'?' list-flag-right-style':'')">
                 <div :class="(position === 'right'?' flag-left-before':'flag-before')"></div>
                 <div :class="(position === 'right'?' flag-after-before':'flag-after')"></div>
-                <span class="flat-text-style">骨干教师</span>
+                <span class="flat-text-style">{{teacherInfo.honerName}}</span>
             </div>
         </div>
-        <div v-if="position === 'right'" :class="'teacher-img-style' + (position === 'right'?' teacher-img-right-style':'')"><img src="../../../../assets/images/teacher1.jpeg"/></div>
+        <div v-if="position === 'right'" :class="'teacher-img-style' + (position === 'right'?' teacher-img-right-style':'')"><img :src="teacherInfo.imgSrc"/></div>
         <div v-if="position === 'left'" class="teacher-info-style">
-            <div class="teacher-info-text-style">孙勤书</div>
-            <div class="teacher-info-text-style light-text-style">语文学科</div>
+            <div class="teacher-info-text-style">{{teacherInfo.name}}</div>
+            <div class="teacher-info-text-style light-text-style">{{teacherInfo.projectName}}</div>
             <div class="list-flag-style">
                 <div class="flag-before"></div>
                 <div class="flag-after"></div>
-                <span class="flat-text-style">骨干教师</span>
+                <span class="flat-text-style">{{teacherInfo.honerName}}</span>
             </div>
         </div>
     </div>
@@ -29,7 +29,16 @@
 
             }
         },
-        props:['position'],//left right
+        props:{
+            position:{
+                type:String,
+                default:"left"
+            },
+            teacherInfo:{
+                type:Object,
+                default:{}
+            }
+        }
     }
 </script>
 <style scoped lang="scss">

src/views/screenAdaptation/pages/monitorCenter/schoolDaily/schoolStyle/teacherStyle.vue

@@ -5,20 +5,20 @@
             <div class="medal-text-style">荣誉榜</div>
         </div>
         <div class="list-row-style" style="padding: 0 20px">
-            <TeacherInfo position="left"/>
-            <TeacherInfo position="right"/>
+            <TeacherInfo position="left" :teacherInfo="dataList[0]"/>
+            <TeacherInfo position="right" :teacherInfo="dataList[1]"/>
         </div>
         <div class="list-row-style">
-            <TeacherInfo position="left"/>
-            <TeacherInfo position="right"/>
+            <TeacherInfo position="left" :teacherInfo="dataList[2]"/>
+            <TeacherInfo position="right" :teacherInfo="dataList[3]"/>
         </div>
         <div class="list-row-style" style="padding: 0 5px">
-            <TeacherInfo position="left"/>
-            <TeacherInfo position="right"/>
+            <TeacherInfo position="left" :teacherInfo="dataList[4]"/>
+            <TeacherInfo position="right" :teacherInfo="dataList[5]"/>
         </div>
         <div class="list-row-style"  style="padding: 0 25px">
-            <TeacherInfo position="left"/>
-            <TeacherInfo position="right"/>
+            <TeacherInfo position="left" :teacherInfo="dataList[6]"/>
+            <TeacherInfo position="right" :teacherInfo="dataList[7]"/>
         </div>
     </div>
 </template>
@@ -29,7 +29,18 @@
     import TeacherInfo from './teacherInfo.vue';
     export default{
         data(){
-            return {}
+            return {
+                dataList:[
+                    {name:"孙勤书",projectName:"语文学科",honerName:"骨干教师",imgSrc:require("../../../../assets/images/teacherImg/teacher01.png")},
+                    {name:"蒋红梅",projectName:"语文学科",honerName:"特级教师",imgSrc:require("../../../../assets/images/teacherImg/teacher02.png")},
+                    {name:"孙正鹏",projectName:"语文学科",honerName:"优秀教师",imgSrc:require("../../../../assets/images/teacherImg/teacher03.png")},
+                    {name:"尚爱娟",projectName:"语文学科",honerName:"教学名师",imgSrc:require("../../../../assets/images/teacherImg/teacher04.png")},
+                    {name:"刘丽",projectName:"语文学科",honerName:"骨干教师",imgSrc:require("../../../../assets/images/teacherImg/teacher05.png")},
+                    {name:"董玉书",projectName:"语文学科",honerName:"特级教师",imgSrc:require("../../../../assets/images/teacherImg/teacher06.png")},
+                    {name:"秦小双",projectName:"语文学科",honerName:"优秀教师",imgSrc:require("../../../../assets/images/teacherImg/teacher07.png")},
+                    {name:"王桂琴",projectName:"语文学科",honerName:"骨干教师",imgSrc:require("../../../../assets/images/teacherImg/teacher08.png")},
+                ]
+            }
         },
         components: {
             TeacherInfo

src/views/screenAdaptation/pages/secondPages/commonBox.vue

@@ -1,6 +1,10 @@
 <template>
     <div class="common-box-style">
-        <dv-border-box-12>{{title}}</dv-border-box-12>
+        <div class="common-box-title-style">
+            <img :src="require('../../assets/images/boxTitle.png')" style="width:100%;height: 100%"/>
+            <span class="common-box-title">{{title}}</span>
+        </div>
+        <!--<dv-border-box-12>{{title}}</dv-border-box-12>-->
         <slot></slot>
     </div>
 </template>
@@ -26,16 +30,21 @@
         display: flex;
         justify-content: center;
         margin-top: 50px;
-        .dv-border-box-12{
-            width: 200px;
+        .common-box-title-style{
+            width: 300px;
             height: 40px;
             line-height: 40px;
-            text-align: center;
+            display: flex;
+            justify-content: center;
+            align-items: center;
             position: absolute;
-            top: -20px;
+            top: -22px;
             border-radius: 15px;
-            background-color: #094193;
+            /*background-color: #094193;*/
             color: white;
+            .common-box-title{
+                position: absolute;
+            }
         }
     }
 </style>