guanqb
2023-10-23 5e7451f531377efdefc1f911928ee0310667c166
万达晶座商场并入万达广场、首页酒店住户接口添加
3 files modified
376 ■■■■ changed files
src/api/home/index.js 351 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 11 ●●●●● patch | view | raw | blame | history
src/views/house/index.vue 14 ●●●●● patch | view | raw | blame | history
src/api/home/index.js
@@ -8,16 +8,16 @@
 *
 * Copyright (c) 2023 by shuishen 1109946754@qq.com, All Rights Reserved.
 */
import request from "@/router/axios.js";
import request from "@/router/axios.js"
let equipmentNum = "";
let equipmentNum = ""
if (process.env.NODE_ENV == "development") {
  // 开发
  equipmentNum = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_EQUIPMENT;
    // 开发
    equipmentNum = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_EQUIPMENT
} else {
  // 部署
  equipmentNum = window.BASE_URL_CONFIG.VUE_APP_INTRANET_EQUIPMENT;
    // 部署
    equipmentNum = window.BASE_URL_CONFIG.VUE_APP_INTRANET_EQUIPMENT
}
/**
@@ -27,16 +27,16 @@
 */
// export const getSchedulingList = (current, size, params) => {
export const getSchedulingList = (params) => {
  return request({
    url: `/api/scheduling/scheduling/page`,
    method: "get",
    params: {
      ...params,
      // current: current,
      // size: size
    },
  });
};
    return request({
        url: `/api/scheduling/scheduling/page`,
        method: "get",
        params: {
            ...params,
            // current: current,
            // size: size
        },
    })
}
/**
 * 获取值班单位集合信息
@@ -44,213 +44,222 @@
 * @returns
 */
export const getSchedulingDeptList = (current, size, params) => {
  return request({
    url: `/api/scheduling/scheduling/getSchedulingDeptList`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/scheduling/scheduling/getSchedulingDeptList`,
        method: "get",
        params: params,
    })
}
export const getAnswerPolices = (params) => {
  return request({
    url: `/api/doorplate/doorplate/acceptAlarmList`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/doorplate/doorplate/acceptAlarmList`,
        method: "get",
        params: params,
    })
}
export const getCallPolices = () => {
  return request({
    url: `/api/doorplate/doorplate/setOutAlarmList`,
    method: "get",
    params: {},
  });
};
    return request({
        url: `/api/doorplate/doorplate/setOutAlarmList`,
        method: "get",
        params: {},
    })
}
// 获取接警历史记录
export const getAlarmList = (params) => {
  return request({
    url: `/api/alarm/alarm/page`,
    method: "get",
    params: {
      ...params,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/page`,
        method: "get",
        params: {
            ...params,
        },
    })
}
// 获取接警历史记录统计数据
export const getAlarmStatistics = (params) => {
  return request({
    url: `/api/alarm/alarm/statisticsAlarmByBJLX`,
    method: "get",
    params: {
      ...params,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/statisticsAlarmByBJLX`,
        method: "get",
        params: {
            ...params,
        },
    })
}
// 获取处警历史
export const getActAsPoliceList = (alarmID, cjdwbh = "") => {
  return request({
    url: `/api/outAlarm/outAlarm/page`,
    method: "get",
    params: {
      current: 1,
      size: 100,
      alarmID,
      cjdwbh,
    },
  });
};
    return request({
        url: `/api/outAlarm/outAlarm/page`,
        method: "get",
        params: {
            current: 1,
            size: 100,
            alarmID,
            cjdwbh,
        },
    })
}
// 案件统计数量接口查询
export const getCaseAll = (start, end, jjdwbh = "") => {
  return request({
    url: `/api/alarm/alarm/statisticsAlarm`,
    method: "get",
    params: {
      start,
      end,
      jjdwbh,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/statisticsAlarm`,
        method: "get",
        params: {
            start,
            end,
            jjdwbh,
        },
    })
}
// 案件统计社区排行接口查询
export const getCaseRanking = (start, end, dwbh = "") => {
  return request({
    url: `/api/alarm/alarm/getAlarmVillageOrderList`,
    method: "get",
    params: {
      start,
      end,
      dwbh,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/getAlarmVillageOrderList`,
        method: "get",
        params: {
            start,
            end,
            dwbh,
        },
    })
}
// 案件统计辖区排行接口查询
export const getCaseRankingArea = (start, end, dwbh = "") => {
  return request({
    url: `/api/alarm/alarm/getAlarmStatisticsByPoliceOrArea`,
    method: "get",
    params: {
      start,
      end,
      dwbh,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/getAlarmStatisticsByPoliceOrArea`,
        method: "get",
        params: {
            start,
            end,
            dwbh,
        },
    })
}
// 获取设备统计数据
export const getEquipment = (jjdwbh = "") => {
  return request({
    url: `/api/alarm/alarm/statisticsCameraTypeOnline`,
    method: "get",
    params: {
      jjdwbh,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/statisticsCameraTypeOnline`,
        method: "get",
        params: {
            jjdwbh,
        },
    })
}
// 派出所责任区小区-获取三级区域数据
export const getPoliceStationTree = (type, id) => {
  return request({
    url: `/api/policeStationInfo/policeStationInfo/getPoliceStationTree`,
    method: "get",
    params: {
      type,
      id,
    },
  });
};
    return request({
        url: `/api/policeStationInfo/policeStationInfo/getPoliceStationTree`,
        method: "get",
        params: {
            type,
            id,
        },
    })
}
// 现有小区模块
export const getAreaStatisticInfo = (type, deptId) => {
  return request({
    url: `/api/policeStationInfo/policeStationInfo/getAreaStatisticInfo`,
    method: "get",
    params: {
      type,
      deptId,
    },
  });
};
    return request({
        url: `/api/policeStationInfo/policeStationInfo/getAreaStatisticInfo`,
        method: "get",
        params: {
            type,
            deptId,
        },
    })
}
// 获取设备分页数据
export const getEquipmentPaging = (params) => {
  return request({
    url: `/device/query/devices/${equipmentNum}/channelsCar`,
    method: "get",
    requestBaseUrl: "outside",
    params: {
      ...params,
    },
  });
};
    return request({
        url: `/device/query/devices/${equipmentNum}/channelsCar`,
        method: "get",
        requestBaseUrl: "outside",
        params: {
            ...params,
        },
    })
}
// 获取设备数据
export const getEquipmentAll = (params) => {
  return request({
    url: `/api/alarm/alarm/channelsCarAll`,
    method: "get",
    params: {
      ...params,
      deviceId: equipmentNum,
    },
  });
};
    return request({
        url: `/api/alarm/alarm/channelsCarAll`,
        method: "get",
        params: {
            ...params,
            deviceId: equipmentNum,
        },
    })
}
// 获取现有小区详情弹窗
export const getLandDetail = (params) => {
  return request({
    url: `/api/policeStationInfo/policeStationInfo/page`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/policeStationInfo/policeStationInfo/page`,
        method: "get",
        params: params,
    })
}
//实有房屋统计
export const getVillageStatisticData = (params) => {
  return request({
    url: `/api/villageDetail/villageDetail/getVillageStatisticData`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/villageDetail/villageDetail/getVillageStatisticData`,
        method: "get",
        params: params,
    })
}
//实有房屋统计--详情
export const getVillageStatisticDetail = (params) => {
  return request({
    url: `/api/villageDetail/villageDetail/page`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/villageDetail/villageDetail/page`,
        method: "get",
        params: params,
    })
}
//关注场所统计
export const getPlaceOfConcernStatisticData = (params) => {
  return request({
    url: `/api/placeOfConcern/placeOfConcern/getPlaceOfConcernStatisticData`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/placeOfConcern/placeOfConcern/getPlaceOfConcernStatisticData`,
        method: "get",
        params: params,
    })
}
//关注场所统计--详情
export const getPlaceOfConcernStatisticDetail = (params) => {
  return request({
    url: `/api/placeOfConcern/placeOfConcern/page`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/placeOfConcern/placeOfConcern/page`,
        method: "get",
        params: params,
    })
}
//实有住宅和关注场所统计总数
export const getVillageDetailAndPlaceStatisticNumber = (params) => {
  return request({
    url: `/api/placeOfConcern/placeOfConcern/getVillageDetailAndPlaceStatisticNumber`,
    method: "get",
    params: params,
  });
};
    return request({
        url: `/api/placeOfConcern/placeOfConcern/getVillageDetailAndPlaceStatisticNumber`,
        method: "get",
        params: params,
    })
}
//酒店住户列表
export const getCheckInInfo = (params) => {
    return request({
        url: `/api/checkInInfo/checkInInfo/page`,
        method: "get",
        params,
    })
}
src/views/home/index.vue
@@ -556,6 +556,9 @@
                            size="small" :title="'定位'">
                            <i class="el-icon-location" :style="{ color: positionColor(scope.row) }"></i>
                        </el-button>
                        <!-- <el-button @click="zhuSuInfoClick(scope.row)" type="text" size="small" :title="'住户信息'">
                            <i class="el-icon-user-solid" style="color:#fcc31f"></i>
                        </el-button> -->
                    </template>
                </el-table-column>
            </el-table>
@@ -1148,7 +1151,7 @@
            this.gzcsPopupShow = false
        },
        // 实有楼栋---酒店--点击事件
        // 实有楼栋---酒店--定位点击事件
        zhuSuClick (row) {
            this.$EventBus.$emit('toPosition', {
                siteJd: row.longitude,
@@ -1186,6 +1189,12 @@
            this.zhuSuPopupShow = false
        },
        // 实有楼栋---酒店--住户信息点击事件
        zhuSuInfoClick (row) {
            console.log('zhuSuInfoClick')
        },
        // 实有楼栋分页事件
        handleSyldPageChange (current) {
            this.syldLoading = true
src/views/house/index.vue
@@ -1445,10 +1445,8 @@
                            this.businessData.push(item)
                        }
                    })
                    console.log('ids---', ids, ids == 'aba5227bc3c16d3fec0f0b1e87f25bbb')
                    if (ids == '62556EAF45C31B9DE0530EF4520A0CFC' || ids == '62556EAF4B731B9DE0530EF4520A0CFC' || ids == 'aba5227bc3c16d3fec0f0b1e87f25bbb' || ids == '644A2C4049024A3C8C76D96EEE4366FD') {//小区uid
                        this.isQFL27 = true
                        console.log('if---')
                        let sCAoiId = ''//商场aoiId
                        if (ids == '62556EAF45C31B9DE0530EF4520A0CFC') {//指定庆丰路27号天集信江明珠小区uid
                            sCAoiId = '6E5276A05D1611EAB6183C15FB00027B'
@@ -1456,16 +1454,14 @@
                        } else if (ids == '62556EAF4B731B9DE0530EF4520A0CFC') {//指定万达广场uid
                            sCAoiId = '6E513C5E5D1611EAB6183C15FB00027B'
                        } else if (ids == 'aba5227bc3c16d3fec0f0b1e87f25bbb') {//指定万达晶座uid
                        } else if (ids == 'aba5227bc3c16d3fec0f0b1e87f25bbb') {//指定万达晶座uid--此路不通因为没deep_infos
                            sCAoiId = 'A425AEC8D3FE4C85937FE36B4F996437'
                            console.log('if---万达晶座')
                        } else if (ids == '644A2C4049024A3C8C76D96EEE4366FD') {//指定万达华府uid
                            sCAoiId = '6E5271B45D1611EAB6183C15FB00027B'
                        }
                        console.log('if---else', sCAoiId)
                        let sCData = []
                        businessJs.forEach(item => {
@@ -1476,9 +1472,15 @@
                                item.picUrl = 'http://10.141.11.11' + item.url
                                sCData.push(item)
                            }
                            if (sCAoiId == '6E513C5E5D1611EAB6183C15FB00027B' && item.aoi_id == 'A425AEC8D3FE4C85937FE36B4F996437') {//万达晶座并入万达广场
                                item.name = item.place_name
                                item.x = item.lng
                                item.y = item.lat
                                item.picUrl = 'http://10.141.11.11' + item.url
                                sCData.push(item)
                            }
                        })
                        this.businessData = sCData
                        console.log('sCData', sCData)
                    } else {
                        this.isQFL27 = false
                    }