admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
成润页面bug修复

See merge request !161
This commit is contained in:
袁晶琳 2023-05-13 17:04:59 +08:00
commit 85eadb4bdc
19 changed files with 246 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/config.js
View File

@ -40,15 +40,15 @@ var baseUrl = window.location.protocol + '//' + window.location.host + '/';
var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目账号登录 var LOGINTYPE = 1; // 1.通用 2.只支持企业账号登录 3.只支持项目账号登录
var showNotBuyMoudle = false; //是否展示未解锁产品 var showNotBuyMoudle = false; //是否展示未解锁产品
var isDockingToWoer = 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 // var mqttUrl = 'ws://10.139.72.12:8083/mqtt' //longguang
if (COMPANY == '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://10.139.72.12:8083/mqtt'
// mqttUrl = 'ws://121.35.243.71:8083/mqtt' // mqttUrl = 'ws://121.35.243.71:8083/mqtt'
mqttUrl = 'ws://zhgdmqtt.loganwy.com:80/mqtt' mqttUrl = 'ws://zhgdmqtt.loganwy.com:80/mqtt'
} else if (COMPANY == 'henan') { } 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 enabledProjectV2 = 2; //是否用精益建造版 1：精益建造版(黑色) 2： 最初版（白色） 3：数据看板UI蓝色版（白色） 4:湛蓝色
var CONSTRUCTIONSTAGE = [{ var CONSTRUCTIONSTAGE = [{

5
src/assets/js/http.js
View File

@ -42,7 +42,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 // 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://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://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://192.168.34.231: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://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 // 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') { } else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com' axios.defaults.baseURL = 'https://www.ceshi.com'
} else if (process.env.NODE_ENV == 'production') { } else if (process.env.NODE_ENV == 'production') {

4
src/components/message.vue
View File

@ -153,7 +153,7 @@ export default {
if (process.env.NODE_ENV == 'development') { if (process.env.NODE_ENV == 'development') {
this.userId = this.$store.state.userInfo.userId this.userId = this.$store.state.userInfo.userId
this.topicName = this.$store.state.userInfo.scope 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) client = mqtt.connect(mqttUrl, options)
this.getData() this.getData()
this.mqttMSG() this.mqttMSG()
@ -161,7 +161,7 @@ export default {
} else if (process.env.NODE_ENV == 'production') { } else if (process.env.NODE_ENV == 'production') {
this.userId = this.$store.state.userInfo.userId this.userId = this.$store.state.userInfo.userId
this.topicName = this.$store.state.userInfo.scope 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) client = mqtt.connect(mqttUrl, options)
this.getData() this.getData()
this.mqttMSG() this.mqttMSG()

18
src/store/index.js
View File

@ -48,12 +48,12 @@ export default new Vuex.Store({
BASEURL: baseUrl BASEURL: baseUrl
? baseUrl ? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境 : window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL: // UPLOADURL:
window.location.protocol + // window.location.protocol +
"//" + // "//" +
window.location.host + // window.location.host +
"/upload/image", //正式环境 // "/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl
// ? baseUrl // ? baseUrl
@ -87,14 +87,16 @@ export default new Vuex.Store({
// FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
// UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
// FILEURL: 'http://182.90.224.147:100/image/',//演示平台 // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
// UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
// FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
// UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
// FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地 // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
// FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
// UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
// FILEURL: 'http://42.194.144.62:8088/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: [ ACCOUNTTYPE: [
"系统管理员", "系统管理员",

2
src/views/companyFront/project/overview.vue
View File

@ -1559,7 +1559,7 @@ export default {
companySn: this.$store.state.userInfo.headquartersSn, companySn: this.$store.state.userInfo.headquartersSn,
propagateFile: url, propagateFile: url,
}).then((res) => { }).then((res) => {
this.$message.success("上传成功"); // this.$message.success("上传成功");
var json = this.$store.state.userInfo; var json = this.$store.state.userInfo;
json.propagateFile = url == "-1" ? "" : url; json.propagateFile = url == "-1" ? "" : url;
this.$store.commit("setUserInfo", json); this.$store.commit("setUserInfo", json);

61
src/views/projectAdmin/dataBoard/AiAnalysis.vue
View File

@ -58,6 +58,16 @@
}}</span> }}</span>
</li> </li>
</ul> </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> </vue-scroll>
</div> </div>
</div> </div>
@ -115,7 +125,18 @@
</div> </div>
</li> </li>
</ul> </ul>
</vue-seamless-scroll> </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> </div>
</div> </div>
@ -174,9 +195,19 @@
</div> </div>
</div> </div>
</vue-seamless-scroll> </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>
</div> </div>
<div class="blockBox blockBox2"> <div class="blockBox blockBox2" style="height:calc(33.33% - 23px) !important;">
<div class="blockTitle"> <div class="blockTitle">
<!-- 预警趋势 --> <!-- 预警趋势 -->
{{ $t('message.dataBoard.warningTrend') }} {{ $t('message.dataBoard.warningTrend') }}
@ -413,7 +444,7 @@ export default {
this.selectAiAnalyseHardWareAlarmList() this.selectAiAnalyseHardWareAlarmList()
}, },
mounted() { 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); client = mqtt.connect(mqttUrl, options);
this.mqttMSG(); this.mqttMSG();
}, },
@ -670,12 +701,19 @@ export default {
// ['总计', '安全帽报警','明火报警','聚众报警','倒地报警','越界报警','闯入报警','反光衣报警','吸烟报警'], // ['总计', '安全帽报警','明火报警','聚众报警','倒地报警','越界报警','闯入报警','反光衣报警','吸烟报警'],
data: this.$t('message.dataBoard.alarmTypeArray'), data: this.$t('message.dataBoard.alarmTypeArray'),
textStyle: { textStyle: {
// fontSize: 14,//字体大小 fontSize: 10,//字体大小
color: '#FEFFFF' //字体颜色 color: '#ccc' //字体颜色
}, },
left: '10%', left: '6%',
top: '6%' top: '7%',
}, },
grid: {
top:'20%',
left: '3%',
right: '4%',
bottom: '29%',
containLabel: true
},
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
position: [20, 20] position: [20, 20]
@ -687,7 +725,8 @@ export default {
formatter: '{value}', formatter: '{value}',
textStyle: { 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}', formatter: '{value}',
textStyle: { textStyle: {
//改变刻度字体样式 //改变刻度字体样式
color: 'RGB(254,255,255,0.5)' color: 'RGB(254,255,255,0.5)',
fontSize: 10,
} }
}, },
splitLine: { splitLine: {
show: true, show: true,
lineStyle: { lineStyle: {
type: 'dashed', 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; //align-items: center;
justify-content: center; justify-content: center;
li { li {
margin-bottom: 10px; margin-bottom: 5px;
display: flex; display: flex;
align-items: center; align-items: center;
span { span {

2
src/views/projectAdmin/dataBoard/AiAnalysisCopy.vue
View File

@ -315,7 +315,7 @@ export default {
// this.selectAiAnalyseHardWareAlarmList() // this.selectAiAnalyseHardWareAlarmList()
}, },
mounted() { 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) client = mqtt.connect(mqttUrl, options)
this.mqttMSG() this.mqttMSG()
}, },

73
src/views/projectAdmin/dataBoard/digitalSite/index.vue
View File

@ -52,7 +52,7 @@
countImg: require('@/assets/images/dataBoard/tower.png'), countImg: require('@/assets/images/dataBoard/tower.png'),
todayNum: totalDangerTowerDev, todayNum: totalDangerTowerDev,
todayLabel: 'todayAlarmCount', todayLabel: 'todayAlarmCount',
todayImg: require('@/assets/images/dataBoard/alarmcount.png') todayImg: require('@/assets/images/dataBoard/alarmcount.png'),
}" }"
:list="towerList" :list="towerList"
></DataCard> ></DataCard>
@ -65,7 +65,7 @@
countImg: require('@/assets/images/dataBoard/lifter.png'), countImg: require('@/assets/images/dataBoard/lifter.png'),
todayNum: totalDangerLifterDev, todayNum: totalDangerLifterDev,
todayLabel: 'todayAlarmCount', todayLabel: 'todayAlarmCount',
todayImg: require('@/assets/images/dataBoard/alarmcount.png') todayImg: require('@/assets/images/dataBoard/alarmcount.png'),
}" }"
:list="lifterList" :list="lifterList"
></DataCard> ></DataCard>
@ -147,7 +147,7 @@
:key="index" :key="index"
:style="{ :style="{
top: item.mapY / imgHeightScale - 36 + 'px', top: item.mapY / imgHeightScale - 36 + 'px',
left: item.mapX / imgWidthScale - 22 + 'px' left: item.mapX / imgWidthScale - 22 + 'px',
}" }"
@click="clickPoint(item)" @click="clickPoint(item)"
> >
@ -459,8 +459,8 @@
{ {
alert: alert:
lifterCurrentData.heightAlarm != 0 || lifterCurrentData.heightAlarm != 0 ||
lifterCurrentData.heightPreAlarm != 0 lifterCurrentData.heightPreAlarm != 0,
} },
]" ]"
> >
<p> <p>
@ -522,8 +522,8 @@
{ {
alert: alert:
lifterCurrentData.obliguityXAlarm != 0 || lifterCurrentData.obliguityXAlarm != 0 ||
lifterCurrentData.obliguityXPreAlarm != 0 lifterCurrentData.obliguityXPreAlarm != 0,
} },
]" ]"
> >
<p> <p>
@ -544,8 +544,8 @@
{ {
alert: alert:
lifterCurrentData.obliguityYAlarm != 0 || lifterCurrentData.obliguityYAlarm != 0 ||
lifterCurrentData.obliguityYPreAlarm != 0 lifterCurrentData.obliguityYPreAlarm != 0,
} },
]" ]"
> >
<p> <p>
@ -566,8 +566,8 @@
{ {
alert: alert:
lifterCurrentData.speedAlarm != 0 || lifterCurrentData.speedAlarm != 0 ||
lifterCurrentData.speedPreAlarm != 0 lifterCurrentData.speedPreAlarm != 0,
} },
]" ]"
> >
<p> <p>
@ -587,8 +587,8 @@
{ {
alert: alert:
lifterCurrentData.windSpeedAlarm != 0 || lifterCurrentData.windSpeedAlarm != 0 ||
lifterCurrentData.windSpeedPreAlarm != 0 lifterCurrentData.windSpeedPreAlarm != 0,
} },
]" ]"
> >
<p> <p>
@ -885,7 +885,7 @@
class="pointDialogContent" class="pointDialogContent"
:style="{ :style="{
margin: company == 'longguang' ? '0 70px' : '40px 70px', 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"> <div class="dialogBlock left">
@ -1125,7 +1125,7 @@
<div class="boltDetailsRight_top_item"> <div class="boltDetailsRight_top_item">
<p <p
:class="{ :class="{
alarmNumber: afterAnalysisDataInfo.alarmNum > 0 alarmNumber: afterAnalysisDataInfo.alarmNum > 0,
}" }"
> >
{{ afterAnalysisDataInfo.alarmNum }} {{ afterAnalysisDataInfo.alarmNum }}
@ -1229,7 +1229,7 @@
:style="{ :style="{
left: coordData.coordX + 8 + 'px', left: coordData.coordX + 8 + 'px',
height: coordData.lineLength + 'px', height: coordData.lineLength + 'px',
top: '78px' top: '78px',
}" }"
/> />
<div <div
@ -1238,7 +1238,7 @@
v-show="hideGoods" v-show="hideGoods"
:style="{ :style="{
top: coordData.coordY + 'px', top: coordData.coordY + 'px',
left: coordData.coordX - 6 + 'px' left: coordData.coordX - 6 + 'px',
}" }"
> >
<img src="@/assets/images/towericon/hock.png" /> <img src="@/assets/images/towericon/hock.png" />
@ -1262,7 +1262,7 @@
left: coordData.coordX + 8 + 'px', left: coordData.coordX + 8 + 'px',
height: coordData.lineLength + 'px', height: coordData.lineLength + 'px',
width: '5px', width: '5px',
top: '126px' top: '126px',
}" }"
/> />
@ -1273,7 +1273,7 @@
v-show="hideGoods && company == 'longguang'" v-show="hideGoods && company == 'longguang'"
:style="{ :style="{
top: coordData.coordY + 'px', top: coordData.coordY + 'px',
left: coordData.coordX - 10 + 'px' left: coordData.coordX - 10 + 'px',
}" }"
> >
<img <img
@ -1294,7 +1294,7 @@
:style="{ :style="{
transform: `rotate(${ transform: `rotate(${
(towerCurrentInfo || {}).angle || '' (towerCurrentInfo || {}).angle || ''
}deg)` }deg)`,
}" }"
> >
<span></span> <span></span>
@ -1388,7 +1388,7 @@
:class="{ :class="{
red: red:
towerCurrentInfo.maxRangeAlarm != 0 || towerCurrentInfo.maxRangeAlarm != 0 ||
towerCurrentInfo.minRangeAlarm != 0 towerCurrentInfo.minRangeAlarm != 0,
}" }"
> >
<span> <span>
@ -1444,7 +1444,7 @@
:class="{ :class="{
red: red:
towerCurrentInfo.obliguityXAlarm != 0 || towerCurrentInfo.obliguityXAlarm != 0 ||
towerCurrentInfo.obliguityYAlarm != 0 towerCurrentInfo.obliguityYAlarm != 0,
}" }"
> >
<span> <span>
@ -1603,7 +1603,7 @@
:class="{ :class="{
red: red:
towerCurrentInfo.maxRangeAlarm != 0 || towerCurrentInfo.maxRangeAlarm != 0 ||
towerCurrentInfo.minRangeAlarm != 0 towerCurrentInfo.minRangeAlarm != 0,
}" }"
> >
<span> <span>
@ -1657,7 +1657,7 @@
:class="{ :class="{
red: red:
towerCurrentInfo.obliguityXAlarm != 0 || towerCurrentInfo.obliguityXAlarm != 0 ||
towerCurrentInfo.obliguityYAlarm != 0 towerCurrentInfo.obliguityYAlarm != 0,
}" }"
> >
<span> <span>
@ -1780,7 +1780,7 @@
<div <div
class="dialogDataBox2" class="dialogDataBox2"
:style="{ :style="{
'margin-top': company == 'longguang' ? '24px' : '100px' 'margin-top': company == 'longguang' ? '24px' : '100px',
}" }"
> >
<p> <p>
@ -2043,7 +2043,6 @@
<div <div
class="environBox pointDialog_s" class="environBox pointDialog_s"
v-show="showCarDialog2" v-show="showCarDialog2"
:style="{ position: 'absolute', left: carBoxPos.x, top: carBoxPos.y }"
> >
<div class="title"> <div class="title">
{{ carDetail.name }} - {{ carDetail.name }} -
@ -2559,7 +2558,7 @@
countImg: require('@/assets/images/dataBoard/uface.png'), countImg: require('@/assets/images/dataBoard/uface.png'),
todayNum: ufaceInCount, todayNum: ufaceInCount,
todayLabel: 'todayInPeople', todayLabel: 'todayInPeople',
todayImg: require('@/assets/images/dataBoard/inpeople.png') todayImg: require('@/assets/images/dataBoard/inpeople.png'),
}" }"
:list="ufaceList" :list="ufaceList"
type="face" type="face"
@ -2591,7 +2590,7 @@
countImg: require('@/assets/images/dataBoard/online.jpg'), countImg: require('@/assets/images/dataBoard/online.jpg'),
todayNum: offlineDevNum, todayNum: offlineDevNum,
todayLabel: 'notOnlineDev', todayLabel: 'notOnlineDev',
todayImg: require('@/assets/images/dataBoard/offline.jpg') todayImg: require('@/assets/images/dataBoard/offline.jpg'),
}" }"
:list="environmentDevList" :list="environmentDevList"
></DataCard> ></DataCard>
@ -2852,8 +2851,8 @@ export default {
this.countBoxSize() this.countBoxSize()
}, },
computed: { computed: {
changVideoSize() {}, changVideoSize() { },
closeVideo() {}, closeVideo() { },
transformTimestamp() { transformTimestamp() {
return function (timestamp) { return function (timestamp) {
let a = new Date(timestamp).getTime() let a = new Date(timestamp).getTime()
@ -3120,7 +3119,7 @@ export default {
.line( .line(
(item.relatedX - this.minX).toFixed(2), (item.relatedX - this.minX).toFixed(2),
Number((Number(item.relatedY) - this.minY).toFixed(2)) + Number((Number(item.relatedY) - this.minY).toFixed(2)) +
Number(item.posteriorArmLength), Number(item.posteriorArmLength),
(item.relatedX - this.minX).toFixed(2), (item.relatedX - this.minX).toFixed(2),
(item.relatedY - this.minY - item.forearmLength).toFixed(2) (item.relatedY - this.minY - item.forearmLength).toFixed(2)
) )
@ -3155,7 +3154,7 @@ export default {
.text( .text(
(Number(item.relatedX) - this.minX).toFixed(2) - 6, (Number(item.relatedX) - this.minX).toFixed(2) - 6,
(Number(item.relatedY) - this.minY).toFixed(2) - (Number(item.relatedY) - this.minY).toFixed(2) -
item.forearmLength / 2, item.forearmLength / 2,
[ [
this.$t('message.dataBoard.forearmLong') + ':', this.$t('message.dataBoard.forearmLong') + ':',
item.forearmLength ? item.forearmLength : '0', item.forearmLength ? item.forearmLength : '0',
@ -3509,9 +3508,9 @@ export default {
switch (Number(item.devType)) { switch (Number(item.devType)) {
case 1: case 1:
console.log(item) console.log(item)
this.carBoxPos.x = parseFloat(item.mapX) + 50 + 'px' this.carBoxPos.x = parseFloat(item.mapX) - 320 + 'px'
this.carBoxPos.y = this.carBoxPos.y =
parseFloat(item.mapY) / this.imgWidthScale - 20 + 'px' parseFloat(item.mapY) / this.imgWidthScale - 280 + 'px'
this.carDetail.name = item.name this.carDetail.name = item.name
this.getCarTotalList(item) this.getCarTotalList(item)
this.showCarDialog2 = true this.showCarDialog2 = true
@ -3617,7 +3616,7 @@ export default {
) )
if ( if (
this.gantryCraneInfo.ratedSpan < this.gantryCraneInfo.ratedSpan <
res.result.smallCraneMainHookHeight || res.result.smallCraneMainHookHeight ||
res.result.smallCraneMainHookHeight < 0 res.result.smallCraneMainHookHeight < 0
) { ) {
// 当前高度参数错误 // 当前高度参数错误
@ -4780,7 +4779,7 @@ img {
.alarmList { .alarmList {
position: absolute; position: absolute;
right: 10px; right: 10px;
bottom: 100px; bottom: 15px;
background-color: #193b43; background-color: #193b43;
border-radius: 3px; border-radius: 3px;
text-align: center; text-align: center;
@ -4844,7 +4843,7 @@ img {
.floatBtn { .floatBtn {
position: absolute; position: absolute;
right: 10px; right: 10px;
bottom: 100px; bottom: 50px;
width: 50px; width: 50px;
height: 50px; height: 50px;
border-radius: 50%; border-radius: 50%;

10
src/views/projectAdmin/dataBoard/index.vue
View File

@ -41,9 +41,9 @@
controls controls
loop loop
></video> ></video>
<div @mouseenter="showChangeImg = true" @mouseleave="showChangeImg = false" v-if="optionListIndex == 2" class="imgBox"> <div @mouseenter="showChangeImg = true" @mouseleave="showChangeImg = false" v-if="optionListIndex == 2" class="imgBox">
<el-upload <el-upload
v-if="showChangeImg"
style="position: absolute; left: 420px; top: 230px" style="position: absolute; left: 420px; top: 230px"
:action="$store.state.UPLOADURL" :action="$store.state.UPLOADURL"
:on-success="file => handleSuccessTwo(file, 1)" :on-success="file => handleSuccessTwo(file, 1)"
@ -53,14 +53,14 @@
:show-file-list="false" :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> </el-upload>
<img <img
style=" style="
width: 686px; width: 686px;
margin-left: 113px; margin-left: 113px;
margin-top: 16px; margin-top: 16px;
height: 430px; height: 345px;
" "
:src="fileUrl + imgUrl" :src="fileUrl + imgUrl"
alt="" alt=""
@ -887,7 +887,7 @@ export default {
//保存或删除宣传视频 //保存或删除宣传视频
saveOrDeleteVideo(url) { saveOrDeleteVideo(url) {
editProjectInfo({ editProjectInfo({
projectId: this.projectData.projectId, projectSn: this.$store.state.projectSn,
videoUrl: url videoUrl: url
}).then(res => { }).then(res => {
this.$message.success(this.$t('message.companyDiagram.uploadSuccess')) //"上传成功" this.$message.success(this.$t('message.companyDiagram.uploadSuccess')) //"上传成功"

2
src/views/projectAdmin/dataBoardTwo/AiAnalysis.vue
View File

@ -413,7 +413,7 @@ export default {
this.selectAiAnalyseHardWareAlarmList() this.selectAiAnalyseHardWareAlarmList()
}, },
mounted() { 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) client = mqtt.connect(mqttUrl, options)
this.mqttMSG() this.mqttMSG()
}, },

174
src/views/projectFront/BIMCenter/BIMManageV3.vue
View File

@ -3,29 +3,33 @@
<div class="left fullHeight whiteBlock"> <div class="left fullHeight whiteBlock">
<div class="title"> <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> --> <!-- <p @click="configDialog=true" style="position:absolute;right:10px;top:15px">配置服务器</p> -->
<el-button <el-button
type="default" type="default"
size="mini" size="mini"
@click="configDialog=true" @click="configDialog = true"
style="position:absolute;right:10px;top:15px" style="position: absolute; right: 10px; top: 15px"
>{{$t('message.BIMmanage.confingServer')}}</el-button> >{{ $t('message.BIMmanage.confingServer') }}</el-button
>
</div> </div>
<div class="list_content"> <div class="list_content">
<vue-scroll v-if="buildList.length>0"> <vue-scroll v-if="buildList.length > 0">
<div <div
class="flex content_data" class="flex content_data"
v-for="(item,index) in buildList" v-for="(item, index) in buildList"
:key="index" :key="index"
:class=" {'active': activeBuildIndex==index }" :class="{ active: activeBuildIndex == index }"
@click="changeBuildFn(item,index)" @click="changeBuildFn(item, index)"
> >
<div>{{item.modelName}}</div> <div>{{ item.modelName }}</div>
<div class="flex2"> <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 <img
style="margin-left: 8px;" style="margin-left: 8px"
@click.stop="deleteFn(item)" @click.stop="deleteFn(item)"
src="@/assets/images/icon-delete.png" src="@/assets/images/icon-delete.png"
class="icon" class="icon"
@ -33,20 +37,26 @@
</div> </div>
</div> </div>
</vue-scroll> </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>
<div class="addFirm" @click="addFn"> <div class="addFirm" @click="addFn">
<!-- {{$t('message.personnelPosition.mapManage.new_build')}} --> <!-- {{$t('message.personnelPosition.mapManage.new_build')}} -->
<!-- 上传新模型 --> <!-- 上传新模型 -->
{{$t('message.BIMmanage.updateNewModel')}} {{ $t('message.BIMmanage.updateNewModel') }}
</div> </div>
</div> </div>
<div class="right fullHeight"> <div class="right fullHeight">
<div class="mapContainer whiteBlock"> <div class="mapContainer whiteBlock">
<!-- :fileId="buildList.length>0?parseInt(buildList[activeBuildIndex].fileId):''" --> <!-- :fileId="buildList.length>0?parseInt(buildList[activeBuildIndex].fileId):''" -->
<overview <overview
:urn="buildList.length>0?buildList[activeBuildIndex].bimUrn:''" :urn="buildList.length > 0 ? buildList[activeBuildIndex].bimUrn : ''"
:fileId ="buildList.length>0?parseInt(buildList[activeBuildIndex].fileId):''" :fileId="
buildList.length > 0
? parseInt(buildList[activeBuildIndex].fileId)
: ''
"
:opendrawlabel="true" :opendrawlabel="true"
></overview> ></overview>
</div> </div>
@ -67,7 +77,10 @@
label-width="120px" label-width="120px"
class="dialogFormBox" class="dialogFormBox"
> >
<el-form-item :label="$t('message.BIMmanage.modelName')" prop="modelName"> <el-form-item
:label="$t('message.BIMmanage.modelName')"
prop="modelName"
>
<el-input <el-input
v-model="addBuildForm.modelName" v-model="addBuildForm.modelName"
:placeholder="$t('message.personnelPosition.please_enter')" :placeholder="$t('message.personnelPosition.please_enter')"
@ -79,13 +92,16 @@
:placeholder="$t('message.personnelPosition.please_enter')" :placeholder="$t('message.personnelPosition.please_enter')"
></el-input> ></el-input>
</el-form-item> </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' --> <!-- :auto-upload="false" $http.defaults.baseURL+'xmgl/projectBim/saveBim' -->
<el-upload <el-upload
class="uploadBtn" class="uploadBtn"
ref="upload" ref="upload"
name="files" name="files"
action="http://47.97.202.104:6023/upload/image" :action="uploadUrl"
:show-file-list="true" :show-file-list="true"
:data="uploadParams" :data="uploadParams"
:on-change="changeUpload" :on-change="changeUpload"
@ -94,18 +110,22 @@
:on-exceed="exceedFn" :on-exceed="exceedFn"
> >
<!-- <span slot="trigger">选择文件</span> --> <!-- <span slot="trigger">选择文件</span> -->
<el-button <el-button slot="trigger" type="primary" size="medium">{{
slot="trigger" $t('message.BIMmanage.chooseFile')
type="primary" }}</el-button>
size="medium"
>{{$t('message.BIMmanage.chooseFile')}}</el-button>
<el-button <el-button
type="danger" type="danger"
size="medium" size="medium"
@click="$refs.upload.clearFiles();addBuildForm.modelUrl=''" @click="
style="margin-left:20px" $refs.upload.clearFiles()
>{{$t('message.BIMmanage.cleanFile')}}</el-button> addBuildForm.modelUrl = ''
<div slot="tip" class="el-upload__tip">{{addBuildForm.modelUrl.name}}</div> "
style="margin-left: 20px"
>{{ $t('message.BIMmanage.cleanFile') }}</el-button
>
<div slot="tip" class="el-upload__tip">
{{ addBuildForm.modelUrl.name }}
</div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<div class="dialog-footer"> <div class="dialog-footer">
@ -114,13 +134,15 @@
@click="addBuildDialog = false" @click="addBuildDialog = false"
icon="el-icon-circle-close" icon="el-icon-circle-close"
size="medium" size="medium"
>{{$t('message.personnelPosition.cancel')}}</el-button> >{{ $t('message.personnelPosition.cancel') }}</el-button
>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@click="submitData" @click="submitData"
size="medium" size="medium"
>{{$t('message.personnelPosition.determine')}}</el-button> >{{ $t('message.personnelPosition.determine') }}</el-button
>
</div> </div>
</el-form> </el-form>
</div> </div>
@ -131,15 +153,17 @@
:title="$t('message.BIMmanage.confingServerData')" :title="$t('message.BIMmanage.confingServerData')"
:visible.sync="configDialog" :visible.sync="configDialog"
width="700px" width="700px"
:close-on-click-modal="configForm.id?true:false" :close-on-click-modal="configForm.id ? true : false"
:show-close="configForm.id?true:false" :show-close="configForm.id ? true : false"
> >
<div class="dialog_content"> <div class="dialog_content">
<p <p
class="redText" class="redText"
v-show="configForm.id" v-show="configForm.id"
style="margin-bottom:20px;text-align:center" style="margin-bottom: 20px; text-align: center"
>{{$t('message.BIMmanage.warnText')}}</p> >
{{ $t('message.BIMmanage.warnText') }}
</p>
<el-form <el-form
size="medium" size="medium"
:model="configForm" :model="configForm"
@ -153,7 +177,9 @@
v-model="configForm.appKey" v-model="configForm.appKey"
:placeholder="$t('message.personnelPosition.please_enter')" :placeholder="$t('message.personnelPosition.please_enter')"
></el-input> ></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>
<el-form-item :label="'AppSecrt(私钥):'" prop="appSecret"> <el-form-item :label="'AppSecrt(私钥):'" prop="appSecret">
<el-input <el-input
@ -163,29 +189,38 @@
v-model="configForm.appSecret" v-model="configForm.appSecret"
:placeholder="$t('message.personnelPosition.please_enter')" :placeholder="$t('message.personnelPosition.please_enter')"
></el-input> ></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>
<div class="dialog-footer"> <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 <el-button
type="primary" type="primary"
icon="el-icon-circle-close" icon="el-icon-circle-close"
@click="configDialog = false" @click="configDialog = false"
size="medium" size="medium"
>{{'取消'}}</el-button> >{{ '取消' }}</el-button
>
<el-button <el-button
type="primary" type="primary"
icon="el-icon-circle-check" icon="el-icon-circle-check"
@click="submitConfigData" @click="submitConfigData"
size="medium" size="medium"
>{{$t('message.personnelPosition.determine')}}</el-button> >{{ $t('message.personnelPosition.determine') }}</el-button
>
</div> </div>
</el-form> </el-form>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="使用说明" :visible.sync="dialogTableVisible"> <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> </el-dialog>
</div> </div>
</template> </template>
@ -211,7 +246,7 @@ export default {
components: { overview }, components: { overview },
data() { data() {
return { return {
fileId:"", fileId: "",
dialogTableVisible: false, dialogTableVisible: false,
buildList: [], buildList: [],
addBuildDialog: false, addBuildDialog: false,
@ -266,9 +301,13 @@ export default {
appKey: "", appKey: "",
appSecret: "", appSecret: "",
type: 1 type: 1
} },
uploadUrl: '', //文件上传地址
}; };
}, },
created(){
this.uploadUrl = this.$store.state.UPLOADURL
},
mounted() { mounted() {
this.getConfigFn(); this.getConfigFn();
this.loadData(); this.loadData();
@ -302,11 +341,11 @@ export default {
window.open("https://bimface.com/user-console/login"); window.open("https://bimface.com/user-console/login");
}, },
// 设为主模型 // 设为主模型
setToMain(item,index) { setToMain(item, index) {
let currentIndex = index let currentIndex = index
for(let b in this.buildList){ for (let b in this.buildList) {
if(b!=currentIndex){ if (b != currentIndex) {
this.buildList[b].isEnable = false this.buildList[b].isEnable = false
} }
} }
startJlwApi({ startJlwApi({
@ -322,8 +361,9 @@ export default {
getJlwConfigApi({ getJlwConfigApi({
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
}).then(res => { }).then(res => {
console.log('-----有吗',res) console.log('-----有吗', res)
if (res.result) { if (res.result) {
this.configForm = res.result.bimfaceConfig; this.configForm = res.result.bimfaceConfig;
// this.configForm.appKey = res.result.bimfaceConfig // this.configForm.appKey = res.result.bimfaceConfig
this.loadData(); this.loadData();
@ -348,15 +388,15 @@ export default {
exceedFn(files, fileList) { exceedFn(files, fileList) {
this.$message.warning( this.$message.warning(
this.$t("message.BIMmanage.tipText") + this.$t("message.BIMmanage.tipText") +
files.length + files.length +
this.$t("message.BIMmanage.tipText2") + this.$t("message.BIMmanage.tipText2") +
(files.length + fileList.length) + (files.length + fileList.length) +
this.$t("message.BIMmanage.tipText3") this.$t("message.BIMmanage.tipText3")
); );
}, },
changeUpload(file, fileList) { changeUpload(file, fileList) {
// console.log("file", file, fileList); // console.log("file", file, fileList);
// this.addBuildForm.modelUrl = file; // this.addBuildForm.modelUrl = file;
}, },
uploadMapSuccess(response) { uploadMapSuccess(response) {
console.log("上传成功的", response); console.log("上传成功的", response);
@ -373,7 +413,7 @@ export default {
changeBuildFn(item, index) { changeBuildFn(item, index) {
// this.addBuildForm=JSON.parse(JSON.stringify(item)) // this.addBuildForm=JSON.parse(JSON.stringify(item))
this.activeBuildIndex = index; this.activeBuildIndex = index;
if(this.buildList.length>0){ if (this.buildList.length > 0) {
this.fileId = parseInt(this.buildList[this.activeBuildIndex].fileId) this.fileId = parseInt(this.buildList[this.activeBuildIndex].fileId)
} }
}, },
@ -386,7 +426,7 @@ export default {
res => { res => {
console.log("------模型列表---", res); console.log("------模型列表---", res);
this.buildList = res.result.page.records; this.buildList = res.result.page.records;
res.result.page.records.forEach((item,index) => { res.result.page.records.forEach((item, index) => {
if (item.isEnable == 0) { if (item.isEnable == 0) {
item.isEnable = false; item.isEnable = false;
} else { } else {
@ -422,12 +462,12 @@ export default {
} }
this.addBuildForm.projectSn = this.$store.state.projectSn this.addBuildForm.projectSn = this.$store.state.projectSn
addJlwUploadApi(this.addBuildForm).then((res) => { addJlwUploadApi(this.addBuildForm).then((res) => {
console.log('------------',res) console.log('------------', res)
this.addBuildDialog = false; this.addBuildDialog = false;
this.loadData(); this.loadData();
this.$message.success( this.$message.success(
this.$t("message.personnelPosition.add_success") this.$t("message.personnelPosition.add_success")
); //添加成功！ ); //添加成功！
}); });
} else { } else {
projectBimEditApi(this.addBuildForm).then(res => { projectBimEditApi(this.addBuildForm).then(res => {
@ -448,11 +488,11 @@ export default {
deleteFn(item) { deleteFn(item) {
this.$confirm( this.$confirm(
this.$t("message.BIMmanage.tipText4") + this.$t("message.BIMmanage.tipText4") +
"【" + "【" +
item.modelName + item.modelName +
"】," + "】," +
this.$t("message.BIMmanage.tipText5") + this.$t("message.BIMmanage.tipText5") +
"?", "?",
this.$t("message.BIMmanage.tip"), this.$t("message.BIMmanage.tip"),
{ {
confirmButtonText: this.$t("message.BIMmanage.confirm"), confirmButtonText: this.$t("message.BIMmanage.confirm"),
@ -492,7 +532,7 @@ export default {
display: inline-block; display: inline-block;
&::before { &::before {
content: ""; content: '';
position: absolute; position: absolute;
bottom: -1px; bottom: -1px;
left: 0; left: 0;
@ -525,7 +565,7 @@ export default {
background-color: rgba(81, 129, 246, 0.1); background-color: rgba(81, 129, 246, 0.1);
&::after { &::after {
content: ""; content: '';
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;

4
src/views/projectFront/buildersDiary/diaryMod.vue
View File

@ -88,7 +88,7 @@
<el-col :span="5"> <el-col :span="5">
<!-- 项目负责人 --> <!-- 项目负责人 -->
<!-- <label class="xingxing"></label> --> <!-- <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-input v-model="ruleForm.projectDirector"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -451,7 +451,7 @@
type="primary" type="primary"
> >
<!-- "新增" : "编辑" --> <!-- "新增" : "编辑" -->
{{ type == "add" ? "提交":$t('message.buildersDiary.edit') }}</el-button {{ type == "add" ? "提交":"保存" }}</el-button
> >
</div> </div>
</el-col> </el-col>

2
src/views/projectFront/carManage/carManage.vue
View File

@ -56,7 +56,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="driverName" prop="driverWorkerName"
:label="$t('message.carManage.driverName')" :label="$t('message.carManage.driverName')"
align="center" align="center"
></el-table-column> ></el-table-column>

2
src/views/projectFront/laborManage/overview.vue
View File

@ -513,7 +513,7 @@ export default {
this.getNewestData(1) this.getNewestData(1)
this.loadWeather() this.loadWeather()
console.log(mqttUrl) 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) client2 = mqtt.connect(mqttUrl, options)
this.mqttMSG() this.mqttMSG()
}, },

23
src/views/projectFront/lifter/basicInfo.vue
View File

@ -135,12 +135,12 @@
<el-input v-model="lifterForm.maxHeight"></el-input> <el-input v-model="lifterForm.maxHeight"></el-input>
</el-form-item> </el-form-item>
<!-- 最大载重(kg) --> <!-- 最大载重(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-input v-model="lifterForm.maxLoad"></el-input>
</el-form-item> </el-form-item>
<!-- 总楼层数 --> <!-- 总楼层数 -->
<el-form-item :label="$t('message.lifter.totalFloors')" prop="totalFloor"> <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> </el-form-item>
<!-- 升降机操作人员 liftOperator 司机 driver --> <!-- 升降机操作人员 liftOperator 司机 driver -->
<el-form-item :label="company == 'longguang'? $t('message.lifter.liftOperator') : $t('message.lifter.driver') " prop="recordNumber"> <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" v-for="item in videoList"
:key="item.itemId" :key="item.itemId"
:label="item.videoName" :label="item.videoName"
:value="item.itemId" :value="item.itemId+''"
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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 <el-select
v-model="lifterForm.videoList" v-model="lifterForm.alarmPushWorkerId"
filterable filterable
multiple multiple
collapse-tags collapse-tags
@ -191,7 +191,7 @@
> >
<el-option <el-option
v-for="item in accountList" v-for="item in accountList"
:key="item.workerId+'b'" :key="item.userId"
:label="item.realName" :label="item.realName"
:value="item.userId" :value="item.userId"
> >
@ -276,7 +276,8 @@ export default {
driverList: "", driverList: "",
videoList: "", videoList: "",
totalFloor: "", totalFloor: "",
generalContractorsId: "" generalContractorsId: "",
alarmPushWorkerId:[],
}, },
rules: { rules: {
devName: [ devName: [
@ -301,7 +302,6 @@ export default {
created() { created() {
this.projectSn = this.$store.state.projectSn; this.projectSn = this.$store.state.projectSn;
this.getLifterList(); this.getLifterList();
this.getAccountList()
this.selectEnterpriseInfoList() this.selectEnterpriseInfoList()
}, },
@ -320,6 +320,7 @@ export default {
getAccountList() { getAccountList() {
getProjectChilderSystemUserListApi({ projectSn: this.projectSn }).then((result) => { getProjectChilderSystemUserListApi({ projectSn: this.projectSn }).then((result) => {
this.accountList = result.result; this.accountList = result.result;
console.log(' this.accountList====', this.accountList);
} }
); );
}, },
@ -357,6 +358,7 @@ export default {
}; };
this.getWorkerInfoList(); this.getWorkerInfoList();
this.getVideoItemList(); this.getVideoItemList();
this.getAccountList()
}, },
//获取司机列表 //获取司机列表
@ -379,6 +381,7 @@ export default {
getVideoItemListApi(data).then((res) => { getVideoItemListApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.videoList = res.result.list; this.videoList = res.result.list;
console.log('videoList=========',this.videoList,);
} }
}); });
}, },
@ -394,6 +397,9 @@ export default {
this.getWorkerInfoList(); this.getWorkerInfoList();
this.getVideoItemList(); this.getVideoItemList();
this.getDetailsData(val.id); 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) console.log(data)
if(!this.editType){ if(!this.editType){
data.alarmPushWorkerId= data.alarmPushWorkerId?data.alarmPushWorkerId.join(','):''
addLifterApi(data).then((res) => { addLifterApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.lifterCraneDialog = false; this.lifterCraneDialog = false;

3
src/views/projectFront/markingRoom/sampleManage.vue
View File

@ -149,7 +149,8 @@
v-model="workerInfo.formingTime" v-model="workerInfo.formingTime"
type="datetime" type="datetime"
:placeholder="$t('message.projectInfo.chooseDateAndTime')" :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-date-picker>
<!-- <el-input <!-- <el-input

1
src/views/projectFront/qualitySpringback/buildManage.vue
View File

@ -594,6 +594,7 @@
this.floorDialogTitle = this.$t('message.personnelPosition.mapManage.new_floor');//新增楼层 this.floorDialogTitle = this.$t('message.personnelPosition.mapManage.new_floor');//新增楼层
this.addFloorDialog = true; this.addFloorDialog = true;
this.isAdd = true; this.isAdd = true;
this.floorForm={}
} }
}, },
editFloorFn(item) { editFloorFn(item) {

2
src/views/projectFront/qualitySpringback/electronicPouringOrder.vue
View File

@ -352,7 +352,6 @@ export default {
}; };
}, },
created() { created() {
this.loadBuildData();
this.getListData(); this.getListData();
}, },
methods: { methods: {
@ -380,6 +379,7 @@ export default {
}); });
}, },
addFn() { addFn() {
this.loadBuildData();
this.isAdd = true; this.isAdd = true;
// this.dialogTitle = this.$t( // this.dialogTitle = this.$t(
// "message.personnelPosition.cardManage.dialog_edit.addText" // "message.personnelPosition.cardManage.dialog_edit.addText"

2
src/views/projectFront/waterManage/alarmValueSet.vue
View File

@ -241,7 +241,7 @@
v-for="item in options" v-for="item in options"
:key="item.workerId" :key="item.workerId"
:label="item.workerName" :label="item.workerName"
:value="item.workerId" :value="Number(item.workerId)"
> >
</el-option> </el-option>
</el-select> </el-select>