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

zhongrj

2023-04-01 fb4b4d0780117701a4f4d07ee0eea12f79cd22f9

 src/views/home/components/rightContainer.vue

@@ -10,7 +10,8 @@
                    <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"
                        empty-text="暂无值班信息">
                        empty-text="暂无值班信息" v-loading="schedulingLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                        <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>
@@ -26,8 +27,9 @@
                <div class="table-box" v-show="showMJL">
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                        :show-header="false" :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"
                        v-loading="schedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                        element-loading-background="rgba(0, 0, 0, 0.2)">
                        <el-table-column :show-overflow-tooltip="true" v-for="(item, index) in transTitle" :label="item"
                            :key="index" align="center">
                            <template slot-scope="scope">
@@ -57,7 +59,10 @@
                            :picker-options="pickerOptions"></el-date-picker>
                    </div>
                </div>
                <div id="EventChangeEcharts" class="echarts-box"></div>
                <el-main v-loading="eventChangeEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div id="EventChangeEcharts" class="echarts-box"></div>
                </el-main>
            </div>

            <svg class="border-svg">
@@ -106,7 +111,10 @@
                        <span :class="{ choosed: linetype == 1 }" @click="initEquipmentEcharts(1)">设备状态</span>
                    </div>
                </div>
                <div style="overflow: hidden" id="EquipmentEcharts" class="echarts-box"></div>
                <el-main v-loading="equipmentEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div style="overflow: hidden" id="EquipmentEcharts" class="echarts-box"></div>
                </el-main>
            </div>

            <svg class="border-svg">
@@ -153,6 +161,9 @@
    data () {
        return {
            eventTime: [],
            equipmentEchartsLoading: false,
            eventChangeEchartsLoading: false,
            schedulingLoading: false,
            pickerOptions: {
                shortcuts: [
                    {
@@ -270,6 +281,7 @@

        getSchedulingList () {
            console.log(this.userInfo, 4567)
            this.schedulingLoading = true
            if (this.userInfo.dept_id == "1596020515064381442") {
                const data = [
                    {
@@ -322,6 +334,9 @@
                    this.schedulingList = res.data.data.records
                })
            }
            setTimeout(() => {
                this.schedulingLoading = false
            }, 1000)
        },

        echartsResize () {
@@ -399,6 +414,7 @@

        // 初始化案件统计
        async initEventChangeEcharts () {
            this.eventChangeEchartsLoading = true
            var chartDom = document.getElementById("EventChangeEcharts")

            if (
@@ -416,16 +432,11 @@

            const optionsData = await this.getCaseAll(date[0], date[1])

            eventchangemychart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })

            eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))

            setTimeout(() => {
                eventchangemychart.hideLoading()
                eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))
                this.eventChangeEchartsLoading = false
            }, 500)
        },

@@ -553,8 +564,8 @@

            let data = []
            this.regionTotal = 0

            const dataAll = getEquipment(
            let dataAll = null
            dataAll = getEquipment(
                this.policeStaionID != "" ? this.policeStaionID : this.userInfo.dept_id
            ).then((res) => {
                if (this.linetype == 0) {
@@ -611,6 +622,8 @@

                    return data
                }
            }).catch(res => {
                dataAll = '请求错误'
            })

            return dataAll
@@ -619,6 +632,7 @@
        // 现有设备饼图初始化
        async initEquipmentEcharts (type) {
            this.linetype = type
            this.equipmentEchartsLoading = true

            if (
                equipmentmyChart != null &&
@@ -634,24 +648,18 @@

            const data = await this.getEquipment()

            if (data == '请求错误') {
                setTimeout(() => {
                    this.equipmentEchartsLoading = false
                }, 500)
            }
            const newData = data.filter((item) => {
                if (item.value != 0) {
                    return item
                }
            })

            equipmentmyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
                equipmentmyChart.hideLoading()
                equipmentmyChart.setOption(this.initEquipmentOptions(newData))
            }, 500)

            equipmentmyChart.setOption(this.initEquipmentOptions(newData))

            this.clickEquimentChart()

@@ -662,6 +670,9 @@
                equipmentmyChart.off("mouseover")
                equipmentmyChart.off("mouseout")
            }
            setTimeout(() => {
                this.equipmentEchartsLoading = false
            }, 500)
        },

        // 现有设备options饼图数据
@@ -956,6 +967,11 @@
        //     margin-left: 8px;
        // }


        :deep(.el-main) {
            padding: 0;
        }

        .box {
            display: flex;
            position: absolute;
@@ -1033,6 +1049,8 @@
        .echarts-box {
            padding: 12px;
            flex: 1;
            height: 100%;
            width: 100%;
        }

        .table-box {
@@ -1053,6 +1071,10 @@
                    cursor: pointer;
                }
            }

            :deep(.el-table .cell) {
                white-space: pre-line;
            }
        }

        #peopleList {