Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

shuishen

2023-01-30 2bcba16498f5862c8d43b70600c10f4631213eae

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 package-lock.json

Diff too large

 prod.env.js

@@ -27,8 +27,8 @@
    // 视频监控平台

    // 本地开发
    // VUE_APP_OUTER_NET_VIDEO: 'http://192.168.0.126:18185/api',
    VUE_APP_OUTER_NET_VIDEO: 'http://192.168.0.129:18185/api',
    VUE_APP_OUTER_NET_VIDEO: 'http://192.168.0.126:18185/api',
    // VUE_APP_OUTER_NET_VIDEO: 'http://192.168.0.129:18185/api',
    // 内网部署
    VUE_APP_INTRANET_VIDEO: 'http://10.141.11.11:18185/api',
}

 src/views/activity/index.vue

@@ -903,7 +903,7 @@
                                scale: 0.5
                            })
                            tc.addTrack(track)
                            let coords = global.DC.GeoTools.polylineBuffer(positionNewArr, 100)
                            let coords = global.DC.GeoTools.polylineBuffer(positionNewArr, 1000000)
                            let polygon = new global.DC.Polygon(coords)
                            polygon.setStyle({
                                material: global.DC.Color.RED.withAlpha(0.4)
@@ -2141,18 +2141,18 @@
    }

    .video6 {
        left: calc(1540 / 1920 * 100vw);
        top: calc(680 / 1080 * 100vh);
    }

    .video7 {
        left: calc(780 / 1920 * 100vw);
        top: calc(680 / 1080 * 100vh);
    }

    .video8 {
    .video7 {
        left: calc(1160 / 1920 * 100vw);
        top: calc(680 / 1080 * 100vh);
    }

    .video8 {
        left: calc(1540 / 1920 * 100vw);
        top: calc(680 / 1080 * 100vh);
    }
}
</style>

 src/views/house/index.vue

@@ -43,9 +43,14 @@
                        <div class="progress"></div>
                    </div>
                    <div class="housing-bg">
                        <!-- <img style="height: 100%;" :src="villageInfo.pic_url" alt /> -->
                        <el-image style=" height: 100%" :src="villageInfo.pic_url"
                            :preview-src-list="villageInfo.pic_url_list"></el-image>
                        <div class="block">
                            <el-carousel height="150px">
                                <el-carousel-item v-for="item in villageInfo.pic_url_list" :key="item">
                                    <el-image style=" height: 100%" :src="item"
                                        :preview-src-list="villageInfo.pic_url_list"></el-image>
                                </el-carousel-item>
                            </el-carousel>
                        </div>
                    </div>
                    <div class="housing-introduce">
                        <div>
@@ -468,7 +473,11 @@

<script>
import { listQuery, accurateSearch } from "@/utils/search.js"
import { getSearchExtensively, getHouses, getSearchExtensivelyBgAoiDeepdata, getPoliceStationLazyTree, getPoliceStationTrees, getVillageInfo, getVillagePersonStatisticInfoByBuildId, getVillagePersonInfo } from '@/api/dept/index.js'
import {
    getSearchExtensively, getHouses, getSearchExtensivelyBgAoiDeepdata,
    getPoliceStationLazyTree, getPoliceStationTrees, getVillageInfo,
    getVillagePersonStatisticInfoByBuildId, getVillagePersonInfo, getResidentialQuartersInfo
} from '@/api/dept/index.js'
import { getAlarmList } from "@/api/home/index.js"


@@ -561,6 +570,7 @@
    },

    created () {
        this.getResidentialQuartersInfo()
        // 首页跳转社区包含参数
        if (this.$route.query.id) {
            this.getVillageInfo(this.$route.query.id)
@@ -632,19 +642,19 @@
                    this.villageInfo.pic_url_list.push(pic_url_item)
                })
                // 停车场出入口商场
                let deepData = res.data.result[0].deep_infos.deep_info
                this.parkingLotData = []
                this.comeOutData = []
                this.businessData = []
                deepData.forEach(item => {
                    if (item.pc_type == 1) {
                        this.comeOutData.push(item)
                    } else if (item.pc_type == 2) {
                        this.parkingLotData.push(item)
                    } else if (item.pc_type == 4) {
                        this.businessData.push(item)
                    }
                })
                // let deepData = res.data.result[0].deep_infos.deep_info
                // this.parkingLotData = []
                // this.comeOutData = []
                // this.businessData = []
                // deepData.forEach(item => {
                //     if (item.pc_type == 1) {
                //         this.comeOutData.push(item)
                //     } else if (item.pc_type == 2) {
                //         this.parkingLotData.push(item)
                //     } else if (item.pc_type == 4) {
                //         this.businessData.push(item)
                //     }
                // })
                // 小区楼栋数据
                let buildData = res.data.result[0].children_infos
                this.buildingList = []
@@ -1038,6 +1048,26 @@
            this.getVillagePersonInfo('', this.choosedBuildId, this.keyPeopleType == 1 ? '' : this.keyPeopleType, this.peoplePage.currentPage, this.peopleName, this.callPhone)
        },

        getResidentialQuartersInfo () {
            getResidentialQuartersInfo('6E513C5E5D1611EAB6183C15FB00027B', '361102').then(res => {
                console.log(res, 111221)
                // 停车场出入口商场
                // let deepData = res.data.result[0].deep_infos.deep_info
                // this.parkingLotData = []
                // this.comeOutData = []
                // this.businessData = []
                // deepData.forEach(item => {
                //     if (item.pc_type == 1) {
                //         this.comeOutData.push(item)
                //     } else if (item.pc_type == 2) {
                //         this.parkingLotData.push(item)
                //     } else if (item.pc_type == 4) {
                //         this.businessData.push(item)
                //     }
                // })
            })
        },

    },

    destroyed () {

 src/views/police/index.vue

@@ -14,27 +14,52 @@
        <div v-show="boxShow" class="container-content">
            <div class="switch-box" v-show="!detailFlag">
                资源类别：
                <el-select v-model="typeValue" @change="navClick" placeholder="请选择" class="type-select-css">
                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
                        class="option-css"></el-option>
                <el-select
                    v-model="typeValue"
                    @change="navClick"
                    placeholder="请选择"
                    class="type-select-css"
                >
                    <el-option
                        v-for="item in options"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
                        class="option-css"
                    ></el-option>
                </el-select>
            </div>

            <div class="list-show" v-if="!detailFlag">
                <div class="search-box">
                    资源名称：
                    <input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入搜索条件" />
                    <input
                        v-model="searchValue"
                        @input="searchChange"
                        type="text"
                        placeholder="请输入搜索条件"
                    />
                </div>

                <div class="list" ref="tableBox">
                    <el-table :data="equimentTableData"
                    <el-table
                        :data="equimentTableData"
                        :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                        :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'pointer' }"
                        :height="currentTableHeight">
                        <el-table-column prop="name" :show-overflow-tooltip="true" label="名称"
                            min-width="30%"></el-table-column>
                        <el-table-column prop="channelId" :show-overflow-tooltip="true" label="通道编号"
                            min-width="24%"></el-table-column>
                        :height="currentTableHeight"
                    >
                        <el-table-column
                            prop="name"
                            :show-overflow-tooltip="true"
                            label="名称"
                            min-width="30%"
                        ></el-table-column>
                        <el-table-column
                            prop="channelId"
                            :show-overflow-tooltip="true"
                            label="通道编号"
                            min-width="24%"
                        ></el-table-column>
                        <el-table-column prop="status" label="状态" min-width="18%">
                            <template slot-scope="scope">
                                <div class="state-box" :class="{ online: scope.row.status == '1' }"></div>
@@ -43,14 +68,29 @@

                        <el-table-column label="操作" align="center" min-width="28%">
                            <template slot-scope="scope">
                                <el-button @click="rowClick(scope.row)" type="text" size="small" title="定位">
                                <el-button
                                    @click="rowClick(scope.row)"
                                    type="text"
                                    size="small"
                                    title="定位"
                                >
                                    <i class="el-icon-location"></i>
                                </el-button>
                                <el-button v-show="navType == 0" @click="equipmentTrack(scope.row)" type="text"
                                    size="small" title="轨迹">
                                <el-button
                                    v-show="navType == 0"
                                    @click="equipmentTrack(scope.row)"
                                    type="text"
                                    size="small"
                                    title="轨迹"
                                >
                                    <i class="el-icon-position"></i>
                                </el-button>
                                <el-button @click="play(scope.row)" type="text" size="small" title="播放视频">
                                <el-button
                                    @click="play(scope.row)"
                                    type="text"
                                    size="small"
                                    title="播放视频"
                                >
                                    <i class="el-icon-video-play"></i>
                                </el-button>
                            </template>
@@ -58,9 +98,15 @@
                    </el-table>

                    <div class="pages" ref="tablePagination">
                        <el-pagination background layout="prev, pager, next" you:page-size="equimentPage.pageSize"
                            :page-count="equimentPage.count" :pager-count="4" :current-page="equimentPage.currentPage"
                            @current-change="handleCurrentChange"></el-pagination>
                        <el-pagination
                            background
                            layout="prev, pager, next"
                            you:page-size="equimentPage.pageSize"
                            :page-count="equimentPage.count"
                            :pager-count="4"
                            :current-page="equimentPage.currentPage"
                            @current-change="handleCurrentChange"
                        ></el-pagination>
                    </div>
                </div>
            </div>
@@ -88,8 +134,8 @@
                            <div>状态：</div>
                            <div>
                                {{
                                    currentSelectEquipment.status ? (currentSelectEquipment.status == 0 ? '离线' :
                                        '在线') : ''
                                currentSelectEquipment.status ? (currentSelectEquipment.status == 0 ? '离线' :
                                '在线') : ''
                                }}
                            </div>
                        </li>
@@ -97,9 +143,16 @@
                        <li>
                            <div>选择时间：</div>
                            <div class="datetime">
                                <el-date-picker v-model="trackTime" type="daterange" unlink-panels range-separator="至"
                                    start-placeholder="开始日期" size="mini" :editable="false"
                                    end-placeholder="结束日期"></el-date-picker>
                                <el-date-picker
                                    v-model="trackTime"
                                    type="daterange"
                                    unlink-panels
                                    range-separator="至"
                                    start-placeholder="开始日期"
                                    size="mini"
                                    :editable="false"
                                    end-placeholder="结束日期"
                                ></el-date-picker>
                            </div>
                        </li>

@@ -112,8 +165,13 @@
        </div>

        <div class="search-content">
            <input v-model="searchExtensivelyValue" @input="searchExtensivelyChange" @focus="searchExtensivelyFocus"
                type="text" placeholder="请输入搜索条件" />
            <input
                v-model="searchExtensivelyValue"
                @input="searchExtensivelyChange"
                @focus="searchExtensivelyFocus"
                type="text"
                placeholder="请输入搜索条件"
            />
            <div class="clear" v-show="isShowClearBtn" @click="clearSearchValue" title="清空">
                <img src="../../../public/img/icon/clear.png" alt />
            </div>
@@ -122,15 +180,31 @@

        <div v-show="searchExtensivelyValBoxShow" class="searchExtensively-val-box">
            <div>
                <div @click="searchExtensivelyVlaClick(item)" v-for="(item, index) in searchExtensivelyArray"
                    :key="index">{{ item.name }}</div>
                <div
                    @click="searchExtensivelyVlaClick(item)"
                    v-for="(item, index) in searchExtensivelyArray"
                    :key="index"
                >{{ item.name }}</div>
            </div>
        </div>

        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
            <video autoplay controls width="100%" height="100%" ref="videoElement" id="videoElement"
                style="object-fit: fill"></video>
        <el-dialog
            :title="dialogTitle"
            :modal="false"
            :visible.sync="dialogVisible"
            :before-close="dialogBeforeClose"
            :close-on-click-modal="true"
            class="car-video-box"
        >
            <video
                autoplay
                controls
                width="100%"
                height="100%"
                ref="videoElement"
                id="videoElement"
                style="object-fit: fill"
            ></video>
        </el-dialog>
    </div>
</template>
@@ -701,7 +775,7 @@
            align-items: center;
            justify-content: space-around;

            &>div {
            & > div {
                flex: 1;
            }
        }
@@ -815,18 +889,18 @@
                color: #fff;
                border-bottom: 1px solid #fff;

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

                &>div:first-child {
                & > div:first-child {
                    flex: 2;
                }

                &>div:last-child {
                & > div:last-child {
                    flex: 6;

                    &>div {
                    & > div {
                        width: 100% !important;
                    }
                }
@@ -928,7 +1002,7 @@
        border-radius: 10px;
        overflow: hidden;

        &>div {
        & > div {
            height: 100%;
            overflow-y: auto;