From af7f97ecf3d34bfa86dfba21248b885ed31caef8 Mon Sep 17 00:00:00 2001
From: gongdi <410827992@qq.com>
Date: Wed, 17 Nov 2021 17:21:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=8B=E6=B5=A6=E5=A4=A7=E5=B1=8F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A1=B9=E7=9B=AE=E9=98=B6=E6=AE=B5=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screenAdaptation/common/borderBox12.vue   |  50 +++++++
 .../pages/dynamicMode/dynamicMode.vue         | 135 +++++++++++++++++-
 .../pages/dynamicMode/energyCondition.vue     |  68 +++++++++
 .../pages/dynamicMode/equipmentCondition.vue  |  63 ++++++++
 .../pages/dynamicMode/foodSafe.vue            |  55 +++++++
 src/views/screenAdaptation/pages/index.vue    |   2 +-
 src/views/screenAdaptation/pages/main.vue     |  68 ---------
 .../screenAdaptation/pages/menuTop/top.vue    |   2 +-
 .../threeDimensionalSchoolModel/menuItem.vue  |  51 +++++++
 .../threeDimensionalSchoolModel/menuRight.vue |  42 ++++++
 .../schoolActivity.vue                        |  66 +++++++++
 .../teacherInfo.vue                           |  94 ------------
 .../teacherStudentInfo.vue                    | 104 ++++++++++++++
 .../threeDimensionalSchoolModel.vue           |  44 +++++-
 .../pages/traditionalMode/menuItem.vue        |   9 +-
 .../pages/traditionalMode/traditionalMode.vue |  15 +-
 src/views/screenAdaptation/utils/chart.js     |  10 +-
 src/views/screenAdaptation/utils/drawMixin.js |   4 +-
 18 files changed, 686 insertions(+), 196 deletions(-)
 create mode 100644 src/views/screenAdaptation/common/borderBox12.vue
 create mode 100644 src/views/screenAdaptation/pages/dynamicMode/energyCondition.vue
 create mode 100644 src/views/screenAdaptation/pages/dynamicMode/equipmentCondition.vue
 create mode 100644 src/views/screenAdaptation/pages/dynamicMode/foodSafe.vue
 delete mode 100644 src/views/screenAdaptation/pages/main.vue
 create mode 100644 src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuItem.vue
 create mode 100644 src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuRight.vue
 create mode 100644 src/views/screenAdaptation/pages/threeDimensionalSchoolModel/schoolActivity.vue
 delete mode 100644 src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherInfo.vue
 create mode 100644 src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherStudentInfo.vue

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 @@
+<template>
+    <dv-border-box-12>
+        <div class="border-info-style" style="pointer-events: auto">
+            <div class="teacher-info-title-style">{{title}}</div>
+            <div class="data-info-style">
+                <slot></slot>
+            </div>
+        </div>
+    </dv-border-box-12>
+</template>
+<script>
+    export default{
+        data(){
+            return {}
+        },
+        props:['title'],
+    }
+</script>
+<style scoped lang="scss">
+    .dv-border-box-12 {
+        width: 400px;
+        height: 150px;
+        .border-info-style {
+            width: 400px;
+            height: 100%;
+            margin-top: 20px;
+            display: flex;
+            align-items: center;
+            padding-left: 10px;
+            .teacher-info-title-style {
+                width: 50px;
+                height: 90%;
+                line-height: 25px;
+                display: flex;
+                font-size: 16px;
+                justify-content: center;
+                align-items: center;
+                padding: 15px;
+                border-right: 1px solid #7ce7fd;
+            }
+            .data-info-style {
+                width: 350px;
+                height: 90%;
+                display: flex;
+                padding-right: 20px;
+            }
+        }
+    }
+
+</style>
\ 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 @@
 <template>
-    <div>
-
-        动态模式
+    <div id="dynamicMode" class="dynamic-mode-style">
+        <div v-if="!loading" class="content-left-style">
+            <div class="content-title-style">
+                校园简报
+            </div>
+            <BorderBox12 title="教师情况">
+                <TeacherStudentInfo :dataInfo="teacherInfo"/>
+            </BorderBox12>
+            <BorderBox12 title="学生情况">
+                <TeacherStudentInfo :dataInfo="studentInfo"/>
+            </BorderBox12>
+            <BorderBox12 class="school-activity-box-style" title="校园活动">
+                <SchoolActivity/>
+            </BorderBox12>
+        </div>
+        <div v-if="!loading" class="content-right-style">
+            <div class="content-title-style school-safe-style">
+                校园安防
+            </div>
+            <BorderBox12 title="食品安全">
+                <FoodSafe :dataInfo="safeWarning"/>
+            </BorderBox12>
+            <BorderBox12 title="设备情况">
+                <EquipmentCondition :dataInfo="equipmentCondition"/>
+            </BorderBox12>
+            <BorderBox12 class="energy-condition-box-style" title="能耗情况">
+                <EnergyCondition :dataInfo="energyCondition"/>
+            </BorderBox12>
+        </div>
     </div>
 </template>
-
-
 <script>
     /*
     * 动态模式
     * */
+    import BorderBox12 from '../../common/borderBox12.vue';
+    import TeacherStudentInfo from '../threeDimensionalSchoolModel/teacherStudentInfo.vue';
+    import SchoolActivity from '../threeDimensionalSchoolModel/schoolActivity.vue';
+    import FoodSafe from './foodSafe.vue';
+    import EquipmentCondition from './equipmentCondition.vue';
+    import EnergyCondition from './energyCondition.vue';
     export default{
         data(){
-            return {}
+            return {
+                loading:true,
+                teacherInfo:{
+                    shouldNum:162,
+                    realNum:156,
+                    lateNum:3,
+                    missNum:6
+                },
+                studentInfo:{
+                    shouldNum:1053,
+                    realNum:1051,
+                    lateNum:8,
+                    missNum:2
+                },
+                safeWarning:{
+                    disinfectWarning:6,
+                    overdueWarning:1,
+                    stockWarning:0,
+                },
+                equipmentCondition:{
+                    totalNum: 38,
+                    normalNum: 36,
+                    faultNum: 2,
+                    warningNum: 0
+                },
+                energyCondition:{
+                    totalEnergy: 4856,
+                    airConditionerEnergy: 133,
+                    socketEnergy: 98,
+                    lightingEnergy: 58,
+                    otherEnergy: 10
+                }
+            }
+        },
+        mounted(){
+            this.cancelLoading();
+        },
+        methods:{
+            cancelLoading() {
+                setTimeout(() => {
+                    this.loading = false
+                }, 1000)
+            },
+        },
+        components:{
+            BorderBox12,
+            TeacherStudentInfo,
+            SchoolActivity,
+            FoodSafe,
+            EquipmentCondition,
+            EnergyCondition
         }
     }
 </script>
 
-<style></style>
\ No newline at end of file
+<style scoped lang="scss">
+    .dynamic-mode-style{
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: space-between;
+        .content-left-style{
+            width: 400px;
+            height: auto;
+            .content-title-style{
+                width: 100%;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                padding: 16px 16px 30px 16px;
+                font-size: 20px;
+                color: #31a8fa;
+                border-bottom: 2px solid #e49543;
+            }
+            .school-activity-box-style{
+                height: 200px !important;
+            }
+        }
+        .content-right-style{
+            width: 400px;
+            height: auto;
+            .content-title-style{
+                width: 100%;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                padding: 16px 16px 30px 16px;
+                font-size: 20px;
+                color: #31a8fa;
+                border-bottom: 2px solid #3eceb1;
+            }
+            .energy-condition-box-style{
+                height: 200px !important;
+            }
+        }
+    }
+</style>
\ 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 @@
+<template>
+    <div class="energy-condition-style">
+        <div class="data-row-style">
+            <span class="info-title-style">总能耗：</span>
+            <span class="info-data-style">{{dataInfo.totalEnergy + 'kwh'}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">空调：</span>
+            <span class="info-data-style">{{dataInfo.airConditionerEnergy + 'kwh'}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">插座：</span>
+            <span class="info-data-style">{{dataInfo.socketEnergy + 'kwh'}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">照明：</span>
+            <span class="info-data-style">{{dataInfo.lightingEnergy + 'kwh'}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">其他：</span>
+            <span class="info-data-style">{{dataInfo.otherEnergy + 'kwh'}}</span>
+        </div>
+    </div>
+</template>
+<script>
+    /*
+    * 能耗情况
+    * */
+    export default{
+        data(){
+            return {}
+        },
+        props: {
+            dataInfo: {
+                type: Object,
+                default: {
+                    totalEnergy: 0,
+                    airConditionerEnergy: 0,
+                    socketEnergy: 0,
+                    lightingEnergy: 0,
+                    otherEnergy: 0
+                }
+            }
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .energy-condition-style {
+        width: 350px;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding-left: 10px;
+        font-size: 16px;
+        .data-row-style {
+            width: 100%;
+            height: 30px;
+            line-height: 30px;
+            display: flex;
+            justify-content: space-between;
+            .info-data-style {
+                color: #7ce7fd;
+            }
+        }
+    }
+</style>
\ 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 @@
+<template>
+    <div class="equipment-condition-style">
+        <div class="data-row-style">
+            <span class="info-title-style">共计设备：</span>
+            <span class="info-data-style">{{dataInfo.totalNum}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">正常运行：</span>
+            <span class="info-data-style">{{dataInfo.normalNum}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">故障：</span>
+            <span class="info-data-style">{{dataInfo.faultNum}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">告警：</span>
+            <span class="info-data-style">{{dataInfo.warningNum}}</span>
+        </div>
+    </div>
+</template>
+<script>
+    /*
+    * 设备情况
+    * */
+    export default{
+        data(){
+            return {}
+        },
+        props: {
+            dataInfo: {
+                type: Object,
+                default: {
+                    totalNum: 0,
+                    normalNum: 0,
+                    faultNum: 0,
+                    warningNum: 0
+                }
+            }
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .equipment-condition-style {
+        width: 350px;
+        height: 130px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding-left: 10px;
+        font-size: 16px;
+        .data-row-style {
+            width: 100%;
+            height: 30px;
+            line-height: 30px;
+            display: flex;
+            justify-content: space-between;
+            .info-data-style {
+                color: #7ce7fd;
+            }
+        }
+    }
+</style>
\ 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 @@
+<template>
+    <div class="food-safe-style">
+        <div class="data-row-style">
+            <span class="info-title-style">备餐间消毒预警：</span>
+            <span class="info-data-style">{{dataInfo.disinfectWarning}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">食品库存过期预警：</span>
+            <span class="info-data-style">{{dataInfo.overdueWarning}}</span>
+        </div>
+        <div class="data-row-style">
+            <span class="info-title-style">食品库存用量预警：</span>
+            <span class="info-data-style">{{dataInfo.stockWarning}}</span>
+        </div>
+    </div>
+</template>
+<script>
+    export default{
+        data(){
+            return {}
+        },
+        props: {
+            dataInfo: {
+                type: Object,
+                default: {
+                    disinfectWarning: 0,
+                    overdueWarning: 0,
+                    stockWarning: 0
+                }
+            }
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .food-safe-style {
+        width: 350px;
+        height: 130px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        padding-left: 10px;
+        font-size: 16px;
+        .data-row-style {
+            width: 100%;
+            height: 30px;
+            line-height: 30px;
+            display: flex;
+            justify-content: space-between;
+            .info-data-style {
+                color: #7ce7fd;
+            }
+        }
+    }
+</style>
\ 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 @@
 <template>
     <div id="index" ref="appRef" style="position: relative">
-        <iframe width="100%" height="100%" style="border: none" :src="model3DUrl"></iframe>
+        <iframe id="backIframe" width="100%" height="100%" :src="model3DUrl" frameborder="0"></iframe>
         <div id="screenContent" class="bg" :style="{position:'absolute',top:0,pointerEvents:pointerEvents}">
             <dv-loading v-if="loading">Loading...</dv-loading>
             <div v-else class="host-body">
diff --git a/src/views/screenAdaptation/pages/main.vue b/src/views/screenAdaptation/pages/main.vue
deleted file mode 100644
index 34266a9..0000000
--- a/src/views/screenAdaptation/pages/main.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-    <div :style="{width:pageWeight + 'px',height:pageHeight + 'px',backgroundImage:'url('+require('../assets/background-2.png')+')',backgroundSize:'100%'}" class="main-screen-style">
-        <div class="title-style" :style="{color:'white',fontSize:16 * fontSize + 'px'}">电商618数据大屏</div>
-    </div>
-</template>
-<script>
-    import BackImg from '../assets/background-1.png';
-    export default{
-        data(){
-            return {
-                rate: "",//页面宽高比例
-                fontSize:1,
-                pageHeight: document.documentElement.clientHeight,//实时屏幕高度
-                pageWeight: document.documentElement.clientHeight * this.rate,//实时屏幕宽度
-            }
-        },
-        created(){
-            this.rate = (document.documentElement.clientWidth/document.documentElement.clientHeight).toFixed(2);
-            let deviceWidth = document.documentElement.clientWidth;
-            if(deviceWidth > 640){
-                deviceWidth = 640;
-            }
-            this.fontSize = deviceWidth / 7.5;
-
-
-            console.log(this.rate)
-            this.handle()
-        },
-        mounted(){
-            document.body.style.backgroundImage = 'url(' +require('../assets/background-2.png')+ ')';
-            document.body.style.backgroundSize = '100%';
-            window.addEventListener("resize", this.screenResize(this.handle, 1000))
-        },
-        methods: {
-            screenResize: function (fn, wait) {
-                var timer = null;
-                return function () {
-                    if (timer !== null) {
-                        clearTimeout(timer);
-                    }
-                    timer = setTimeout(fn, wait)
-                }
-            },
-            handle: function () {
-                let windowWidth = document.documentElement.clientWidth;//实时屏幕宽度
-                let windowHeight = document.body.clientHeight;//实时屏幕高度
-                console.log(windowWidth,windowHeight)
-                if(windowHeight * this.rate > windowWidth){
-                    this.pageWeight = windowWidth;
-                    this.pageHeight = windowWidth/this.rate;
-                }else if(windowHeight * this.rate < windowWidth){
-                    this.pageHeight = windowHeight;
-                    this.pageWeight = windowHeight * this.rate;
-                }
-
-            }
-        }
-    }
-</script>
-<style scoped lang="scss">
-    .main-screen-style {
-        border: 1px solid #31a8fa;
-        margin: auto;
-        .title-style{
-
-        }
-    }
-</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/menuTop/top.vue b/src/views/screenAdaptation/pages/menuTop/top.vue
index 0232ced..6858202 100644
--- a/src/views/screenAdaptation/pages/menuTop/top.vue
+++ b/src/views/screenAdaptation/pages/menuTop/top.vue
@@ -65,7 +65,7 @@
                 dateWeek: null,
                 weekday: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
                 modelTypes: [{id: 1, value: "动态模式"}, {id: 2, value: "立体校园模式"}, {id: 3, value: "传统模式"}],
-                modelId: 3,
+                modelId: 1,
             }
         },
         mounted(){
diff --git a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuItem.vue b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuItem.vue
new file mode 100644
index 0000000..39c63f1
--- /dev/null
+++ b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuItem.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="menu-item-style">
+        <dv-border-box-9>
+            <div class="menu-icon-style">
+                <my-icon :type="iconType" class="icon-style" style="font-size: 50px;"></my-icon>
+            </div>
+        </dv-border-box-9>
+        <div class="menu-name-style">{{name}}</div>
+    </div>
+</template>
+<script>
+    export default{
+        data(){
+            return {}
+        },
+        props:["name","iconType"]
+    }
+</script>
+<style scoped lang="scss">
+
+    .menu-item-style{
+        width: 120px;
+        height: 130px;
+        margin: 50px auto 0;
+        cursor: pointer;
+        .dv-border-box-9{
+            width: 100%;
+            height: 100px;
+            display: flex;
+            flex-direction: column;
+            .menu-icon-style{
+                width: 120px;
+                height: 100px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                flex-direction: column;
+            }
+        }
+        .menu-name-style{
+            width: 100%;
+            height: 20px;
+            margin-top: 10px;
+            font-size: 16px;
+            color: #31a8fa;
+            font-weight: bolder;
+            text-align: center;
+        }
+
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuRight.vue b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuRight.vue
new file mode 100644
index 0000000..02af824
--- /dev/null
+++ b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/menuRight.vue
@@ -0,0 +1,42 @@
+<template>
+    <dv-border-box-13>
+        <div class="menu-right-style" style="pointer-events: auto">
+            <vue-scroll :ops="listScroll" style="height:800px">
+                <menu-item v-for="item in menuAry" :key="item.id" :name="item.name" :iconType="item.iconType"/>
+            </vue-scroll>
+        </div>
+    </dv-border-box-13>
+</template>
+<script>
+    /*
+     * 右侧菜单导航
+     * */
+    import Vue from 'vue'
+    import MenuConfig from '../../menuConfig';
+    import MenuItem from './menuItem.vue';
+    import {Icon} from 'ant-design-vue';
+    import vueScroll from "vuescroll";//引入vuescroll
+    import "vuescroll/dist/vuescroll.css";//引入vuescroll样式
+    export default{
+        data(){
+            return {
+                listScroll:this.StaticParams.scrollOption,
+                menuAry: MenuConfig,
+            }
+        },
+        components: {
+            MenuItem,
+            AIcon: Icon,
+            vueScroll
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .menu-right-style {
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        height: 100%;
+        padding: 16px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/schoolActivity.vue b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/schoolActivity.vue
new file mode 100644
index 0000000..8252ce7
--- /dev/null
+++ b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/schoolActivity.vue
@@ -0,0 +1,66 @@
+<template>
+    <div class="school-activity-style">
+        <div class="activity-type-style">
+            <div class="data-row-style activity-title-style">学生活动</div>
+            <div class="data-row-style">
+                <span class="info-title-style">[小学] 社团活动</span>
+                <span class="info-data-style">6</span>
+            </div>
+            <div class="data-row-style">
+                <span class="info-title-style">[初中] 读书日</span>
+                <span class="info-data-style">3</span>
+            </div>
+        </div>
+        <div class="activity-type-style">
+            <div class="data-row-style activity-title-style">教师活动</div>
+            <div class="data-row-style">
+                <span class="info-title-style">[小学] 教研活动</span>
+                <span class="info-data-style">1</span>
+            </div>
+            <div class="data-row-style">
+                <span class="info-title-style">[初中] 教师培训</span>
+                <span class="info-data-style">1</span>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    /*
+    * 校园活动
+    * */
+    export default{
+        data(){
+            return {}
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .school-activity-style{
+        width: 350px;
+        display: flex;
+        flex-direction: column;
+        font-size: 16px;
+        justify-content: center;
+        align-items: center;
+        .activity-type-style{
+            width: 100%;
+            height: 100px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            padding-left: 10px;
+            .data-row-style{
+                height:25px;
+                line-height: 25px;
+                display: flex;
+                justify-content: space-between;
+                .info-data-style{
+                    color: #7ce7fd;
+                }
+            }
+            .activity-title-style{
+                font-weight: bolder;
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherInfo.vue b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherInfo.vue
deleted file mode 100644
index e8eebef..0000000
--- a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherInfo.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-    <dv-border-box-12>
-        <div class="teacher-info-style" style="pointer-events: auto">
-            <div class="teacher-info-title-style">教师情况</div>
-            <div class="data-info-style">
-                <div class="chart" ref="myCharts" style="width: 160px;height: 130px"></div>
-            </div>
-        </div>
-    </dv-border-box-12>
-</template>
-<script>
-    import {getPie3D, getParametricEquation} from '../../utils/chart.js' //工具类js，页面路径自己修改
-    import * as echarts from 'echarts';
-    import 'echarts-gl'
-    export default{
-        data(){
-            return {}
-        },
-        created(){
-            //this.setLabel()
-        },
-        mounted () {
-            this.initChart()
-//
-//            //根据窗口变化自动调节图表大小
-//            const that = this
-//            window.onresize = function () {
-//                that.changeSize()
-//            }
-        },
-        methods: {
-            initChart() {
-                const myCharts = echarts.init(this.$refs.myCharts);
-                let option = getPie3D([
-                    {
-                        name: '实到',
-                        value: 158,
-                        itemStyle: {
-                            opacity: 0.3,
-//                            color: 'green',
-                        }
-                    },
-                    {
-                        name: '迟到',
-                        value: 3,
-                        itemStyle: {
-                            opacity: 0.3,
-//                            color: 'green',
-                        }
-                    },
-                    {
-                        name: '缺勤',
-                        value: 3,
-                        itemStyle: {
-                            opacity: 0.3,
-//                            color: 'green',
-                        }
-                    }
-                ],0);
-                myCharts.setOption(option)
-            }
-        }
-    }
-</script>
-<style scoped lang="scss">
-    .dv-border-box-12 {
-        width: 400px;
-        height: 150px;
-        .teacher-info-style {
-            width: 400px;
-            height: 150px;
-            margin-top: 20px;
-            display: flex;
-            align-items: center;
-            padding-left: 10px;
-            .teacher-info-title-style {
-                width: 50px;
-                height: 130px;
-                line-height: 25px;
-                display: flex;
-                font-size: 16px;
-                justify-content: center;
-                align-items: center;
-                padding: 15px;
-                border-right: 1px solid #7ce7fd;
-            }
-            .data-info-style {
-                width: 350px;
-                height: 130px;
-            }
-        }
-    }
-
-</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherStudentInfo.vue b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherStudentInfo.vue
new file mode 100644
index 0000000..e1a8ed7
--- /dev/null
+++ b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/teacherStudentInfo.vue
@@ -0,0 +1,104 @@
+<template>
+    <div class="teacher-student-info-style">
+        <div class="chart" ref="myCharts" style="width: 200px;height: 130px"></div>
+        <div class="data-row-style" style="width: 150px;height: 130px">
+            <div class="row-info-style">
+                <span class="info-title-style">应到：</span>
+                <span class="info-data-style">{{dataInfo.shouldNum}}</span>
+            </div>
+            <div class="row-info-style">
+                <span class="info-title-style">实到：</span>
+                <span class="info-data-style">{{dataInfo.realNum}}</span>
+            </div>
+            <div class="row-info-style">
+                <span class="info-title-style">迟到：</span>
+                <span class="info-data-style">{{dataInfo.lateNum}}</span>
+            </div>
+            <div class="row-info-style">
+                <span class="info-title-style">缺勤：</span>
+                <span class="info-data-style">{{dataInfo.missNum}}</span>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import {getPie3D, getParametricEquation} from '../../utils/chart.js' //工具类js，页面路径自己修改
+    import * as echarts from 'echarts';
+    import 'echarts-gl'
+    export default{
+        data(){
+            return {}
+        },
+        props: {
+            dataInfo: {
+                type: Object,
+                default: {
+                    shouldNum: 0,
+                    realNum: 0,
+                    lateNum: 0,
+                    missNum: 0
+                }
+            }
+        },
+        mounted () {
+            this.initChart()
+        },
+        methods: {
+            initChart() {
+                const myCharts = echarts.init(this.$refs.myCharts);
+                let option = getPie3D([
+                    {
+                        name: '实到',
+                        value: this.dataInfo.realNum,
+                        itemStyle: {
+                            opacity: 0.3,
+//                            color: 'green',
+                        }
+                    },
+                    {
+                        name: '迟到',
+                        value: this.dataInfo.lateNum,
+                        itemStyle: {
+                            opacity: 0.3,
+//                            color: 'green',
+                        }
+                    },
+                    {
+                        name: '缺勤',
+                        value: this.dataInfo.missNum,
+                        itemStyle: {
+                            opacity: 0.3,
+//                            color: 'green',
+                        }
+                    }
+                ], 0);
+                myCharts.setOption(option)
+            }
+        }
+    }
+</script>
+<style scoped lang="scss">
+    .teacher-student-info-style {
+        width: 350px;
+        height: 130px;
+        display: flex;
+        padding-right: 20px;
+        .data-row-style {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            .row-info-style {
+                width: 100%;
+                height: 25px;
+                line-height: 25px;
+                display: flex;
+                justify-content: space-between;
+                font-size: 16px;
+                .info-data-style {
+                    color: #7ce7fd;
+                }
+            }
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue
index 9364ad6..b9ac791 100644
--- a/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue
+++ b/src/views/screenAdaptation/pages/threeDimensionalSchoolModel/threeDimensionalSchoolModel.vue
@@ -4,10 +4,18 @@
             <div class="content-title-style">
                 校园简报
             </div>
-            <TeacherInfo/>
+            <BorderBox12 title="教师情况">
+                <TeacherStudentInfo :dataInfo="teacherInfo"/>
+            </BorderBox12>
+            <BorderBox12 title="学生情况">
+                <TeacherStudentInfo :dataInfo="studentInfo"/>
+            </BorderBox12>
+            <BorderBox12 class="school-activity-box-style" title="校园活动">
+                <SchoolActivity/>
+            </BorderBox12>
         </div>
         <div v-if="!loading" class="content-right-style">
-
+            <MenuRight/>
         </div>
     </div>
 </template>
@@ -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
         }
     }
 </script>
@@ -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;
         }
     }
 </style>
\ 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 @@
 <template>
     <dv-border-box-1>
-        <div class="menu-item-style">
+        <div class="menu-item-style" @click="menuClick">
             <div class="menu-name-style">{{name}}</div>
             <my-icon :type="iconType" class="icon-style" style="font-size: 80px;margin-top: 50px"></my-icon>
         </div>
@@ -11,7 +11,12 @@
         data(){
             return {}
         },
-        props:["name","iconType"]
+        props:["name","iconType"],
+        methods:{
+            menuClick:function () {
+                this.$emit("menuClick")
+            }
+        }
     }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/screenAdaptation/pages/traditionalMode/traditionalMode.vue b/src/views/screenAdaptation/pages/traditionalMode/traditionalMode.vue
index d29501c..b9279ef 100644
--- a/src/views/screenAdaptation/pages/traditionalMode/traditionalMode.vue
+++ b/src/views/screenAdaptation/pages/traditionalMode/traditionalMode.vue
@@ -1,16 +1,9 @@
 <template>
     <div id="traditionalModel" class="traditional-menu-style">
-        <!--<dv-border-box-9>-->
-            <!--<dv-border-box-1>dv-border-box-1</dv-border-box-1>-->
-
-        <!--</dv-border-box-9>-->
-
         <dv-border-box-10>
             <div class="menu-content-style">
-                <menu-item v-for="item in menuAry" :key="item.id" :name="item.name" :iconType="item.iconType"/>
+                <menu-item v-for="item in menuAry" :key="item.id" :name="item.name" :iconType="item.iconType" @menuClick="menuClick"/>
             </div>
-            <!--<dv-border-box-1>dv-border-box-1</dv-border-box-1>-->
-            <!--<dv-border-box-1>dv-border-box-1</dv-border-box-1>-->
         </dv-border-box-10>
     </div>
 </template>
@@ -28,13 +21,17 @@
         },
         mounted(){
 
+        },
+        methods:{
+            menuClick:function () {
+
+            }
         },
         components:{
             MenuItem
         }
     }
 </script>
-
 <style scoped lang="scss">
     .traditional-menu-style{
         width: 100%;
diff --git a/src/views/screenAdaptation/utils/chart.js b/src/views/screenAdaptation/utils/chart.js
index 92a193a..c947e1c 100644
--- a/src/views/screenAdaptation/utils/chart.js
+++ b/src/views/screenAdaptation/utils/chart.js
@@ -290,7 +290,6 @@ function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h
     // 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0）
     let offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0;
     let offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0;
-    console.log(offsetX,offsetY)
     // 计算高亮效果的放大比例（未高亮，则比例为 1）
     let hoverRate = isHovered ? 1.05 : 1;
     // 返回曲面参数方程
@@ -322,7 +321,6 @@ function getParametricEquation(startRatio, endRatio, isSelected, isHovered, k, h
             if (u > endRadian) {
                 return offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate;
             }
-            console.log("k:",k)
             return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate;
         },
 
@@ -434,12 +432,12 @@ function getPie3D(pieData, internalDiameterRatio) {
 //                            }
 //                        },
         xAxis3D: {
-            min: -1,
-            max: 1
+            min: -1.5,
+            max: 1.5
         },
         yAxis3D: {
-            min: -1,
-            max: 1
+            min: -1.5,
+            max: 1.5
         },
         zAxis3D: {
             min: -1,
diff --git a/src/views/screenAdaptation/utils/drawMixin.js b/src/views/screenAdaptation/utils/drawMixin.js
index 93e1236..d89786b 100644
--- a/src/views/screenAdaptation/utils/drawMixin.js
+++ b/src/views/screenAdaptation/utils/drawMixin.js
@@ -2,8 +2,8 @@
 
 // * 默认缩放值
 const scale = {
-  width: '1',
-  height: '1',
+    width: '1',
+    height: '1',
 }
 
 // * 设计稿尺寸（px）