Merge branch '20210819' of 123.207.147.179:vue-project/liangXing/frontEnd into 20210819

src/components/PopupFrame.vue

+<template>
+    <div class="PopupFrame" v-if="visible">
+        <div class="iframe" :style="`width:${layout.width};height:${layout.height}`">
+            <!-- <div class="title">
+                <span>
+                    {{ title }}
+                </span>
+            </div> -->
+            <div class="close" @click="closeBullet"></div>
+            <div class="content">
+                <!-- 内容部分 -->
+                <slot></slot>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'PopupFrame',
+
+    data () {
+        return {
+        }
+    },
+
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        title: '',
+        layout: {
+            type: Object,
+            default () {
+                return {
+                    width: '1440px',
+                    height: '815px'
+                }
+            }
+        }
+    },
+
+    components: {
+    },
+
+    methods: {
+        // 关闭弹出框
+        closeBullet () {
+            this.$emit('beforeClose', false)
+        }
+    }
+}
+</script>
+
+<style lang="less">
+.PopupFrame {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    left: 0;
+    top: 0;
+    z-index: 101;
+    background-color: rgba(0, 0, 0, 0.6);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .iframe {
+        width: 1280px;
+        height: 721px;
+        position: relative;
+        background-color: rgba(0, 0, 0, 0.8);
+        .title {
+            width: 1090px;
+            height: 38px;
+            text-align: center;
+            margin: 0 auto;
+            span {
+                font-size: 22px;
+                font-family: Source Han Sans CN;
+                font-weight: bold;
+                color: #ffffff;
+                line-height: 22px;
+                background: linear-gradient(0deg, #a3dcff 0%, #ffffff 100%);
+                -webkit-background-clip: text;
+                -webkit-text-fill-color: transparent;
+                position: relative;
+                top: 7px;
+            }
+        }
+        .content {
+            margin-top: 15px;
+        }
+        .close {
+            width: 24px;
+            height: 24px;
+            background: url('../../static/images/index/bulletFrame-close.png')
+                no-repeat left top;
+            position: absolute;
+            top: 36px;
+            right: 19px;
+            cursor: pointer;
+        }
+    }
+}
+</style>
\ No newline at end of file

src/components/echarts/BarChart.vue

@@ -116,7 +116,7 @@ export default {
                     show: false
                 },
                 grid: {
-                    left: -10,
+                    left: 0,
                     right: 35,
                     bottom: 0,
                     top: 0,

src/pages/index/active.vue

@@ -142,7 +142,7 @@ export default {
                         width: 28px;
                         height: 24px;
                         // margin-top: 5px!important;
-                     background:url('../../../static/images/index/查看更多.png') no-repeat;
+                        background:url('../../../static/images/index/more.png') no-repeat;
                     }
                    
                 }

src/pages/index/index.vue

@@ -74,6 +74,10 @@ export default {
                 }
                 // 右侧数据
                 this.rightData = {
+                    staff: data.p12 || {}, // 师资力量
+                    coursedata: data.p13 || {}, // 教学课程
+                    line: data.p14 || {}, // 教学线上线下比例
+                    learn: data.p15 || {} // 学习内容
                 }
             } catch (err) {
                 console.log('managePlatform >', err)

src/public/plugins/index.js

@@ -6,6 +6,7 @@ import ContentContainer from 'components/ContentContainer'
 import Header from 'components/Header'
 // 插件
 import CountTo from 'components/CountTo.vue'
+import PopupFrame from '@/components/PopupFrame'
 
 const UsePlugin = {}
 
@@ -22,6 +23,8 @@ UsePlugin.install = function (Vue, options = {}) {
     Vue.component('page-head', Header)
     // 数组滚动
     Vue.component('count-to', CountTo)
+    // 弹框组件
+    Vue.component('popup-frame', PopupFrame)
 }
 
 export default UsePlugin