diff --git a/equipmentCenter.js b/equipmentCenter.js index 098918c7..9cf8a9ea 100644 --- a/equipmentCenter.js +++ b/equipmentCenter.js @@ -6,70 +6,93 @@ const routes = [{ path: '/login', name: 'login', // component: () => import('../views/home/login.vue') - component: () => import('../views/home/login_v1.vue') + component: () => + import ('../views/home/login_v1.vue') }, { path: '/sign', name: 'sign', - component: () => import('../views/home/sign.vue') + component: () => + import ('../views/home/sign.vue') }, { path: '/map_app', name: 'map_app', - component: () => import('../components/map_app.vue') + component: () => + import ('../components/map_app.vue') }, { path: '/equipmentCenter/', name: 'page', - component: () => import('@/components/layout.vue'), + component: () => + import ('@/components/layout.vue'), children: [{ path: 'videoAlarmList', name: 'videoAlarmList', - component: () => import('../views/equipmentCenter/videoManage/cameraList.vue'), + component: () => + import ('../views/equipmentCenter/videoManage/cameraList.vue'), }, { path: 'cameraList', name: '视频监控_摄像机列表', - component: () => import('../views/equipmentCenter/videoManage/videoConfig.vue'), + component: () => + import ('../views/equipmentCenter/videoManage/videoConfig.vue'), }, { path: 'laborDevManage', name: '劳务管理_设备管理', - component: () => import('../views/equipmentCenter/laborManage/devConfig.vue'), + component: () => + import ('../views/equipmentCenter/laborManage/devConfig.vue'), }, { path: 'accessGroup', name: '劳务管理_门禁分组', - component: () => import('../views/equipmentCenter/laborManage/accessGroup.vue'), + component: () => + import ('../views/equipmentCenter/laborManage/accessGroup.vue'), }, { path: 'markingRoomDevManage', name: '标养室_设备管理', - component: () => import('../views/equipmentCenter/markingRoom/devConfig.vue'), - }, { + component: () => + import ('../views/equipmentCenter/markingRoom/devConfig.vue'), + }, + { + path: 'rainfallManage', + name: '绿色施工_雨量设备管理', + component: () => + import ('../views/equipmentCenter/rainfallManage/devList.vue'), + }, + { path: 'envirDevManage', name: '绿色施工_扬尘设备管理', - component: () => import('../views/equipmentCenter/environmentManage/devList.vue'), + component: () => + import ('../views/equipmentCenter/environmentManage/devList.vue'), }, { path: 'sprayDevManage', name: '绿色施工_雾炮喷淋设备管理', - component: () => import('../views/equipmentCenter/environmentManage/sprayDevManage.vue'), - },{ + component: () => + import ('../views/equipmentCenter/environmentManage/sprayDevManage.vue'), + }, { path: 'sprayDevManageRT', name: '绿色施工_喷淋设备管理', - component: () => import('../views/equipmentCenter/environmentManage/sprayDevManageRT.vue'), + component: () => + import ('../views/equipmentCenter/environmentManage/sprayDevManageRT.vue'), }, { path: 'electricDevManage', name: '电箱管理_设备管理', - component: () => import('../views/equipmentCenter/electricBox/deviceManage'), + component: () => + import ('../views/equipmentCenter/electricBox/deviceManage'), }, { path: 'carCameraDev', name: '车辆管理_车辆相机管理', - component: () => import('../views/equipmentCenter/carManage/carCameraDev'), + component: () => + import ('../views/equipmentCenter/carManage/carCameraDev'), }, { path: 'carGateDev', name: '车辆管理_车辆闸门管理', - component: () => import('../views/equipmentCenter/carManage/carGateDev'), + component: () => + import ('../views/equipmentCenter/carManage/carGateDev'), }, { path: 'carWashDevManage', name: '车辆冲洗_设备管理', - component: () => import('../views/projectFront/carManage/carWashDevManage.vue'), + component: () => + import ('../views/projectFront/carManage/carWashDevManage.vue'), }, { path: 'towerCraneList', //塔吊管理 基本信息 @@ -111,50 +134,56 @@ const routes = [{ }, { path: 'aiAnalysisDevManage', name: 'AI预警中心_设备管理', - component: () => import('@/views/projectFront/aiAnalysis/devManage.vue') + component: () => + import ('@/views/projectFront/aiAnalysis/devManage.vue') }, { path: 'gantryCraneDevManage', name: '龙门吊_设备管理', - component: () => import('@/views/projectLevel/gantryCrane/gantryCraneInfo.vue') + component: () => + import ('@/views/projectLevel/gantryCrane/gantryCraneInfo.vue') }, { path: 'photovoltaic', name: '光伏发电_实时数据_设备管理', - component: () => import('@/views/projectLevel/photovoltaic/photovoltaic.vue') + component: () => + import ('@/views/projectLevel/photovoltaic/photovoltaic.vue') }, { path: 'photovoltaicEquipment', name: '光伏发电_光伏设备_设备管理', - component: () => import('@/views/projectLevel/photovoltaic/photovoltaicEquipment.vue') + component: () => + import ('@/views/projectLevel/photovoltaic/photovoltaicEquipment.vue') }, { path: 'bicarbonEquipment', name: '双碳设备_加油记录_设备管理', - component: () => import('@/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue') + component: () => + import ('@/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue') }, { path: 'bicarbonEquipmentManage', name: '双碳设备_设备管理', - component: () => import('@/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue') + component: () => + import ('@/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue') }, { path: 'edgequtManagement', name: '临边防护_设备管理', component: (resolve) => - require(['@/views/projectFront/edgeProtection/edgequtManagement.vue'],resolve), + require(['@/views/projectFront/edgeProtection/edgequtManagement.vue'], resolve), }, { path: 'gasEqtManagement', name: '有毒气体监测_设备管理', component: (resolve) => - require(['@/views/projectFront/toxicGasDetection/gasEqtManagement.vue'],resolve), + require(['@/views/projectFront/toxicGasDetection/gasEqtManagement.vue'], resolve), }, { path: 'smokeManagement', name: '无线智能烟感报警_设备管理', component: (resolve) => - require(['@/views/projectFront/smokeAlarmSystem/smokeManagement.vue'],resolve), + require(['@/views/projectFront/smokeAlarmSystem/smokeManagement.vue'], resolve), }, // { // path: 'carPosition', @@ -166,7 +195,8 @@ const routes = [{ { path: '/equipmentCenterIndx', name: 'equipmentCenterIndx', - component: () => import('@/views/equipmentCenter/equipmentCenterIndex.vue'), + component: () => + import ('@/views/equipmentCenter/equipmentCenterIndex.vue'), } ] diff --git a/src/assets/js/api/rainfallManage.js b/src/assets/js/api/rainfallManage.js new file mode 100644 index 00000000..38d0e543 --- /dev/null +++ b/src/assets/js/api/rainfallManage.js @@ -0,0 +1,17 @@ +/** + * api接口统一管理 + */ +import { post, get } from '../http' +//绿色施工 +export const rainDevAdd = data => post('xmgl/rainDev/add', data); //添加雨量设备信息 +export const rainDevEdit = data => post('xmgl/rainDev/edit', data); //编辑雨量设备信息 +export const rainDevDelete = data => post('xmgl/rainDev/delete', data); //删除雨量设备信息 +export const rainDevList = data => get('xmgl/rainDev/list', data); //列表查询雨量设备信息 + +export const getLaborManagementInfoList = data => post('xmgl/systemUser/getProjectChilderSystemUserList', data); //查询劳务和管理人员列表 + +// 分页列表查询环境实时数据 +export const rainRecordPageApi = data => get('xmgl/rainRecord/page', data); + +//报警预警 +export const rainAlarmList = data => get('xmgl/rainAlarm/page', data); //分页列表查询绿色设备报警预警数据信息 \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 88d75a5e..be680155 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -172,22 +172,24 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 - // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 - // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 - // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 - // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址 - // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 - // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 - // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 - // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 + // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 + // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 + // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址 + // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 + // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) + // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 + // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) + // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //南京汇创正式地址 + } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/router/equipmentCenter.js b/src/router/equipmentCenter.js index d268adb6..3df36cc7 100644 --- a/src/router/equipmentCenter.js +++ b/src/router/equipmentCenter.js @@ -6,70 +6,93 @@ const routes = [{ path: '/login', name: 'login', // component: () => import('../views/home/login.vue') - component: () => import('../views/home/login_v1.vue') + component: () => + import ('../views/home/login_v1.vue') }, { path: '/sign', name: 'sign', - component: () => import('../views/home/sign.vue') + component: () => + import ('../views/home/sign.vue') }, { path: '/map_app', name: 'map_app', - component: () => import('../components/map_app.vue') + component: () => + import ('../components/map_app.vue') }, { path: '/equipmentCenter/', name: 'page', - component: () => import('@/components/layout.vue'), + component: () => + import ('@/components/layout.vue'), children: [{ path: 'videoAlarmList', name: 'videoAlarmList', - component: () => import('../views/equipmentCenter/videoManage/cameraList.vue'), + component: () => + import ('../views/equipmentCenter/videoManage/cameraList.vue'), }, { path: 'cameraList', name: '视频监控_摄像机列表', - component: () => import('../views/equipmentCenter/videoManage/videoConfig.vue'), + component: () => + import ('../views/equipmentCenter/videoManage/videoConfig.vue'), }, { path: 'laborDevManage', name: '劳务管理_设备管理', - component: () => import('../views/equipmentCenter/laborManage/devConfig.vue'), + component: () => + import ('../views/equipmentCenter/laborManage/devConfig.vue'), }, { path: 'accessGroup', name: '劳务管理_门禁分组', - component: () => import('../views/equipmentCenter/laborManage/accessGroup.vue'), + component: () => + import ('../views/equipmentCenter/laborManage/accessGroup.vue'), }, { path: 'markingRoomDevManage', name: '标养室_设备管理', - component: () => import('../views/equipmentCenter/markingRoom/devConfig.vue'), - }, { + component: () => + import ('../views/equipmentCenter/markingRoom/devConfig.vue'), + }, + { + path: 'rainfallManage', + name: '绿色施工_雨量设备管理', + component: () => + import ('../views/equipmentCenter/rainfallManage/devList.vue'), + }, + { path: 'envirDevManage', name: '绿色施工_扬尘设备管理', - component: () => import('../views/equipmentCenter/environmentManage/devList.vue'), + component: () => + import ('../views/equipmentCenter/environmentManage/devList.vue'), }, { path: 'sprayDevManage', name: '绿色施工_雾炮喷淋设备管理', - component: () => import('../views/equipmentCenter/environmentManage/sprayDevManage.vue'), - },{ + component: () => + import ('../views/equipmentCenter/environmentManage/sprayDevManage.vue'), + }, { path: 'sprayDevManageRT', name: '绿色施工_雾炮喷淋设备管理', - component: () => import('../views/equipmentCenter/environmentManage/sprayDevManageRT.vue'), + component: () => + import ('../views/equipmentCenter/environmentManage/sprayDevManageRT.vue'), }, { path: 'electricDevManage', name: '电箱管理_设备管理', - component: () => import('../views/equipmentCenter/electricBox/deviceManage'), + component: () => + import ('../views/equipmentCenter/electricBox/deviceManage'), }, { path: 'carCameraDev', name: '车辆管理_车辆相机管理', - component: () => import('../views/equipmentCenter/carManage/carCameraDev'), + component: () => + import ('../views/equipmentCenter/carManage/carCameraDev'), }, { path: 'carGateDev', name: '车辆管理_车辆闸门管理', - component: () => import('../views/equipmentCenter/carManage/carGateDev'), + component: () => + import ('../views/equipmentCenter/carManage/carGateDev'), }, { path: 'carWashDevManage', name: '车辆冲洗_设备管理', - component: () => import('../views/projectFront/carManage/carWashDevManage.vue'), + component: () => + import ('../views/projectFront/carManage/carWashDevManage.vue'), }, { path: 'towerCraneList', //塔吊管理 基本信息 @@ -111,63 +134,70 @@ const routes = [{ }, { path: 'aiAnalysisDevManage', name: 'AI预警中心_设备管理', - component: () => import('@/views/projectFront/aiAnalysis/devManage.vue') + component: () => + import ('@/views/projectFront/aiAnalysis/devManage.vue') }, { path: 'gantryCraneDevManage', name: '龙门吊_设备管理', - component: () => import('@/views/projectLevel/gantryCrane/gantryCraneInfo.vue') + component: () => + import ('@/views/projectLevel/gantryCrane/gantryCraneInfo.vue') }, { path: 'photovoltaic', name: '光伏发电_实时数据_设备管理', - component: () => import('@/views/projectLevel/photovoltaic/photovoltaic.vue') + component: () => + import ('@/views/projectLevel/photovoltaic/photovoltaic.vue') }, { path: 'photovoltaicEquipment', name: '光伏发电_光伏设备_设备管理', - component: () => import('@/views/projectLevel/photovoltaic/photovoltaicEquipment.vue') + component: () => + import ('@/views/projectLevel/photovoltaic/photovoltaicEquipment.vue') }, { path: 'bicarbonEquipment', name: '双碳设备_加油记录_设备管理', - component: () => import('@/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue') + component: () => + import ('@/views/projectLevel/bicarbonEquipment/bicarbonEquipment.vue') }, { path: 'bicarbonEquipmentManage', name: '双碳设备_设备管理', - component: () => import('@/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue') + component: () => + import ('@/views/projectLevel/bicarbonEquipment/bicarbonEquipmentManage.vue') }, { path: 'edgequtManagement', name: '临边防护_设备管理', component: (resolve) => - require(['@/views/projectFront/edgeProtection/edgequtManagement.vue'],resolve), + require(['@/views/projectFront/edgeProtection/edgequtManagement.vue'], resolve), }, { path: 'gasEqtManagement', name: '有毒气体监测_设备管理', component: (resolve) => - require(['@/views/projectFront/toxicGasDetection/gasEqtManagement.vue'],resolve), + require(['@/views/projectFront/toxicGasDetection/gasEqtManagement.vue'], resolve), }, { path: 'smokeManagement', name: '无线智能烟感报警_设备管理', component: (resolve) => - require(['@/views/projectFront/smokeAlarmSystem/smokeManagement.vue'],resolve), + require(['@/views/projectFront/smokeAlarmSystem/smokeManagement.vue'], resolve), }, { path: 'carPosition', name: '车辆定位_设备管理', component: (resolve) => - require(['@/views/equipmentCenter/carPosition/devConfig'],resolve), + require(['@/views/equipmentCenter/carPosition/devConfig'], resolve), }, ] }, { path: '/equipmentCenterIndx', name: 'equipmentCenterIndx', - component: () => import('@/views/equipmentCenter/equipmentCenterIndex.vue'), + component: () => + import ('@/views/equipmentCenter/equipmentCenterIndex.vue'), } ] diff --git a/src/router/index.js b/src/router/index.js index e548bcbe..93e513af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -258,10 +258,8 @@ const routes2 = [{ name: "page", component: () => isDockingToWoer ? - import ("@/components/layout_zhongjian.vue") : - enabledProjectV2 == 1 ? - import ("@/views/projectLevel/common/page.vue") : - import ("@/components/layout.vue"), + import ("@/components/layout_zhongjian.vue") : enabledProjectV2 == 1 ? + import ("@/views/projectLevel/common/page.vue") : import ("@/components/layout.vue"), meta: { keepAlive: true, }, @@ -2534,6 +2532,18 @@ const routes2 = [{ "@/views/projectFront/qualitySafeReport/engineeringManagement.vue" ), }, + { + path: "/project/rainfallMonitor/reportForm", + name: "雨量监测-数据台账", + component: () => + import ("@/views/projectFront/rainfallMonitor/reportForm.vue"), + }, + { + path: "/project/rainfallMonitor/alarmWarning", + name: "绿色施工_报警预警1", + component: () => + import ("@/views/projectFront/rainfallMonitor/alarmWarning.vue"), + }, { path: "/project/environmentalMonitor/reportForm", name: "环境监测-数据台账", diff --git a/src/store/index.js b/src/store/index.js index 62f8eadd..e82c8eae 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,6 +46,8 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], + // UPLOADURL: 'http://192.168.100.4:9809/upload/image/', // 南京汇创 + // FILEURL: 'http://192.168.100.4:9809/image/', //南京汇创 // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', @@ -58,8 +60,8 @@ export default new Vuex.Store({ WORKFLOWURL: "http://192.168.34.175:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 - // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 - // FILEURL:'http://42.180.188.17:11211/image/',//测试 + // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 + // FILEURL: 'http://42.180.188.17:11211/image/', //测试 // BASEURL: baseUrl ? // baseUrl : // window.location.protocol + "//" + window.location.host + "/", //正式环境 diff --git a/src/views/equipmentCenter/equipmentCenterIndex.vue b/src/views/equipmentCenter/equipmentCenterIndex.vue index 1dad8c0d..de895bc4 100644 --- a/src/views/equipmentCenter/equipmentCenterIndex.vue +++ b/src/views/equipmentCenter/equipmentCenterIndex.vue @@ -166,6 +166,22 @@ export default { path: "/equipmentCenter/sprayDevManageRT", }, ], + },{ + moduleName: this.$t('message.middleGround.moduleName7'), // 绿色施工 + subhead: this.$t('message.middleGround.subhead7'), // 扬尘设备新增、编辑、删除 + operation: true, + id: 4, + openedUrl: require("../../assets/images/menu/lssg_active.png"), + shutUrl: require("../../assets/images/menu/lssg.png"), + children: [ + { + menuName: this.$t('message.middleGround.moduleName8'), // 扬尘设备管理 + subhead: this.$t('message.middleGround.subhead2'), // 人员管理 + operation: true, + id: 21, + path: "/equipmentCenter/rainfallManage", + }, + ], },{ moduleName: this.$t('message.middleGround.moduleName10'), // 电箱管理 subhead: this.$t('message.middleGround.subhead10'), // 电箱设备新增、编辑、删除 diff --git a/src/views/equipmentCenter/rainfallManage/devList.vue b/src/views/equipmentCenter/rainfallManage/devList.vue new file mode 100644 index 00000000..01f8f05d --- /dev/null +++ b/src/views/equipmentCenter/rainfallManage/devList.vue @@ -0,0 +1,341 @@ + + + diff --git a/src/views/projectFront/rainfallMonitor/alarmWarning.vue b/src/views/projectFront/rainfallMonitor/alarmWarning.vue new file mode 100644 index 00000000..12b7930e --- /dev/null +++ b/src/views/projectFront/rainfallMonitor/alarmWarning.vue @@ -0,0 +1,183 @@ + + + \ No newline at end of file diff --git a/src/views/projectFront/rainfallMonitor/relaTimeData.vue b/src/views/projectFront/rainfallMonitor/relaTimeData.vue new file mode 100644 index 00000000..50b0f12b --- /dev/null +++ b/src/views/projectFront/rainfallMonitor/relaTimeData.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/src/views/projectFront/rainfallMonitor/reportForm.vue b/src/views/projectFront/rainfallMonitor/reportForm.vue new file mode 100644 index 00000000..5a5ef411 --- /dev/null +++ b/src/views/projectFront/rainfallMonitor/reportForm.vue @@ -0,0 +1,90 @@ + + + + +