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

shuishen

2022-09-20 0d2351b15c8fbb0ab2d2017b3ef415bfd1cdfdbe

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

 src/views/home/index.vue

@@ -79,14 +79,14 @@
            </div>
            <div class="alert-box">
                <div class="title">
                    <div class="one-level">警情近一年</div>
                    <div class="two-level">历史累计</div>
                    <div class="one-level">警情历史(近一年)</div>
                    <!-- <div class="two-level">历史累计</div> -->
                </div>

                <div class="sub-title">
                <!-- <div class="sub-title">
                    <div class="one-level">警情、案事件总量</div>
                    <div class="two-level">555578起</div>
                </div>
                </div>-->

                <div id="EventCountEcharts" class="echarts-box"></div>
            </div>
@@ -366,8 +366,8 @@
                { value: 4664, name: '固定枪机' },
                { value: 310, name: '固定球机' },
                { value: 279, name: '可控球机' },
                { value: 241, name: '卡口枪击' },
                { value: 5, name: '云台枪击' }
                { value: 241, name: '卡口枪机' },
                { value: 5, name: '云台枪机' }
            ]
            for (let i = 0; i < dataArr.length; i++) {
                regionTotal += dataArr[i].value

 src/views/house/index.vue

@@ -237,14 +237,19 @@
                    <el-table-column prop="type" label="类别" width="120"></el-table-column>
                </el-table>
                <el-dialog
                    title="详细信息"
                    title="警务详情"
                    :visible.sync="dialogVisible"
                    width="30%"
                    width="40%"
                    height="60%"
                    :before-close="handleClose"
                    custom-class="tan"
                >
                    <ul>
                        <li v-for="(value,key) in JWdetails" :key="key">{{key}}---------{{value}}</li>
                    </ul>
                    <table border="1" class="tableClass">
                        <tr v-for="(value,key) in JWdetails" :key="key">
                            <th>{{key}}</th>
                            <td>{{value}}</td>
                        </tr>
                    </table>
                    <span slot="footer" class="dialog-footer"></span>
                </el-dialog>
            </div>
@@ -576,6 +581,26 @@
            }
            ::v-deep .el-table tr:hover td {
                color: #000;
                cursor: pointer;
            }
            ::v-deep .el-dialog__header {
                margin-top: 150px;
            }
            ::v-deep .el-dialog__title {
                line-height: 24px;
                font-size: 24px;
                font-weight: 700;
                color: #303133;
            }
            .tableClass {
                margin: 0 auto;
                width: 600px;
                height: 400px;
                border-collapse: collapse;
            }
            .tableClass th,
            .tableClass td {
                width: 200px;
            }
        }
    }