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

shuishen

2022-09-22 c7444c189fcf23e0be07ba294802c7a4756036a1

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

 src/views/activity/index.vue

@@ -49,7 +49,12 @@
            </div>
            <div class="result-content">
                <div class="table-box">
                    <div class="row-box" v-for="(item, index) in 6" :key="index">
                    <div
                        class="row-box"
                        v-for="(item, index) in 6"
                        :key="index"
                        @click="goAbDetail"
                    >
                        <div class="row-title">常规安保</div>
                        <div class="row-content">
                            <div>
@@ -68,6 +73,51 @@
                            </div>
                        </div>
                    </div>
                    <el-dialog
                        title="安保活动详情"
                        :visible.sync="dialogVisible"
                        width="25%"
                        height="70%"
                        :before-close="handleClose"
                        custom-class="tan"
                        center="false"
                    >
                        <table border="1" class="tableClass">
                            <tr>
                                <th>活动名称：</th>
                                <td>xxx活动</td>
                            </tr>
                            <tr>
                                <th>活动时间：</th>
                                <td>2022-08-01 00:00:00 至 2022-09-01 00:00:00</td>
                            </tr>
                            <tr>
                                <th>活动内容：</th>
                                <td>(1)在接到停电通知的状况下，管理运作部应事先将停电线路、区域、时光、电梯使用 以及安全防范要求等状况通知每个住户和商户，并在主要出入口发布停电通告；同时， 工程物料部应做好停电前的应变工作。</td>
                            </tr>
                            <tr>
                                <th></th>
                                <td>(2)在没有接到任何通知、突然发生停电的状况下，工程物料部应立即确认是内部故障 停电还是外部停电。若系内部故障停电，应立即派人查找原因采取措施，防止故障扩 大；若系外部停电，一方面要防止突然来电引发事故，一方面致电电力局查询停电状 况，了解何时恢复供电，并将了解的状况通知管理运作部。</td>
                            </tr>
                            <tr>
                                <th></th>
                                <td>(3)保安部立即会同工程物料部派人分头前往各楼检查电梯运行状况，发现电梯关人立 即按照电梯困人应急预案施救。</td>
                            </tr>
                            <tr>
                                <th>撤退路线</th>
                                <td>
                                    <input type="text" />
                                </td>
                            </tr>
                            <tr>
                                <th>设置xx范围：</th>
                                <td>
                                    <input type="text" />
                                </td>
                            </tr>
                        </table>
                        <span slot="footer" class="dialog-footer"></span>
                    </el-dialog>
                </div>

                <el-pagination
@@ -82,7 +132,13 @@
            </div>
        </div>
        <div class="second-container">
            <el-tree :data="treeData" show-checkbox node-key="id" @check="treeCheckClick"></el-tree>
            <el-tree
                :data="treeData"
                show-checkbox
                node-key="id"
                @check="treeCheckClick"
                @node-click="treeNodeClick"
            ></el-tree>
        </div>
    </div>
</template>
@@ -122,47 +178,54 @@
                    children: [{
                        id: 7,
                        label: 'BOOM',
                        lng: 116.033595,
                        lat: 28.702225,
                        lng: 116.020595,
                        lat: 28.686225,
                        alt: 100,
                    }, {
                        id: 8,
                        label: 'MDM',
                        lng: 116.007370,
                        lat: 28.662075,
                        lng: 116.030370,
                        lat: 28.685075,
                        alt: 100,
                    }, {
                        id: 9,
                        label: 'pdds',
                        lng: 116.009054,
                        lat: 28.674692,
                        lng: 116.021054,
                        lat: 28.684692,
                        alt: 100,
                    }]
                }, {
                    id: 3,
                    label: '视频监控',
                    children: [{
                        id: 10,
                        label: '监控1',
                        lng: 116.032703,
                        lat: 28.677435,
                        alt: 100,
                    }]
                }, {
                    id: 4,
                    label: '治安重点场所',
                    children: [{
                        id: 10,
                        label: '卡点',
                        lng: 115.984703,
                        lat: 28.673435,
                        lng: 116.029703,
                        lat: 28.683435,
                        alt: 100,
                    },
                    {
                        id: 11,
                        label: '电警点',
                        lng: 115.998703,
                        lat: 28.691435,
                        lng: 115.022703,
                        lat: 28.682435,
                        alt: 100,
                    },
                    {
                        id: 12,
                        label: '岗亭',
                        lng: 116.027002,
                        lat: 28.683302,
                        lng: 116.028002,
                        lat: 28.681302,
                        alt: 100,
                    }]
                }, {
@@ -171,36 +234,36 @@
                    children: [{
                        id: 13,
                        label: '大中型商超',
                        lng: 116.018293,
                        lat: 28.624986,
                        lng: 116.023293,
                        lat: 28.680986,
                        alt: 100,
                    },
                    {
                        id: 14,
                        label: '幼儿园',
                        lng: 116.0145001,
                        lat: 28.694361,
                        lng: 116.0275001,
                        lat: 28.679361,
                        alt: 100,
                    },
                    {
                        id: 15,
                        label: '政府事业单位',
                        lng: 116.025398,
                        lat: 28.663066,
                        lng: 116.024398,
                        lat: 28.678066,
                        alt: 100,
                    },
                    {
                        id: 16,
                        label: '机场',
                        lng: 115.99685299,
                        lat: 28.70599572,
                        lng: 116.0268529,
                        lat: 28.6829572,
                        alt: 100,
                    },
                    {
                        id: 17,
                        label: '银行',
                        lng: 116.033595,
                        lat: 28.702225,
                        lng: 116.025595,
                        lat: 28.681225,
                        alt: 100,
                    }]
                },
@@ -210,29 +273,29 @@
                    children: [{
                        id: 18,
                        label: '印刷店',
                        lng: 116.007370,
                        lat: 28.662075,
                        lng: 116.020370,
                        lat: 28.680075,
                        alt: 100,
                    },
                    {
                        id: 19,
                        label: '废旧金属收购',
                        lng: 116.009054,
                        lat: 28.674692,
                        lng: 116.030054,
                        lat: 28.683692,
                        alt: 100,
                    },
                    {
                        id: 20,
                        label: '开锁店',
                        lng: 115.984703,
                        lat: 28.673435,
                        lng: 116.022703,
                        lat: 28.679435,
                        alt: 100,
                    },
                    {
                        id: 21,
                        label: '酒店',
                        lng: 115.998703,
                        lat: 28.691435,
                        lng: 115.028703,
                        lat: 28.684435,
                        alt: 100,
                    }]
                }]
@@ -240,7 +303,8 @@
            defaultProps: {
                children: 'children',
                label: 'label'
            }
            },
            dialogVisible: false,
        }
    },
    created () {
@@ -274,7 +338,31 @@
                }
            })
        },
        treeNodeClick () {
            console.log(1111223)
            this.$EventBus.$emit('layerPolylineAdd', {
                layerName: 'polylineLayer',
                positions: ([
                    116.025000, 28.686000,
                    116.025000, 28.678000,
                    116.020000, 28.678000,
                ]),
                material: '#f00',
                width: 2
            })
        },
        goAbDetail () {
            console.log(1)
            this.dialogVisible = true

        },

    },
    destroyed () {
        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'activeLayer',
            type: 'VectorLayer'
        })
    }
}
</script>
@@ -347,6 +435,23 @@
                        }
                    }
                }
                .row-box:hover {
                    background-color: rgba(255, 255, 255, 0.5);
                    color: #000;
                }
                :deep(.el-dialog) {
                    margin-right: 0px;
                }
                .tableClass {
                    margin: 0 auto;
                    width: 400px;
                    // height: 400px;
                    border-collapse: collapse;
                }

                .tableClass td {
                    width: 300px;
                }
            }
        }
    }
@@ -357,7 +462,6 @@
        left: 405px;
        flex-direction: column;
        width: 240px;
        // height: 70%;
        color: #fff;
        background: rgba(7, 22, 37, 0.8);
        :deep(.el-tree-node__content) {
@@ -365,6 +469,7 @@
        }
        :deep(.el-tree-node) {
            background: #0f1e2d;
            background-color: #fff;
        }
    }
}

 src/views/house/index.vue

@@ -246,7 +246,6 @@
                    width="40%"
                    height="60%"
                    :before-close="handleClose"
                    custom-class="tan"
                >
                    <table border="1" class="tableClass">
                        <tr v-for="(value,key) in JWdetails" :key="key">
@@ -267,6 +266,7 @@
            :visible.sync="residentDetailsShow"
            :before-close="residentDetailsClose"
            :close-on-click-modal="true"
            height="70%"
            class="resident-details-box"
        >
            <div