diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1843bd0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:20104"' }) diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1843bd0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:20104"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 3455ce7..bb20d1d 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11304"', // BASE_API: '"http://42.81.160.165:2022/smartwell/"', - BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + BASE_API: '"http://111.198.10.15:20104"' //11643 } diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1843bd0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:20104"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 3455ce7..bb20d1d 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11304"', // BASE_API: '"http://42.81.160.165:2022/smartwell/"', - BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + BASE_API: '"http://111.198.10.15:20104"' //11643 } diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue index 7c7350f..96b500a 100644 --- a/src/views/dataManage/deviceData/listGasflowData.vue +++ b/src/views/dataManage/deviceData/listGasflowData.vue @@ -49,7 +49,7 @@ scope.row[column.value] }} {{ - scope.row["areaFullName"] +'/' + scope.row[column.value] + scope.row["areaFullName"] + '/' + scope.row[column.value] }} {{ scope.row[column.value] }} diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1843bd0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:20104"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 3455ce7..bb20d1d 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11304"', // BASE_API: '"http://42.81.160.165:2022/smartwell/"', - BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + BASE_API: '"http://111.198.10.15:20104"' //11643 } diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue index 7c7350f..96b500a 100644 --- a/src/views/dataManage/deviceData/listGasflowData.vue +++ b/src/views/dataManage/deviceData/listGasflowData.vue @@ -49,7 +49,7 @@ scope.row[column.value] }} {{ - scope.row["areaFullName"] +'/' + scope.row[column.value] + scope.row["areaFullName"] + '/' + scope.row[column.value] }} {{ scope.row[column.value] }} diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..1b8e2cd 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -176,9 +176,9 @@ align: 'center' }, { - text: '压力(pa)', + text: '压力(MPa)', value: 'pressure', - width: 80, + width: 90, align: 'center' }, { diff --git a/config/dev.env.js b/config/dev.env.js index 36f7d4a..1843bd0 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -10,5 +10,6 @@ // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 - BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + // BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 + BASE_API: '"http://111.198.10.15:20104"' }) diff --git a/config/prod.env.js b/config/prod.env.js index 3455ce7..bb20d1d 100644 --- a/config/prod.env.js +++ b/config/prod.env.js @@ -3,5 +3,6 @@ NODE_ENV: '"production"', // BASE_API: '"http://111.198.10.15:11304"', // BASE_API: '"http://42.81.160.165:2022/smartwell/"', - BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //11643 + BASE_API: '"http://111.198.10.15:20104"' //11643 } diff --git a/src/views/dataManage/deviceData/listGasflowData.vue b/src/views/dataManage/deviceData/listGasflowData.vue index 7c7350f..96b500a 100644 --- a/src/views/dataManage/deviceData/listGasflowData.vue +++ b/src/views/dataManage/deviceData/listGasflowData.vue @@ -49,7 +49,7 @@ scope.row[column.value] }} {{ - scope.row["areaFullName"] +'/' + scope.row[column.value] + scope.row["areaFullName"] + '/' + scope.row[column.value] }} {{ scope.row[column.value] }} diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue index 2515720..1b8e2cd 100644 --- a/src/views/dataManage/deviceData/listWaterData.vue +++ b/src/views/dataManage/deviceData/listWaterData.vue @@ -176,9 +176,9 @@ align: 'center' }, { - text: '压力(pa)', + text: '压力(MPa)', value: 'pressure', - width: 80, + width: 90, align: 'center' }, { diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index b4741c2..2cd3742 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -207,6 +207,7 @@ this.loading = true const base_url = process.env.BASE_API + '/static/' getJobInfo(jobId).then(response => { + console.log(response, ' ============response=') this.loading = false if (response.code === 200) { if (response.data.length <= 0) { @@ -217,7 +218,7 @@ // 处理现场图片 if (job.firstStatePhotos !== '') { this.firstImageList = [] - const urls = job.firstStatePhotos.split(';') + const urls = job.firstStatePhotos.split(',') for (const url of urls) { if (url) { // this.firstImageList.push({ name: url, url: base_url + url }) @@ -231,7 +232,7 @@ // 处理维护图片 if (job.handlePhotos.length !== '') { this.handleImageList = [] - const urls = job.handlePhotos.split(';') + const urls = job.handlePhotos.split(',') for (const url of urls) { if (url) { // this.handleImageList.push({ name: url, url: base_url + url })