shuishen
2023-02-23 2d195fb54bbe452cab262afd9cb98304fcecb91c
所有图层点的高度调整
7 files modified
195 ■■■■ changed files
src/views/activity/index.vue 58 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 12 ●●●● patch | view | raw | blame | history
src/views/house/index.vue 62 ●●●● patch | view | raw | blame | history
src/views/police/index.vue 12 ●●●● patch | view | raw | blame | history
src/views/policeInfor/index.vue 12 ●●●● patch | view | raw | blame | history
src/views/video/list.vue 26 ●●●● patch | view | raw | blame | history
src/views/video/region.vue 13 ●●●● patch | view | raw | blame | history
src/views/activity/index.vue
@@ -22,11 +22,11 @@
                            v-model="activityType"
                            placeholder="请选择"
                            @change="activityTypeChange"
                            >
                                <el-option
                                    v-for="item in activityOptions"
                                    :key="item.dictKey"
                                    :label="item.dictValue"
                                >
                                    <el-option
                                        v-for="item in activityOptions"
                                        :key="item.dictKey"
                                        :label="item.dictValue"
                                :value="item.dictKey"
                                class="activity-option"
                            ></el-option>
@@ -38,12 +38,12 @@
                    <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>-->
                                    size="small"
                                    v-model="selectTime"
                                    type="date"
                                    placeholder="选择日期"
                                    style="width:268px"
                                ></el-date-picker>-->
                        <el-date-picker v-model="selectTime" type="daterange" align="right" unlink-panels
                            format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至"
                            start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions"
@@ -141,10 +141,10 @@
                    <ul>
                        <li>
                            <!-- <el-button
                                title="路线绘制"
                                @click="draw('billboard', 'policeman')"
                                icon="el-icon-my-route"
                                ></el-button>-->
                                    title="路线绘制"
                                    @click="draw('billboard', 'policeman')"
                                    icon="el-icon-my-route"
                                    ></el-button>-->
                            <button @click="draw('polyline', 'policecar')" title="巡逻路线">
                                <img src="../../../public/img/icon/route1.png" style="height:100%" />
                            </button>
@@ -385,9 +385,12 @@
            <div>
                <div class="value-name-box">选择范围颜色:</div>
                <div class="color-box">
                    <div class="red-color" @click="changeLineColor('#FF0000')">{{ chooseColor == '#FF0000' ? '√' : '' }}</div>
                    <div class="green-color" @click="changeLineColor('#00FF00')">{{ chooseColor == '#00FF00' ? '√' : '' }}</div>
                    <div class="blue-color" @click="changeLineColor('#0000FF')">{{ chooseColor == '#0000FF' ? '√' : '' }}</div>
                    <div class="red-color" @click="changeLineColor('#FF0000')">{{ chooseColor == '#FF0000' ? '√' : '' }}
                    </div>
                    <div class="green-color" @click="changeLineColor('#00FF00')">{{ chooseColor == '#00FF00' ? '√' : '' }}
                    </div>
                    <div class="blue-color" @click="changeLineColor('#0000FF')">{{ chooseColor == '#0000FF' ? '√' : '' }}
                    </div>
                </div>
            </div>
            <div>
@@ -419,9 +422,11 @@
                <div class="color-box">
                    <div class="red-color" @click="changePlotColor('#FF0000')">{{ choosePlotColor == '#FF0000' ? '√' : '' }}
                    </div>
                    <div class="green-color" @click="changePlotColor('#00FF00')">{{ choosePlotColor == '#00FF00' ? '√' : '' }}
                    <div class="green-color" @click="changePlotColor('#00FF00')">{{ choosePlotColor == '#00FF00' ? '√' : ''
                    }}
                    </div>
                    <div class="blue-color" @click="changePlotColor('#0000FF')">{{ choosePlotColor == '#0000FF' ? '√' : '' }}
                    <div class="blue-color" @click="changePlotColor('#0000FF')">{{ choosePlotColor == '#0000FF' ? '√' : ''
                    }}
                    </div>
                </div>
            </div>
@@ -1203,7 +1208,7 @@
                                    ...item,
                                    lng: item.longitude,
                                    lat: item.latitude,
                                    alt: 100,
                                    alt: 1,
                                    url: '/img/icon/camera.png'
                                },
                                // incident: this.siteClick
@@ -1751,7 +1756,7 @@
                                ...item,
                                lng: item.location.lng,
                                lat: item.location.lat,
                                alt: 0,
                                alt: 1,
                                url: `/img/icon/${iconType}.png`
                            },
                        })
@@ -1780,7 +1785,7 @@
                    params: {
                        lng: `${this.searchExtensivelyArray[0].location.lng}`,
                        lat: `${this.searchExtensivelyArray[0].location.lat}`,
                        alt: 0,
                        alt: 1,
                        text: this.searchExtensivelyArray[0].name
                    },
                })
@@ -1821,7 +1826,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    text: item.name
                }
            })
@@ -1831,7 +1836,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/location.png'
                },
            })
@@ -2750,5 +2755,4 @@
        cursor: pointer;
        z-index: 100;
    }
}
</style>
}</style>
src/views/home/index.vue
@@ -30,7 +30,7 @@
                <el-checkbox v-model="areaPolygonLayerShow" @change="areaPolygonChange">辖区</el-checkbox>
        </div>
        <!-- <div class="layers-control-btn house">
                                        <el-checkbox v-model="houseLayerShow" @change="houseChange">小区</el-checkbox>
                                            <el-checkbox v-model="houseLayerShow" @change="houseChange">小区</el-checkbox>
            </div>-->
        <div class="layers-control-btn car">
                <el-checkbox v-model="carLayerShow" @change="carChange">警车</el-checkbox>
@@ -39,11 +39,11 @@
                <el-checkbox v-model="cameraLayerShow" @change="cameraChange">摄像头</el-checkbox>
            </div>
            <!-- <div class="layers-control-btn moitor">
                                        <el-checkbox v-model="monitoringLayerShow" @change="monitoringChange">监控</el-checkbox>
                                    </div>-->
                                            <el-checkbox v-model="monitoringLayerShow" @change="monitoringChange">监控</el-checkbox>
                                        </div>-->
            <!-- <div class="layers-control-btn panorama">
                                        <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
                                    </div>-->
                                            <el-checkbox v-model="panoramaLayerShow" @change="panoramaChange">全景</el-checkbox>
                                        </div>-->
            <div class="layers-control-btn police-situation">
                <el-checkbox v-model="policeSituationLayerShow" @change="policeSituationChange">警情</el-checkbox>
            </div>
@@ -1506,7 +1506,7 @@
                params: {
                    lng: center[0],
                    lat: center[1],
                    alt: 0,
                    alt: 1,
                    text: item.housingsName
                }
            })
src/views/house/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-23 08:46:15
 * @LastEditTime: 2023-02-23 08:57:03
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -140,9 +140,9 @@
                                <div class="two">
                                    <div>
                                        <div>98</div>
                                            <div>户籍人口</div>
                                        </div>
                                        <div>
                                                <div>户籍人口</div>
                                            </div>
                                            <div>
                                        <div style="color:#0E88FF">20</div>
                                        <div>流动人口</div>
                                    </div>
@@ -164,17 +164,17 @@
                                <div>
                                    <div>120</div>
                                    <div>出租</div>
                                        </div>
                                        <div>
                                            <div>160</div>
                                            <div>自住</div>
                                        </div>
                                        <div>
                                            <div>8</div>
                                            <div>空置</div>
                                        </div>
                                    </div>
                                    <div>
                                        <div>160</div>
                                        <div>自住</div>
                                    </div>
                                    <div>
                                        <div>8</div>
                                        <div>空置</div>
                                    </div>
                                </div>
                            </div>-->
                                </div>-->
                        <div class="house-element-info" v-if="isShowHouseBox">
                        <!-- 选择单元 -->
                        <div class="condo" v-show="isShowUnitChoose">
@@ -219,17 +219,17 @@
                                    <div>
                                        <span class="zizhu"></span>
                                        自住
                                            </div>
                                            <div>
                                                <span class="kongzhi"></span>
                                                空置
                                            </div>
                                            <div>
                                                <span class="shangye"></span>
                                                商业
                                            </div>
                                        </div>
                                        <div>
                                            <span class="kongzhi"></span>
                                            空置
                                        </div>
                                        <div>
                                            <span class="shangye"></span>
                                            商业
                                        </div>
                                    </div>
                                </div>-->
                                    </div>-->
                            <el-main v-loading="pictLoading" element-loading-background="rgba(17, 38, 163, .1)"
                                element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                                v-show="isShowHouseBox">
@@ -266,8 +266,8 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                <div class="focus"></div>
                                                    <div class="warning"></div>-->
                                                    <div class="focus"></div>
                                                        <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -1048,7 +1048,7 @@
                    params: {
                        lng: `${this.searchExtensivelyArray[0].location.lng}`,
                        lat: `${this.searchExtensivelyArray[0].location.lat}`,
                        alt: 0,
                        alt: 1,
                        text: this.searchExtensivelyArray[0].name
                    },
                })
@@ -1089,7 +1089,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    text: item.name
                }
            })
@@ -1099,7 +1099,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/location.png'
                },
            })
@@ -1139,7 +1139,7 @@
                params: {
                    lng: `${row.x}`,
                    lat: `${row.y}`,
                    alt: 0,
                    alt: 1,
                    text: row.name
                }
            })
@@ -1149,7 +1149,7 @@
                params: {
                    lng: `${row.x}`,
                    lat: `${row.y}`,
                    alt: 0,
                    alt: 1,
                    url: url
                },
            })
src/views/police/index.vue
@@ -253,7 +253,7 @@
                            }
                        }
                        return { ...item, newName: newName, lng: item.longitude, lat: item.latitude, alt: 100 }
                        return { ...item, newName: newName, lng: item.longitude, lat: item.latitude, alt: 1 }
                    })
                    this.equimentTableData.forEach(item => {
@@ -476,7 +476,7 @@
                params: {
                    lng: positionsArr[0].longitude,
                    lat: positionsArr[0].latitude,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/orgin.png'
                }
            })
@@ -487,7 +487,7 @@
                params: {
                    lng: positionsArr[positionsArr.length - 1].longitude,
                    lat: positionsArr[positionsArr.length - 1].latitude,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/end.png'
                }
            })
@@ -561,7 +561,7 @@
                    params: {
                        lng: `${this.searchExtensivelyArray[0].location.lng}`,
                        lat: `${this.searchExtensivelyArray[0].location.lat}`,
                        alt: 0,
                        alt: 1,
                        text: this.searchExtensivelyArray[0].name
                    }
                })
@@ -602,7 +602,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    text: item.name
                }
            })
@@ -612,7 +612,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/location.png'
                }
            })
src/views/policeInfor/index.vue
@@ -253,7 +253,7 @@
                            }
                        }
                        return { ...item, newName: newName, lng: item.longitude, lat: item.latitude, alt: 100 }
                        return { ...item, newName: newName, lng: item.longitude, lat: item.latitude, alt: 1 }
                    })
                    this.equimentTableData.forEach(item => {
@@ -476,7 +476,7 @@
                params: {
                    lng: positionsArr[0].longitude,
                    lat: positionsArr[0].latitude,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/orgin.png'
                }
            })
@@ -487,7 +487,7 @@
                params: {
                    lng: positionsArr[positionsArr.length - 1].longitude,
                    lat: positionsArr[positionsArr.length - 1].latitude,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/end.png'
                }
            })
@@ -561,7 +561,7 @@
                    params: {
                        lng: `${this.searchExtensivelyArray[0].location.lng}`,
                        lat: `${this.searchExtensivelyArray[0].location.lat}`,
                        alt: 0,
                        alt: 1,
                        text: this.searchExtensivelyArray[0].name
                    }
                })
@@ -602,7 +602,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    text: item.name
                }
            })
@@ -612,7 +612,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/location.png'
                }
            })
src/views/video/list.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-20 10:43:51
 * @LastEditTime: 2023-02-23 08:56:50
 * @FilePath: \srs-police-affairs\src\views\video\list.vue
 * @Description: 辖区管理
 * 
@@ -26,11 +26,11 @@
                <el-button type="primary" size="mini" @click="draww('polyline')">绘制测试</el-button>
            </div>
            <!-- <div class="range-input" v-show="inputpopup">
                        <div class="close" @click="closeRangeInput"></div>
                        <h3>请输入距离</h3>
                        <input type="text" v-model="range" />
                        <button @click="changeRange" class="btn">确定</button>
                    </div>-->
                            <div class="close" @click="closeRangeInput"></div>
                            <h3>请输入距离</h3>
                            <input type="text" v-model="range" />
                            <button @click="changeRange" class="btn">确定</button>
                        </div>-->
            <div class="down-tree">
                <el-scrollbar>
@@ -400,7 +400,7 @@
                        name: item.name,
                        lng: item.longitude,
                        lat: item.latitude,
                        alt: 100,
                        alt: 1,
                        url: '/img/icon/video.png',
                        deviceId: item.deviceId,
                        channelId: item.channelId
@@ -513,7 +513,7 @@
                    params: {
                        lng: `${this.searchExtensivelyArray[0].location.lng}`,
                        lat: `${this.searchExtensivelyArray[0].location.lat}`,
                        alt: 0,
                        alt: 1,
                        text: this.searchExtensivelyArray[0].name
                    },
                })
@@ -554,7 +554,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    text: item.name
                }
            })
@@ -564,7 +564,7 @@
                params: {
                    lng: `${item.location.lng}`,
                    lat: `${item.location.lat}`,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/location.png'
                },
            })
@@ -642,7 +642,7 @@
                params: {
                    lng: node.longitude,
                    lat: node.latitude,
                    alt: 0,
                    alt: 1,
                    text: node.name
                }
            })
@@ -654,7 +654,7 @@
                    name: node.name,
                    lng: node.longitude,
                    lat: node.latitude,
                    alt: 0,
                    alt: 1,
                    url: '/img/icon/video.png',
                    channelId: node.id
                },
@@ -673,7 +673,7 @@
                                text: item.name,
                                lng: item.longitude,
                                lat: item.latitude,
                                alt: 0,
                                alt: 1,
                                url: '/img/icon/video.png',
                                channelId: item.channelId
                            },
src/views/video/region.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-02-23 08:47:38
 * @LastEditTime: 2023-02-23 08:56:44
 * @FilePath: \srs-police-affairs\src\views\video\region.vue
 * @Description: 辖区管理
 * 
@@ -33,9 +33,9 @@
                                <el-table-column prop="name" label="范围名称" min-width="50%"></el-table-column>
                                <el-table-column prop="extent" label="长度/km" min-width="50%">
                                    <!-- <template slot-scope="scope">
                                                <span>{{ scope.row.extent }}</span>
                                                <span>千米</span>
                                            </template>-->
                                                    <span>{{ scope.row.extent }}</span>
                                                    <span>千米</span>
                                                </template>-->
                                </el-table-column>
                                <el-table-column prop="id" label="操作" min-width="50%">
                                    <template slot-scope="scope">
@@ -515,7 +515,7 @@
                        name: item.name,
                        lng: item.longitude,
                        lat: item.latitude,
                        alt: 10,
                        alt: 1,
                        url: '/img/icon/video.png',
                        // deviceId: item.deviceId
                    },
@@ -1087,4 +1087,5 @@
    .deleteVideo-new-left {
        left: calc(1380 / 1920 * 100vw);
    }
}</style>
}
</style>