From e613f96bbc2ca9ee79fc043a1ae96a9dd67009ca Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Sat, 13 May 2023 17:00:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E6=B6=A6=E9=A1=B9=E7=9B=AE-?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 6 +- src/assets/js/http.js | 5 +- src/components/message.vue | 4 +- src/store/index.js | 18 +- src/views/companyFront/project/overview.vue | 2 +- .../projectAdmin/dataBoard/AiAnalysis.vue | 61 +++++- .../projectAdmin/dataBoard/AiAnalysisCopy.vue | 2 +- .../dataBoard/digitalSite/index.vue | 75 ++++---- src/views/projectAdmin/dataBoard/index.vue | 10 +- .../projectAdmin/dataBoardTwo/AiAnalysis.vue | 2 +- .../projectFront/BIMCenter/BIMManageV3.vue | 178 +++++++++++------- .../projectFront/buildersDiary/diaryMod.vue | 2 +- .../projectFront/carManage/carManage.vue | 2 +- .../projectFront/laborManage/overview.vue | 2 +- src/views/projectFront/lifter/basicInfo.vue | 23 ++- .../projectFront/markingRoom/sampleManage.vue | 3 +- .../qualitySpringback/buildManage.vue | 1 + .../electronicPouringOrder.vue | 2 +- .../waterManage/alarmValueSet.vue | 2 +- 19 files changed, 245 insertions(+), 155 deletions(-) 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 a86ac450..cf8d1179 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -42,7 +42,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址 - axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ + // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // 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/'; //杨思瑞本地 @@ -87,8 +87,7 @@ if (process.env.NODE_ENV == 'development') { // 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'//港投项目线上 - + 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..46a4c457 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,12 +48,12 @@ export default new Vuex.Store({ 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/", //正式环境 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl @@ -87,14 +87,16 @@ export default new Vuex.Store({ // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 - // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 - // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 + UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 + FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // 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..7d57bd95 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: 10,//字体大小 + color: '#ccc' //字体颜色 }, - left: '10%', - top: '6%' + left: '6%', + top: '7%', }, + grid: { + top:'20%', + left: '3%', + right: '4%', + bottom: '29%', + 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: 8, } } }, @@ -697,14 +736,16 @@ export default { formatter: '{value}', textStyle: { //改变刻度字体样式 - color: 'RGB(254,255,255,0.5)' + color: 'RGB(254,255,255,0.5)', + fontSize: 10, } }, splitLine: { show: true, lineStyle: { type: 'dashed', - color: 'RGB(236,236,236,0.5)' + color: 'RGB(236,236,236,0.5)', + } } }, @@ -1096,7 +1137,7 @@ export default { //align-items: center; justify-content: center; li { - margin-bottom: 10px; + margin-bottom: 5px; display: flex; align-items: center; span { diff --git a/src/views/projectAdmin/dataBoard/AiAnalysisCopy.vue b/src/views/projectAdmin/dataBoard/AiAnalysisCopy.vue index d73e993d..461ab056 100644 --- a/src/views/projectAdmin/dataBoard/AiAnalysisCopy.vue +++ b/src/views/projectAdmin/dataBoard/AiAnalysisCopy.vue @@ -315,7 +315,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() }, diff --git a/src/views/projectAdmin/dataBoard/digitalSite/index.vue b/src/views/projectAdmin/dataBoard/digitalSite/index.vue index e94e2c03..34388190 100644 --- a/src/views/projectAdmin/dataBoard/digitalSite/index.vue +++ b/src/views/projectAdmin/dataBoard/digitalSite/index.vue @@ -52,7 +52,7 @@ countImg: require('@/assets/images/dataBoard/tower.png'), todayNum: totalDangerTowerDev, todayLabel: 'todayAlarmCount', - todayImg: require('@/assets/images/dataBoard/alarmcount.png') + todayImg: require('@/assets/images/dataBoard/alarmcount.png'), }" :list="towerList" > @@ -65,7 +65,7 @@ countImg: require('@/assets/images/dataBoard/lifter.png'), todayNum: totalDangerLifterDev, todayLabel: 'todayAlarmCount', - todayImg: require('@/assets/images/dataBoard/alarmcount.png') + todayImg: require('@/assets/images/dataBoard/alarmcount.png'), }" :list="lifterList" > @@ -147,7 +147,7 @@ :key="index" :style="{ top: item.mapY / imgHeightScale - 36 + 'px', - left: item.mapX / imgWidthScale - 22 + 'px' + left: item.mapX / imgWidthScale - 22 + 'px', }" @click="clickPoint(item)" > @@ -459,8 +459,8 @@ { alert: lifterCurrentData.heightAlarm != 0 || - lifterCurrentData.heightPreAlarm != 0 - } + lifterCurrentData.heightPreAlarm != 0, + }, ]" >

@@ -522,8 +522,8 @@ { alert: lifterCurrentData.obliguityXAlarm != 0 || - lifterCurrentData.obliguityXPreAlarm != 0 - } + lifterCurrentData.obliguityXPreAlarm != 0, + }, ]" >

@@ -544,8 +544,8 @@ { alert: lifterCurrentData.obliguityYAlarm != 0 || - lifterCurrentData.obliguityYPreAlarm != 0 - } + lifterCurrentData.obliguityYPreAlarm != 0, + }, ]" >

@@ -566,8 +566,8 @@ { alert: lifterCurrentData.speedAlarm != 0 || - lifterCurrentData.speedPreAlarm != 0 - } + lifterCurrentData.speedPreAlarm != 0, + }, ]" >

@@ -587,8 +587,8 @@ { alert: lifterCurrentData.windSpeedAlarm != 0 || - lifterCurrentData.windSpeedPreAlarm != 0 - } + lifterCurrentData.windSpeedPreAlarm != 0, + }, ]" >

@@ -885,7 +885,7 @@ class="pointDialogContent" :style="{ margin: company == 'longguang' ? '0 70px' : '40px 70px', - height: company == 'longguang' ? '100%' : 'calc(100% - 80px)' + height: company == 'longguang' ? '100%' : 'calc(100% - 80px)', }" >

@@ -1125,7 +1125,7 @@

{{ afterAnalysisDataInfo.alarmNum }} @@ -1229,7 +1229,7 @@ :style="{ left: coordData.coordX + 8 + 'px', height: coordData.lineLength + 'px', - top: '78px' + top: '78px', }" />

@@ -1262,7 +1262,7 @@ left: coordData.coordX + 8 + 'px', height: coordData.lineLength + 'px', width: '5px', - top: '126px' + top: '126px', }" /> @@ -1273,7 +1273,7 @@ v-show="hideGoods && company == 'longguang'" :style="{ top: coordData.coordY + 'px', - left: coordData.coordX - 10 + 'px' + left: coordData.coordX - 10 + 'px', }" > @@ -1388,7 +1388,7 @@ :class="{ red: towerCurrentInfo.maxRangeAlarm != 0 || - towerCurrentInfo.minRangeAlarm != 0 + towerCurrentInfo.minRangeAlarm != 0, }" > @@ -1444,7 +1444,7 @@ :class="{ red: towerCurrentInfo.obliguityXAlarm != 0 || - towerCurrentInfo.obliguityYAlarm != 0 + towerCurrentInfo.obliguityYAlarm != 0, }" > @@ -1603,7 +1603,7 @@ :class="{ red: towerCurrentInfo.maxRangeAlarm != 0 || - towerCurrentInfo.minRangeAlarm != 0 + towerCurrentInfo.minRangeAlarm != 0, }" > @@ -1657,7 +1657,7 @@ :class="{ red: towerCurrentInfo.obliguityXAlarm != 0 || - towerCurrentInfo.obliguityYAlarm != 0 + towerCurrentInfo.obliguityYAlarm != 0, }" > @@ -1780,7 +1780,7 @@

@@ -2042,8 +2042,7 @@

{{ carDetail.name }} - @@ -2559,7 +2558,7 @@ countImg: require('@/assets/images/dataBoard/uface.png'), todayNum: ufaceInCount, todayLabel: 'todayInPeople', - todayImg: require('@/assets/images/dataBoard/inpeople.png') + todayImg: require('@/assets/images/dataBoard/inpeople.png'), }" :list="ufaceList" type="face" @@ -2591,7 +2590,7 @@ countImg: require('@/assets/images/dataBoard/online.jpg'), todayNum: offlineDevNum, todayLabel: 'notOnlineDev', - todayImg: require('@/assets/images/dataBoard/offline.jpg') + todayImg: require('@/assets/images/dataBoard/offline.jpg'), }" :list="environmentDevList" > @@ -2852,8 +2851,8 @@ export default { this.countBoxSize() }, computed: { - changVideoSize() {}, - closeVideo() {}, + changVideoSize() { }, + closeVideo() { }, transformTimestamp() { return function (timestamp) { let a = new Date(timestamp).getTime() @@ -3120,7 +3119,7 @@ export default { .line( (item.relatedX - this.minX).toFixed(2), Number((Number(item.relatedY) - this.minY).toFixed(2)) + - Number(item.posteriorArmLength), + Number(item.posteriorArmLength), (item.relatedX - this.minX).toFixed(2), (item.relatedY - this.minY - item.forearmLength).toFixed(2) ) @@ -3155,7 +3154,7 @@ export default { .text( (Number(item.relatedX) - this.minX).toFixed(2) - 6, (Number(item.relatedY) - this.minY).toFixed(2) - - item.forearmLength / 2, + item.forearmLength / 2, [ this.$t('message.dataBoard.forearmLong') + ':', item.forearmLength ? item.forearmLength : '0', @@ -3509,9 +3508,9 @@ export default { switch (Number(item.devType)) { case 1: console.log(item) - this.carBoxPos.x = parseFloat(item.mapX) + 50 + 'px' + this.carBoxPos.x = parseFloat(item.mapX) - 320 + 'px' this.carBoxPos.y = - parseFloat(item.mapY) / this.imgWidthScale - 20 + 'px' + parseFloat(item.mapY) / this.imgWidthScale - 280 + 'px' this.carDetail.name = item.name this.getCarTotalList(item) this.showCarDialog2 = true @@ -3617,7 +3616,7 @@ export default { ) if ( this.gantryCraneInfo.ratedSpan < - res.result.smallCraneMainHookHeight || + res.result.smallCraneMainHookHeight || res.result.smallCraneMainHookHeight < 0 ) { // 当前高度参数错误 @@ -4780,7 +4779,7 @@ img { .alarmList { position: absolute; right: 10px; - bottom: 100px; + bottom: 15px; background-color: #193b43; border-radius: 3px; text-align: center; @@ -4844,7 +4843,7 @@ img { .floatBtn { position: absolute; right: 10px; - bottom: 100px; + bottom: 50px; width: 50px; height: 50px; border-radius: 50%; diff --git a/src/views/projectAdmin/dataBoard/index.vue b/src/views/projectAdmin/dataBoard/index.vue index a590339b..4d27e714 100644 --- a/src/views/projectAdmin/dataBoard/index.vue +++ b/src/views/projectAdmin/dataBoard/index.vue @@ -41,9 +41,9 @@ controls loop > -
+
- {{ $t('message.companyDiagram.changeImg') }} + {{ $t('message.companyDiagram.changeImg') }} { this.$message.success(this.$t('message.companyDiagram.uploadSuccess')) //"上传成功" diff --git a/src/views/projectAdmin/dataBoardTwo/AiAnalysis.vue b/src/views/projectAdmin/dataBoardTwo/AiAnalysis.vue index a31b10c6..bfeb754a 100644 --- a/src/views/projectAdmin/dataBoardTwo/AiAnalysis.vue +++ b/src/views/projectAdmin/dataBoardTwo/AiAnalysis.vue @@ -413,7 +413,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() }, diff --git a/src/views/projectFront/BIMCenter/BIMManageV3.vue b/src/views/projectFront/BIMCenter/BIMManageV3.vue index a2a493c6..af57928e 100644 --- a/src/views/projectFront/BIMCenter/BIMManageV3.vue +++ b/src/views/projectFront/BIMCenter/BIMManageV3.vue @@ -3,29 +3,33 @@
- {{$t('message.BIMmanage.model')}} + {{ $t('message.BIMmanage.model') }} {{$t('message.BIMmanage.confingServer')}} + @click="configDialog = true" + style="position: absolute; right: 10px; top: 15px" + >{{ $t('message.BIMmanage.confingServer') }}
- +
-
{{item.modelName}}
+
{{ item.modelName }}
- +
-
{{$t('message.personnelPosition.mapManage.no_data')}}
+
+ {{ $t('message.personnelPosition.mapManage.no_data') }} +
- {{$t('message.BIMmanage.updateNewModel')}} + {{ $t('message.BIMmanage.updateNewModel') }}
@@ -67,7 +77,10 @@ label-width="120px" class="dialogFormBox" > - + - + - {{$t('message.BIMmanage.chooseFile')}} + {{ + $t('message.BIMmanage.chooseFile') + }} {{$t('message.BIMmanage.cleanFile')}} -
{{addBuildForm.modelUrl.name}}
+ @click=" + $refs.upload.clearFiles() + addBuildForm.modelUrl = '' + " + style="margin-left: 20px" + >{{ $t('message.BIMmanage.cleanFile') }} +
+ {{ addBuildForm.modelUrl.name }} +
@@ -114,13 +134,15 @@ @click="addBuildDialog = false" icon="el-icon-circle-close" size="medium" - >{{$t('message.personnelPosition.cancel')}} + >{{ $t('message.personnelPosition.cancel') }} {{$t('message.personnelPosition.determine')}} + >{{ $t('message.personnelPosition.determine') }}
@@ -131,15 +153,17 @@ :title="$t('message.BIMmanage.confingServerData')" :visible.sync="configDialog" width="700px" - :close-on-click-modal="configForm.id?true:false" - :show-close="configForm.id?true:false" + :close-on-click-modal="configForm.id ? true : false" + :show-close="configForm.id ? true : false" >

{{$t('message.BIMmanage.warnText')}}

+ style="margin-bottom: 20px; text-align: center" + > + {{ $t('message.BIMmanage.warnText') }} +

- {{'获取公钥'}} + {{ + '获取公钥' + }} - {{'获取私钥'}} + {{ + '获取私钥' + }}
- {{'获取模型帐号'}} + {{ + '获取模型帐号' + }} {{'取消'}} + >{{ '取消' }} {{$t('message.personnelPosition.determine')}} + >{{ $t('message.personnelPosition.determine') }}
- +
@@ -211,7 +246,7 @@ export default { components: { overview }, data() { return { - fileId:"", + fileId: "", dialogTableVisible: false, buildList: [], addBuildDialog: false, @@ -266,9 +301,13 @@ export default { appKey: "", appSecret: "", type: 1 - } + }, + uploadUrl: '', //文件上传地址 }; }, + created(){ + this.uploadUrl = this.$store.state.UPLOADURL + }, mounted() { this.getConfigFn(); this.loadData(); @@ -302,11 +341,11 @@ export default { window.open("https://bimface.com/user-console/login"); }, // 设为主模型 - setToMain(item,index) { + setToMain(item, index) { let currentIndex = index - for(let b in this.buildList){ - if(b!=currentIndex){ - this.buildList[b].isEnable = false + for (let b in this.buildList) { + if (b != currentIndex) { + this.buildList[b].isEnable = false } } startJlwApi({ @@ -322,8 +361,9 @@ export default { getJlwConfigApi({ projectSn: this.$store.state.projectSn, }).then(res => { - console.log('-----有吗',res) + console.log('-----有吗', res) if (res.result) { + this.configForm = res.result.bimfaceConfig; // this.configForm.appKey = res.result.bimfaceConfig this.loadData(); @@ -348,15 +388,15 @@ export default { exceedFn(files, fileList) { this.$message.warning( this.$t("message.BIMmanage.tipText") + - files.length + - this.$t("message.BIMmanage.tipText2") + - (files.length + fileList.length) + - this.$t("message.BIMmanage.tipText3") + files.length + + this.$t("message.BIMmanage.tipText2") + + (files.length + fileList.length) + + this.$t("message.BIMmanage.tipText3") ); }, changeUpload(file, fileList) { - // console.log("file", file, fileList); - // this.addBuildForm.modelUrl = file; + // console.log("file", file, fileList); + // this.addBuildForm.modelUrl = file; }, uploadMapSuccess(response) { console.log("上传成功的", response); @@ -373,12 +413,12 @@ export default { changeBuildFn(item, index) { // this.addBuildForm=JSON.parse(JSON.stringify(item)) this.activeBuildIndex = index; - if(this.buildList.length>0){ + if (this.buildList.length > 0) { this.fileId = parseInt(this.buildList[this.activeBuildIndex].fileId) } }, - + //获取模型列表 loadData() { @@ -386,7 +426,7 @@ export default { res => { console.log("------模型列表---", res); this.buildList = res.result.page.records; - res.result.page.records.forEach((item,index) => { + res.result.page.records.forEach((item, index) => { if (item.isEnable == 0) { item.isEnable = false; } else { @@ -395,7 +435,7 @@ export default { this.fileId = item.fileId } }); - + } ); }, @@ -422,12 +462,12 @@ export default { } this.addBuildForm.projectSn = this.$store.state.projectSn addJlwUploadApi(this.addBuildForm).then((res) => { - console.log('------------',res) - this.addBuildDialog = false; - this.loadData(); - this.$message.success( - this.$t("message.personnelPosition.add_success") - ); //添加成功！ + console.log('------------', res) + this.addBuildDialog = false; + this.loadData(); + this.$message.success( + this.$t("message.personnelPosition.add_success") + ); //添加成功！ }); } else { projectBimEditApi(this.addBuildForm).then(res => { @@ -448,11 +488,11 @@ export default { deleteFn(item) { this.$confirm( this.$t("message.BIMmanage.tipText4") + - "【" + - item.modelName + - "】," + - this.$t("message.BIMmanage.tipText5") + - "?", + "【" + + item.modelName + + "】," + + this.$t("message.BIMmanage.tipText5") + + "?", this.$t("message.BIMmanage.tip"), { confirmButtonText: this.$t("message.BIMmanage.confirm"), @@ -492,7 +532,7 @@ export default { display: inline-block; &::before { - content: ""; + content: ''; position: absolute; bottom: -1px; left: 0; @@ -525,7 +565,7 @@ export default { background-color: rgba(81, 129, 246, 0.1); &::after { - content: ""; + content: ''; position: absolute; top: 0; left: 0; diff --git a/src/views/projectFront/buildersDiary/diaryMod.vue b/src/views/projectFront/buildersDiary/diaryMod.vue index f153aac7..0a8be3c6 100644 --- a/src/views/projectFront/buildersDiary/diaryMod.vue +++ b/src/views/projectFront/buildersDiary/diaryMod.vue @@ -451,7 +451,7 @@ type="primary" > - {{ type == "add" ? "提交":$t('message.buildersDiary.edit') }}
diff --git a/src/views/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index a1136e46..a3c3fd60 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -56,7 +56,7 @@ > diff --git a/src/views/projectFront/laborManage/overview.vue b/src/views/projectFront/laborManage/overview.vue index a32819ba..fa87c620 100644 --- a/src/views/projectFront/laborManage/overview.vue +++ b/src/views/projectFront/laborManage/overview.vue @@ -513,7 +513,7 @@ export default { this.getNewestData(1) this.loadWeather() console.log(mqttUrl) - // client2 = mqtt.connect("tcp://182.90.224.147:1883", options); + // client2 = mqtt.connect("ws://182.90.224.147:8083/mqtt", options); client2 = mqtt.connect(mqttUrl, options) this.mqttMSG() }, diff --git a/src/views/projectFront/lifter/basicInfo.vue b/src/views/projectFront/lifter/basicInfo.vue index 7520ab15..2fc0c9e1 100644 --- a/src/views/projectFront/lifter/basicInfo.vue +++ b/src/views/projectFront/lifter/basicInfo.vue @@ -135,12 +135,12 @@ - + - + @@ -174,15 +174,15 @@ v-for="item in videoList" :key="item.itemId" :label="item.videoName" - :value="item.itemId" + :value="item.itemId+''" > - + @@ -276,7 +276,8 @@ export default { driverList: "", videoList: "", totalFloor: "", - generalContractorsId: "" + generalContractorsId: "", + alarmPushWorkerId:[], }, rules: { devName: [ @@ -301,7 +302,6 @@ export default { created() { this.projectSn = this.$store.state.projectSn; this.getLifterList(); - this.getAccountList() this.selectEnterpriseInfoList() }, @@ -320,6 +320,7 @@ export default { getAccountList() { getProjectChilderSystemUserListApi({ projectSn: this.projectSn }).then((result) => { this.accountList = result.result; + console.log(' this.accountList====', this.accountList); } ); }, @@ -357,6 +358,7 @@ export default { }; this.getWorkerInfoList(); this.getVideoItemList(); + this.getAccountList() }, //获取司机列表 @@ -379,6 +381,7 @@ export default { getVideoItemListApi(data).then((res) => { if (res.code == 200) { this.videoList = res.result.list; + console.log('videoList=========',this.videoList,); } }); }, @@ -394,6 +397,9 @@ export default { this.getWorkerInfoList(); this.getVideoItemList(); this.getDetailsData(val.id); + this.getAccountList() + // this.lifterTitle.alarmPushWorkerId=val.alarmPushWorkerId .split(',') + // .map((item) => String(item)) }, //删除 @@ -473,6 +479,7 @@ export default { //新增 console.log(data) if(!this.editType){ + data.alarmPushWorkerId= data.alarmPushWorkerId?data.alarmPushWorkerId.join(','):'' addLifterApi(data).then((res) => { if (res.code == 200) { this.lifterCraneDialog = false; diff --git a/src/views/projectFront/markingRoom/sampleManage.vue b/src/views/projectFront/markingRoom/sampleManage.vue index 01c0a21b..182fc78b 100644 --- a/src/views/projectFront/markingRoom/sampleManage.vue +++ b/src/views/projectFront/markingRoom/sampleManage.vue @@ -149,7 +149,8 @@ v-model="workerInfo.formingTime" type="datetime" :placeholder="$t('message.projectInfo.chooseDateAndTime')" - value-format="yyyy-MM-dd hh:mm" + value-format="yyyy-MM-dd HH:mm:ss" + clearable > - +