diff --git a/src/components/assembly/indexList.vue b/src/components/assembly/indexList.vue index 9ceefb8..67f7acd 100644 --- a/src/components/assembly/indexList.vue +++ b/src/components/assembly/indexList.vue @@ -17,13 +17,17 @@ let props = defineProps<{ isLink: boolean title: any; url: any; + hash: any; }>(); function routerpush(isLink:boolean=false) { if (isLink) { location.href = props.path } else { router.push({ - path: props.path, + name: props.path, + query: { + hash: props.hash, + } }) } diff --git a/src/http/AerialView/index.ts b/src/http/AerialView/index.ts index c7bb05f..49c0b16 100644 --- a/src/http/AerialView/index.ts +++ b/src/http/AerialView/index.ts @@ -11,16 +11,16 @@ import {get,post,put} from "@/utils/http" export function getSensorInfodata(){ - return get('/device/getSensorInfo') + return get('/screen/device/getSensorInfo') } export function deviceDistributeInMachineryFactorydata(){ - return get('/device/deviceDistributeInMachineryFactory') + return get('/screen/device/deviceDistributeInMachineryFactory') } export function getSensorInfoByType(data){ - return get('/device/getSensorDistributionSpecificMF',data) + return get('/screen/device/getSensorDistributionSpecificMF',data) } export function updateCoordinateByPoint(data){ - return put('/device/updateCoordinate',data) + return put('/screen/device/updateCoordinate',data) } \ No newline at end of file diff --git a/src/http/InPlantProducts/index.ts b/src/http/InPlantProducts/index.ts index ff00fe7..c1087a9 100644 --- a/src/http/InPlantProducts/index.ts +++ b/src/http/InPlantProducts/index.ts @@ -11,25 +11,25 @@ import {get,post} from "@/utils/http" //设备详情 export function getDeviceSensorInfo(data:any){ - return get('/device/getDeviceSensorInfo',data) + return get('/screen/device/getDeviceSensorInfo',data) } //设备详情2 export function getDeviceInfo(data:any){ - return get('/device/getDeviceInfo',data) + return get('/screen/device/getDeviceInfo',data) } //2023.4.27修改的设备详情接口 export function getDeviceDetail(data:any){ - return get('/device/getDeviceDetail',data) + return get('/screen/device/getDeviceDetail',data) } //各军团网关网关状态 export function gatewayOfCorps(){ - return get('/device/gatewayOfCorps') + return get('/screen/device/gatewayOfCorps') } //军团厂内设备列表 export function getDeviceInPlant(){ - return get('/device/getDeviceInPlant') + return get('/screen/device/getDeviceInPlant') } //安装总数量及已完成数量(安装进度) export function getprogressOfCorps(){ - return get('/device/progressOfCorps') + return get('/screen/device/progressOfCorps') } \ No newline at end of file diff --git a/src/http/Mechanics/index.ts b/src/http/Mechanics/index.ts index c7f0cab..ecf386c 100644 --- a/src/http/Mechanics/index.ts +++ b/src/http/Mechanics/index.ts @@ -11,38 +11,38 @@ import {get,post} from "@/utils/http" //机械分厂网关状态 export function gatewayOfMachineryFactory(){ - return get('/device/gatewayOfMachineryFactory') + return get('/screen/device/gatewayOfMachineryFactory') } //机械分厂各车间设备数量 export function gatcountsOfMachineryFactory(){ - return get('/device/countsOfMachineryFactory') + return get('/screen/device/countsOfMachineryFactory') } //机械分厂各车间设备状态接口 export function gatDeviceStatusOfMF(){ - return get('/device/DeviceStatusOfMF') + return get('/screen/device/DeviceStatusOfMF') } //机械分厂各车间各种状态的设备数量 export function gatcountsOfMachineryFactoryInStatusTime(){ - return get('/device/countsOfMachineryFactoryInStatusTime') + return get('/screen/device/countsOfMachineryFactoryInStatusTime') } //机械分厂设备详情 export function gatdeviceStatusInfoMF(data:any){ - return get('/device/deviceStatusInfoMF',data) + return get('/screen/device/deviceStatusInfoMF',data) } /**newIndex */ //设备列表 export function reqDeviceTotelListMF(){ - return get('/device/deviceTotelListMF') + return get('/screen/device/deviceTotelListMF') } //状态数量 export function reqDeviceTotelStatusMF() { - return get('/device/deviceTotelStatusMF') + return get('/screen/device/deviceTotelStatusMF') } //提醒 export function reqDeviceRemind() { - return get('/device/deviceRemind') + return get('/screen/device/deviceRemind') } diff --git a/src/http/MicrofactoryDev/index.ts b/src/http/MicrofactoryDev/index.ts index d2cc05b..d8b4920 100644 --- a/src/http/MicrofactoryDev/index.ts +++ b/src/http/MicrofactoryDev/index.ts @@ -11,25 +11,25 @@ import {get,post} from "@/utils/http" //微工厂设备列表 export function getInfoOfMiniatureFactoryData(){ - return get('/device/getInfoOfMiniatureFactory') + return get('/screen/device/getInfoOfMiniatureFactory') } //微工厂网关状态及在线、离线设备数量 export function getStatusCountsOfMiniatureFactoryData(){ - return get('/device/getStatusCountsOfMiniatureFactory') + return get('/screen/device/getStatusCountsOfMiniatureFactory') } //微工厂设备缝纫时间 export function getSewingTimeData(){ - return get('/device/getSewingTime') + return get('/screen/device/getSewingTime') } //微工厂压脚柱状图 export function getPresserFootHistogramData(){ - return get('/device/getPresserFootHistogram') + return get('/screen/device/getPresserFootHistogram') } //微工厂剪线柱状图 export function getCuttingLineHistogramData(){ - return get('/device/getCuttingLineHistogram') + return get('/screen/device/getCuttingLineHistogram') } //微工厂稼動率 export function getActivationData(){ - return get('/device/getActivation') + return get('/screen/device/getActivation') } diff --git a/src/http/PaintShopView/index.ts b/src/http/PaintShopView/index.ts index 1439fa9..0bc8762 100644 --- a/src/http/PaintShopView/index.ts +++ b/src/http/PaintShopView/index.ts @@ -12,5 +12,5 @@ import {get,post} from "@/utils/http" //气压 //用电量 export function getSensorByDept(data:any){ - return get('/s/getSensorByDept',data) + return get('/screen/s/getSensorByDept',data) } diff --git a/src/http/Trend/index.ts b/src/http/Trend/index.ts index cec1269..7a814e2 100644 --- a/src/http/Trend/index.ts +++ b/src/http/Trend/index.ts @@ -11,5 +11,5 @@ import {get,post} from "@/utils/http" //气压 export function getCurrent24Trend(id:string){ - return get('/dataTrend/getCurrent24Trend',{id}) + return get('/screen/dataTrend/getCurrent24Trend',{id}) } \ No newline at end of file diff --git a/src/http/device/index.ts b/src/http/device/index.ts index e55832b..a9d1f89 100644 --- a/src/http/device/index.ts +++ b/src/http/device/index.ts @@ -12,7 +12,7 @@ import {get,post} from "@/utils/http" //获取微工厂缝纫设备数据 export function getSewingBoard(){ - return get('/device/getSewingBoard') + return get('/screen/device/getSewingBoard') } diff --git a/src/http/electronicControl/index.ts b/src/http/electronicControl/index.ts index 2d3c272..2c1fa81 100644 --- a/src/http/electronicControl/index.ts +++ b/src/http/electronicControl/index.ts @@ -12,11 +12,11 @@ import {get,post} from "@/utils/http" //获取电控分厂数据 export function getElectronDevice(){ - return get('/device/electronDevice') + return get('/screen/device/electronDevice') } //通过depId 获取设备状态 export function getElectronDeviceStatus(deptId:string,alarmType:string = 'offline'){ - return get('/alarm/getAlarmListByDeptId',{deptId,alarmType}) + return get('/screen/alarm/getAlarmListByDeptId',{deptId,alarmType}) } diff --git a/src/http/energyConsume/index.ts b/src/http/energyConsume/index.ts index b395623..b42c0b7 100644 --- a/src/http/energyConsume/index.ts +++ b/src/http/energyConsume/index.ts @@ -11,37 +11,37 @@ import {get,post} from "@/utils/http" //用电量 export function getPowerData(data:any){ - return get('/s/getPowerData',data) + return get('/screen/s/getPowerData',data) } //用部门详细能耗 export function getconsumeDetail(){ - return get('/device/consumeDetail') + return get('/screen/device/consumeDetail') } //部门同比 export function getcurrentRate(){ - return get('/device/currentRate') + return get('/screen/device/currentRate') } //生产额 用电量接口 export function getcurrentProduct(){ - return get('/device/currentProduct') + return get('/screen/device/currentProduct') } //部门同比机械分厂 export function getcurrentRateMF(){ - return get('/device/currentRateMF') + return get('/screen/device/currentRateMF') } //生产额机械分厂 export function getcurrentProductMF(){ - return get('/device/currentProductMF') + return get('/screen/device/currentProductMF') } // 历史用气量 export function getHistoryGasData(){ - return get('/device/getHistoryGas') + return get('/screen/device/getHistoryGas') } //历史用水量 export function getHistoryWaterData(){ - return get('/device/getHistoryWater') + return get('/screen/device/getHistoryWater') } //历史用电量 export function getHistoryCurrentData(){ - return get('/device/getHistoryCurrent') + return get('/screen/device/getHistoryCurrent') } diff --git a/src/http/generalEnvironment/index.ts b/src/http/generalEnvironment/index.ts index 6865164..e4f9d0c 100644 --- a/src/http/generalEnvironment/index.ts +++ b/src/http/generalEnvironment/index.ts @@ -11,17 +11,17 @@ import {get,post} from "@/utils/http" //温湿度 export function getHumitureData(data:any){ - return get('/s/getHumitureData',data) + return get('/screen/s/getHumitureData',data) } //PM2.5 export function getPmtwoData(data:any){ - return get('/s/getPmtwoData',data) + return get('/screen/s/getPmtwoData',data) } //PM10 export function getPmtenData(data:any){ - return get('/s/getPmtenData',data) + return get('/screen/s/getPmtenData',data) } //噪音 export function getnoiseData(data:any){ - return get('/s/getnoiseData',data) + return get('/screen/s/getnoiseData',data) } \ No newline at end of file diff --git a/src/http/index.ts b/src/http/index.ts index 1a18726..736f8c1 100644 --- a/src/http/index.ts +++ b/src/http/index.ts @@ -11,9 +11,9 @@ import {get,post} from "@/utils/http" //报警数据 export function getAlarmListData(data:any){ - return get('/alarm/getAlarmList',data) + return get('/screen/alarm/getAlarmList',data) } //报警历史数据查询 export function getAlarmListHistoryData(data:any){ - return get('/alarm/getAlarmListHistory',data) + return get('/screen/alarm/getAlarmListHistory',data) } \ No newline at end of file diff --git a/src/http/legionProducts/index.ts b/src/http/legionProducts/index.ts index 1bec860..5e14771 100644 --- a/src/http/legionProducts/index.ts +++ b/src/http/legionProducts/index.ts @@ -2,10 +2,10 @@ import {get,post} from "@/utils/http" //设备列表 export function getDeviceInPlantList(data:any){ - return get('/device/getDeviceInPlant',data) + return get('/screen/device/getDeviceInPlant',data) } //设备状态 export function getDeviceStatus(data:any){ - return get('/device/deviceStatusNum',data) + return get('/screen/device/deviceStatusNum',data) } \ No newline at end of file diff --git a/src/http/offsite/index.ts b/src/http/offsite/index.ts index f632087..f489777 100644 --- a/src/http/offsite/index.ts +++ b/src/http/offsite/index.ts @@ -11,30 +11,30 @@ import {get,post} from "@/utils/http" export function deviceCountsOfOutPlantData(){ - return get('/device/deviceCountsOfOutPlant') + return get('/screen/device/deviceCountsOfOutPlant') } export function deviceTypeCountsOfOutPlantData(){ - return get('/device/deviceTypeCountsOfOutPlant') + return get('/screen/device/deviceTypeCountsOfOutPlant') } export function deviceStatusCountsOfOutPlantData(){ - return get('/device/deviceStatusCountsOfOutPlant') + return get('/screen/device/deviceStatusCountsOfOutPlant') } export function getDeviceOutPlantData(){ - return get('/device/getDeviceOutPlant') + return get('/screen/device/getDeviceOutPlant') } // 各分公司设备数量(二级) export function deviceCountsSecondaryOfOutPlantData(){ - return get('/device/deviceCountsSecondaryOfOutPlant') + return get('/screen/device/deviceCountsSecondaryOfOutPlant') } // 分公司各类型设备数量(二级) export function deviceTypeCountsSecondaryOfOutPlantData(){ - return get('/device/deviceTypeCountsSecondaryOfOutPlant') + return get('/screen/device/deviceTypeCountsSecondaryOfOutPlant') } // 分公司设备各种状态的数量(二级) export function deviceStatusCountsSecondaryOfOutPlantData(){ - return get('/device/deviceStatusCountsSecondaryOfOutPlant') + return get('/screen/device/deviceStatusCountsSecondaryOfOutPlant') } // 分公司二级页面列表 export function secondaryOutPlantData(){ - return get('/device/secondaryOutPlant') + return get('/screen/device/secondaryOutPlant') } \ No newline at end of file diff --git a/src/http/realtimeSecurity/index.ts b/src/http/realtimeSecurity/index.ts index eaf9b67..5cd482b 100644 --- a/src/http/realtimeSecurity/index.ts +++ b/src/http/realtimeSecurity/index.ts @@ -11,11 +11,11 @@ import {get,post} from "@/utils/http" //气压 export function getSafeWarningData(data:any={}){ - return get('/s/getSafeWarningData',data) + return get('/screen/s/getSafeWarningData',data) } export function getPressureData(){ - return get('/s/getPressureData') + return get('/screen/s/getPressureData') } export function getpipeData(data:any){ - return get('/s/getpipeData',data) + return get('/screen/s/getpipeData',data) } \ No newline at end of file diff --git a/src/http/rule/index.ts b/src/http/rule/index.ts index e37657e..ec92724 100644 --- a/src/http/rule/index.ts +++ b/src/http/rule/index.ts @@ -9,7 +9,11 @@ */ import {get,post} from "@/utils/http" -//气压 +//url export function selectPermission({address,hash}){ - return get('/manage/selectPermission',{address,hash}) + return get('/system/screen/selectPermission',{address,hash}) +} +//首页 +export function getScreenByHash({hash}){ + return get('/system/screen/getScreenByHash',{hash}) } \ No newline at end of file diff --git a/src/http/waterHouse/index.ts b/src/http/waterHouse/index.ts index 168d78d..2451e90 100644 --- a/src/http/waterHouse/index.ts +++ b/src/http/waterHouse/index.ts @@ -11,5 +11,5 @@ import {get,post} from "@/utils/http" //气压 export function getWaterFlowInfo(type:string){ - return get('/waterFlow/getWaterFlowInfo',{type}) + return get('/screen/waterFlow/getWaterFlowInfo',{type}) } \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 78e6d5f..a23c33b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -337,7 +337,7 @@ router.beforeEach(async (to: any, from, next) => { // 返回 false 以取消导航 if (to.path == "/") { - sessionStorage.setItem("screen_user_id", to.query.id); + sessionStorage.setItem("screen_hash", to.query.hash); next(); } else if (arr.includes(address)) { diff --git a/src/utils/devSever.ts b/src/utils/devSever.ts index 8cd0b4f..8bb2b03 100644 --- a/src/utils/devSever.ts +++ b/src/utils/devSever.ts @@ -9,8 +9,8 @@ */ // export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.3.97:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} -export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} -export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"} +export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/screen/image/"} +export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/screen/image/"} //拼接图片url路径 export function imgurlAddXhr(img){ let src=null diff --git a/src/views/index.vue b/src/views/index.vue index 27b1900..7062cde 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -11,18 +11,18 @@