1

guanqb

2022-11-08 3883590f95c498ac4677598f46efea255db54cd9

1

 src/components/map/index.vue

@@ -13,10 +13,18 @@
        <!-- 全屏控制按钮 -->
        <div class="screen-full-btn">
            <el-tooltip v-if="isFullscreen" content="缩放" placement="bottom" effect="dark">
                <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
                <i
                    class="fa fa-compress"
                    style="vertical-align: middle; cursor: pointer"
                    @click="fullscreenchange"
                ></i>
            </el-tooltip>
            <el-tooltip v-if="!isFullscreen" content="全屏" placement="bottom" effect="dark">
                <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
                <i
                    class="fa fa-expand"
                    style="vertical-align: middle; cursor: pointer"
                    @click="fullscreenchange"
                ></i>
            </el-tooltip>
        </div>
    </div>

 src/views/activity/index.vue

@@ -18,8 +18,12 @@
                    <div class="category">活动类型：</div>
                    <div class="category-value">
                        <el-select size="small" v-model="activityType" placeholder="请选择">
                            <el-option v-for="item in activityOptions" :key="item.value" :label="item.label"
                                :value="item.value"></el-option>
                            <el-option
                                v-for="item in activityOptions"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value"
                            ></el-option>
                        </el-select>
                    </div>
                </div>
@@ -33,16 +37,25 @@
                <div>
                    <div class="category">选择时间：</div>
                    <div class="category-value">
                        <el-date-picker size="small" v-model="selectTime" type="date" placeholder="选择日期"
                            style="width:268px"></el-date-picker>
                        <el-date-picker
                            size="small"
                            v-model="selectTime"
                            type="date"
                            placeholder="选择日期"
                            style="width:268px"
                        ></el-date-picker>
                    </div>
                </div>
            </div>
            <div class="result-content">
                <div class="table-box">
                    <div class="row-box" :class="{ on: currentClickIndex === index }"
                    <div
                        class="row-box"
                        :class="{ on: currentClickIndex === index }"
                        v-for="(item, index) in activityList.slice((currentPage - 1) * pagesize, currentPage * pagesize)"
                        :key="index" @click="goAbDetail(item, index)">
                        :key="index"
                        @click="goAbDetail(item, index)"
                    >
                        <div class="row-title">常规安保</div>
                        <div class="row-content">
                            <div>
@@ -51,7 +64,9 @@
                            </div>
                            <div>
                                <div class="category">活动时间：</div>
                                <div class="category-value">2022-08-01 00:00:00 至 2022-09-01 00:00:00</div>
                                <div
                                    class="category-value"
                                >2022-08-01 00:00:00 至 2022-09-01 00:00:00</div>
                            </div>
                            <div>
                                <div class="category">活动详情：</div>
@@ -61,9 +76,15 @@
                    </div>
                </div>
                <div class="pages">
                    <el-pagination background layout="prev, pager, next" :total="activityList.length"
                        :page-size="pagesize" pager-count="3" :current-page="currentPage"
                        @current-change="handleCurrentChange"></el-pagination>
                    <el-pagination
                        background
                        layout="prev, pager, next"
                        :total="activityList.length"
                        :page-size="pagesize"
                        pager-count="3"
                        :current-page="currentPage"
                        @current-change="handleCurrentChange"
                    ></el-pagination>
                </div>
            </div>
        </div>
@@ -110,16 +131,13 @@
        </div>

        <div class="second-container">
            <el-tree :data="treeData" show-checkbox node-key="id" @check="treeCheckClick" @node-click="treeNodeClick">
            </el-tree>
            <el-tree :data="treeData" show-checkbox node-key="id" @check="treeCheckClick"></el-tree>
        </div>

        <div v-show="dialogVisible" class="activity-details-box">
            <div class="title">
                活动详情
                <div class="close" @click="closeActivityDetails">
                    <i class="el-icon-close"></i>
                </div>
                <div class="close" @click="closeActivityDetails"></div>
            </div>

            <div class="row-box">
@@ -163,7 +181,7 @@
                        inactive-color="#ccc"
                    ></el-switch>
                </div>
            </div> -->
            </div>-->

            <!-- <div class="row-box">
                <div class="category">分析范围：</div>
@@ -176,7 +194,7 @@
                        placeholder="请输入范围"
                    ></el-input>
                </div>
            </div> -->
            </div>-->
        </div>

        <div class="btn-box">
@@ -513,19 +531,6 @@
            }
        },

        treeNodeClick () {
            let color = global.DC.Namespace.Cesium.Color.fromBytes(
                102, 176, 255,
                100
            )
            this.$EventBus.$emit('layerPolylineAdd', {
                layerName: 'polylineLayer1',
                positions: '116.025000, 28.686000, 116.025000, 28.678000,116.020000, 28.678000',
                material: color,
                width: 2
            })
        },

        goAbDetail (item, index) {
            if (this.currentClickIndex !== '' && this.currentClickIndex == index) {
                return
@@ -711,11 +716,11 @@
        .search-box {
            padding: 0 10px;

            &>div:first-child {
            & > div:first-child {
                margin-top: 0;
            }

            &>div {
            & > div {
                margin-top: 10px;
                display: flex;
                align-items: center;
@@ -789,7 +794,7 @@
                    font-size: 14px;

                    .row-content {
                        &>div {
                        & > div {
                            display: flex;
                            line-height: 28px;

@@ -912,6 +917,10 @@
                transform: translate(0, -50%);
                cursor: pointer;
            }
            .close::before {
                content: '\e6db';
                font-family: element-icons;
            }
        }

        .row-box {
@@ -919,7 +928,7 @@
            line-height: 28px;
            display: flex;

            &>div {
            & > div {
                text-align: left;
            }


 src/views/home/index.vue

@@ -54,7 +54,7 @@
            <div class="layers-control-btn activity">
                <el-checkbox v-model="activityLayerShow" @change="activityChange">活动</el-checkbox>
            </div>
            <div class="layers-control-btn policeSituation">
            <div class="layers-control-btn police-situation">
                <el-checkbox v-model="policeSituationLayerShow" @change="policeSituationChange">警情</el-checkbox>
            </div>
        </div>
@@ -220,7 +220,7 @@
            :close-on-click-modal="true"
            class="equiment-details-box"
        >
            <div class="equimentDetail">
            <div class="equiment-detail">
                <div class="left">
                    <el-tree
                        :data="jurisdictionData"
@@ -1128,8 +1128,9 @@
                            lng: center[0],
                            lat: center[1],
                            alt: 0,
                            text: item.policeStationName
                            text: item.policeStationName,
                        },
                        distanceDisplayCondition: { "near": 0, "far": 200000 }
                    })
                    let cylinder = new global.DC.LightCylinderPrimitive(new global.DC.Position(center[0], center[1]), 1200, 1, 600)
                    cylinder.setStyle({
@@ -1418,7 +1419,6 @@
            } else {
                this.jurisdictionData = treeData
            }

        },

        showkeypersondetail (name, arr) {
@@ -1624,7 +1624,7 @@
            }
        }

        .policeSituation {
        .police-situation {
            :deep(.el-checkbox__inner) {
                background: rgb(228, 63, 63);
                border-color: rgb(228, 63, 63);
@@ -1663,7 +1663,7 @@
        }
    }

    .equimentDetail {
    .equiment-detail {
        height: 540px;
        width: 100%;