1

guanqb

2023-01-13 90bdcb39f0504a3d643ec6ea96446a0009c93324

1

 src/views/activity/index.vue

@@ -127,7 +127,6 @@
                <h3>预案布置</h3>
                <div>
                    <span>警力资源：</span>

                    <ul>
                        <li>
                            <button @click="draw('billboard', 'policeman')" title="警员">
@@ -142,9 +141,6 @@
                                <img src="../../../public/img/icon/car-btn.png" style="height:100%" />
                            </button>
                        </li>
                        <!-- <li>
                        <button @click="draw('polyline', 'policecar')">巡逻路线</button>
                        </li>-->
                    </ul>
                </div>
                <div>
@@ -770,11 +766,12 @@
                res.data.data.forEach(item => {
                    if (item.type == 1 && polylineShow) {
                        let positionNewArr = this.convertPolylineOrPolygonPositionDate(item.position, item.type)
                        console.log(3333333333, positionNewArr)
                        this.$EventBus.$emit('layerPolylineAdd', {
                            layerName: 'newCarDrawLayers',
                            positions: positionNewArr,
                            material: global.DC.Color.BLUE.withAlpha(0.4),
                            width: 8,
                            material: global.DC.Color.RED.withAlpha(0.8),
                            width: 3,
                            params: {
                                id: item.id,
                                carId: item.carId
@@ -1109,7 +1106,9 @@
                                    position += item._lng + ' ' + item._lat + ','
                                })
                                position = position.slice(0, position.length - 1)
                                that.polylineBtnSwitch = true
                                that.addCarAndRange('', position, that.showingSecurityId, 1)
                                flag = false
                            }
                        }
                    })
@@ -1136,7 +1135,6 @@
                        plotType = 4
                    }
                    plot.edit(overlay, (e) => {
                        console.log(overlay, 222)
                        let position = ''
                        overlay._positions.forEach(item => {
                            position += item._lng + ' ' + item._lat + ','

 src/views/home/index.vue

@@ -390,7 +390,6 @@
            >暂无数据</div>
        </el-dialog>

<<<<<<< HEAD
        <el-dialog
            :title="dialogEquimentVideoTitle"
            :modal="true"
@@ -400,20 +399,14 @@
            class="car-video-box"
        >
            <video
                src
                autoplay
                controls
                width="100%"
                height="100%"
                ref="videoElement"
                id="videoElement"
                style="object-fit: fill"
            ></video>
=======
        <el-dialog :title="dialogEquimentVideoTitle" :modal="true" :visible.sync="dialogEquimentVideoVisible"
            :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>
>>>>>>> dbee24cadab97ead14488f77f55bcffc7a300a0f
        </el-dialog>
    </div>
</template>

 src/views/house/index.vue

@@ -174,7 +174,6 @@
                            <div class="content">
                                <div>
                                    <div>电梯</div>
                                    <!-- <div>{{ ridgepoleNum.elevator == true ? '有' : '无' }}</div> -->
                                    <div>有</div>
                                </div>
                                <div>