Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2022-11-16 1b60f4d54ba2cc3a90ffad8306c6ff01485a8950

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/api/police/index.js

New file
@@ -0,0 +1,24 @@
/*
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-11-15 15:10:41
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-11-15 17:29:09
 * @FilePath: \srs-police-affairs\src\api\police\index.js
 * @Description: 
 * 
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved. 
 */
import request from "@/router/axios.js"

/**
 * 获取设备历史轨迹
 * @param {*} params  包含 start 开始时间 -- end  结束时间  --   channelId 设备编号
 * @returns 
 */
export const getVideoList = (params) => {
    return request({
        url: `/position/history/${params.channelId}`,
        method: 'get',
        params: params
    })
}

 src/api/video/index.js

New file
@@ -0,0 +1,57 @@
/*
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-11-15 15:10:41
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-11-15 17:27:41
 * @FilePath: \srs-police-affairs\src\api\video\index.js
 * @Description: 
 * 
 * Copyright (c) 2022 by shuishen 1109946754@qq.com, All Rights Reserved. 
 */
import request from "@/router/axios.js"

/**
 * 获取设备列表
 * @param {*} page 页数
 * @param {*} count 每页数量
 * @param {*} params 暂时不用传
 * @returns 
 */
export const getVideoList = (page = 1, count = 10, params) => {
    return request({
        url: '/device/query/devices',
        method: 'get',
        params: {
            page,
            count,
            ...params
        }
    })
}

/**
 * 获取视频播放网址 
 * @param {*} equipmentNumber 设备编号
 * @returns 
 */
export const getDevices = (equipmentNumber) => {
    return request({
        url: `/play/start/${equipmentNumber}/${equipmentNumber}`,
        method: 'get'
    })
}

/**
 * 空间查询
 * @param {*} page 页数
 * @param {*} count 每页数量
 * @param {*} params 包含参数 range 参数值参考 116.292735,40.0717; 116.476708, 40.083625; 116.476708, 40.083625; 116.292735, 40.0717
 * @returns 
 */
export const getRegionList = (page = 1, count = 15, params) => {
    return request({
        url: '/device/query/SpatialQueryList',
        method: 'get',
        params: params
    })
}

 src/router/axios.js

@@ -2,8 +2,8 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-07-29 15:19:13
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-08-22 16:19:49
 * @FilePath: \srs-psb\src\router\axios.js
 * @LastEditTime: 2022-11-15 15:08:30
 * @FilePath: \srs-police-affairs\src\router\axios.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
/**
@@ -19,7 +19,8 @@
// import * as auth from '@/utils/auth'

const service = axios.create({
    baseURL: 'http://36.14.255.242:18080/api',
    // baseURL: 'http://36.14.255.242:18080/api',
    baseURL: 'http://192.168.0.105:18080/api',
    timeout: 600000 // request timeout
})


 src/styles/element-ui/element-ui.scss

@@ -343,4 +343,37 @@
.el-table,
.el-table__expanded-cell {
    background-color: rgba(20, 50, 123, 1.0) !important;
}

.tree-search-popup {
    top: 135px !important;
    background: rgb(20, 50, 123);
    border: 1px solid rgb(0, 92, 169);
    color: #fff;

    .select-tree-box {
        background: transparent;
        color: #fff;

        .el-tree-node__content,
        .el-upload-list__item,
        .el-tree-node__content:hover,
        .el-upload-list__item:hover {
            background: transparent !important;
        }
    }
}

.tree-search-popup::after {
    content: '';
    width: 0;
    height: 0;

    position: absolute;
    top: 0;
    left: 50%;
    border: 10px solid;
    transform: translate(-50%, -100%);

    border-color: transparent transparent rgb(0, 92, 169) transparent;
}

 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: 2022-11-10 13:49:42
 * @LastEditTime: 2022-11-14 15:22:41
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -14,8 +14,23 @@
        <div v-show='boxShow' class="container-content">

            <div v-show="contentShow" class="search-box">
                <input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入搜索条件" />
                <button @click="searchClick" class="el-icon-search"></button>
                <!-- <input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入搜索条件" />
                <button @click="searchClick" class="el-icon-search"></button> -->

                <el-popover ref="popover" placement="bottom" trigger="click" :visible-arrow="false"
                    popper-class="tree-search-popup">
                    <el-input placeholder="请输入搜索条件" v-model="filterText"> </el-input>

                    <el-tree style="width: 360px; height: 400px; overflow: auto;" class="select-tree-box"
                        :data="testData" :props="defaultProps" ref="popupTree" @current-change="currentChangeHandle"
                        :default-expand-all="defaultExpandAll" :accordion="accordion"
                        :highlight-current="highlightCurrent" :expand-on-click-node="true" check-strictly
                        :filter-node-method="filterNode">
                    </el-tree>
                </el-popover>

                <el-input slot="reference" v-model="prop" v-popover:popover :readonly="true" placeholder="请输入搜索条件"
                    style="cursor: pointer;"></el-input>
            </div>

            <div v-show="searchValBoxShow" class="search-val-box">
@@ -509,7 +524,81 @@
            searchArray: [],
            searchValBoxShow: false,
            boxShow: false,

            // 下拉搜索
            filterText: "",
            testData: [
                {
                    name: "一级 1",
                    children: [
                        {
                            name: "二级 1-1",
                            children: [
                                {
                                    name: "三级 1-1-1",
                                },
                            ],
                        },
                    ],
                },
                {
                    name: "一级 2",
                    children: [
                        {
                            name: "二级 2-1",
                            children: [
                                {
                                    name: "三级 2-1-1",
                                },
                            ],
                        },
                        {
                            name: "二级 2-2",
                            children: [
                                {
                                    name: "三级 2-2-1",
                                },
                            ],
                        },
                    ],
                },
                {
                    name: "一级 3",
                    children: [
                        {
                            name: "二级 3-1",
                            children: [
                                {
                                    name: "三级 3-1-1",
                                },
                            ],
                        },
                        {
                            name: "二级 3-2",
                            children: [
                                {
                                    name: "三级 3-2-1",
                                },
                            ],
                        },
                    ],
                },
            ],
            defaultProps: {
                children: "children", //代表children为子级
                label: "name", //根据name渲染tree列表
            },
            prop: '',
            defaultExpandAll: false,
            accordion: true,
            highlightCurrent: true,
        }
    },
    watch: {
        //监听输入框的内容（进行搜索）
        filterText (val) {
            this.$refs.popupTree.filter(val)
        },
    },
    created () {
        this.villageHousesList = villageHousesList
@@ -671,6 +760,21 @@
        boxResize (val) {
            this.boxShow = val
        },

        //对树节点进行筛选时执行的方法
        filterNode (value, data) {
            console.log(value)
            console.log(data)
            if (!value) return true
            return data.name.indexOf(value) !== -1
        },

        // 点击选中
        currentChangeHandle (current, currentNode) {
            console.log(current, currentNode)

            this.$refs[`popover`].doClose()
        }
    },

    destroyed () {

 src/views/police/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-11-12 10:57:18
 * @LastEditTime: 2022-11-15 16:12:04
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -272,6 +272,10 @@
import phoneList from '@/assets/data/phone.js'
import zfList from '@/assets/data/zf.js'
import dtList from '@/assets/data/dt.js'

let tc = null
let track = null

export default {
    data () {
        return {
@@ -307,7 +311,7 @@
                label: '执法记录仪'
            }],
            typeValue: '1',
            boxShow: false,
            boxShow: true,
        }
    },
    created () {
@@ -327,6 +331,8 @@
        this.$parent.resize('400px', true)

        this.navClick(1)

        tc = new global.DC.TrackController(global.viewer)
    },
    methods: {
        handleCurrentChange: function (currentPage) {
@@ -510,6 +516,10 @@
                layerName: 'polylineLayer',
                type: 'VectorLayer'
            })

            tc.pause()

            tc.removeTrack(track)
        },

        lookTrack () {
@@ -556,12 +566,28 @@
            this.$EventBus.$emit('layerPolylineAdd', {
                layerName: 'polylineLayer',
                positions: '116.025000, 28.686000; 116.025000, 28.678000; 116.020000, 28.678000',
                material: global.DC.Namespace.Cesium.Color.fromBytes(
                    255, 17, 0,
                    255
                ),
                width: 4
                material: global.DC.Color.RED,
                width: 6
            })

            track = new global.DC.Track('116.025000, 28.686000; 116.025000, 28.678000; 116.020000, 28.678000', 20)

            track.setModel('/model/qiche.gltf', {
                scale: 1
            })

            tc.addTrack(track)


            this.$EventBus.$emit('toPosition', {
                siteJd: 116.025000,
                siteWd: 28.686000,
                siteGd: 5000,
                siteHeading: 0,
                sitePitch: -90
            })

            tc.play()
        },

        // 处理时间补零操作
@@ -605,6 +631,10 @@
            type: 'VectorLayer'
        })

        tc.pause()

        tc.removeTrack(track)

        window.removeEventListener('resize', this.setTableHeight)

        this.$parent.resize('0px')

 src/views/video/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-11-14 14:03:14
 * @LastEditTime: 2022-11-14 16:22:59
 * @FilePath: \srs-police-affairs\src\views\video\index.vue
 * @Description: 辖区管理
 * 
@@ -74,7 +74,7 @@
            searchValue: '',
            searchArray: [],
            searchValBoxShow: false,
            boxShow: false,
            boxShow: true,
        }
    },