diff --git a/public/config/project.config.json b/public/config/project.config.json index 30fb74e..7161fbc 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://192.168.8.107:11308/", + "baseUrl": "http://192.168.13.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/public/config/project.config.json b/public/config/project.config.json index 30fb74e..7161fbc 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://192.168.8.107:11308/", + "baseUrl": "http://192.168.13.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue index 679b63b..7356226 100644 --- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue +++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue @@ -131,12 +131,12 @@ align: 'center' }, { - text: '低报报警阈值', + text: '低报报警阈值(%LEL)', value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', + text: '高报报警阈值(%LEL)', value: 'upperThreshold', align: 'center' }, diff --git a/public/config/project.config.json b/public/config/project.config.json index 30fb74e..7161fbc 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://192.168.8.107:11308/", + "baseUrl": "http://192.168.13.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue index 679b63b..7356226 100644 --- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue +++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue @@ -131,12 +131,12 @@ align: 'center' }, { - text: '低报报警阈值', + text: '低报报警阈值(%LEL)', value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', + text: '高报报警阈值(%LEL)', value: 'upperThreshold', align: 'center' }, diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue index 1e51555..927a804 100644 --- a/src/views/deviceConfig/components/ListPressConfig.vue +++ b/src/views/deviceConfig/components/ListPressConfig.vue @@ -131,13 +131,13 @@ align: 'center' }, { - text: '低报报警阈值', - value: 'attemptsMax', + text: '低报报警阈值(MPa)', + value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', - value: 'attemptsCurrent', + text: '高报报警阈值(MPa)', + value: 'upperThreshold', align: 'center' }, { diff --git a/public/config/project.config.json b/public/config/project.config.json index 30fb74e..7161fbc 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://192.168.8.107:11308/", + "baseUrl": "http://192.168.13.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue index 679b63b..7356226 100644 --- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue +++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue @@ -131,12 +131,12 @@ align: 'center' }, { - text: '低报报警阈值', + text: '低报报警阈值(%LEL)', value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', + text: '高报报警阈值(%LEL)', value: 'upperThreshold', align: 'center' }, diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue index 1e51555..927a804 100644 --- a/src/views/deviceConfig/components/ListPressConfig.vue +++ b/src/views/deviceConfig/components/ListPressConfig.vue @@ -131,13 +131,13 @@ align: 'center' }, { - text: '低报报警阈值', - value: 'attemptsMax', + text: '低报报警阈值(MPa)', + value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', - value: 'attemptsCurrent', + text: '高报报警阈值(MPa)', + value: 'upperThreshold', align: 'center' }, { diff --git a/src/views/deviceConfig/components/editCombustibleGasConfig.vue b/src/views/deviceConfig/components/editCombustibleGasConfig.vue index e5a9a1e..e59c2c3 100644 --- a/src/views/deviceConfig/components/editCombustibleGasConfig.vue +++ b/src/views/deviceConfig/components/editCombustibleGasConfig.vue @@ -163,7 +163,7 @@ port: '', // 端口号 attemptsMax: '3', // 最大尝试次数 lowerThreshold: '', // 低报报警阈值 - upperThreshold: '' // 高报报警阈值 + upperThreshold: '26' // 高报报警阈值 }, textMap: { update: '编辑', diff --git a/public/config/project.config.json b/public/config/project.config.json index 30fb74e..7161fbc 100644 --- a/public/config/project.config.json +++ b/public/config/project.config.json @@ -2,7 +2,7 @@ "title": "管网运行监测系统", "subtitle": "", "theme":"blue", - "baseUrl": "http://192.168.8.107:11308/", + "baseUrl": "http://192.168.13.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue index 679b63b..7356226 100644 --- a/src/views/deviceConfig/components/ListCombustibleGasConfig.vue +++ b/src/views/deviceConfig/components/ListCombustibleGasConfig.vue @@ -131,12 +131,12 @@ align: 'center' }, { - text: '低报报警阈值', + text: '低报报警阈值(%LEL)', value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', + text: '高报报警阈值(%LEL)', value: 'upperThreshold', align: 'center' }, diff --git a/src/views/deviceConfig/components/ListPressConfig.vue b/src/views/deviceConfig/components/ListPressConfig.vue index 1e51555..927a804 100644 --- a/src/views/deviceConfig/components/ListPressConfig.vue +++ b/src/views/deviceConfig/components/ListPressConfig.vue @@ -131,13 +131,13 @@ align: 'center' }, { - text: '低报报警阈值', - value: 'attemptsMax', + text: '低报报警阈值(MPa)', + value: 'lowerThreshold', align: 'center' }, { - text: '高报报警阈值', - value: 'attemptsCurrent', + text: '高报报警阈值(MPa)', + value: 'upperThreshold', align: 'center' }, { diff --git a/src/views/deviceConfig/components/editCombustibleGasConfig.vue b/src/views/deviceConfig/components/editCombustibleGasConfig.vue index e5a9a1e..e59c2c3 100644 --- a/src/views/deviceConfig/components/editCombustibleGasConfig.vue +++ b/src/views/deviceConfig/components/editCombustibleGasConfig.vue @@ -163,7 +163,7 @@ port: '', // 端口号 attemptsMax: '3', // 最大尝试次数 lowerThreshold: '', // 低报报警阈值 - upperThreshold: '' // 高报报警阈值 + upperThreshold: '26' // 高报报警阈值 }, textMap: { update: '编辑', diff --git a/src/views/deviceConfig/components/editNoiseConfig.vue b/src/views/deviceConfig/components/editNoiseConfig.vue index b34b450..448546c 100644 --- a/src/views/deviceConfig/components/editNoiseConfig.vue +++ b/src/views/deviceConfig/components/editNoiseConfig.vue @@ -103,7 +103,7 @@