diff --git a/src/views/bigNumber/secondary/transformerCasing.vue b/src/views/bigNumber/secondary/transformerCasing.vue index d2a00ff..5ef814e 100644 --- a/src/views/bigNumber/secondary/transformerCasing.vue +++ b/src/views/bigNumber/secondary/transformerCasing.vue @@ -8,7 +8,15 @@
@@ -25,11 +33,18 @@
diff --git a/src/views/healthAssessment/components/ModelLoading.vue b/src/views/healthAssessment/components/ModelLoading.vue index f6efeda..ddce6d9 100644 --- a/src/views/healthAssessment/components/ModelLoading.vue +++ b/src/views/healthAssessment/components/ModelLoading.vue @@ -109,7 +109,17 @@ export default { if (element.modelType == "211") { this.modelDataObj = JSON.parse(element.modelParams); this.modelSiteId = element; - this.filePath = element.filePath; + if ( + window.location.hostname === "localhost" && + window.location.port === "9528" + ) { + const currentUrl = "http://192.168.1.190:92"; + this.filePath = currentUrl + element.filePath; + } else { + const currentUrl = window.location.origin; + this.filePath = currentUrl + element.filePath; + } + // this.filePath = element.filePath; break; } } @@ -130,7 +140,17 @@ export default { const element = modelParameter[index]; if (element.modelType == type) { this.modelDataObj = JSON.parse(element.modelParams); - this.filePath = element.filePath; + if ( + window.location.hostname === "localhost" && + window.location.port === "9528" + ) { + const currentUrl = "http://192.168.1.190:92"; + this.filePath = currentUrl + element.filePath; + } else { + const currentUrl = window.location.origin; + this.filePath = currentUrl + element.filePath; + } + break; } } diff --git a/src/views/onLineMonitoring/model/index.vue b/src/views/onLineMonitoring/model/index.vue index 5ab1630..dc252f7 100644 --- a/src/views/onLineMonitoring/model/index.vue +++ b/src/views/onLineMonitoring/model/index.vue @@ -49,8 +49,8 @@ item.dataList.length == 1 && item.title == '' ? item.dataList[0].secondTitle : item.title != '' - ? item.title - : '实时数据展示' + ? item.title + : '实时数据展示' " placement="top" > @@ -125,10 +125,10 @@ val.picpath.length == 0 && val.http_url == '' ? 'modelInfoBoxContent' : val.http_url != '' && val.number < 5 - ? 'viewVideoData' - : val.picpath.length != 0 && val.http_url == '' - ? 'viewImageData' - : 'modelInfoBoxContent', + ? 'viewVideoData' + : val.picpath.length != 0 && val.http_url == '' + ? 'viewImageData' + : 'modelInfoBoxContent', ]" > @@ -147,9 +147,8 @@ :content="val.secondTitle" placement="top" > - {{ val.secondTitle }} + {{ val.secondTitle }} - + @@ -209,14 +208,14 @@