shuishen
2023-01-06 a9bc9dab41d393a5305519f8e96a039bb723c6c2
警情修改
5 files modified
77 ■■■■ changed files
src/api/home/index.js 7 ●●●●● patch | view | raw | blame | history
src/components/map/components/mapPopup.vue 5 ●●●●● patch | view | raw | blame | history
src/router/axios.js 10 ●●●● patch | view | raw | blame | history
src/views/home/components/bottomContainer.vue 24 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 31 ●●●● patch | view | raw | blame | history
src/api/home/index.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-12-27 14:19:19
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-01-06 15:51:20
 * @LastEditTime: 2023-01-06 16:30:13
 * @FilePath: \srs-police-affairs\src\api\home\index.js
 * @Description: 
 * 
@@ -44,6 +44,7 @@
    })
}
// 获取接警历史记录
export const getAlarmList = (type, time) => {
    return request({
        url: `/api/alarm/alarm/page`,
@@ -58,9 +59,9 @@
}
// 获取处警历史
export const getActAsPoliceList = (alarmID, cjdwbh) => {
export const getActAsPoliceList = (alarmID, cjdwbh = '') => {
    return request({
        url: `/api/alarm/alarm/page`,
        url: `/api/outAlarm/outAlarm/page`,
        method: 'get',
        params: {
            current: 1,
src/components/map/components/mapPopup.vue
@@ -139,9 +139,10 @@
        currentBtnChange (type) {
            this.currentBtn = type
            this.CJdata = {}
            getActAsPoliceList(this.dataPopup.JJDBH, '').then(res => {
                console.log(res, 999999)
                // this.CJdata = res.data.result
                this.CJdata = res.data.data.records
            })
        },
src/router/axios.js
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-07-29 15:19:13
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-01-03 10:58:13
 * @LastEditTime: 2023-01-06 16:50:55
 * @FilePath: \srs-police-affairs\src\router\axios.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
@@ -41,12 +41,12 @@
        // 调用监控平台的
        if (config.requestBaseUrl == "outside") {
            // 内网部署地址
            config.baseURL = 'http://10.141.11.11:18185/api'
            // config.baseURL = "http://192.168.0.129:18185/api"
            config.baseURL = 'http://10.141.11.11:18185'
            // config.baseURL = "http://192.168.0.129:18185"
        } else if (config.requestBaseUrl == "fengt") {
            // feng tu 数据
            // config.baseURL = "http://10.141.11.11:18080"
            config.baseURL = "http://192.168.0.112:18080"
            config.baseURL = "http://10.141.11.11:18080"
            // config.baseURL = "http://192.168.0.112:18080"
        } else if (config.requestBaseUrl == "fengtDS") {
            config.baseURL = "http://192.168.0.112:9091"
        }
src/views/home/components/bottomContainer.vue
@@ -194,26 +194,26 @@
        // 获取实时接警记录
        getAnswerPolices () {
            // getAnswerPolices().then(res => {
            //     this.policeSituationRealtimeArr = res.data.result
            // })
            getAnswerPolices().then(res => {
                this.policeSituationRealtimeArr = res.data.result
            })
            this.policeSituationRealtimeArr = [{
                ZDDWXZB: 112,
                ZDDWYZB: 25,
                JJDWMC: '公安局'
            // this.policeSituationRealtimeArr = [{
            //     ZDDWXZB: 112,
            //     ZDDWYZB: 25,
            //     JJDWMC: '公安局'
            },
            {
                JJDWMC: '公安局'
            }]
            // },
            // {
            //     JJDWMC: '公安局'
            // }]
        },
        // 获取历史接警记录
        getAlarmList (type, time) {
            getAlarmList(type, time).then(res => {
                this.policeSituationHistoryArr = res.data.result
                this.policeSituationHistoryArr = res.data.data.records
            })
        },
src/views/home/index.vue
@@ -280,57 +280,57 @@
            <div v-show="policeInformationType == '出警信息'" class="box">
                <div class="item">
                    <div>处警单位编号:</div>
                    <div>{{ policeSituationDetailArr.CJDWBH }}</div>
                    <div>{{ CJdata.CJDWBH }}</div>
                </div>
                <div class="item">
                    <div>处警单位名称:</div>
                    <div>{{ policeSituationDetailArr.CJDWMC }}</div>
                    <div>{{ CJdata.CJDWMC }}</div>
                </div>
                <div class="item">
                    <div>处警单编号:</div>
                    <div>{{ policeSituationDetailArr.CJDBH }}</div>
                    <div>{{ CJdata.CJDBH }}</div>
                </div>
                <div class="item">
                    <div>处警员编号:</div>
                    <div>{{ policeSituationDetailArr.CJYBH }}</div>
                    <div>{{ CJdata.CJYBH }}</div>
                </div>
                <div class="item">
                    <div>处警员姓名:</div>
                    <div>{{ policeSituationDetailArr.CJYXM }}</div>
                    <div>{{ CJdata.CJYXM }}</div>
                </div>
                <div class="item">
                    <div>接警时间:</div>
                    <div>{{ policeSituationDetailArr.JJSJ }}</div>
                    <div>{{ CJdata.JJSJ }}</div>
                </div>
                <div class="item">
                    <div>到达现场时间:</div>
                    <div>{{ policeSituationDetailArr.DDXCSJ }}</div>
                    <div>{{ CJdata.DDXCSJ }}</div>
                </div>
                <div class="item">
                    <div>首次反馈时间:</div>
                    <div>{{ policeSituationDetailArr.SCFKSJ }}</div>
                    <div>{{ CJdata.SCFKSJ }}</div>
                </div>
                <div class="item">
                    <div>处理完毕时间:</div>
                    <div>{{ policeSituationDetailArr.CLWBSJ }}</div>
                    <div>{{ CJdata.CLWBSJ }}</div>
                </div>
                <div class="item">
                    <div>出动人员:</div>
                    <div>{{ policeSituationDetailArr.CDRY }}</div>
                    <div>{{ CJdata.CDRY }}</div>
                </div>
                <div class="item">
                    <div>出动车辆:</div>
                    <div>{{ policeSituationDetailArr.CDCL }}</div>
                    <div>{{ CJdata.CDCL }}</div>
                </div>
                <div class="item">
                    <div>处警类型:</div>
                    <div>{{ policeSituationDetailArr.CJLX }}</div>
                    <div>{{ CJdata.CJLX }}</div>
                </div>
                <div class="dialog-content">
                    <div>备注:</div>
                    <div>{{ policeSituationDetailArr.MEMO }}</div>
                    <div>{{ CJdata.MEMO }}</div>
                </div>
            </div>
        </el-dialog>
@@ -591,6 +591,7 @@
            policeSituationRealtimeArr: [],
            policeSituationHistoryArr: [],
            policeSituationDetailArr: {},
            CJdata: {},
            activityDetailArr: {},
        }
@@ -672,10 +673,10 @@
        alarmOrActAsPolice (type) {
            this.policeInformationType = type
            this.CJdata = {}
            if (type == '出警信息') {
                getActAsPoliceList(this.policeSituationDetailArr.JJDBH).then(res => {
                    console.log(res, '出警信息')
                    this.CJdata = res.data.data.records
                })
            }
        },