Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web

shuishen

2022-10-21 6e71fe5b09365c5faf54aeb514273daa20dacd12

Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web

 src/pcviews/homepage/Header/index.vue

@@ -5,8 +5,8 @@
        <div class="btn2 navBtn" :class="{'btnClick':isClick == 2}" @click="isClick = 2">能源管理</div>
        <div class="btn3 navBtn" :class="{'btnClick':isClick == 3}" @click="isClick = 3">地下管网</div>
        <div class="btn4 navBtn" :class="{'btnClick':isClick == 4}" @click="isClick = 4">资产管理</div>
        <div class="btn5 navBtn" :class="{'btnClick':isClick == 5}" @click="onBtn5">校园导览</div>
        <div class="btn6 navBtn" :class="{'btnClick':isClick == 6}" @click="isClick = 6">新生迎新</div>
        <div class="btn5 navBtn" :class="{'btnClick':isClick == 5}" @click="onBtn5">校园三维</div>
        <div class="btn6 navBtn" :class="{'btnClick':isClick == 6}" @click="isClick = 6">视频融合</div>

        <div class="underLine"></div>
    </div>

 src/pcviews/homepage/PipeWellPercent/index.vue

@@ -74,9 +74,8 @@
                    {
                        name: 'Nightingale Chart',
                        type: 'pie',
                        radius: [26, 100],
                        radius: [0, 100],
                        center: ['30%', '58%'],
                        roseType: 'area',
                        data: this.data,
                        label: {
                            show: true,