diff --git a/.env.development b/.env.development index ed07633..1cb52ab 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -VITE_API_URL = 'http://192.168.34.221:9111' +# VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' @@ -15,7 +15,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/api/modules/equipmentPosition.ts b/src/api/modules/equipmentPosition.ts new file mode 100644 index 0000000..d0af8fb --- /dev/null +++ b/src/api/modules/equipmentPosition.ts @@ -0,0 +1,94 @@ +import http from "@/api"; +const BASEURL = import.meta.env.VITE_API_URL; + +// 分页列表查询车辆(人员)定位- 报警记录信息 +export const getAlarmRecordInfo = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionAlarm/list`, params); +}; + +// 分页列表查询车辆(人员)定位- 实时数据信息 +export const getRealtimeRecordInfo = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionData/page`, params); +}; + +// 列表查询车辆(人员)定位- 实时数据信息 +export const getRealtimeRecordList = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionData/list`, params); +}; + +// 车辆定位-设备中台 +export const getstandardDevListApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionDev/page`, params); +}; +export const addstandardDevApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/add`, params); +}; +export const editstandardDevApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/edit`, params); +}; +export const deletestandardDevApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/delete`, params); +}; + +export const getVehiclePositionFence = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionFence/list`, params); +}; +export const addVehiclePositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionFence/add`, params); +}; +export const editVehiclePositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionFence/edit`, params); +}; +export const deleteVehiclePositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionFence/delete`, params); +}; + +// 获取设备中台所有数据 +export const getCarDevOption = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionDev/list`, params); +}; + +// 查询设备状态总数 +export const getFenceTypeTotal = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/countVehiclePositionDev`, params); +}; + +// 查询车辆日行数据 +export const getVehiclePositionDayRecord = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionDayRecord/list`, params); +}; + + +// 机械设备定位--分类查询设备列表 +export const getEpDevOptionApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionDev/list`, params); +}; +// 机械设备定位--查询设备状态总数 +export const getEpTypeTotalApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/mechanicalEquipmentPositionDev/countDev`, params); +}; +// 机械设备定位--查询围栏信息 +export const getEpSuroundInfoApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionFence/list`, params); +}; +// 机械设备定位--查询报警信息 +export const getEpAlarmRecordInfoApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionAlarm/list`, params); +}; +// 机械设备定位--查询实时数据信息 +export const getEpRealtimeDataApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionData/list`, params); +}; +// 机械设备定位--查询机械设备日行数据 +export const getEpDayRecordApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/mechanicalEquipmentPositionDayRecord/list`, params); +}; + +// 机械设备定位--删除围栏 +export const deleteEpFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/mechanicalEquipmentPositionFence/deleteBatch`, params); +}; +// 机械设备定位--添加围栏 +export const addEpPositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/mechanicalEquipmentPositionFence/add`, params); +}; \ No newline at end of file diff --git a/src/api/modules/smartSafeHat.ts b/src/api/modules/smartSafeHat.ts new file mode 100644 index 0000000..599e251 --- /dev/null +++ b/src/api/modules/smartSafeHat.ts @@ -0,0 +1,81 @@ +import http from "@/api"; +const BASEURL = import.meta.env.VITE_API_URL; + +// 分页列表查询车辆(人员)定位- 实时数据信息 +export const getRealtimeRecordInfo = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionData/page`, params); +}; + +// 列表查询车辆(人员)定位- 实时数据信息 +export const getRealtimeRecordList = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionData/list`, params); +}; + +// 车辆定位-设备中台 +export const getstandardDevListApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionDev/page`, params); +}; +export const addstandardDevApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/add`, params); +}; +export const editstandardDevApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/edit`, params); +}; +export const deletestandardDevApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionDev/delete`, params); +}; + +export const getVehiclePositionFence = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionFence/list`, params); +}; +export const addVehiclePositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionFence/add`, params); +}; +export const editVehiclePositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionFence/edit`, params); +}; +export const deleteVehiclePositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/vehiclePositionFence/delete`, params); +}; + +// 查询车辆日行数据 +export const getVehiclePositionDayRecord = (params: {}) => { + return http.get(BASEURL + `/xmgl/vehiclePositionDayRecord/list`, params); +}; + +// 智能安全帽--分类查询设备列表 +export const getHatDevOptionApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/safetyHatDev/list`, params); +}; +// 智能安全帽--查询设备状态总数 +export const getSafeHatTypeTotalApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/safetyHatDev/countSafetyHatDev`, params); +}; +// 智能安全帽--查询周报警数据 +export const getWeekAlarmDataApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/safetyHatAlarm/getRecentWeekAlarm`, params); +}; +// 智能安全帽--查询围栏信息 +export const getSuroundInfoApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/safetyHatFence/list`, params); +}; +// 智能安全帽--查询报警信息 +export const getAlarmRecordInfoApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/safetyHatAlarm/list`, params); +}; +// 智能安全帽--查询实时数据信息 +export const getRealtimeDataApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/safetyHatData/list`, params); +}; +// 智能安全帽--查询安全帽日行数据 +export const getSafeHatDayRecordApi = (params: {}) => { + return http.get(BASEURL + `/xmgl/safetyHatData/list`, params); +}; +// 智能安全帽--删除围栏 +export const deleteSafehatFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/safetyHatFence/deleteBatch`, params); +}; +// 智能安全帽--添加围栏 +export const addSafeHatPositionFence = (params: {}) => { + return http.post(BASEURL + `/xmgl/safetyHatFence/add`, params); +}; \ No newline at end of file diff --git a/src/assets/images/cancel.png b/src/assets/images/cancel.png new file mode 100644 index 0000000..d6e6119 Binary files /dev/null and b/src/assets/images/cancel.png differ diff --git a/src/assets/images/carPosition/epOff.png b/src/assets/images/carPosition/epOff.png new file mode 100644 index 0000000..d18fcec Binary files /dev/null and b/src/assets/images/carPosition/epOff.png differ diff --git a/src/assets/images/carPosition/epOn.png b/src/assets/images/carPosition/epOn.png new file mode 100644 index 0000000..fceb86f Binary files /dev/null and b/src/assets/images/carPosition/epOn.png differ diff --git a/src/assets/images/carPosition/equipmentPosition.png b/src/assets/images/carPosition/equipmentPosition.png new file mode 100644 index 0000000..32b1cc1 Binary files /dev/null and b/src/assets/images/carPosition/equipmentPosition.png differ diff --git a/src/assets/images/carPosition/equipmentPosition2.png b/src/assets/images/carPosition/equipmentPosition2.png new file mode 100644 index 0000000..a75dd45 Binary files /dev/null and b/src/assets/images/carPosition/equipmentPosition2.png differ diff --git a/src/assets/images/cbg.png b/src/assets/images/cbg.png new file mode 100644 index 0000000..6798919 Binary files /dev/null and b/src/assets/images/cbg.png differ diff --git a/src/assets/images/confirm.png b/src/assets/images/confirm.png new file mode 100644 index 0000000..f889789 Binary files /dev/null and b/src/assets/images/confirm.png differ diff --git a/src/assets/images/hatCount.png b/src/assets/images/hatCount.png new file mode 100644 index 0000000..9814fe1 Binary files /dev/null and b/src/assets/images/hatCount.png differ diff --git a/src/assets/images/lineP.png b/src/assets/images/lineP.png new file mode 100644 index 0000000..131b7e9 Binary files /dev/null and b/src/assets/images/lineP.png differ diff --git a/src/assets/images/safeHat.png b/src/assets/images/safeHat.png new file mode 100644 index 0000000..9d87ba4 Binary files /dev/null and b/src/assets/images/safeHat.png differ diff --git a/src/assets/images/smartSafeHat.png b/src/assets/images/smartSafeHat.png new file mode 100644 index 0000000..9242cca Binary files /dev/null and b/src/assets/images/smartSafeHat.png differ diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index 46bfa8d..79e29c9 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -45,6 +45,14 @@ export const commonMenu: Array = [ { menuName: "车辆定位", companyPath: "/carPosition" + }, + { + menuName: "机械设备定位", + companyPath: "/equipmentPosition" + }, + { + menuName: "智能安全帽", + companyPath: "/smartSafeHat" } ] }, diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index d79aa8d..22d713d 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -102,6 +102,18 @@ export const staticRouter: RouteRecordRaw[] = [ name: "车辆定位", component: () => import("@/views/sevenLargeScreen/digitalConstruction/carPosition/index.vue") }, + { + path: "/equipmentPosition", + // path: "/carPosition", + name: "机械设备定位", + component: () => import("@/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue") + }, + { + path: "/smartSafeHat", + // path: "/carPosition", + name: "智能安全帽", + component: () => import("@/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue") + }, { path: "/edgeProtection", name: "临边防护", diff --git a/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue new file mode 100644 index 0000000..8fc9101 --- /dev/null +++ b/src/views/sevenLargeScreen/digitalConstruction/equipmentPosition/index.vue @@ -0,0 +1,2193 @@ + + + + + + + + + diff --git a/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue new file mode 100644 index 0000000..d9c57c3 --- /dev/null +++ b/src/views/sevenLargeScreen/digitalConstruction/smartSafeHat/index.vue @@ -0,0 +1,2629 @@ + + + + + + + + + diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index c13c319..76d2125 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -212,6 +212,14 @@ let menuList = ref([ { menuName: "车辆定位", companyPath: "/carPosition" + }, + { + menuName: "机械设备定位", + companyPath: "/equipmentPosition" + }, + { + menuName: "智能安全帽", + companyPath: "/smartSafeHat" } ] }, diff --git a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue index d75980e..c21b1c0 100644 --- a/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue +++ b/src/views/sevenLargeScreen/qualityControl/concreteMonitor/rightTop.vue @@ -7,7 +7,7 @@
正在告警
-
{{ realTimeTotal.alarmNum || 0 }}
+
{{ realTimeTotal.alarmPositionNum || 0 }}