diff --git a/src/views/screenAdaptation/common/borderBox12.vue b/src/views/screenAdaptation/common/borderBox12.vue new file mode 100644 index 0000000..ae6fe7e --- /dev/null +++ b/src/views/screenAdaptation/common/borderBox12.vue @@ -0,0 +1,50 @@ + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/dynamicMode/dynamicMode.vue b/src/views/screenAdaptation/pages/dynamicMode/dynamicMode.vue index 503b7f9..e85c0a2 100644 --- a/src/views/screenAdaptation/pages/dynamicMode/dynamicMode.vue +++ b/src/views/screenAdaptation/pages/dynamicMode/dynamicMode.vue @@ -1,20 +1,141 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/dynamicMode/energyCondition.vue b/src/views/screenAdaptation/pages/dynamicMode/energyCondition.vue new file mode 100644 index 0000000..3dde9be --- /dev/null +++ b/src/views/screenAdaptation/pages/dynamicMode/energyCondition.vue @@ -0,0 +1,68 @@ + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/dynamicMode/equipmentCondition.vue b/src/views/screenAdaptation/pages/dynamicMode/equipmentCondition.vue new file mode 100644 index 0000000..19d0765 --- /dev/null +++ b/src/views/screenAdaptation/pages/dynamicMode/equipmentCondition.vue @@ -0,0 +1,63 @@ + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/dynamicMode/foodSafe.vue b/src/views/screenAdaptation/pages/dynamicMode/foodSafe.vue new file mode 100644 index 0000000..79c6972 --- /dev/null +++ b/src/views/screenAdaptation/pages/dynamicMode/foodSafe.vue @@ -0,0 +1,55 @@ + + + \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/index.vue b/src/views/screenAdaptation/pages/index.vue index b726dd0..5ce7989 100644 --- a/src/views/screenAdaptation/pages/index.vue +++ b/src/views/screenAdaptation/pages/index.vue @@ -1,6 +1,6 @@ @@ -15,11 +23,26 @@ /* * 立体校园模式 * */ - import TeacherInfo from './teacherInfo.vue'; + import BorderBox12 from '../../common/borderBox12.vue'; + import TeacherStudentInfo from './teacherStudentInfo.vue'; + import SchoolActivity from './schoolActivity.vue'; + import MenuRight from './menuRight.vue'; export default{ data(){ return { loading:true, + teacherInfo:{ + shouldNum:162, + realNum:156, + lateNum:3, + missNum:6 + }, + studentInfo:{ + shouldNum:1053, + realNum:1051, + lateNum:8, + missNum:2 + } } }, mounted(){ @@ -33,7 +56,10 @@ }, }, components:{ - TeacherInfo + BorderBox12, + TeacherStudentInfo, + SchoolActivity, + MenuRight } } @@ -56,10 +82,16 @@ color: #31a8fa; border-bottom: 2px solid #e49543; } + .school-activity-box-style{ + height: 200px !important; + } } .content-right-style{ - width: 400px; - height: auto; + width: 180px; + height: 800px; + display: flex; + justify-content: center; + align-items: center; } } \ No newline at end of file diff --git a/src/views/screenAdaptation/pages/traditionalMode/menuItem.vue b/src/views/screenAdaptation/pages/traditionalMode/menuItem.vue index 6ee54bd..f183019 100644 --- a/src/views/screenAdaptation/pages/traditionalMode/menuItem.vue +++ b/src/views/screenAdaptation/pages/traditionalMode/menuItem.vue @@ -1,6 +1,6 @@