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/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 722bd62..9c5321a 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/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 722bd62..9c5321a 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/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue index ecd0289..a410f29 100644 --- a/src/views/gasDashboard/components/corrodeCountByDay.vue +++ b/src/views/gasDashboard/components/corrodeCountByDay.vue @@ -49,8 +49,10 @@ left: 30 }, yAxis: { + position: 'left', + type: 'value', name: '腐蚀率(%)', - position: 'left' + nameRotate: '0.1' }, legend: { // type: 'scroll', 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 722bd62..9c5321a 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/gasDashboard/components/corrodeCountByDay.vue b/src/views/gasDashboard/components/corrodeCountByDay.vue index ecd0289..a410f29 100644 --- a/src/views/gasDashboard/components/corrodeCountByDay.vue +++ b/src/views/gasDashboard/components/corrodeCountByDay.vue @@ -49,8 +49,10 @@ left: 30 }, yAxis: { + position: 'left', + type: 'value', name: '腐蚀率(%)', - position: 'left' + nameRotate: '0.1' }, legend: { // type: 'scroll', diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue index d03da8d..fe7e68e 100644 --- a/src/views/jobManage/detailJob.vue +++ b/src/views/jobManage/detailJob.vue @@ -207,6 +207,7 @@ this.loading = true const base_url = this.baseConfig.baseUrl + '/static/' getJobInfo(jobId).then(response => { + console.log(response, ' ============response=') this.loading = false if (response.code === 200) { if (response.data.length <= 0) { @@ -217,26 +218,28 @@ // 处理现场图片 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 }) this.firstImageList.push(base_url + url) } } + console.log(this.firstImageList) } else { this.firstImageList = [] } // 处理维护图片 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 }) this.handleImageList.push(base_url + url) } } + console.log(this.handleImageList) } else { this.handleImageList = [] }