guanqb
2023-03-21 3e44ce46ec7a6c5847a1990edf2351420213670e
Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
4 files modified
261 ■■■■■ changed files
src/styles/media/index.scss 56 ●●●●● patch | view | raw | blame | history
src/views/home/components/leftContainer.vue 72 ●●●● patch | view | raw | blame | history
src/views/home/components/rightContainer.vue 127 ●●●●● patch | view | raw | blame | history
vue.config.js 6 ●●●● patch | view | raw | blame | history
src/styles/media/index.scss
@@ -208,6 +208,62 @@
                                    top: countSizeVh(102);
                                }
                            }
                            .case-box {
                                .table-box {
                                    height: calc(100% - 18.6%);
                                    .title-header {
                                        height: countSizeVh(40);
                                        li {
                                            display: flex;
                                            background: $table-header-bg-color !important;
                                            span {
                                                line-height: 24px;
                                            }
                                            .time {
                                                width: 20%;
                                            }
                                            .zbry {
                                                width: 40%;
                                            }
                                            .fxlry {
                                                width: 40%;
                                            }
                                        }
                                    }
                                    .warp {
                                        height: calc(100% - countSizeVh(54));
                                        overflow: hidden;
                                        li {
                                            display: flex;
                                            span {
                                                line-height: 24px;
                                            }
                                            .time {
                                                width: 20%;
                                            }
                                            .zbry {
                                                width: 40%;
                                            }
                                            .fxlry {
                                                width: 40%;
                                            }
                                        }
                                    }
                                }
                            }
                        }
                        .bottom-container {
src/views/home/components/leftContainer.vue
@@ -43,10 +43,10 @@
                <defs>
                    <path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                        d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                        c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                        c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                        c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                        c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                        c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                        c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                        c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                        c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                        fill="transparent" />
                    <radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
                        <stop offset="0%" stop-color="#fff" stop-opacity="1" />
@@ -56,10 +56,10 @@
                        <circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
                            <animateMotion dur="8s"
                                path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                            c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                            c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                            c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                            c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                            c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                            c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                            c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                            c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                rotate="auto" repeatCount="indefinite" />
                        </circle>
                    </mask>
@@ -253,6 +253,8 @@
                this.initkeyPersonEcharts()
            }
        },
        /**
@@ -305,6 +307,16 @@
                    homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate, colors), true)
                    this.clickPeopleChart()
                    if (this.policeStaionID == '') {
                        if (this.userInfo.dept_id == '1596020515064381442') {
                            this.personAll.emphasisNum = 21
                        }
                    } else {
                        if (this.policeStaionID == '1596020515064381442') {
                            this.personAll.emphasisNum = 21
                        }
                    }
                }
            })
        },
@@ -719,9 +731,49 @@
            let personInfo = await this.getPersonInfo()
            keyPersonmyChart.setOption(this.initkeyPersonOption(personInfo))
            const dataArr = [
                {
                    name: '非涉法涉诉重点个访人员',
                    value: 6
                },
                {
                    name: '楼盘业主维权群体',
                    value: 1
                },
                {
                    name: '欠薪讨债群体',
                    value: 1
                },
                {
                    name: '涉法涉诉重点个访人员',
                    value: 4
                },
                {
                    name: '征地拆迁群体',
                    value: 9
                }
            this.clickkeyPersonChart()
            ]
            if (this.policeStaionID == '') {
                if (this.userInfo.dept_id == '1596020515064381442') {
                    keyPersonmyChart.setOption(this.initkeyPersonOption(dataArr))
                    this.personAll.emphasisNum = 21
                } else {
                    keyPersonmyChart.setOption(this.initkeyPersonOption(personInfo))
                    this.clickkeyPersonChart()
                }
            } else {
                if (this.policeStaionID == '1596020515064381442') {
                    keyPersonmyChart.setOption(this.initkeyPersonOption(dataArr))
                    this.personAll.emphasisNum = 21
                } else {
                    keyPersonmyChart.setOption(this.initkeyPersonOption(personInfo))
                    this.clickkeyPersonChart()
                }
            }
        },
        /**
         * @description: 调用接口获取重点人员数据
src/views/home/components/rightContainer.vue
@@ -5,7 +5,8 @@
                <div class="title" ref="alertBoxTitle">
                    <div>值班信息(当日)</div>
                </div>
                <div class="table-box">
                <div class="table-box" v-if="showZbPerson">
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                        :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
@@ -21,6 +22,26 @@
                            </div>
                        </el-tooltip>
                    </div>
                </div>
                <div class="table-box" v-else>
                    <ul class="title-header">
                        <li>
                            <span class="time">日期</span>
                            <span class="zbry">值班人员</span>
                            <span class="fxlry">副班、巡逻人员</span>
                        </li>
                    </ul>
                    <vue-seamless-scroll class="warp" :data="zhPersonList" :class-option="classOption">
                        <ul class="item">
                            <li v-for="(item, index) in zhPersonList" :key="index" class="row">
                                <span class="time" v-text="item.time"></span>
                                <span class="zbry" v-text="item.zbry"></span>
                                <span class="fxlry" v-text="item.fxlry"></span>
                            </li>
                        </ul>
                    </vue-seamless-scroll>
                </div>
            </div>
@@ -116,6 +137,8 @@
let timer
let equimentDataLength = 0
import vueSeamlessScroll from 'vue-seamless-scroll'
import recorderArr from '@/assets/data/equimentsDate/recorder.js'
import { getSchedulingList, getSchedulingDeptList } from '@/api/home/index.js'
import { fontSize } from '@/utils/fontSize.js'
@@ -161,9 +184,95 @@
            tableHeight: 0,
            schedulingList: [],
            schedulingDeptList: [1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6],
            policeStaionID: ''
            policeStaionID: '',
            showZbPerson: true,
            zhPersonList: [
                {
                    time: '2023-3-20',
                    zbry: '齐光华、周静、吕来城、周骏、邓道群、沈强、王岳、魏霄峰、夏添、李道福',
                    fxlry: '潘林彬,刘志祥,李志强,杨俊浩,黄天行,叶子淳',
                    bz: ''
                },
                {
                    time: '2023-3-21',
                    zbry: '徐星逸、任圣日、娄永攀、蔡善龙、陈小强、梅祥、吕镇、刘开勇、付建冬',
                    fxlry: '余梦宝,徐宝盛,李仁豪,付涵,周林,王宗强,',
                    bz: ''
                },
                {
                    time: '2023-3-22',
                    zbry: '矢裕忠、戴饶平、余传公、杨敏、苏浩男、周安云、蒋丁岩、陈圣俊、雷智荐',
                    fxlry: '连子健,曾萍,祝顺鑫,吕皇,魏敏耀,纪辉帅',
                    bz: ''
                },
                {
                    time: '2023-3-23',
                    zbry: '齐光华、周静、吕来城、周骏、邓道群、沈强、王岳、魏霄峰、夏添、李道福',
                    fxlry: '章正椿,夏文翔,叶江明,黄俊龙,苏茯林,王顺祥',
                    bz: ''
                },
                {
                    time: '2023-3-24',
                    zbry: '徐星逸、任圣日、娄永攀、蔡善龙、陈小强、梅祥、吕镇、刘开勇、付建冬',
                    fxlry: '潘林彬,刘志祥,李志强,杨俊浩,黄天行,叶子淳',
                    bz: ''
                },
                {
                    time: '2023-3-25',
                    zbry: '矢裕忠、戴饶平、余传公、杨敏、苏浩男、周安云、蒋丁岩、陈圣俊、雷智荐',
                    fxlry: '余梦宝,徐宝盛,李仁豪,付涵,周林,王宗强,',
                    bz: ''
                },
                {
                    time: '2023-3-26',
                    zbry: '齐光华、周静、吕来城、周骏、邓道群、沈强、王岳、魏霄峰、夏添、李道福',
                    fxlry: '连子健,曾萍,祝顺鑫,吕皇,魏敏耀,纪辉帅',
                    bz: ''
                },
                {
                    time: '2023-3-27',
                    zbry: '徐星逸、任圣日、娄永攀、蔡善龙、陈小强、梅祥、吕镇、刘开勇、付建冬',
                    fxlry: '章正椿,夏文翔,叶江明,黄俊龙,苏茯林,王顺祥',
                    bz: ''
                },
                {
                    time: '2023-3-28',
                    zbry: '矢裕忠、戴饶平、余传公、杨敏、苏浩男、周安云、蒋丁岩、陈圣俊、雷智荐',
                    fxlry: '潘林彬,刘志祥,李志强,杨俊浩,黄天行,叶子淳',
                    bz: ''
                },
                {
                    time: '2023-3-29',
                    zbry: '齐光华、周静、吕来城、周骏、邓道群、沈强、王岳、魏霄峰、夏添、李道福',
                    fxlry: '余梦宝,徐宝盛,李仁豪,付涵,周林,王宗强',
                    bz: ''
                },
                {
                    time: '2023-3-30',
                    zbry: '徐星逸、任圣日、娄永攀、蔡善龙、陈小强、梅祥、吕镇、刘开勇、付建冬',
                    fxlry: '连子健,曾萍,祝顺鑫,吕皇,魏敏耀,纪辉帅',
                    bz: ''
                },
                {
                    time: '2023-3-31',
                    zbry: '矢裕忠、戴饶平、余传公、杨敏、苏浩男、周安云、蒋丁岩、陈圣俊、雷智荐',
                    fxlry: '章正椿,夏文翔,叶江明,黄俊龙,苏茯林,王顺祥',
                    bz: ''
                }
            ],
            classOption: {
                step: 1
            },
        }
    },
    components: {
        vueSeamlessScroll
    },
    created () {
        this.pickerOptions = {
            ...this.pickerOptions,
@@ -217,6 +326,20 @@
        getHomeAllData (id = '') {
            this.policeStaionID = id
            if (this.policeStaionID == '') {
                if (this.userInfo.dept_id == '1596020515064381442') {
                    this.showZbPerson = false
                } else {
                    this.showZbPerson = true
                }
            } else {
                if (this.policeStaionID == '1596020515064381442') {
                    this.showZbPerson = false
                } else {
                    this.showZbPerson = true
                }
            }
            this.initEventChangeEcharts()
            this.initEquipmentEcharts(this.linetype)
vue.config.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:37:07
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-14 16:03:54
 * @LastEditTime: 2023-03-21 08:37:10
 * @FilePath: \srs-police-affairs\vue.config.js
 * @Description:
 *
@@ -157,8 +157,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称,即是你的api接口的服务器地址
                // target: "http://localhost:82",
                target: "http://192.168.0.126:82",
                target: "http://localhost:82",
                // target: "http://192.168.0.126:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566