diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js index a816d0b..fffbb72 100644 --- a/src/api/device/deviceImei.js +++ b/src/api/device/deviceImei.js @@ -18,7 +18,7 @@ return request({ url: 'device/simManage/add', method: 'post', - params + data: params }) } // 修改设备 @@ -30,18 +30,16 @@ }) } // 删除设备 -export function delDeviceImei(ids) { +export function delDeviceImei(id) { return request({ url: 'device/simManage/delete', method: 'post', params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + id: id } }) } + // 批量导入 export function batchImportDevice(fileobj) { const param = new FormData() diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js index a816d0b..fffbb72 100644 --- a/src/api/device/deviceImei.js +++ b/src/api/device/deviceImei.js @@ -18,7 +18,7 @@ return request({ url: 'device/simManage/add', method: 'post', - params + data: params }) } // 修改设备 @@ -30,18 +30,16 @@ }) } // 删除设备 -export function delDeviceImei(ids) { +export function delDeviceImei(id) { return request({ url: 'device/simManage/delete', method: 'post', params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + id: id } }) } + // 批量导入 export function batchImportDevice(fileobj) { const param = new FormData() diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue index 49ee723..aaf253b 100644 --- a/src/views/dataView/components/panelGroup.vue +++ b/src/views/dataView/components/panelGroup.vue @@ -120,7 +120,12 @@ const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss') const params = { beginTime, endTime } dataCount(params).then(response => { - this.dataGroup[2].context = response.data.total + let count = 0 + response.data.forEach(item => { + count = count + Number(item.countRecords) + }) + this.dataGroup[2].context = count + '' + console.log('今日总数', this.dataGroup[2].context) }) } } diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js index a816d0b..fffbb72 100644 --- a/src/api/device/deviceImei.js +++ b/src/api/device/deviceImei.js @@ -18,7 +18,7 @@ return request({ url: 'device/simManage/add', method: 'post', - params + data: params }) } // 修改设备 @@ -30,18 +30,16 @@ }) } // 删除设备 -export function delDeviceImei(ids) { +export function delDeviceImei(id) { return request({ url: 'device/simManage/delete', method: 'post', params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + id: id } }) } + // 批量导入 export function batchImportDevice(fileobj) { const param = new FormData() diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue index 49ee723..aaf253b 100644 --- a/src/views/dataView/components/panelGroup.vue +++ b/src/views/dataView/components/panelGroup.vue @@ -120,7 +120,12 @@ const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss') const params = { beginTime, endTime } dataCount(params).then(response => { - this.dataGroup[2].context = response.data.total + let count = 0 + response.data.forEach(item => { + count = count + Number(item.countRecords) + }) + this.dataGroup[2].context = count + '' + console.log('今日总数', this.dataGroup[2].context) }) } } diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue index 1c992fc..5f9adb1 100644 --- a/src/views/deviceConfig/components/editLiquidConfig.vue +++ b/src/views/deviceConfig/components/editLiquidConfig.vue @@ -61,15 +61,15 @@ - - + + - + @@ -205,7 +205,7 @@ percent: '', // 报警阈值 installHeight: '', // 安装高度 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 retryTimes: '3', // 重传次数 ip: '', // ip地址 @@ -223,7 +223,7 @@ percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }], installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }], collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }], - collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], + collectCount: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }], deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], ip: [{ trigger: ['blur', 'change'], validator: validateIp }], @@ -280,7 +280,7 @@ installHeight: row.installHeight, // 安装高度 retryTimes: row.retryTimes, // 重传次数 collectInterval: row.collectInterval, // 采集间隔 - collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔 + collectCount: row.collectCount || '', // 采集次数，数据上报间隔 dataThreshold: row.dataThreshold || '', // 边界阈值 ip: row.ip, // ip地址 port: row.port, // 端口号 @@ -302,7 +302,7 @@ installHeight: '', // 安装高度 retryTimes: '3', // 重传次数 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 ip: '', // ip地址 port: '', // 端口号 diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js index a816d0b..fffbb72 100644 --- a/src/api/device/deviceImei.js +++ b/src/api/device/deviceImei.js @@ -18,7 +18,7 @@ return request({ url: 'device/simManage/add', method: 'post', - params + data: params }) } // 修改设备 @@ -30,18 +30,16 @@ }) } // 删除设备 -export function delDeviceImei(ids) { +export function delDeviceImei(id) { return request({ url: 'device/simManage/delete', method: 'post', params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + id: id } }) } + // 批量导入 export function batchImportDevice(fileobj) { const param = new FormData() diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue index 49ee723..aaf253b 100644 --- a/src/views/dataView/components/panelGroup.vue +++ b/src/views/dataView/components/panelGroup.vue @@ -120,7 +120,12 @@ const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss') const params = { beginTime, endTime } dataCount(params).then(response => { - this.dataGroup[2].context = response.data.total + let count = 0 + response.data.forEach(item => { + count = count + Number(item.countRecords) + }) + this.dataGroup[2].context = count + '' + console.log('今日总数', this.dataGroup[2].context) }) } } diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue index 1c992fc..5f9adb1 100644 --- a/src/views/deviceConfig/components/editLiquidConfig.vue +++ b/src/views/deviceConfig/components/editLiquidConfig.vue @@ -61,15 +61,15 @@ - - + + - + @@ -205,7 +205,7 @@ percent: '', // 报警阈值 installHeight: '', // 安装高度 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 retryTimes: '3', // 重传次数 ip: '', // ip地址 @@ -223,7 +223,7 @@ percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }], installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }], collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }], - collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], + collectCount: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }], deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], ip: [{ trigger: ['blur', 'change'], validator: validateIp }], @@ -280,7 +280,7 @@ installHeight: row.installHeight, // 安装高度 retryTimes: row.retryTimes, // 重传次数 collectInterval: row.collectInterval, // 采集间隔 - collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔 + collectCount: row.collectCount || '', // 采集次数，数据上报间隔 dataThreshold: row.dataThreshold || '', // 边界阈值 ip: row.ip, // ip地址 port: row.port, // 端口号 @@ -302,7 +302,7 @@ installHeight: '', // 安装高度 retryTimes: '3', // 重传次数 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 ip: '', // ip地址 port: '', // 端口号 diff --git a/src/views/deviceConfig/components/editPressConfig.vue b/src/views/deviceConfig/components/editPressConfig.vue index 2593cfc..a494eac 100644 --- a/src/views/deviceConfig/components/editPressConfig.vue +++ b/src/views/deviceConfig/components/editPressConfig.vue @@ -60,12 +60,12 @@ - + - + diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js index a816d0b..fffbb72 100644 --- a/src/api/device/deviceImei.js +++ b/src/api/device/deviceImei.js @@ -18,7 +18,7 @@ return request({ url: 'device/simManage/add', method: 'post', - params + data: params }) } // 修改设备 @@ -30,18 +30,16 @@ }) } // 删除设备 -export function delDeviceImei(ids) { +export function delDeviceImei(id) { return request({ url: 'device/simManage/delete', method: 'post', params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + id: id } }) } + // 批量导入 export function batchImportDevice(fileobj) { const param = new FormData() diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue index 49ee723..aaf253b 100644 --- a/src/views/dataView/components/panelGroup.vue +++ b/src/views/dataView/components/panelGroup.vue @@ -120,7 +120,12 @@ const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss') const params = { beginTime, endTime } dataCount(params).then(response => { - this.dataGroup[2].context = response.data.total + let count = 0 + response.data.forEach(item => { + count = count + Number(item.countRecords) + }) + this.dataGroup[2].context = count + '' + console.log('今日总数', this.dataGroup[2].context) }) } } diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue index 1c992fc..5f9adb1 100644 --- a/src/views/deviceConfig/components/editLiquidConfig.vue +++ b/src/views/deviceConfig/components/editLiquidConfig.vue @@ -61,15 +61,15 @@ - - + + - + @@ -205,7 +205,7 @@ percent: '', // 报警阈值 installHeight: '', // 安装高度 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 retryTimes: '3', // 重传次数 ip: '', // ip地址 @@ -223,7 +223,7 @@ percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }], installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }], collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }], - collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], + collectCount: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }], deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], ip: [{ trigger: ['blur', 'change'], validator: validateIp }], @@ -280,7 +280,7 @@ installHeight: row.installHeight, // 安装高度 retryTimes: row.retryTimes, // 重传次数 collectInterval: row.collectInterval, // 采集间隔 - collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔 + collectCount: row.collectCount || '', // 采集次数，数据上报间隔 dataThreshold: row.dataThreshold || '', // 边界阈值 ip: row.ip, // ip地址 port: row.port, // 端口号 @@ -302,7 +302,7 @@ installHeight: '', // 安装高度 retryTimes: '3', // 重传次数 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 ip: '', // ip地址 port: '', // 端口号 diff --git a/src/views/deviceConfig/components/editPressConfig.vue b/src/views/deviceConfig/components/editPressConfig.vue index 2593cfc..a494eac 100644 --- a/src/views/deviceConfig/components/editPressConfig.vue +++ b/src/views/deviceConfig/components/editPressConfig.vue @@ -60,12 +60,12 @@ - + - + diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue index 8ba85bc..ed4faab 100644 --- a/src/views/deviceConfig/components/listLiquidConfig.vue +++ b/src/views/deviceConfig/components/listLiquidConfig.vue @@ -127,14 +127,14 @@ }, { text: '采集次数', - value: 'collectCnt', + value: 'collectCount', align: 'center' }, - { - text: '边界阈值', - value: 'dataThreshold', - align: 'center' - }, + // { + // text: '边界阈值', + // value: 'dataThreshold', + // align: 'center' + // }, { text: 'IP地址', value: 'ip', diff --git a/20240104.zip b/20240104.zip new file mode 100644 index 0000000..ac5e629 --- /dev/null +++ b/20240104.zip Binary files differ diff --git a/20240108.zip b/20240108.zip new file mode 100644 index 0000000..5d34132 --- /dev/null +++ b/20240108.zip Binary files differ diff --git a/public/config/project.config.json b/public/config/project.config.json index 7161fbc..be63190 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.13.39:11308/", + "baseUrl": "http://192.168.75.39:11308/", "wsUrl": "ws://11.100.6.182:5001/websocket/", "mainPage": "http://111.198.10.15:11404/dcms/#", "amapSecurityCode": "182a2c5889f7fe6d90546d9b8f4781ad", diff --git a/src/api/device/deviceImei.js b/src/api/device/deviceImei.js index a816d0b..fffbb72 100644 --- a/src/api/device/deviceImei.js +++ b/src/api/device/deviceImei.js @@ -18,7 +18,7 @@ return request({ url: 'device/simManage/add', method: 'post', - params + data: params }) } // 修改设备 @@ -30,18 +30,16 @@ }) } // 删除设备 -export function delDeviceImei(ids) { +export function delDeviceImei(id) { return request({ url: 'device/simManage/delete', method: 'post', params: { - ids: ids - }, - paramsSerializer: params => { - return qs.stringify(params, { indices: false }) + id: id } }) } + // 批量导入 export function batchImportDevice(fileobj) { const param = new FormData() diff --git a/src/views/dataView/components/panelGroup.vue b/src/views/dataView/components/panelGroup.vue index 49ee723..aaf253b 100644 --- a/src/views/dataView/components/panelGroup.vue +++ b/src/views/dataView/components/panelGroup.vue @@ -120,7 +120,12 @@ const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss') const params = { beginTime, endTime } dataCount(params).then(response => { - this.dataGroup[2].context = response.data.total + let count = 0 + response.data.forEach(item => { + count = count + Number(item.countRecords) + }) + this.dataGroup[2].context = count + '' + console.log('今日总数', this.dataGroup[2].context) }) } } diff --git a/src/views/deviceConfig/components/editLiquidConfig.vue b/src/views/deviceConfig/components/editLiquidConfig.vue index 1c992fc..5f9adb1 100644 --- a/src/views/deviceConfig/components/editLiquidConfig.vue +++ b/src/views/deviceConfig/components/editLiquidConfig.vue @@ -61,15 +61,15 @@ - - + + - + @@ -205,7 +205,7 @@ percent: '', // 报警阈值 installHeight: '', // 安装高度 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 retryTimes: '3', // 重传次数 ip: '', // ip地址 @@ -223,7 +223,7 @@ percent: [{ required: true, trigger: ['blur', 'change'], validator: validatePercent }], installHeight: [{ required: true, trigger: ['blur', 'change'], validator: validateInstallHeight }], collectInterval: [{ required: false, trigger: ['blur', 'change'], validator: validatecollectInterval }], - collectCnt: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], + collectCount: [{ required: false, trigger: ['blur', 'change'], validator: validateCollectCnt }], dataThreshold: [{ required: false, trigger: ['blur', 'change'], validator: validateDataThreshold }], deviceId: [{ required: true, message: '设备编号不能为空', trigger: ['blur', 'change'] }], ip: [{ trigger: ['blur', 'change'], validator: validateIp }], @@ -280,7 +280,7 @@ installHeight: row.installHeight, // 安装高度 retryTimes: row.retryTimes, // 重传次数 collectInterval: row.collectInterval, // 采集间隔 - collectCnt: row.collectCnt || '', // 采集次数，数据上报间隔 + collectCount: row.collectCount || '', // 采集次数，数据上报间隔 dataThreshold: row.dataThreshold || '', // 边界阈值 ip: row.ip, // ip地址 port: row.port, // 端口号 @@ -302,7 +302,7 @@ installHeight: '', // 安装高度 retryTimes: '3', // 重传次数 collectInterval: '', // 采集间隔 - collectCnt: '', // 采集次数，数据上报间隔 + collectCount: '', // 采集次数，数据上报间隔 dataThreshold: '', // 边界阈值 ip: '', // ip地址 port: '', // 端口号 diff --git a/src/views/deviceConfig/components/editPressConfig.vue b/src/views/deviceConfig/components/editPressConfig.vue index 2593cfc..a494eac 100644 --- a/src/views/deviceConfig/components/editPressConfig.vue +++ b/src/views/deviceConfig/components/editPressConfig.vue @@ -60,12 +60,12 @@ - + - + diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue index 8ba85bc..ed4faab 100644 --- a/src/views/deviceConfig/components/listLiquidConfig.vue +++ b/src/views/deviceConfig/components/listLiquidConfig.vue @@ -127,14 +127,14 @@ }, { text: '采集次数', - value: 'collectCnt', + value: 'collectCount', align: 'center' }, - { - text: '边界阈值', - value: 'dataThreshold', - align: 'center' - }, + // { + // text: '边界阈值', + // value: 'dataThreshold', + // align: 'center' + // }, { text: 'IP地址', value: 'ip', diff --git a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue index 75aa9d5..fbb73b2 100644 --- a/src/views/deviceManage/deviceImei/components/editDeviceImei.vue +++ b/src/views/deviceManage/deviceImei/components/editDeviceImei.vue @@ -66,6 +66,7 @@