shuishen
2023-04-06 bc707c6988d4302e06ea99be2a088b74feee02e6
el-dialog更改
21 files modified
1 files deleted
191 ■■■■■ changed files
public/img/icon/video-off.png patch | view | raw | blame | history
public/img/icon/video.png patch | view | raw | blame | history
src/components/assemble/index.vue 4 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 9 ●●●● patch | view | raw | blame | history
src/components/playVideo/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/activity/components/customImageBox.vue 4 ●●●● patch | view | raw | blame | history
src/views/activity/components/policeCarChange.vue 4 ●●●● patch | view | raw | blame | history
src/views/activity/components/policePersonChange.vue 4 ●●●● patch | view | raw | blame | history
src/views/activity/components/polygonPlot.vue 4 ●●●● patch | view | raw | blame | history
src/views/activity/components/polylinePlot.vue 2 ●●● patch | view | raw | blame | history
src/views/home/components/dialog/areaDetailsBox.vue 4 ●●●● patch | view | raw | blame | history
src/views/home/components/dialog/keyPersonBox.vue 4 ●●●● patch | view | raw | blame | history
src/views/home/components/dialog/landDetailsBox.vue 4 ●●●● patch | view | raw | blame | history
src/views/home/components/schedulingList.vue 4 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 26 ●●●● patch | view | raw | blame | history
src/views/house/2.js 67 ●●●●● patch | view | raw | blame | history
src/views/house/index.vue 10 ●●●● patch | view | raw | blame | history
src/views/police/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/policeInfor/index.vue 5 ●●●●● patch | view | raw | blame | history
src/views/video/list.vue 8 ●●●● patch | view | raw | blame | history
src/views/video/region.vue 14 ●●●● patch | view | raw | blame | history
vue.config.js 6 ●●●● patch | view | raw | blame | history
public/img/icon/video-off.png

public/img/icon/video.png

src/components/assemble/index.vue
@@ -10,8 +10,8 @@
-->
<template>
    <div>
        <el-dialog :title="dialogTile" :modal="true" :visible.sync="dialogVisible" :before-close="beforClose"
            :close-on-click-modal="true" class="equiment-details-box-two">
        <el-dialog :title="dialogTile" :visible.sync="dialogVisible" :before-close="beforClose" :modal="true"
            :close-on-click-modal="false" class="equiment-details-box-two">
            <div class="header">
                <div>
                    设备名称:
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-04-05 04:31:12
 * @LastEditTime: 2023-04-06 09:52:22
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -631,6 +631,8 @@
            if (this.tilesetLayerType == type && status == '') {
                this.tilesetLayerType = ''
            } else {
                this.tilesetLayerType = type
@@ -641,6 +643,11 @@
                    label.forEach(item => {
                        this.addMxTileset(`sdTilesetLayer${item}`, `${tile3DUrl}/sf3d/361102/model/all1/${item}/tileset.json`)
                    })
                this.$EventBus.$emit('showHouseingTileset', {
                    curType: this.tilesetLayerType,
                    type,
                })
            }
        },
src/components/playVideo/index.vue
@@ -10,8 +10,8 @@
-->
<template>
    <div>
        <el-dialog :title="title" :modal="true" :visible.sync="visibleFlag" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="title" :visible.sync="visibleFlag" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        </el-dialog>
src/views/activity/components/customImageBox.vue
@@ -10,8 +10,8 @@
-->
<template>
    <div>
        <el-dialog :title="curDialogTitle" :visible.sync="curDialogShow" class="activity-custom-img-box"
            :before-close="closeCurDialog">
        <el-dialog :title="curDialogTitle" :modal="true" :close-on-click-modal="false" :visible.sync="curDialogShow"
            class="activity-custom-img-box" :before-close="closeCurDialog">
            <div class="describe">
                <div class="label">
                    描述
src/views/activity/components/policeCarChange.vue
@@ -1,7 +1,7 @@
<template>
    <div>
        <el-dialog title="选择警车" :modal="false" :visible.sync="policeChooseCarVisible" :before-close="cancel"
            :close-on-click-modal="true" class="choose-policeCar-box">
        <el-dialog title="选择警车" :visible.sync="policeChooseCarVisible" :before-close="cancel" :modal="true"
            :close-on-click-modal="false" class="choose-policeCar-box">
            <div>
                <el-select size="small" v-model="policeType" placeholder="请选择" :disabled="isChoosePoliceElementDisabled">
                    <el-option v-for="item in policeOption" :key="item.value" :label="item.label"
src/views/activity/components/policePersonChange.vue
@@ -1,7 +1,7 @@
<template>
    <div>
        <el-dialog title="选择警员" :modal="false" :visible.sync="policeChooseVisible" :before-close="cancel"
            :close-on-click-modal="true" class="choose-police-box">
        <el-dialog title="选择警员" :visible.sync="policeChooseVisible" :before-close="cancel" :modal="true"
            :close-on-click-modal="false" class="choose-police-box">
            <div>
                <el-input ref="searchTreeInput" v-model="searchPoliceTreeName" @input="searchInputTree"
                    @focus="searchTreeShowFlag = true" @blur="searchTreeShowFlag = false" placeholder="请选择警员"
src/views/activity/components/polygonPlot.vue
@@ -1,6 +1,6 @@
<template>
    <div>
        <el-dialog title="修改标绘" :modal="false" :visible.sync="editPlotVisible" :close-on-click-modal="true"
        <el-dialog title="修改标绘" :visible.sync="editPlotVisible" :modal="true" :close-on-click-modal="false"
            class="edit-plot-box">
            <div>
                <div class="value-name-box">选择标绘颜色:</div>
@@ -25,7 +25,7 @@
            </div>
        </el-dialog>
        <el-dialog title="新增标绘" :modal="false" :visible.sync="polygonAddVisible" :close-on-click-modal="true"
        <el-dialog title="新增标绘" :visible.sync="polygonAddVisible" :modal="true" :close-on-click-modal="false"
            class="add-polygon-box" :before-close="cancelSavePolygon">
            <div class="line" v-show="isNeedPolygonType">
                <div class="value-name-box">选择类型:</div>
src/views/activity/components/polylinePlot.vue
@@ -3,7 +3,7 @@
<template>
    <div>
        <el-dialog :title="lineEditTitle" :modal="false" :visible.sync="lineEditVisible" :close-on-click-modal="true"
        <el-dialog :title="lineEditTitle" :visible.sync="lineEditVisible" :modal="true" :close-on-click-modal="false"
            class="edit-line-box" :before-close="cancelSaveLine">
            <div>
                <div class="value-name-box">设置缓冲范围:</div>
src/views/home/components/dialog/areaDetailsBox.vue
@@ -1,7 +1,7 @@
<template>
    <!-- 户籍人口 -->
    <el-dialog :title="peopleTitle" :modal="true" :visible.sync="peopleVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="area-details-box">
    <el-dialog :title="peopleTitle" :visible.sync="peopleVisible" :before-close="personInfoClose" :modal="true"
        :close-on-click-modal="false" class="area-details-box">
        <div class="header">
            <div>
                人员名称:
src/views/home/components/dialog/keyPersonBox.vue
@@ -1,7 +1,7 @@
<template>
    <!-- 重点人员 -->
    <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="keyPerson-details-box">
    <el-dialog :title="keyPersonTitle" :visible.sync="keyPersonVisible" :before-close="personInfoClose" :modal="true"
        :close-on-click-modal="false" class="keyPerson-details-box">
        <div class="header" v-show="userInfo.dept_id != '1596020515064381442'">
            <div>
                人员名称:
src/views/home/components/dialog/landDetailsBox.vue
@@ -1,6 +1,6 @@
<template>
    <el-dialog :title="landTitle" :modal="true" :visible.sync="landVisible" :before-close="landBeforeClose"
        :close-on-click-modal="true" class="land-details-box">
    <el-dialog :title="landTitle" :visible.sync="landVisible" :before-close="landBeforeClose" :modal="true"
        :close-on-click-modal="false" class="land-details-box">
        <div class="header">
            <div v-show="landType == 2">
                小区名称:
src/views/home/components/schedulingList.vue
@@ -1,8 +1,8 @@
<template>
    <!-- 值班table -->
    <div>
        <el-dialog :title="schedulingTitle" :modal="true" :visible.sync="schedulingVisible"
            :before-close="schedulingBeforeClose" :close-on-click-modal="true" class="area-details-box">
        <el-dialog :title="schedulingTitle" :visible.sync="schedulingVisible" :before-close="schedulingBeforeClose"
            :modal="true" :close-on-click-modal="false" class="area-details-box">
            <div class="header">
                <div>
                    <span>值班人:</span>
src/views/home/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-04-05 03:13:21
 * @LastEditTime: 2023-04-06 10:05:31
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -57,14 +57,14 @@
                :options="housingOptions" :optionsName="'name'" :selectAllClass="selectHouseClass"></map-select>
        </div>
        <el-dialog :title="panoramaTitle" :modal="true" :visible.sync="panoramaVisible" :before-close="panoramaBeforeClose"
            :close-on-click-modal="true" class="panorama-details-box">
        <el-dialog :title="panoramaTitle" :visible.sync="panoramaVisible" :before-close="panoramaBeforeClose" :modal="true"
            :close-on-click-modal="false" class="panorama-details-box">
            <!-- <iframe src="http://vr.jxpskj.com/JXSFKZQJ/QJ/" style="width: 100%; height: 100%;" frameborder="0"></iframe>-->
            <iframe :src="panoramaVrUrl" style="width: 100%; height: 100%;" frameborder="0"></iframe>
        </el-dialog>
        <el-dialog :title="phoneTitle" :modal="true" :visible.sync="phoneVisible" :before-close="phoneBeforeClose"
            :close-on-click-modal="true" class="phone-details-box">
        <el-dialog :title="phoneTitle" :visible.sync="phoneVisible" :before-close="phoneBeforeClose" :modal="true"
            :close-on-click-modal="false" class="phone-details-box">
            <div class="item">
                <div>责任人:</div>
                <div>{{ phoneDetails.person }}</div>
@@ -83,8 +83,8 @@
            </div>
        </el-dialog>
        <el-dialog :title="equimentTitle" :modal="true" :visible.sync="equimentVisible" :before-close="equimentBeforeClose"
            :close-on-click-modal="true" class="equiment-details-box">
        <el-dialog :title="equimentTitle" :visible.sync="equimentVisible" :before-close="equimentBeforeClose" :modal="true"
            :close-on-click-modal="false" class="equiment-details-box">
            <div class="header">
                <div>
                    设备名称:
@@ -140,8 +140,8 @@
        </el-dialog>
        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :close-on-click-modal="true" class="policeSituation-details-box">
        <el-dialog title="警情信息" :visible.sync="policeSituationVisible" :modal="true" :close-on-click-modal="false"
            :before-close="policeSituationBeforeClose" class="policeSituation-details-box">
            <div class="btn-change">
                <div :class="{ on: policeInformationType == '接警信息' }" @click="alarmOrActAsPolice('接警信息')">接警信息</div>
                <div :class="{ on: policeInformationType == '出警信息' }" @click="alarmOrActAsPolice('出警信息')">出警信息</div>
@@ -266,16 +266,16 @@
            <div v-show="policeInformationType == '出警信息' && JSON.stringify(CJdata) == '{}'" class="box no-data">暂无数据</div>
        </el-dialog>
        <el-dialog :title="dialogEquimentVideoTitle" :modal="true" :visible.sync="dialogEquimentVideoVisible"
            :before-close="dialogBeforeClose" :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogEquimentVideoTitle" :visible.sync="dialogEquimentVideoVisible"
            :before-close="dialogBeforeClose" :modal="true" :close-on-click-modal="false" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>
            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        </el-dialog>
        <el-dialog title="学校" :modal="false" :visible.sync="xxPopupShow" :before-close="landBeforeClose"
            :close-on-click-modal="true" class="land-details-box" v-loading="houseLoading" element-loading-text="拼命加载中"
        <el-dialog title="学校" :visible.sync="xxPopupShow" :before-close="landBeforeClose" :modal="true"
            :close-on-click-modal="false" class="land-details-box" v-loading="houseLoading" element-loading-text="拼命加载中"
            element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
            <el-table :data="houseArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
src/views/house/2.js
File was deleted
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-04-05 17:43:24
 * @LastEditTime: 2023-04-06 10:06:43
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -189,7 +189,7 @@
                                                :class="{ on: floorChoosed == value.properties.fojcu }">
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                     <div class="warning"></div>-->
                                                                             <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -271,7 +271,7 @@
        <map-search-box></map-search-box>
        <el-dialog title="报警信息" :modal="true" :visible.sync="policeSituationVisible" :append-to-body="true"
        <el-dialog title="报警信息" :visible.sync="policeSituationVisible" :append-to-body="true" :modal="true"
            :close-on-click-modal="false" :before-close="policeSituationBeforeClose" class="policeSituation-details-box">
            <div class="box">
                <div class="item">
@@ -333,7 +333,7 @@
            </div>
        </el-dialog>
        <el-dialog :title="residentDetailsTitle" :modal="true" :visible.sync="residentDetailsShow" :append-to-body="true"
        <el-dialog :title="residentDetailsTitle" :visible.sync="residentDetailsShow" :append-to-body="true" :modal="true"
            :close-on-click-modal="false" :before-close="residentDetailsClose" class="resident-details-box" width="24%">
            <el-table :data="houseDate"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
@@ -346,7 +346,7 @@
            </el-table>
        </el-dialog>
        <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :append-to-body="true"
        <el-dialog :title="keyPersonTitle" :visible.sync="keyPersonVisible" :append-to-body="true" :modal="true"
            :close-on-click-modal="false" :before-close="keyPersonBeforeClose" class="keyPerson-details-box-two">
            <div class="header">
                <div>
src/views/police/index.vue
@@ -129,8 +129,8 @@
            </div>
        </div>
        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>
            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
src/views/policeInfor/index.vue
@@ -81,8 +81,9 @@
            </div>
        </div>
        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :close-on-click-modal="true" class="policeSituation-details-box">
        <el-dialog title="警情信息" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :modal="true" :close-on-click-modal="false"
            class="policeSituation-details-box">
            <div class="btn-change">
                <div :class="{ on: policeInformationType == '接警信息' }" @click="alarmOrActAsPolice('接警信息')">接警信息</div>
                <div :class="{ on: policeInformationType == '出警信息' }" @click="alarmOrActAsPolice('出警信息')">出警信息</div>
src/views/video/list.vue
@@ -80,15 +80,15 @@
        <map-search-box></map-search-box>
        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>
            <video id="videoElement" autoplay controls width="100%" height="100%" style="object-fit: fill"></video>
        </el-dialog>
        <el-dialog :title="drawDialogTitle" :modal="false" :visible.sync="drawDialogVisible"
            :before-close="drawDialogBeforeClose" :close-on-click-modal="true" class="video-draw-box">
        <el-dialog :title="drawDialogTitle" :visible.sync="drawDialogVisible" :before-close="drawDialogBeforeClose"
            :modal="true" :close-on-click-modal="false" class="video-draw-box">
            <div v-show="inputpopup">
                <div>距离:</div>
                <div>
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-03-22 16:21:34
 * @LastEditTime: 2023-04-06 10:08:15
 * @FilePath: \srs-police-affairs\src\views\video\region.vue
 * @Description: 辖区管理
 * 
@@ -35,9 +35,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">
@@ -231,12 +231,12 @@
        </div>
        <!-- <div class="deleteVideo" v-show="isShowVideo.video1" @click="deleteVideo">关闭</div> -->
        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :close-on-click-modal="false" class="car-video-box">
            <video id="videoElement" autoplay controls width="100%" height="100%" style="object-fit: fill"></video>
        </el-dialog>
        <el-dialog title="范围设置" :modal="false" :visible.sync="editRangeVisible" :close-on-click-modal="true"
        <el-dialog title="范围设置" :visible.sync="editRangeVisible" :modal="true" :close-on-click-modal="false"
            class="edit-range-box">
            <div class="line">
                <div class="value-name-box">选择范围颜色:</div>
vue.config.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:37:07
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-05 01:24:12
 * @LastEditTime: 2023-04-06 09:48:46
 * @FilePath: \srs-police-affairs\vue.config.js
 * @Description:
 *
@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称,即是你的api接口的服务器地址
                // target: "http://localhost:82",
                target: "http://192.168.0.100:82",
                target: "http://localhost:82",
                // target: "http://192.168.0.100:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566