diff --git a/src/assets/js/api/company/project.js b/src/assets/js/api/company/project.js index f562bdbc..c4161a45 100644 --- a/src/assets/js/api/company/project.js +++ b/src/assets/js/api/company/project.js @@ -1,10 +1,10 @@ /** * api接口统一管理 */ -import {post} from '../../http' +import {post,get} from '../../http' export const getComapnyStatisticsListApi = data => post('xmgl/company/getComapnyStatisticsList', data); //统计企业下项目各项目统计 -export const getWorkerStatisticsCountApi = data => post('xmgl/workerInfo/getWorkerStatisticsCount', data,"aa"); //统计企业下项目各人员统计 +export const getWorkerStatisticsCountApi = data => get('xmgl/workerInfo/getPersonnelSituationNum', data,"aa"); //统计企业下项目各人员统计 export const getComapnyParentNameApi = data => post('xmgl/company/getComapnyParentName', data);//根据sn查所有父级组织 export const getComapnyVideoListApi = data => post('xmgl/company/getComapnyVideoList', data); //统计企业下视频列表 diff --git a/src/assets/js/api/gantryCrane.js b/src/assets/js/api/gantryCrane.js index 2be2bdc4..27e75dbf 100644 --- a/src/assets/js/api/gantryCrane.js +++ b/src/assets/js/api/gantryCrane.js @@ -43,3 +43,30 @@ export const getGantryCraneAlarmListApi = data => post('xmgl/gantryCraneAlarm/li // // //设备管理 export const updateGantryCraneCoordinateApi = data => post('xmgl/gantryCrane/updateGantryCraneCoordinate', data); //修改地图点位 + + +//光伏发电设备 +export const getPhotovoltaocList = data => get('xmgl/photovoltaicPowerDev/selectPage', data); //查询列表数据 +export const addPhotovoltaoc = data => post('xmgl/photovoltaicPowerDev/addPhotovoltaicPowerDev', data); //新增光伏设备 +export const editPhotovoltaoc = data => post('xmgl/photovoltaicPowerDev/updatePhotovoltaicPowerDev', data); //编辑光伏设备 +export const deletePhotovoltaoc = data => get('xmgl/photovoltaicPowerDev/deleteById', data); //删除光伏设备 + +//光伏发电设备(实时数据) +export const getRealTimeList = data => get('xmgl/photovoltaicPowerCurrentData/selectPage', data); //查询列表数据(实时数据) +export const addRealTimPhotovoltaoc = data => post('xmgl/photovoltaicPowerCurrentData/addPhotovoltaicPowerCurrentData', data); //新增光伏设备(实时数据) +export const editRealTimPhotovoltaoc = data => post('xmgl/photovoltaicPowerCurrentData/updatePhotovoltaicPowerCurrentData', data); //编辑光伏设备(实时数据) +export const deleteRealTimPhotovoltaoc = data => get('xmgl/photovoltaicPowerCurrentData/deleteById', data); //删除光伏设备(实时数据) +export const getPhotovltaocName = data => get('/xmgl/photovoltaicPowerDev/list', data); //新增光伏设备下拉框(实时数据) + +//双碳设备 +export const getBicarbonList = data => get('xmgl/doubleCarbonDev/selectPage', data); //查询列表数据 +export const addBicarbon = data => post('xmgl/doubleCarbonDev/addDoubleCarbonDev', data); //新增双碳设备 +export const editBicarbon = data => post('xmgl/doubleCarbonDev/updateDoubleCarbonDev', data); //编辑双碳设备 +export const deleteBicarbon = data => get('xmgl/doubleCarbonDev/deleteById', data); //删除双碳设备 + +//加油记录getRefuelingRecordList,addRefuelingRecord,editRefuelingRecord,deleteRefuelingRecord +export const getRefuelingRecordList = data => get('xmgl/doubleCarbonDevData/selectPage', data); //查询列表数据 +export const addRefuelingRecord = data => post('xmgl/doubleCarbonDevData/addDoubleCarbonDevData', data); //新增加油记录 +export const editRefuelingRecord = data => post('xmgl/doubleCarbonDevData/updateDoubleCarbonDevData', data); //编辑加油记录 +export const deleteRefuelingRecord = data => get('xmgl/doubleCarbonDevData/deleteById', data); //删除加油记录 +export const getAllRefuelingRecordList = data => get('xmgl/doubleCarbonDev/list', data); //查询所有设备 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c06e5588..803684c8 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,7 +40,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 + axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 diff --git a/src/router/equipmentCenter.js b/src/router/equipmentCenter.js index 4e43c320..c048bef1 100644 --- a/src/router/equipmentCenter.js +++ b/src/router/equipmentCenter.js @@ -109,7 +109,27 @@ const routes = [{ path: 'gantryCraneDevManage', name: '龙门吊_设备管理', component: () => import('@/views/projectLevel/gantryCrane/gantryCraneInfo.vue') - } + }, + { + path: 'photovoltaic', + name: '光伏发电_实时数据_设备管理', + component: () => import('@/views/projectLevel/photovoltaic/photovoltaic.vue') + }, + { + path: 'photovoltaicEquipment', + name: '光伏发电_光伏设备_设备管理', + component: () => import('@/views/projectLevel/photovoltaic/photovoltaicEquipment.vue') + }, + { + path: 'bicarbonEquipment', + name: '双碳设备_加油记录_设备管理', + component: () => import('@/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue') + }, + { + path: 'bicarbonEquipmentManage', + name: '双碳设备_设备管理', + component: () => import('@/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue') + }, ] }, { diff --git a/src/views/projectAdmin/fourEngin/command/leftFour.vue b/src/views/projectAdmin/fourEngin/command/leftFour.vue index 70bd3c03..4024abd1 100644 --- a/src/views/projectAdmin/fourEngin/command/leftFour.vue +++ b/src/views/projectAdmin/fourEngin/command/leftFour.vue @@ -20,6 +20,7 @@ export default { projectSn:"", towerNumber:"", lifterNumber:"", + videoNumber:"" } }, created(){ @@ -32,11 +33,13 @@ export default { getData(){ getDevNumberApi({ projectSn: this.projectSn }).then((res)=>{ if(res.code == 200){ + console.log('设备管理',res.result); this.towerNumber = res.result.towerNumber this.lifterNumber = res.result.lifterNumber + this.videoNumber = res.result.videoNumber this.initChart('firstChart', this.towerNumber, '塔吊设备数', require('../assets/images/command-center/icon-tower.png')) this.initChart('secondChart', this.lifterNumber, '升降机设备数', require('../assets/images/command-center/icon-lifter.png')) - this.initChart('thirdChart', 5, '视频设备数', require('../assets/images/command-center/icon-video.png')) + this.initChart('thirdChart', this.videoNumber , '视频设备数', require('../assets/images/command-center/icon-video.png')) } }) }, diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue index 1917046f..7537c363 100644 --- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue @@ -6,32 +6,32 @@
-

{{statisticsCount.workercount.lwAndGlPersonTotal}}

+

{{statisticsCount.sumNumber}}

在场总人数

-

{{statisticsCount.workercount.manPersonTotal}}

+

{{statisticsCount.realNameNumber}}

实名制人数

劳务人数

-

{{statisticsCount.workercount.lwPersonTotal}}

+

{{statisticsCount.lwNumber}}

-

管理人员数量

+

出勤人数

-

{{ statisticsCount.workercount.glPersonTotal }}

+

{{ statisticsCount.attendanceNumber }}

-

今日出勤人数

-

96

+

退场人数

+

{{ statisticsCount.exitNumber }}

diff --git a/src/views/projectAdmin/fourEngin/command/rightThree.vue b/src/views/projectAdmin/fourEngin/command/rightThree.vue index 489665e6..8afcfdc5 100644 --- a/src/views/projectAdmin/fourEngin/command/rightThree.vue +++ b/src/views/projectAdmin/fourEngin/command/rightThree.vue @@ -21,12 +21,12 @@ export default { data() { return { list:[ - {time:'10月14日 11:29',value:'2022年10月13日广州市新冠肺炎疫情情况-广州本地宝', - url:'http://gz.bendibao.com/news/20221014/content326288.shtml' - }, - {time:'10月14日 09:14',value:'10月13日广州新增本土确诊25例和无症状3例(含12例无症状确诊)', - url:'http://gz.bendibao.com/news/20221014/content326265.shtml' - }, + // {time:'10月14日 11:29',value:'2022年10月13日广州市新冠肺炎疫情情况-广州本地宝', + // url:'http://gz.bendibao.com/news/20221014/content326288.shtml' + // }, + // {time:'10月14日 09:14',value:'10月13日广州新增本土确诊25例和无症状3例(含12例无症状确诊)', + // url:'http://gz.bendibao.com/news/20221014/content326265.shtml' + // }, ] } }, diff --git a/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue new file mode 100644 index 00000000..efb2a1ee --- /dev/null +++ b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue @@ -0,0 +1,312 @@ + + + diff --git a/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue new file mode 100644 index 00000000..7cbe36d2 --- /dev/null +++ b/src/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue @@ -0,0 +1,332 @@ + + + diff --git a/src/views/projectLevel/photovoltaic/photovoltaic.vue b/src/views/projectLevel/photovoltaic/photovoltaic.vue new file mode 100644 index 00000000..1e668d6f --- /dev/null +++ b/src/views/projectLevel/photovoltaic/photovoltaic.vue @@ -0,0 +1,307 @@ + + + diff --git a/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue b/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue new file mode 100644 index 00000000..14ab6acc --- /dev/null +++ b/src/views/projectLevel/photovoltaic/photovoltaicEquipment.vue @@ -0,0 +1,361 @@ + + +