diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c06e5588..04c0aee6 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -40,11 +40,11 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 + //axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地 diff --git a/src/store/index.js b/src/store/index.js index d06e887e..8080e5d8 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -45,8 +45,8 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // - UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // + // BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', // + // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', // // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口 /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 @@ -57,15 +57,15 @@ export default new Vuex.Store({ // UPLOADURL: 'http://182.90.224.237:7000/upload/image', // FILEURL: 'http://182.90.224.237:7000/image/', // 邱平毅的 - // BASEURL:'http://192.168.34.116:6023/', - // UPLOADURL: 'http://192.168.34.116:6023/upload/image', - // FILEURL: 'http://192.168.34.116:6023/image/', + BASEURL:'http://192.168.34.116:6023/', + UPLOADURL: 'http://192.168.34.116:6023/upload/image', + FILEURL: 'http://192.168.34.116:6023/image/', // UPLOADURL: 'http://124.71.67.160:8088/upload/image', // FILEURL: 'http://124.71.67.160:8088/image/', // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 - FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 + // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 ACCOUNTTYPE: ['系统管理员', '企业一级管理员', '企业二级管理员', '企业三级管理员', '项目管理员'], //1系统管理员,2企业管理员账号,3企业区账号,4企业市账号,5项目账号 userInfo: null, //登录返回的账号信息 // currentUrl:'',//当前路由地址 diff --git a/src/views/projectAdmin/fourEngin/security/centerBottom.vue b/src/views/projectAdmin/fourEngin/security/centerBottom.vue index b87141a2..d3538fb3 100644 --- a/src/views/projectAdmin/fourEngin/security/centerBottom.vue +++ b/src/views/projectAdmin/fourEngin/security/centerBottom.vue @@ -21,7 +21,7 @@
验收日期
-
+ +
+
+ +

{{$t('message.dataBoard.nodata')}}

+
@@ -64,7 +70,7 @@
报警状态
-
+ +
+
+ +

{{$t('message.dataBoard.nodata')}}

+
@@ -183,7 +195,7 @@ export default { } .dataImg { margin-left: 500px; - margin-top: 20px; + margin-top: 50px; p { margin-left: 4%; } diff --git a/src/views/projectAdmin/fourEngin/security/centerTop.vue b/src/views/projectAdmin/fourEngin/security/centerTop.vue index a6c20bf4..1800a6f3 100644 --- a/src/views/projectAdmin/fourEngin/security/centerTop.vue +++ b/src/views/projectAdmin/fourEngin/security/centerTop.vue @@ -35,7 +35,7 @@
{{i.eduTime}}
-
暂无数据
+
暂无数据
@@ -71,7 +71,7 @@
-
暂无数据
+
暂无数据
@@ -119,7 +119,7 @@
{{i.eduTime}}
-
暂无数据
+
暂无数据
diff --git a/src/views/projectAdmin/fourEngin/security/leftBottom.vue b/src/views/projectAdmin/fourEngin/security/leftBottom.vue index 36d33d22..9a2b4617 100644 --- a/src/views/projectAdmin/fourEngin/security/leftBottom.vue +++ b/src/views/projectAdmin/fourEngin/security/leftBottom.vue @@ -12,11 +12,26 @@
- +
-
{{ alarmTypeList[item.thingType] }}
+
{{ alarmTypeList[item.alarmType] }}
{{ item.createTime }}
+
+
+ 暂无数据 +
+
@@ -54,7 +69,8 @@ export default { getSelectNewPAiListApi() { selectNewPAiListApi({ projectSn: this.projectSn, count: 20 }).then(res => { console.log(res, '=============ai分析') - this.aiList = res.result.length>0?res.result:this.aiList; + // this.aiList = res.result.length>0?res.result:this.aiList; + this.aiList = res.result }) } }, diff --git a/src/views/projectAdmin/fourEngin/security/leftTop.vue b/src/views/projectAdmin/fourEngin/security/leftTop.vue index f924a764..03087af1 100644 --- a/src/views/projectAdmin/fourEngin/security/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/security/leftTop.vue @@ -3,24 +3,42 @@
- + :data="[ + { + value: safetyPatrolInspection.allRectificationNum, + name: '已处理', + }, + { + value: safetyPatrolInspection.allNoRectificationNum, + name: '未处理', + }, + ]" + :radius="['60%', '85%']" + :legend="false" + />
- 已处理 + 已闭合 占比
{{ safetyPatrolInspection.allRectificationNum || 0 }} - {{ safetyPatrolInspection.allRectificationRatio || 0 }}% + {{ safetyPatrolInspection.allRectificationRatio || 0 }}%
- 未处理 + 未闭合 占比
@@ -31,29 +49,53 @@
- + :data="[ + { + value: safetyPatrolInspection.todayRectificationNum, + name: '已巡检', + }, + { + value: safetyPatrolInspection.todayNoRectificationRatio, + name: '未巡检', + }, + ]" + :radius="['60%', '85%']" + :legend="false" + />
- 已巡检 + 已闭合 占比
{{ safetyPatrolInspection.todayRectificationNum || 0 }} - {{ safetyPatrolInspection.todayRectificationRatio || 0 }}% + {{ safetyPatrolInspection.todayRectificationRatio || 0 }}%
- 未巡检 + 未闭合 占比
- {{ safetyPatrolInspection.todayNoRectificationRatio || 0 }} - {{ safetyPatrolInspection.todayNoRectificationRatio || 0 }}% + {{ + safetyPatrolInspection.todayNoRectificationRatio || 0 + }} + {{ + safetyPatrolInspection.todayNoRectificationRatio || 0 + }}%
@@ -62,20 +104,41 @@
事件类型
-
上报时间
+
检查时间
处理状态
-
-
{{ fmtType(item.recordType) }}
-
{{ item.inspectTime }}
-
{{ fmtStatus(item.status) }}
+
+
{{ item.checkContent }}
+
{{ item.createTime }}
+
+ {{ fmtStatus(item.status) }} +
-
-
暂无数据
+
+
+ 暂无数据 +
@@ -86,18 +149,19 @@