Merge branch 'dev-yjl' into 'shenzhen-dev'
成润页面bug修复 See merge request !161
This commit is contained in:
袁晶琳
commit
85eadb4bdc
@ -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 = [{
|
||||
|
||||
@ -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') {
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -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: [
|
||||
"系统管理员",
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -58,6 +58,16 @@
|
||||
}}</span>
|
||||
</li>
|
||||
</ul>
|
||||
<div
|
||||
class="placeholderBox placeholderBox2"
|
||||
v-if="devStatusList.length == 0"
|
||||
>
|
||||
<img src="@/assets/images/noData3.png" alt="" srcset="" />
|
||||
<p>
|
||||
<!-- 暂无数据 -->
|
||||
{{$t('message.dataBoard.nodata')}}
|
||||
</p>
|
||||
</div>
|
||||
</vue-scroll>
|
||||
</div>
|
||||
</div>
|
||||
@ -115,7 +125,18 @@
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
</vue-seamless-scroll>
|
||||
<div
|
||||
class="placeholderBox placeholderBox2"
|
||||
v-if="earlyWarning.length == 0"
|
||||
>
|
||||
<img src="@/assets/images/noData3.png" alt="" srcset="" />
|
||||
<p>
|
||||
<!-- 暂无数据 -->
|
||||
{{$t('message.dataBoard.nodata')}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -174,9 +195,19 @@
|
||||
</div>
|
||||
</div>
|
||||
</vue-seamless-scroll>
|
||||
<div
|
||||
class="placeholderBox placeholderBox2"
|
||||
v-if="captureRecord.length == 0"
|
||||
>
|
||||
<img src="@/assets/images/noData3.png" alt="" srcset="" />
|
||||
<p>
|
||||
<!-- 暂无数据 -->
|
||||
{{$t('message.dataBoard.nodata')}}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="blockBox blockBox2">
|
||||
</div>
|
||||
<div class="blockBox blockBox2" style="height:calc(33.33% - 23px) !important;">
|
||||
<div class="blockTitle">
|
||||
<!-- 预警趋势 -->
|
||||
{{ $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,11 +701,18 @@ 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',
|
||||
@ -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 {
|
||||
|
||||
@ -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()
|
||||
},
|
||||
|
||||
@ -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"
|
||||
></DataCard>
|
||||
@ -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"
|
||||
></DataCard>
|
||||
@ -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,
|
||||
},
|
||||
]"
|
||||
>
|
||||
<p>
|
||||
@ -522,8 +522,8 @@
|
||||
{
|
||||
alert:
|
||||
lifterCurrentData.obliguityXAlarm != 0 ||
|
||||
lifterCurrentData.obliguityXPreAlarm != 0
|
||||
}
|
||||
lifterCurrentData.obliguityXPreAlarm != 0,
|
||||
},
|
||||
]"
|
||||
>
|
||||
<p>
|
||||
@ -544,8 +544,8 @@
|
||||
{
|
||||
alert:
|
||||
lifterCurrentData.obliguityYAlarm != 0 ||
|
||||
lifterCurrentData.obliguityYPreAlarm != 0
|
||||
}
|
||||
lifterCurrentData.obliguityYPreAlarm != 0,
|
||||
},
|
||||
]"
|
||||
>
|
||||
<p>
|
||||
@ -566,8 +566,8 @@
|
||||
{
|
||||
alert:
|
||||
lifterCurrentData.speedAlarm != 0 ||
|
||||
lifterCurrentData.speedPreAlarm != 0
|
||||
}
|
||||
lifterCurrentData.speedPreAlarm != 0,
|
||||
},
|
||||
]"
|
||||
>
|
||||
<p>
|
||||
@ -587,8 +587,8 @@
|
||||
{
|
||||
alert:
|
||||
lifterCurrentData.windSpeedAlarm != 0 ||
|
||||
lifterCurrentData.windSpeedPreAlarm != 0
|
||||
}
|
||||
lifterCurrentData.windSpeedPreAlarm != 0,
|
||||
},
|
||||
]"
|
||||
>
|
||||
<p>
|
||||
@ -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)',
|
||||
}"
|
||||
>
|
||||
<div class="dialogBlock left">
|
||||
@ -1125,7 +1125,7 @@
|
||||
<div class="boltDetailsRight_top_item">
|
||||
<p
|
||||
:class="{
|
||||
alarmNumber: afterAnalysisDataInfo.alarmNum > 0
|
||||
alarmNumber: afterAnalysisDataInfo.alarmNum > 0,
|
||||
}"
|
||||
>
|
||||
{{ afterAnalysisDataInfo.alarmNum }}
|
||||
@ -1229,7 +1229,7 @@
|
||||
:style="{
|
||||
left: coordData.coordX + 8 + 'px',
|
||||
height: coordData.lineLength + 'px',
|
||||
top: '78px'
|
||||
top: '78px',
|
||||
}"
|
||||
/>
|
||||
<div
|
||||
@ -1238,7 +1238,7 @@
|
||||
v-show="hideGoods"
|
||||
:style="{
|
||||
top: coordData.coordY + 'px',
|
||||
left: coordData.coordX - 6 + 'px'
|
||||
left: coordData.coordX - 6 + 'px',
|
||||
}"
|
||||
>
|
||||
<img src="@/assets/images/towericon/hock.png" />
|
||||
@ -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',
|
||||
}"
|
||||
>
|
||||
<img
|
||||
@ -1294,7 +1294,7 @@
|
||||
:style="{
|
||||
transform: `rotate(${
|
||||
(towerCurrentInfo || {}).angle || ''
|
||||
}deg)`
|
||||
}deg)`,
|
||||
}"
|
||||
>
|
||||
<span></span>
|
||||
@ -1388,7 +1388,7 @@
|
||||
:class="{
|
||||
red:
|
||||
towerCurrentInfo.maxRangeAlarm != 0 ||
|
||||
towerCurrentInfo.minRangeAlarm != 0
|
||||
towerCurrentInfo.minRangeAlarm != 0,
|
||||
}"
|
||||
>
|
||||
<span>
|
||||
@ -1444,7 +1444,7 @@
|
||||
:class="{
|
||||
red:
|
||||
towerCurrentInfo.obliguityXAlarm != 0 ||
|
||||
towerCurrentInfo.obliguityYAlarm != 0
|
||||
towerCurrentInfo.obliguityYAlarm != 0,
|
||||
}"
|
||||
>
|
||||
<span>
|
||||
@ -1603,7 +1603,7 @@
|
||||
:class="{
|
||||
red:
|
||||
towerCurrentInfo.maxRangeAlarm != 0 ||
|
||||
towerCurrentInfo.minRangeAlarm != 0
|
||||
towerCurrentInfo.minRangeAlarm != 0,
|
||||
}"
|
||||
>
|
||||
<span>
|
||||
@ -1657,7 +1657,7 @@
|
||||
:class="{
|
||||
red:
|
||||
towerCurrentInfo.obliguityXAlarm != 0 ||
|
||||
towerCurrentInfo.obliguityYAlarm != 0
|
||||
towerCurrentInfo.obliguityYAlarm != 0,
|
||||
}"
|
||||
>
|
||||
<span>
|
||||
@ -1780,7 +1780,7 @@
|
||||
<div
|
||||
class="dialogDataBox2"
|
||||
:style="{
|
||||
'margin-top': company == 'longguang' ? '24px' : '100px'
|
||||
'margin-top': company == 'longguang' ? '24px' : '100px',
|
||||
}"
|
||||
>
|
||||
<p>
|
||||
@ -2043,7 +2043,6 @@
|
||||
<div
|
||||
class="environBox pointDialog_s"
|
||||
v-show="showCarDialog2"
|
||||
:style="{ position: 'absolute', left: carBoxPos.x, top: carBoxPos.y }"
|
||||
>
|
||||
<div class="title">
|
||||
{{ 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"
|
||||
></DataCard>
|
||||
@ -2852,8 +2851,8 @@ export default {
|
||||
this.countBoxSize()
|
||||
},
|
||||
computed: {
|
||||
changVideoSize() {},
|
||||
closeVideo() {},
|
||||
changVideoSize() { },
|
||||
closeVideo() { },
|
||||
transformTimestamp() {
|
||||
return function (timestamp) {
|
||||
let a = new Date(timestamp).getTime()
|
||||
@ -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
|
||||
@ -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%;
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
></video>
|
||||
<div @mouseenter="showChangeImg = true" @mouseleave="showChangeImg = false" v-if="optionListIndex == 2" class="imgBox">
|
||||
<el-upload
|
||||
v-if="showChangeImg"
|
||||
|
||||
style="position: absolute; left: 420px; top: 230px"
|
||||
:action="$store.state.UPLOADURL"
|
||||
:on-success="file => handleSuccessTwo(file, 1)"
|
||||
@ -53,14 +53,14 @@
|
||||
:show-file-list="false"
|
||||
>
|
||||
<!-- 更换图片 -->
|
||||
<span style="border: 1px solid #ffffff; padding: 5px">{{ $t('message.companyDiagram.changeImg') }}</span>
|
||||
<span v-if="showChangeImg" style="border: 1px solid #ffffff; padding: 5px">{{ $t('message.companyDiagram.changeImg') }}</span>
|
||||
</el-upload>
|
||||
<img
|
||||
style="
|
||||
width: 686px;
|
||||
margin-left: 113px;
|
||||
margin-top: 16px;
|
||||
height: 430px;
|
||||
height: 345px;
|
||||
"
|
||||
:src="fileUrl + imgUrl"
|
||||
alt=""
|
||||
@ -887,7 +887,7 @@ export default {
|
||||
//保存或删除宣传视频
|
||||
saveOrDeleteVideo(url) {
|
||||
editProjectInfo({
|
||||
projectId: this.projectData.projectId,
|
||||
projectSn: this.$store.state.projectSn,
|
||||
videoUrl: url
|
||||
}).then(res => {
|
||||
this.$message.success(this.$t('message.companyDiagram.uploadSuccess')) //"上传成功"
|
||||
|
||||
@ -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()
|
||||
},
|
||||
|
||||
@ -3,29 +3,33 @@
|
||||
<div class="left fullHeight whiteBlock">
|
||||
<div class="title">
|
||||
<!-- 模型 -->
|
||||
<span>{{$t('message.BIMmanage.model')}}</span>
|
||||
<span>{{ $t('message.BIMmanage.model') }}</span>
|
||||
<!-- <p @click="configDialog=true" style="position:absolute;right:10px;top:15px">配置服务器</p> -->
|
||||
<el-button
|
||||
type="default"
|
||||
size="mini"
|
||||
@click="configDialog=true"
|
||||
style="position:absolute;right:10px;top:15px"
|
||||
>{{$t('message.BIMmanage.confingServer')}}</el-button>
|
||||
@click="configDialog = true"
|
||||
style="position: absolute; right: 10px; top: 15px"
|
||||
>{{ $t('message.BIMmanage.confingServer') }}</el-button
|
||||
>
|
||||
</div>
|
||||
<div class="list_content">
|
||||
<vue-scroll v-if="buildList.length>0">
|
||||
<vue-scroll v-if="buildList.length > 0">
|
||||
<div
|
||||
class="flex content_data"
|
||||
v-for="(item,index) in buildList"
|
||||
v-for="(item, index) in buildList"
|
||||
:key="index"
|
||||
:class=" {'active': activeBuildIndex==index }"
|
||||
@click="changeBuildFn(item,index)"
|
||||
:class="{ active: activeBuildIndex == index }"
|
||||
@click="changeBuildFn(item, index)"
|
||||
>
|
||||
<div>{{item.modelName}}</div>
|
||||
<div>{{ item.modelName }}</div>
|
||||
<div class="flex2">
|
||||
<el-switch v-model="item.isEnable" @change="setToMain(item,index)"></el-switch>
|
||||
<el-switch
|
||||
v-model="item.isEnable"
|
||||
@change="setToMain(item, index)"
|
||||
></el-switch>
|
||||
<img
|
||||
style="margin-left: 8px;"
|
||||
style="margin-left: 8px"
|
||||
@click.stop="deleteFn(item)"
|
||||
src="@/assets/images/icon-delete.png"
|
||||
class="icon"
|
||||
@ -33,20 +37,26 @@
|
||||
</div>
|
||||
</div>
|
||||
</vue-scroll>
|
||||
<div class="placeholderBox" v-else>{{$t('message.personnelPosition.mapManage.no_data')}}</div>
|
||||
<div class="placeholderBox" v-else>
|
||||
{{ $t('message.personnelPosition.mapManage.no_data') }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="addFirm" @click="addFn">
|
||||
<!-- {{$t('message.personnelPosition.mapManage.new_build')}} -->
|
||||
<!-- 上传新模型 -->
|
||||
{{$t('message.BIMmanage.updateNewModel')}}
|
||||
{{ $t('message.BIMmanage.updateNewModel') }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="right fullHeight">
|
||||
<div class="mapContainer whiteBlock">
|
||||
<!-- :fileId="buildList.length>0?parseInt(buildList[activeBuildIndex].fileId):''" -->
|
||||
<overview
|
||||
:urn="buildList.length>0?buildList[activeBuildIndex].bimUrn:''"
|
||||
:fileId ="buildList.length>0?parseInt(buildList[activeBuildIndex].fileId):''"
|
||||
:urn="buildList.length > 0 ? buildList[activeBuildIndex].bimUrn : ''"
|
||||
:fileId="
|
||||
buildList.length > 0
|
||||
? parseInt(buildList[activeBuildIndex].fileId)
|
||||
: ''
|
||||
"
|
||||
:opendrawlabel="true"
|
||||
></overview>
|
||||
</div>
|
||||
@ -67,7 +77,10 @@
|
||||
label-width="120px"
|
||||
class="dialogFormBox"
|
||||
>
|
||||
<el-form-item :label="$t('message.BIMmanage.modelName')" prop="modelName">
|
||||
<el-form-item
|
||||
:label="$t('message.BIMmanage.modelName')"
|
||||
prop="modelName"
|
||||
>
|
||||
<el-input
|
||||
v-model="addBuildForm.modelName"
|
||||
:placeholder="$t('message.personnelPosition.please_enter')"
|
||||
@ -79,13 +92,16 @@
|
||||
:placeholder="$t('message.personnelPosition.please_enter')"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('message.BIMmanage.modelFile')" prop="modelUrl">
|
||||
<el-form-item
|
||||
:label="$t('message.BIMmanage.modelFile')"
|
||||
prop="modelUrl"
|
||||
>
|
||||
<!-- :auto-upload="false" $http.defaults.baseURL+'xmgl/projectBim/saveBim' -->
|
||||
<el-upload
|
||||
class="uploadBtn"
|
||||
ref="upload"
|
||||
name="files"
|
||||
action="http://47.97.202.104:6023/upload/image"
|
||||
:action="uploadUrl"
|
||||
:show-file-list="true"
|
||||
:data="uploadParams"
|
||||
:on-change="changeUpload"
|
||||
@ -94,18 +110,22 @@
|
||||
:on-exceed="exceedFn"
|
||||
>
|
||||
<!-- <span slot="trigger">选择文件</span> -->
|
||||
<el-button
|
||||
slot="trigger"
|
||||
type="primary"
|
||||
size="medium"
|
||||
>{{$t('message.BIMmanage.chooseFile')}}</el-button>
|
||||
<el-button slot="trigger" type="primary" size="medium">{{
|
||||
$t('message.BIMmanage.chooseFile')
|
||||
}}</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="medium"
|
||||
@click="$refs.upload.clearFiles();addBuildForm.modelUrl=''"
|
||||
style="margin-left:20px"
|
||||
>{{$t('message.BIMmanage.cleanFile')}}</el-button>
|
||||
<div slot="tip" class="el-upload__tip">{{addBuildForm.modelUrl.name}}</div>
|
||||
@click="
|
||||
$refs.upload.clearFiles()
|
||||
addBuildForm.modelUrl = ''
|
||||
"
|
||||
style="margin-left: 20px"
|
||||
>{{ $t('message.BIMmanage.cleanFile') }}</el-button
|
||||
>
|
||||
<div slot="tip" class="el-upload__tip">
|
||||
{{ addBuildForm.modelUrl.name }}
|
||||
</div>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
<div class="dialog-footer">
|
||||
@ -114,13 +134,15 @@
|
||||
@click="addBuildDialog = false"
|
||||
icon="el-icon-circle-close"
|
||||
size="medium"
|
||||
>{{$t('message.personnelPosition.cancel')}}</el-button>
|
||||
>{{ $t('message.personnelPosition.cancel') }}</el-button
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="submitData"
|
||||
size="medium"
|
||||
>{{$t('message.personnelPosition.determine')}}</el-button>
|
||||
>{{ $t('message.personnelPosition.determine') }}</el-button
|
||||
>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
@ -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"
|
||||
>
|
||||
<div class="dialog_content">
|
||||
<p
|
||||
class="redText"
|
||||
v-show="configForm.id"
|
||||
style="margin-bottom:20px;text-align:center"
|
||||
>{{$t('message.BIMmanage.warnText')}}</p>
|
||||
style="margin-bottom: 20px; text-align: center"
|
||||
>
|
||||
{{ $t('message.BIMmanage.warnText') }}
|
||||
</p>
|
||||
<el-form
|
||||
size="medium"
|
||||
:model="configForm"
|
||||
@ -153,7 +177,9 @@
|
||||
v-model="configForm.appKey"
|
||||
:placeholder="$t('message.personnelPosition.please_enter')"
|
||||
></el-input>
|
||||
<el-button type="text" @click="getIntro" size="medium">{{'获取公钥'}}</el-button>
|
||||
<el-button type="text" @click="getIntro" size="medium">{{
|
||||
'获取公钥'
|
||||
}}</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item :label="'AppSecrt(私钥):'" prop="appSecret">
|
||||
<el-input
|
||||
@ -163,29 +189,38 @@
|
||||
v-model="configForm.appSecret"
|
||||
:placeholder="$t('message.personnelPosition.please_enter')"
|
||||
></el-input>
|
||||
<el-button type="text" @click="getIntro" size="medium">{{'获取私钥'}}</el-button>
|
||||
<el-button type="text" @click="getIntro" size="medium">{{
|
||||
'获取私钥'
|
||||
}}</el-button>
|
||||
</el-form-item>
|
||||
<div class="dialog-footer">
|
||||
<el-button type="primary" @click="registerCount" size="medium">{{'获取模型帐号'}}</el-button>
|
||||
<el-button type="primary" @click="registerCount" size="medium">{{
|
||||
'获取模型帐号'
|
||||
}}</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-close"
|
||||
@click="configDialog = false"
|
||||
size="medium"
|
||||
>{{'取消'}}</el-button>
|
||||
>{{ '取消' }}</el-button
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-circle-check"
|
||||
@click="submitConfigData"
|
||||
size="medium"
|
||||
>{{$t('message.personnelPosition.determine')}}</el-button>
|
||||
>{{ $t('message.personnelPosition.determine') }}</el-button
|
||||
>
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="使用说明" :visible.sync="dialogTableVisible">
|
||||
<img style="width: 100%; height: 100%" src="@/assets/images/projectImg/jlwModel.png" />
|
||||
<img
|
||||
style="width: 100%; height: 100%"
|
||||
src="@/assets/images/projectImg/jlwModel.png"
|
||||
/>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
@ -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,10 +341,10 @@ 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){
|
||||
for (let b in this.buildList) {
|
||||
if (b != currentIndex) {
|
||||
this.buildList[b].isEnable = false
|
||||
}
|
||||
}
|
||||
@ -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();
|
||||
@ -373,7 +413,7 @@ 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)
|
||||
}
|
||||
},
|
||||
@ -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 {
|
||||
@ -422,7 +462,7 @@ export default {
|
||||
}
|
||||
this.addBuildForm.projectSn = this.$store.state.projectSn
|
||||
addJlwUploadApi(this.addBuildForm).then((res) => {
|
||||
console.log('------------',res)
|
||||
console.log('------------', res)
|
||||
this.addBuildDialog = false;
|
||||
this.loadData();
|
||||
this.$message.success(
|
||||
@ -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;
|
||||
|
||||
@ -88,7 +88,7 @@
|
||||
<el-col :span="5">
|
||||
<!-- 项目负责人 -->
|
||||
<!-- <label class="xingxing"></label> -->
|
||||
<el-form-item class="xingxing":label="$t('message.buildersDiary.projectDutyPeople')+'：'" prop="projectDirector">
|
||||
<el-form-item class="xingxing" :label="$t('message.buildersDiary.projectDutyPeople')+'：'" prop="projectDirector">
|
||||
<el-input v-model="ruleForm.projectDirector"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -451,7 +451,7 @@
|
||||
type="primary"
|
||||
>
|
||||
<!-- "新增" : "编辑" -->
|
||||
{{ type == "add" ? "提交":$t('message.buildersDiary.edit') }}</el-button
|
||||
{{ type == "add" ? "提交":"保存" }}</el-button
|
||||
>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="driverName"
|
||||
prop="driverWorkerName"
|
||||
:label="$t('message.carManage.driverName')"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
|
||||
@ -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()
|
||||
},
|
||||
|
||||
@ -135,12 +135,12 @@
|
||||
<el-input v-model="lifterForm.maxHeight"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 最大载重(kg) -->
|
||||
<el-form-item :label="$t('message.lifter.maximumPayload')" prop="maxLoad">
|
||||
<el-form-item :label="$t('message.lifter.maximumPayload')" prop="maxLoad" >
|
||||
<el-input v-model="lifterForm.maxLoad"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 总楼层数 -->
|
||||
<el-form-item :label="$t('message.lifter.totalFloors')" prop="totalFloor">
|
||||
<el-input v-model="lifterForm.totalFloor"></el-input>
|
||||
<el-input type="number" v-model="lifterForm.totalFloor"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 升降机操作人员 liftOperator 司机 driver -->
|
||||
<el-form-item :label="company == 'longguang'? $t('message.lifter.liftOperator') : $t('message.lifter.driver') " prop="recordNumber">
|
||||
@ -174,15 +174,15 @@
|
||||
v-for="item in videoList"
|
||||
:key="item.itemId"
|
||||
:label="item.videoName"
|
||||
:value="item.itemId"
|
||||
:value="item.itemId+''"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 报警推送人 -->
|
||||
<el-form-item :label="$t('message.lifter.alarmPusher')" prop="recordNumber">
|
||||
<el-form-item :label="$t('message.lifter.alarmPusher')" prop="recordNumber" v-if="!this.editType">
|
||||
<el-select
|
||||
v-model="lifterForm.videoList"
|
||||
v-model="lifterForm.alarmPushWorkerId"
|
||||
filterable
|
||||
multiple
|
||||
collapse-tags
|
||||
@ -191,7 +191,7 @@
|
||||
>
|
||||
<el-option
|
||||
v-for="item in accountList"
|
||||
:key="item.workerId+'b'"
|
||||
:key="item.userId"
|
||||
:label="item.realName"
|
||||
:value="item.userId"
|
||||
>
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
>
|
||||
</el-date-picker>
|
||||
<!-- <el-input
|
||||
|
||||
@ -594,6 +594,7 @@
|
||||
this.floorDialogTitle = this.$t('message.personnelPosition.mapManage.new_floor');//新增楼层
|
||||
this.addFloorDialog = true;
|
||||
this.isAdd = true;
|
||||
this.floorForm={}
|
||||
}
|
||||
},
|
||||
editFloorFn(item) {
|
||||
|
||||
@ -352,7 +352,6 @@ export default {
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.loadBuildData();
|
||||
this.getListData();
|
||||
},
|
||||
methods: {
|
||||
@ -380,6 +379,7 @@ export default {
|
||||
});
|
||||
},
|
||||
addFn() {
|
||||
this.loadBuildData();
|
||||
this.isAdd = true;
|
||||
// this.dialogTitle = this.$t(
|
||||
// "message.personnelPosition.cardManage.dialog_edit.addText"
|
||||
|
||||
@ -241,7 +241,7 @@
|
||||
v-for="item in options"
|
||||
:key="item.workerId"
|
||||
:label="item.workerName"
|
||||
:value="item.workerId"
|
||||
:value="Number(item.workerId)"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user