Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

guanqb

2023-05-08 1f37322883278a611226ab00b7b8ee9d8812633b

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 src/components/map/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-05-06 20:17:16
 * @LastEditTime: 2023-05-08 14:03:31
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -14,20 +14,46 @@
        <slot name="showButton"></slot>
        <div class="over-look-btn">
            <el-tooltip content="一键俯视" placement="top" effect="dark">
                <i class="fa fa-eye" style="vertical-align: middle; cursor: pointer" @click="overLookClick"></i>
                <i
                    class="fa fa-eye"
                    style="vertical-align: middle; cursor: pointer"
                    @click="overLookClick"
                ></i>
            </el-tooltip>
        </div>
        <!-- 全屏控制按钮 -->
        <div class="screen-full-btn">
            <el-tooltip v-if="!isShowHomeContentBtn && isFullscreen" content="缩放" placement="top" effect="dark">
                <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
            <el-tooltip
                v-if="!isShowHomeContentBtn && isFullscreen"
                content="缩放"
                placement="top"
                effect="dark"
            >
                <i
                    class="fa fa-compress"
                    style="vertical-align: middle; cursor: pointer"
                    @click="fullscreenchange"
                ></i>
            </el-tooltip>

            <el-tooltip v-if="!isShowHomeContentBtn && !isFullscreen" content="全屏" placement="top" effect="dark">
                <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
            <el-tooltip
                v-if="!isShowHomeContentBtn && !isFullscreen"
                content="全屏"
                placement="top"
                effect="dark"
            >
                <i
                    class="fa fa-expand"
                    style="vertical-align: middle; cursor: pointer"
                    @click="fullscreenchange"
                ></i>
            </el-tooltip>
            <el-tooltip v-if="isShowHomeContentBtn" content="显示/隐藏" placement="top" effect="dark">
                <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="switchShowHomeContent"></i>
                <i
                    class="fa fa-expand"
                    style="vertical-align: middle; cursor: pointer"
                    @click="switchShowHomeContent"
                ></i>
            </el-tooltip>
        </div>
        <!-- 切换矢量图按钮 -->
@@ -1200,8 +1226,6 @@
                // skipLevelOfDetail: false,
                shadows: global.DC.Namespace.Cesium.ShadowMode.DISABLED
            })

            tilesetObject[titlesetName].setHeight(10)

            // 地形数据添加
            // tilesetObject[titlesetName].setHeight(-73)

 src/views/home/components/rightContainer.vue

@@ -537,7 +537,7 @@

        // 获取警情排行统计值
        getCaseRanking (start, end) {
            const caseAll = getCaseRanking(
            getCaseRanking(
                start,
                end,
                this.policeStaionID != "" ? this.policeStaionID : this.userInfo.dept_id
@@ -545,36 +545,6 @@
                let data = []

                if (res.data.data) {
                    res.data.data.push({
                        name: 123,
                        count: 1
                    })

                    res.data.data.push({
                        name: 456,
                        count: 1
                    })

                    res.data.data.push({
                        name: 22,
                        count: 1
                    })

                    res.data.data.push({
                        name: 33,
                        count: 1
                    })

                    res.data.data.push({
                        name: 55,
                        count: 1
                    })

                    res.data.data.push({
                        name: 66,
                        count: 1
                    })

                    res.data.data = res.data.data.sort((a, b) => a.value - b.value)
                    res.data.data = res.data.data.map((item, index) => {
                        item.value = item.count