shuishen
2023-05-02 924ef1c01ad48fad06d56526ca1fad976737be44
自定义图标修改和部分字段更改
6 files modified
190 ■■■■■ changed files
src/components/imagesSelect/index.vue 6 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 25 ●●●● patch | view | raw | blame | history
src/views/home/homeleft/school.js 4 ●●●● patch | view | raw | blame | history
src/views/home/homeleft/serviceObj.js 18 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/video/list.vue 133 ●●●●● patch | view | raw | blame | history
src/components/imagesSelect/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-04-04 16:24:42
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-05-02 15:35:12
 * @LastEditTime: 2023-05-02 16:53:30
 * @FilePath: \srs-police-affairs\src\components\imagesSelect\index.vue
 * @Description: 
 * 
@@ -41,14 +41,10 @@
            this.imageUrls = []
            getIconsAll().then(res => {
                this.imageUrls = res.data.data
                res.data.data.forEach(item => {
                    let imgArr = item.split('/')
                    let title = imgArr[imgArr.length - 1].split('.')[0]
                    console.log(item, title, 465)
                    this.imageUrls.push({
                        url: item,
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-02 13:25:53
 * @LastEditTime: 2023-05-02 16:30:27
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -317,22 +317,21 @@
            // global.viewer.addTerrain(terrain)
            // 内网
            // that.switchImg()
            that.switchImg()
            // 地形数据添加
            // that.addTerrain()
            that.addTerrain()
            // 外网 
            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                    url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=d083e4cf30bfc438ef93436c10c2c20a',
                    subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
                    format: 'image/jpeg',
                    show: true,
                    maximumLevel: 18
                })
            )
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=d083e4cf30bfc438ef93436c10c2c20a',
            //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
            //         format: 'image/jpeg',
            //         show: true,
            //         maximumLevel: 18
            //     })
            // )
            // 设置地图初始位置,角度等
            global.viewer.camera.setView({
src/views/home/homeleft/school.js
@@ -80,8 +80,8 @@
        "在校教职工人数": "",
        "在校学生数量": "",
        BGMJ: "余传公",
        x: "117.9759993",
        y: "28.42185405"
        x: "117.9798163",
        y: "28.41841859"
    },
    {
        XQPCS: "茅家岭派出所",
src/views/home/homeleft/serviceObj.js
@@ -16,7 +16,7 @@
        RYXM: "梅淑萍",
        RYXB: "女",
        RYNL: "22",
        "类别": "精神残疾",
        RYLB: "精神残疾",
        RYLX: "13576486918",
        JTZZ: "茅家岭街道茅家岭村委会庙前16号",
        "备注": "",
@@ -28,7 +28,7 @@
        RYXM: "梅  评",
        RYXB: "女",
        RYNL: "35",
        "类别": "精神残疾",
        RYLB: "精神残疾",
        RYLX: "15007031654",
        JTZZ: "茅家岭街道茅家岭村委会庙前",
        "备注": "",
@@ -40,7 +40,7 @@
        RYXM: "蔡建飞",
        RYXB: "男",
        RYNL: "38",
        "类别": "精神残疾",
        RYLB: "精神残疾",
        RYLX: "17879300826",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭64号",
        "备注": "",
@@ -52,7 +52,7 @@
        RYXM: "徐玉春",
        RYXB: "女",
        RYNL: "60",
        "类别": "精神残疾",
        RYLB: "精神残疾",
        RYLX: "13537374486",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭83号",
        "备注": "",
@@ -64,7 +64,7 @@
        RYXM: "彭  超",
        RYXB: "男",
        RYNL: "34",
        "类别": "精神残疾",
        RYLB: "精神残疾",
        RYLX: "13767377996",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭24号附1号",
        "备注": "",
@@ -76,7 +76,7 @@
        RYXM: "夏菊英",
        RYXB: "女",
        RYNL: "42",
        "类别": "精神残疾",
        RYLB: "精神残疾",
        RYLX: "13879309264",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭52号附1号",
        "备注": "",
@@ -88,7 +88,7 @@
        RYXM: "罗时明",
        RYXB: "男",
        RYNL: "60",
        "类别": "身体残疾",
        RYLB: "身体残疾",
        RYLX: "13767399492",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭87号",
        "备注": "",
@@ -100,7 +100,7 @@
        RYXM: "项莲琴",
        RYXB: "女",
        RYNL: "70",
        "类别": "独居老人、脱贫户",
        RYLB: "独居老人、脱贫户",
        RYLX: "15870906114",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭113号附1号",
        "备注": "",
@@ -112,7 +112,7 @@
        RYXM: "蔡芝猫",
        RYXB: "男",
        RYNL: "66",
        "类别": "独居老人、五保户",
        RYLB: "独居老人、五保户",
        RYLX: "18970350656",
        JTZZ: "茅家岭街道茅家岭村委会茅家岭47号",
        "备注": "",
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-05-02 15:37:30
 * @LastEditTime: 2023-05-02 16:29:24
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -408,7 +408,7 @@
                v-show="!houseLoading"
            >
                <el-table-column :show-overflow-tooltip="true" prop="XQPCS" label="辖区派出所"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="JZMC" label="校园名称"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="XXMC" label="校园名称"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="JZDZ" label="地址"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="JZQY" label="区域"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="JZLX" label="类型"></el-table-column>
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-04-27 19:29:57
 * @LastEditTime: 2023-05-02 16:49:21
 * @FilePath: \srs-police-affairs\src\views\video\list.vue
 * @Description: 辖区管理
 * 
@@ -13,40 +13,58 @@
    <div class="list container">
        <div v-show="boxShow" class="container-content">
            <div class="search-box">
                <span style="display: inline-block; white-space:nowrap;">
                    点位名称:
                </span>
                <el-input size="small" placeholder="请输入…" v-model="searchValue" @change="searchChange" clearable>
                </el-input>
                <span style="display: inline-block; white-space:nowrap;">点位名称:</span>
                <el-input
                    size="small"
                    placeholder="请输入…"
                    v-model="searchValue"
                    @change="searchChange"
                    clearable
                ></el-input>
            </div>
            <div class="draw-btn">
                搜索范围:
                <el-button type="primary" size="mini" @click="draw('polygon')">区域查询<i
                        class="el-icon-draw-qycx el-icon--right"></i></el-button>
                <el-button type="primary" size="mini" @click="draw('polyline')">缓冲查询<i
                        class="el-icon-draw-line el-icon--right"></i></el-button>
                <el-button type="primary" size="mini" @click="draw('polygon')">
                    区域查询
                    <i class="el-icon-draw-qycx el-icon--right"></i>
                </el-button>
                <el-button type="primary" size="mini" @click="draw('polyline')">
                    缓冲查询
                    <i class="el-icon-draw-line el-icon--right"></i>
                </el-button>
                <el-button type="primary" size="mini" @click="removeDrawLayer">清除</el-button>
            </div>
            <div class="down-tree">
                <el-scrollbar>
                    <el-tree v-show="searchLazyFlag" :props="props" :load="loadNode" lazy node-key="id"
                        @node-click="treeClick" :default-expanded-keys="defaultExpandedKeys" :empty-text="''">
                    <el-tree
                        v-show="searchLazyFlag"
                        :props="props"
                        :load="loadNode"
                        lazy
                        node-key="id"
                        @node-click="treeClick"
                        :default-expanded-keys="defaultExpandedKeys"
                        :empty-text="''"
                    >
                        <span class="custom-tree-node" slot-scope="node">
                            <i v-show="node.data.leaf" class="status-box"
                                :class="{ online: Number(node.data.status) === 1 }"></i>
                            <i
                                v-show="node.data.leaf"
                                class="status-box"
                                :class="{ online: Number(node.data.status) === 1 }"
                            ></i>
                            <span>
                                {{
                                    node.data.name
                                node.data.name
                                }}
                            </span>
                            &nbsp;
                            <span v-show="'number' in node.data && node.data.number != -1">
                            <span
                                v-show="'number' in node.data && node.data.number != -1"
                            >
                                ({{
                                    node.data.number
                                node.data.number
                                }}个)
                            </span>
@@ -54,22 +72,31 @@
                        </span>
                    </el-tree>
                    <el-tree v-show="searchLazyFlag == false" :data="searchTreeData" :props="defaultProps"
                        :default-expand-all="true" @node-click="treeClick" :empty-text="''">
                    <el-tree
                        v-show="searchLazyFlag == false"
                        :data="searchTreeData"
                        :props="defaultProps"
                        :default-expand-all="true"
                        @node-click="treeClick"
                        :empty-text="''"
                    >
                        <span class="custom-tree-node" slot-scope="node">
                            <i class="status-box" :class="{ online: Number(node.data.status) === 1 }"></i>
                            <i
                                class="status-box"
                                :class="{ online: Number(node.data.status) === 1 }"
                            ></i>
                            <span>
                                {{
                                    node.data.name
                                node.data.name
                                }}
                            </span>
                            &nbsp;
                            <span v-show="node.data.number && node.data.number != -1">
                            <span
                                v-show="node.data.number && node.data.number != -1"
                            >
                                ({{
                                    node.data.number
                                node.data.number
                                }}个)
                            </span>
                        </span>
@@ -80,15 +107,36 @@
        <map-search-box></map-search-box>
        <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" :before-close="dialogBeforeClose" :modal="true"
            :modal-append-to-body="false" :close-on-click-modal="false" class="car-video-box">
        <el-dialog
            :title="dialogTitle"
            :visible.sync="dialogVisible"
            :before-close="dialogBeforeClose"
            :modal="true"
            :modal-append-to-body="false"
            :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>
            <video
                id="videoElement"
                autoplay
                controls
                width="100%"
                height="100%"
                style="object-fit: fill"
            ></video>
        </el-dialog>
        <el-dialog :title="drawDialogTitle" :visible.sync="drawDialogVisible" :before-close="drawDialogBeforeClose"
            :modal-append-to-body="false" :modal="true" :close-on-click-modal="false" class="video-draw-box">
        <el-dialog
            :title="drawDialogTitle"
            :visible.sync="drawDialogVisible"
            :before-close="drawDialogBeforeClose"
            :modal-append-to-body="false"
            :modal="true"
            :close-on-click-modal="false"
            class="video-draw-box"
        >
            <div v-show="inputpopup">
                <div>距离:</div>
                <div>
@@ -98,14 +146,21 @@
            <div class="line">
                <div class="value-name-box">颜色:</div>
                <div class="pick-color-box">
                    <el-color-picker v-model="chooseRangeColor" :predefine="predefineColors" size="small">
                    </el-color-picker>
                    <el-color-picker
                        v-model="chooseRangeColor"
                        :predefine="predefineColors"
                        size="small"
                    ></el-color-picker>
                </div>
            </div>
            <div>
                <div class="value-name-box">设置透明度:</div>
                <div class="alpha">
                    <el-slider :min="1" v-model="choosePlotColorAlpha" :format-tooltip="formatTooltip"></el-slider>
                    <el-slider
                        :min="1"
                        v-model="choosePlotColorAlpha"
                        :format-tooltip="formatTooltip"
                    ></el-slider>
                </div>
            </div>
            <div class="button">
@@ -444,7 +499,6 @@
        },
        getRegionListAll ({ customType, positions }) {
            alert(1)
            let positionStr = ''
            const color = this.chooseRangeColor + ',' + this.choosePlotColorAlpha
@@ -639,7 +693,6 @@
        // 获取设备列表
        getEquipmentAll (params, layerName) {
            alert(1)
            this.loading()
            this.$EventBus.$emit('mapClearLayer', {
@@ -797,7 +850,7 @@
            border-radius: 10px;
            overflow-y: auto;
            &>div {
            & > div {
                height: 100%;
                padding: 0 10px;
                line-height: 36px;
@@ -826,7 +879,7 @@
        .list-show {
            flex: 1;
            &>div {
            & > div {
                height: 100%;
                display: flex;
                flex-direction: column;
@@ -892,7 +945,6 @@
                .online {
                    background-color: #4ccc7d;
                }
                .disabled {
                    cursor: not-allowed;
@@ -967,6 +1019,5 @@
            border: 1px solid rgb(0, 92, 169);
        }
    }
}
</style>