diff --git a/public/js/config.js b/public/js/config.js index e82ee993..874da78b 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -40,15 +40,15 @@ var baseUrl = window.location.protocol + '//' + window.location.host + '/'; var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目账号登录 var showNotBuyMoudle = false; //是否展示未解锁产品 var isDockingToWoer = false; //是否是和沃尔平台对接 -var mqttUrl = 'tcp://182.90.224.147:1883' +var mqttUrl = 'ws://182.90.224.147:8083/mqtt' // var mqttUrl = 'ws://10.139.72.12:8083/mqtt' //longguang if (COMPANY == 'longguang') { - // mqttUrl = 'tcp://182.90.224.147:1883' + // mqttUrl = 'ws://182.90.224.147:8083/mqtt' // mqttUrl = 'ws://10.139.72.12:8083/mqtt' // mqttUrl = 'ws://121.35.243.71:8083/mqtt' mqttUrl = 'ws://zhgdmqtt.loganwy.com:80/mqtt' } else if (COMPANY == 'henan') { - mqttUrl = 'tcp://182.90.224.147:1883' + mqttUrl = 'ws://182.90.224.147:8083/mqtt' } var enabledProjectV2 = 2; //是否用精益建造版 1：精益建造版(黑色) 2： 最初版（白色） 3：数据看板UI蓝色版（白色） 4:湛蓝色 var CONSTRUCTIONSTAGE = [{ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c8123ab1..6e4081f5 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -80,15 +80,14 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地 // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地 - // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:11120' //演示平台郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地 // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上 // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 - - + // axios.defaults.baseURL = 'http://182.90.224.147:15551'//港投(成润)项目线上 } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'https://www.ceshi.com' } else if (process.env.NODE_ENV == 'production') { diff --git a/src/components/message.vue b/src/components/message.vue index 4cd2cba1..8638602a 100644 --- a/src/components/message.vue +++ b/src/components/message.vue @@ -153,7 +153,7 @@ export default { if (process.env.NODE_ENV == 'development') { this.userId = this.$store.state.userInfo.userId this.topicName = this.$store.state.userInfo.scope - // // client = mqtt.connect("tcp://182.90.224.147:1883", options); + // // client = mqtt.connect("ws://182.90.224.147:8083/mqtt", options); client = mqtt.connect(mqttUrl, options) this.getData() this.mqttMSG() @@ -161,7 +161,7 @@ export default { } else if (process.env.NODE_ENV == 'production') { this.userId = this.$store.state.userInfo.userId this.topicName = this.$store.state.userInfo.scope - // client = mqtt.connect("tcp://182.90.224.147:1883", options); + // client = mqtt.connect("ws://182.90.224.147:8083/mqtt", options); client = mqtt.connect(mqttUrl, options) this.getData() this.mqttMSG() diff --git a/src/store/index.js b/src/store/index.js index c2e7e314..afec77d7 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -95,6 +95,8 @@ export default new Vuex.Store({ // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 + // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 + // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 ACCOUNTTYPE: [ "系统管理员", diff --git a/src/views/companyFront/project/overview.vue b/src/views/companyFront/project/overview.vue index 1a0c6551..785d339f 100644 --- a/src/views/companyFront/project/overview.vue +++ b/src/views/companyFront/project/overview.vue @@ -1559,7 +1559,7 @@ export default { companySn: this.$store.state.userInfo.headquartersSn, propagateFile: url, }).then((res) => { - this.$message.success("上传成功"); + // this.$message.success("上传成功"); var json = this.$store.state.userInfo; json.propagateFile = url == "-1" ? "" : url; this.$store.commit("setUserInfo", json); diff --git a/src/views/projectAdmin/dataBoard/AiAnalysis.vue b/src/views/projectAdmin/dataBoard/AiAnalysis.vue index 8eb69bdf..bb9604ec 100644 --- a/src/views/projectAdmin/dataBoard/AiAnalysis.vue +++ b/src/views/projectAdmin/dataBoard/AiAnalysis.vue @@ -58,6 +58,16 @@ }} +
+ +

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

+
@@ -115,7 +125,18 @@ + +
+ +

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

+
@@ -174,9 +195,19 @@ +
+ +

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

+
-
+
{{ $t('message.dataBoard.warningTrend') }} @@ -413,7 +444,7 @@ export default { this.selectAiAnalyseHardWareAlarmList() }, mounted() { - // client = mqtt.connect("tcp://182.90.224.147:1883", options); + // client = mqtt.connect("ws://182.90.224.147:8083/mqtt", options); client = mqtt.connect(mqttUrl, options); this.mqttMSG(); }, @@ -670,12 +701,19 @@ export default { // ['总计', '安全帽报警','明火报警','聚众报警','倒地报警','越界报警','闯入报警','反光衣报警','吸烟报警'], data: this.$t('message.dataBoard.alarmTypeArray'), textStyle: { - // fontSize: 14,//字体大小 - color: '#FEFFFF' //字体颜色 + fontSize: 12,//字体大小 + color: '#ccc' //字体颜色 }, - left: '10%', - top: '6%' + left: '6%', + top: '5%', }, + grid: { + top:'20%', + left: '3%', + right: '4%', + bottom: '2%', + containLabel: true + }, tooltip: { trigger: 'axis', position: [20, 20] @@ -687,7 +725,8 @@ export default { formatter: '{value}', textStyle: { //改变刻度字体样式 - color: 'RGB(254,255,255,0.5)' + color: 'RGB(254,255,255,0.5)', + fontSize: 10, } } }, @@ -697,14 +736,16 @@ export default { formatter: '{value}', textStyle: { //改变刻度字体样式 - color: 'RGB(254,255,255,0.5)' + color: 'RGB(254,255,255,0.5)', + fontSize: 12, } }, splitLine: { show: true, lineStyle: { type: 'dashed', - color: 'RGB(236,236,236,0.5)' + color: 'RGB(236,236,236,0.5)', + } } }, @@ -906,16 +947,16 @@ export default { }