diff --git a/public/css/largeScreenStyle.css b/public/css/largeScreenStyle.css index 521753e..8c47a7f 100644 --- a/public/css/largeScreenStyle.css +++ b/public/css/largeScreenStyle.css @@ -3862,7 +3862,7 @@ table{ } -/*质量管理-标养室检测*/ +/*质量管理-标养室监测*/ .process-control{ height: 610px; } diff --git a/src/components/amplify/shipinguanli/amplify-spjk.js b/src/components/amplify/shipinguanli/amplify-spjk.js index 25e2d07..43d8faa 100644 --- a/src/components/amplify/shipinguanli/amplify-spjk.js +++ b/src/components/amplify/shipinguanli/amplify-spjk.js @@ -44,7 +44,7 @@ var vms = Vue.component("amplify-spjk", {
-

AI识别监控

+

AI智能监测

{{aiNum}}
diff --git a/src/components/header.vue b/src/components/header.vue index 53a9235..af80073 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -30,23 +30,23 @@ + @click="pageJump(26, '#/prjAiVideo')">AI智能监测
+ @click="pageJump(28, '#/towerCrane')">塔吊监测
+ @click="pageJump(29, '#/excavation')">基坑监测 + @click="pageJump(30, '#/distributionBox')">配电箱监测 + @click="pageJump(31, '#/dumbwaiter')">升降机监测
+ @click="pageJump(33, '#/standardCuringRoom')">标养室监测 + @click="pageJump(34, '#/concreteStrength')">混凝土强度监测 @@ -64,24 +64,24 @@ + @click="pageJump(61, '#/aiVideo')">AI智能监测 diff --git a/src/pages/gzaiBox/index.vue b/src/pages/gzaiBox/index.vue index 3b76d0d..410fd96 100644 --- a/src/pages/gzaiBox/index.vue +++ b/src/pages/gzaiBox/index.vue @@ -8,7 +8,7 @@ style="transform: scale(0.8); position: relative; top: -40px; left: -70px" > -->
-

AI识别监控

+

AI智能监测

{{ aiNum }}
diff --git a/src/pages/quality/concreteStrength.vue b/src/pages/quality/concreteStrength.vue index 2d7e3e6..1e19998 100644 --- a/src/pages/quality/concreteStrength.vue +++ b/src/pages/quality/concreteStrength.vue @@ -175,7 +175,7 @@ import '@/components/process-control-new' import '@/components/trend-chart-line' import '@/components/screen-select' export default { - //混泥土强度检测 + //混凝土强度监测 name: 'JhbigscreenConcreteStrength', data() { diff --git a/src/pages/quality/standardCuringRoom.vue b/src/pages/quality/standardCuringRoom.vue index 413e007..57c2b7b 100644 --- a/src/pages/quality/standardCuringRoom.vue +++ b/src/pages/quality/standardCuringRoom.vue @@ -169,7 +169,7 @@ import '@/components/process-control-new' import '@/components/trend-chart-line' import '@/components/screen-select' export default { - //标养室检测 + //标养室监测 name: 'JhbigscreenStandardCuringRoom', data() { @@ -197,7 +197,7 @@ export default { this.lastRunData = JSON.parse('{"sid":946050,"deviceNo":"010840009F","deviceNoList":[],"temperature":19.1,"humidity":98.5,"createTime":"2024-03-10 16:44:02","startTime":null,"endTime":null,"projectId":0}'); this.onClickTemperatureTrend(1); this.onClickTumidityTrend(1); - this.selectData = JSON.parse('[{"device_name":"实验室","type_name":"标养室","create_time":"2024-03-10 16:44:02","project_id":132,"name":"标养室监控设备:010840009F","device_No":"010840009F","id":"010840009F","state":1,"deviceId":"010840009F","points":1,"text":"010840009F","deviceNo":"010840009F"}]'); + this.selectData = JSON.parse('[{"device_name":"实验室","type_name":"标养室","create_time":"2024-03-10 16:44:02","project_id":132,"name":"标养室监测设备:010840009F","device_No":"010840009F","id":"010840009F","state":1,"deviceId":"010840009F","points":1,"text":"010840009F","deviceNo":"010840009F"}]'); this.lastChooseDevice = this.selectData[0]; //正在发生 定时器 this.warningInterval = setInterval(this.automaticRoll, 5000); diff --git a/src/pages/safe/distributionBox.vue b/src/pages/safe/distributionBox.vue index 076b3a1..7fcf040 100644 --- a/src/pages/safe/distributionBox.vue +++ b/src/pages/safe/distributionBox.vue @@ -111,7 +111,7 @@
当前设备
-
配电箱监控
+
配电箱监测
@@ -224,7 +224,7 @@ export default { //正在发生 定时器 this.warningInterval = setInterval(this.automaticRoll, 5000); this.powerRun = JSON.parse('{"searchValue":null,"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"remark":null,"params":{},"id":488906,"uid":"PWR.02731XTJ","deviceName":null,"uids":[],"time":"2024-03-10 00:13:44","date":null,"c1":15.5,"c2":1.4,"c3":4.1,"v1":0,"v2":0,"v3":0,"t1":7,"t2":7,"t3":7,"t4":6,"leak":0,"power":0,"startTime":null,"endTime":null,"projectId":null,"projectName":null}'); - this.selectData = JSON.parse('[{"searchValue":null,"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"remark":null,"params":{},"id":"PWR.02731XTJ","deviceId":"配电箱监控设备 PWR.02731XTJ","deviceName":"配电箱","state":1,"projectId":132,"points":1,"typeName":"配电箱","hzTenantId":"1390137257721987073","hzProjectId":"1634117283072266241","text":"PWR.02731XTJ"}]'); + this.selectData = JSON.parse('[{"searchValue":null,"createBy":null,"createTime":null,"updateBy":null,"updateTime":null,"remark":null,"params":{},"id":"PWR.02731XTJ","deviceId":"配电箱监测设备 PWR.02731XTJ","deviceName":"配电箱","state":1,"projectId":132,"points":1,"typeName":"配电箱","hzTenantId":"1390137257721987073","hzProjectId":"1634117283072266241","text":"PWR.02731XTJ"}]'); this.lastChooseDevice = this.selectData[0]; this.warningData=[{type:"预警A",images:['images/831.jpg'],deviceId:'PWR.02731XTJ',content:'告警内容',time:'24-02-02 14:00',project_abbreviation:'xxx项目'},{type:"预警A",images:['images/831.jpg'],deviceId:'PWR.02731XTJ',content:'告警内容',time:'24-02-02 14:00',project_abbreviation:'xxx项目'},{type:"预警A",images:['images/831.jpg'],deviceId:'PWR.02731XTJ',content:'告警内容',time:'24-02-02 14:00',project_abbreviation:'xxx项目'},] this.onClickTemperatureTrend(1); diff --git a/src/utils/requestOthers.js b/src/utils/requestOthers.js index e0e2760..7b4e748 100644 --- a/src/utils/requestOthers.js +++ b/src/utils/requestOthers.js @@ -13,7 +13,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ // axios中请求配置有baseURL选项,表示请求URL公共部分 - baseURL: "http://62.234.3.186:8087/YanZhuGZAI", + baseURL: "https://guangzhou.sxyanzhu.com/YanZhuGZAI", // 超时 timeout: 200000 })