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

shuishen

2023-04-01 fb62da02ec5aface8728f17d1b8d4314049e7d3d

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

 src/views/home/components/bottomContainer.vue

@@ -71,7 +71,7 @@
                            <span class="call-police-content" :title="item.BJNR" v-text="item.BJNR"></span>
                            <span class="incident-site" :title="item.SFDZ" v-text="item.SFDZ"></span>
                            <span class="call-police-type" v-text="item.BJLX"></span>
                            <span class="have-position" v-text="item.isHavePosition"></span>
                            <span class="have-position" v-text="item.position"></span>
                            <span class="alarm-bz" v-text="item.MEMO"></span>
                        </li>
                    </ul>
@@ -427,7 +427,7 @@
            }]

            this.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
            })

            this.$emit('policeSituationChange')

 src/views/home/components/leftContainer.vue

@@ -623,7 +623,7 @@
                                    position: 'right', //在上方显示
                                    textStyle: { //数值样式
                                        color: '#ed7c2f',
                                        fontSize: 16
                                        fontSize: 10
                                    }
                                }
                            }
@@ -647,7 +647,7 @@
                    top: '2%',
                    left: '2%',
                    // right: '-1%',
                    right: '5%',
                    right: '10%',
                    bottom: '2%',
                    containLabel: true
                },
@@ -686,18 +686,11 @@
        },

        houseTabClick (type) {
            this.tabTypeTwo = type

            this.disposeHouseEchart()
            if (type == 0) {
                this.getHouseStatisticInfo(2)
            } else {
                this.getHouseStatisticInfo(1)
            }
        },

        initLandOptions (xDate, yDate) {
            return {
                color: ['#0532ff'],
                grid: {
                    top: '4%',
                    left: '12%',

 src/views/home/components/rightContainer.vue

@@ -9,8 +9,8 @@
                <div class="table-box" v-show="!showMJL">
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                        :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }"
                        :row-class-name="tableRowClassName">
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        empty-text="暂无值班信息">
                        <el-table-column prop="dept" label="值班单位"></el-table-column>
                        <el-table-column prop="person" label="姓名"></el-table-column>
                        <el-table-column prop="contact" label="联系方式"></el-table-column>
@@ -437,7 +437,7 @@
                //暂无数据
                option = {
                    title: {
                        text: "暂无数据",
                        text: "暂无案件数据",
                        x: "center",
                        y: "center",
                        textStyle: {

 vue.config.js

@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                target: "http://localhost:82",
                // target: "http://192.168.0.100:82",
                // target: "http://localhost:82",
                target: "http://192.168.0.100:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566