Merge branch 'yuanfeng' into '20210819'

弹框换图

See merge request vue-project/liangXing/frontEnd!22

src/components/CountTo.vue

-<template>
-  <CountTo
-    :startVal="startVal"
-    :endVal="endVal"
-    :duration="duration"
-    :decimals="decimals"
-    :separator="separator"
-    :suffix="suffix"
-    :prefix="prefix"
-  />
-</template>
-
-<script>
-import CountTo from 'vue-count-to'
-export default {
-    name: 'VueCountTo', // TODO: 数字变动组件
-    components: { CountTo },
-    props: {
-        autoplay: { type: Boolean, default: true }, // 自动播放 默认为 True
-        startVal: { type: Number, default: 0 }, // 起始值
-        endVal: { type: Number, default: 0 }, // 结束值
-        duration: { type: Number, default: 800 }, // 持续时间，以毫秒为单位
-        decimals: { type: Number, default: 0 }, // 要显示的小数位数
-        separator: { type: String, default: ',' }, // 分隔符
-        prefix: { type: String, default: '' }, // 前缀
-        suffix: { type: String, default: '' } // 后缀
-    }
-}
-</script>
-
-<style scoped>
-span {
-  font-family: "Century Gothic";
-}
-</style>

src/components/PopupFrame.vue

@@ -88,17 +88,13 @@ export default {
                 top: 7px;
             }
         }
-        .content {
-            margin-top: 15px;
-        }
         .close {
             width: 24px;
             height: 24px;
-            // background: url('../../static/images/index/bulletFrame-close.png')
-            //     no-repeat left top;
+            background: url('../../static/images/index/bulletFrame-close.png') no-repeat left top;
             position: absolute;
-            top: 36px;
-            right: 19px;
+            top: 20px;
+            right: 20px;
             cursor: pointer;
         }
     }

src/pages/index/Left.vue

@@ -100,7 +100,7 @@
             </div>
         </div>
         <!-- 弹框 -->
-        <popup-frame :visible="visible" :layout="{width: '960px', height: '543px'}" @beforeClose="closePopup">
+        <popup-frame :visible="visible" :layout="{width: '960px', height: '540px'}" @beforeClose="closePopup">
             <img src="../../../static/images/index/studentDemeanor.jpg" alt="弹框">
         </popup-frame>
     </div>
@@ -112,7 +112,6 @@ import BarChart from 'components/echarts/BarChart.vue'
 import PieChart from 'components/echarts/PieChart.vue'
 import LineChart from 'components/echarts/LineChart.vue'
 import Swiper from 'components/Swiper'
-import PopupFrame from 'components/PopupFrame.vue'
 import { swiperSlide } from 'vue-awesome-swiper'
 import utils from 'utils'
 export default {
@@ -124,8 +123,7 @@ export default {
         PieChart,
         LineChart,
         Swiper,
-        swiperSlide,
-        PopupFrame
+        swiperSlide
     },
 
     filters: {

src/public/plugins/index.js

@@ -5,7 +5,6 @@ import ContentContainer from 'components/ContentContainer'
 // 页面头
 import Header from 'components/Header'
 // 插件
-import CountTo from 'components/CountTo.vue'
 import PopupFrame from '@/components/PopupFrame'
 
 const UsePlugin = {}
@@ -21,8 +20,6 @@ UsePlugin.install = function (Vue, options = {}) {
     // 内容容器
     Vue.component('content-container', ContentContainer)
     Vue.component('page-head', Header)
-    // 数组滚动
-    Vue.component('count-to', CountTo)
     // 弹框组件
     Vue.component('popup-frame', PopupFrame)
 }