diff --git a/sgzb-screen/src/api/dialog.js b/sgzb-screen/src/api/dialog.js index 2621fea0..5e5201c9 100644 --- a/sgzb-screen/src/api/dialog.js +++ b/sgzb-screen/src/api/dialog.js @@ -1,25 +1,25 @@ import { POST, GET } from './index.js' -const URL_TYPE_LIST = '/bigScrap/material/returnOfMaterialsInfo/getTypeList' -const URL_DETAILS = '/bigScrap/base/largeScreen/home/getMaterialReqData/details' +const URL_TYPE_LIST = '/screen/material/returnOfMaterialsInfo/getTypeList' +const URL_DETAILS = '/screen/base/largeScreen/home/getMaterialReqData/details' const URL_RETURN_DETAILS = - '/bigScrap/base/largeScreen/home/getMaterialReturnData/details' -const URL_UNIT_LIST = '/bigScrap/material/agreementInfo/getUnitList' -const URL_PROJECT_LIST = '/bigScrap/material/agreementInfo/getProjectList' + '/screen/base/largeScreen/home/getMaterialReturnData/details' +const URL_UNIT_LIST = '/screen/material/agreementInfo/getUnitList' +const URL_PROJECT_LIST = '/screen/material/agreementInfo/getProjectList' const URL_SCRAP_ANALYSIS = - '/bigScrap/base/largeScreen/home/getScrapAnalysisByMonth/details' + '/screen/base/largeScreen/home/getScrapAnalysisByMonth/details' const URL_TOTAL_OWNERSHIP = - '/bigScrap/base/largeScreen/home/getTotalOwnership/details' + '/screen/base/largeScreen/home/getTotalOwnership/details' const URL_ACCEPTANCE_STORAGE = - '/bigScrap/base/largeScreen/home/getAcceptanceStorage/details' + '/screen/base/largeScreen/home/getAcceptanceStorage/details' const URL_PICKING_ANALYSIS = - '/bigScrap/base/largeScreen/home/getPickingAnalysisByMonth/details' + '/screen/base/largeScreen/home/getPickingAnalysisByMonth/details' const URL_MATERIAL_RETURN_BY_MONTH = - '/bigScrap/base/largeScreen/home/getMaterialReturnByMonth/details' + '/screen/base/largeScreen/home/getMaterialReturnByMonth/details' const URL_MAINTENANCE_BY_CHART = - '/bigScrap/base/largeScreen/home/getMaintenanceByMonth/chart' + '/screen/base/largeScreen/home/getMaintenanceByMonth/chart' const URL_MAINTENANCE_BY_MONTH_DETAILS = - '/bigScrap/base/largeScreen/home/getMaintenanceByMonth/details' + '/screen/base/largeScreen/home/getMaintenanceByMonth/details' // 设备类型 export const getTypeList = (params) => GET(URL_TYPE_LIST, params) diff --git a/sgzb-screen/src/api/screen.js b/sgzb-screen/src/api/screen.js index 4f2de387..0d0cc4ec 100644 --- a/sgzb-screen/src/api/screen.js +++ b/sgzb-screen/src/api/screen.js @@ -2,74 +2,72 @@ import { POST, GET } from './index' // 领料数据 export const getMaterialReqDataApi = (params) => - POST(`/bigScrap/base/largeScreen/home/getMaterialReqData`) + POST(`/screen/base/largeScreen/home/getMaterialReqData`) // 退料数据 export const getMaterialReturnDataApi = (params) => - POST(`/bigScrap/base/largeScreen/home/getMaterialReturnData`) + POST(`/screen/base/largeScreen/home/getMaterialReturnData`) //当月报废分析 export const getScrapAnalysisByMonthApi = (params) => POST( - `/bigScrap/base/largeScreen/home/getScrapAnalysisByMonth?maType=${params.maType}` + `/screen/base/largeScreen/home/getScrapAnalysisByMonth?maType=${params.maType}` ) //新购验收入库分析 export const getAcceptanceStorageApi = (params) => POST( - `/bigScrap/base/largeScreen/home/getAcceptanceStorage?maType=${params.maType}` + `/screen/base/largeScreen/home/getAcceptanceStorage?maType=${params.maType}` ) //当月领料分析 export const getPickingAnalysisByMonthApi = (params) => POST( - `/bigScrap/base/largeScreen/home/getPickingAnalysisByMonth?maType=${params.maType}` + `/screen/base/largeScreen/home/getPickingAnalysisByMonth?maType=${params.maType}` ) //当月退料分析 export const getMaterialReturnByMonthApi = (params) => POST( - `/bigScrap/base/largeScreen/home/getMaterialReturnByMonth?maType=${params.maType}` + `/screen/base/largeScreen/home/getMaterialReturnByMonth?maType=${params.maType}` ) //当月维修分析 export const getMaintenanceByMonthApi = (params) => POST( - `/bigScrap/base/largeScreen/home/getMaintenanceByMonth?maType=${params.maType}` + `/screen/base/largeScreen/home/getMaintenanceByMonth?maType=${params.maType}` ) //设备分布图 export const getEquipmentDisByMapApi = (params) => - GET(`/bigScrap/base/largeScreen/home/getEquipmentDisByMap`) + GET(`/screen/base/largeScreen/home/getEquipmentDisByMap`) //获取工程的位置信息 export const getProjectByMapApi = (params) => - GET(`/bigScrap/base/largeScreen/home/getEquipmentDis`, params) + GET(`/screen/base/largeScreen/home/getEquipmentDis`, params) //获取设备的位置信息 export const getDeviceByMapApi = (params) => - GET(`/bigScrap/base/largeScreen/home/getIotMaCodeMachine`, params) + GET(`/screen/base/largeScreen/home/getIotMaCodeMachine`, params) //施工机具/ export const getTotalOwnershipApi = (params) => - POST(`/bigScrap/base/largeScreen/home/getTotalOwnership`) + POST(`/screen/base/largeScreen/home/getTotalOwnership`) // 当月使用车辆 export const getCarUseByMonthApi = (params) => - POST( - `/bigScrap/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}` - ) + POST(`/screen/base/largeScreen/home/getCarUseByMonth?maType=${params.maType}`) // 当月使用车辆 export const getMaintenanceWarningApi = (params) => - POST(`/bigScrap/base/largeScreen/home/getMaintenanceWarning`) + POST(`/screen/base/largeScreen/home/getMaintenanceWarning`) //各公司机具保有量 export const getTotalOwnershipByCompany = (params) => - POST(`/bigScrap/base/largeScreen/home/getTotalOwnershipByCompany`) + POST(`/screen/base/largeScreen/home/getTotalOwnershipByCompany`) /** 获取机具设备的行程信息 */ export const getIotDeviceTripApi = (params) => - POST(`/bigScrap/material/iotMachine/searchItinerary`, params) + POST(`/screen/material/iotMachine/searchItinerary`, params) /** 获取机具设备的停留点信息 */ export const getIotDeviceParkDetailApi = (params) => - POST(`/bigScrap/material/iotMachine/reportParkDetailByTime`, params) + POST(`/screen/material/iotMachine/reportParkDetailByTime`, params) /** 获取工程领料的记录 */ export const getProjectOutApi = (params) => - GET(`/bigScrap/base/largeScreen/home/getLeaseRecordListByLotId`, params) + GET(`/screen/base/largeScreen/home/getLeaseRecordListByLotId`, params) /** 获取工程退料的记录 */ export const getProjectReturnApi = (params) => - GET(`/bigScrap/base/largeScreen/home/getBackRecordListByLotId`, params) + GET(`/screen/base/largeScreen/home/getBackRecordListByLotId`, params) /** 获取工程退料的记录 */ export const getProjectDeviceNumApi = (params) => - GET(`/bigScrap/base/largeScreen/home/getUseNumByLotId`, params) + GET(`/screen/base/largeScreen/home/getUseNumByLotId`, params) /** 获取单位数据 */ export const getUnitListApi = (params) => - POST(`/bigScrap/system/select/getUnitCbx`, params) + POST(`/screen/system/select/getUnitCbx`, params) diff --git a/sgzb-screen/src/components/home/centerFold2.vue b/sgzb-screen/src/components/home/centerFold2.vue index 8d75cb30..fd4a04ce 100644 --- a/sgzb-screen/src/components/home/centerFold2.vue +++ b/sgzb-screen/src/components/home/centerFold2.vue @@ -71,14 +71,14 @@ export default { }, mounted() { console.log(this.$refs['box1'].scrollHeight) // 110 - // this.$refs['box1'].style.height = 'auto' - // this.$refs['box1'].style.height = window.getComputedStyle( - // this.$refs['box1'] - // ).height - // this.getTotalOwnershipApiPage() - // setInterval(() => { - // this.getTotalOwnershipApiPage() - // }, 60 * 1000) + this.$refs['box1'].style.height = 'auto' + this.$refs['box1'].style.height = window.getComputedStyle( + this.$refs['box1'] + ).height + this.getTotalOwnershipApiPage() + setInterval(() => { + this.getTotalOwnershipApiPage() + }, 60 * 1000) }, methods: { getTotalOwnershipApiPage() { diff --git a/sgzb-ui/src/views/dashboard.vue b/sgzb-ui/src/views/dashboard.vue index b8702da7..0036352a 100644 --- a/sgzb-ui/src/views/dashboard.vue +++ b/sgzb-ui/src/views/dashboard.vue @@ -28,9 +28,7 @@ export default { window.open( `${ this.jumpUrl - }//bigScrap/index01.html?token=${localStorage.getItem( - 'token', - )}`, + }/bigScrap/index01.html?token=${localStorage.getItem('token')}`, '_blank', ) },