Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet
water_xu
commit
1c11151012
|
|
@ -48,7 +48,7 @@
|
|||
<breakgroundCfdD v-if="type === 'BREAKGROUND' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
|
||||
<hoistingCfdD v-if="type === 'HOISTING' && corpInfoId === '635917e77af8461691d5da5507b56347'" :id="id" :type="type"/>
|
||||
<peoplePositionCfdD v-if="type === 'peoplePosition'" :id="id" :type="type" :infoname="infoname"/>
|
||||
<peoplePositionCzks v-if="type === 'peoplePositionCzks'" :id="id" :type="type" />
|
||||
<peoplePositionCzks v-if="type === 'peoplePositionCzks'" :id="id" :type="type" :ry-dept-name="RyDeptName" :ry-post-name="RyPostName" :ry-real-name="RyRealName" :person-type-name="personTypeName" />
|
||||
<peoplePositionCmt v-if="type === 'peoplePositionCmt'" :id="id" :type="type" :infoname="infoname"/>
|
||||
<carPositionCfdD v-if="type === 'carPosition'" :id="id" :type="type" :infoname="infoname"/>
|
||||
<!--曹妃甸东 八项作业 曹实业详细页面 end-->
|
||||
|
|
@ -194,6 +194,26 @@ export default {
|
|||
type: String,
|
||||
default: ''
|
||||
},
|
||||
personPhoto: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
RyDeptName: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
RyPostName: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
RyRealName: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
personTypeName: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
GATE_VIDEO_ID: {
|
||||
type: String,
|
||||
default: ''
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@
|
|||
<td><img :src="'http://172.16.130.86/gateway-service/fileStatic/'+personPhoto" alt="" width="50" height="50">
|
||||
</td>
|
||||
<td class="bbg-transparent">姓名</td>
|
||||
<td>{{ info ? info.NAME : '' }}</td>
|
||||
<td >{{ info?info.NAME:RyRealName }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">部门</td>
|
||||
<td>{{ info ? info.DEPARTMENT_NAME : '' }}</td>
|
||||
<td >{{ info?info.DEPARTMENT_NAME:RyDeptName }}</td>
|
||||
<td class="bbg-transparent">岗位</td>
|
||||
<td>{{ info ? info.POST_NAME : '' }}</td>
|
||||
<td >{{ info?info.POST_NAME:RyPostName }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="bbg-transparent">人员类型</td>
|
||||
<td>{{ info ? info.PERSON_TYPE : '' }}</td>
|
||||
<td >{{ info?info.PERSON_TYPE:personTypeName }}</td>
|
||||
<td class="bbg-transparent">是否为隐患确认人</td>
|
||||
<td>{{ info.IS_HAZARDCONFIRMER == 0 ? '否' : '是' }}</td>
|
||||
<td >{{ info?info.IS_HAZARDCONFIRMER == 1 ?'是':'否' :'否' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
|
@ -49,6 +49,30 @@ export default {
|
|||
default() {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
RyDeptName: {
|
||||
type: String,
|
||||
default() {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
RyPostName: {
|
||||
type: String,
|
||||
default() {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
RyRealName: {
|
||||
type: String,
|
||||
default() {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
personTypeName: {
|
||||
type: String,
|
||||
default() {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
|
|
|||
|
|
@ -240,6 +240,11 @@
|
|||
:infoname="dialog.infoname"
|
||||
:name="dialog.name"
|
||||
:GATE_VIDEO_ID="dialog.GATE_VIDEO_ID"
|
||||
:person-photo="dialog.personPhoto"
|
||||
:ry-dept-name="dialog.RyDeptName"
|
||||
:ry-post-name="dialog.RyPostName"
|
||||
:ry-real-name="dialog.RyRealName"
|
||||
:person-type-name="dialog.personTypeName"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -865,7 +870,12 @@ export default {
|
|||
id: '',
|
||||
corpInfoId: '',
|
||||
width: '',
|
||||
infoname: ''
|
||||
infoname: '',
|
||||
personPhoto: '',
|
||||
RyDeptName: '',
|
||||
RyPostName: '',
|
||||
RyRealName: '',
|
||||
personTypeName: ''
|
||||
},
|
||||
/* 曹妃甸使用参数开始*/
|
||||
// 人员定位
|
||||
|
|
@ -1382,7 +1392,7 @@ export default {
|
|||
this.bubble(id)
|
||||
}
|
||||
if (this.gangkouActive === '00002' && point_type === 'peoplePositionCzks') {
|
||||
const { label, point_type, id, corpInfoId, name, infoname } = pick.id._monitoItems.data
|
||||
const { label, point_type, id, corpInfoId, name, infoname, personPhoto, RyDeptName, RyPostName, RyRealName, personTypeName } = pick.id._monitoItems.data
|
||||
this.dialog.visible = true
|
||||
this.dialog.title = label
|
||||
this.dialog.type = point_type
|
||||
|
|
@ -1390,6 +1400,11 @@ export default {
|
|||
this.dialog.name = name
|
||||
this.dialog.infoname = infoname
|
||||
this.dialog.corpInfoId = corpInfoId
|
||||
this.dialog.personPhoto = personPhoto
|
||||
this.dialog.RyDeptName = RyDeptName
|
||||
this.dialog.RyPostName = RyPostName
|
||||
this.dialog.RyRealName = RyRealName
|
||||
this.dialog.personTypeName = personTypeName
|
||||
}
|
||||
if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && (point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '3' || point_id.substring(0, 3) === '1_2' || point_id.substring(0, 3) === '2_8')) {
|
||||
// if (this.gangkouActive === '00004' && point_type.indexOf('标记点') !== -1 && point_id.substring(0, 1) === '0' || point_id.substring(0, 1) === '5') {
|
||||
|
|
@ -2540,9 +2555,14 @@ export default {
|
|||
icon_type: 'img4_0_1',
|
||||
infoname: item.realName,
|
||||
personPhoto: item.personPhoto,
|
||||
RyDeptName: item.deptName,
|
||||
RyPostName: item.postName,
|
||||
RyRealName: item.realName,
|
||||
personTypeName: item.personTypeName,
|
||||
data_id: item.cardId + '',
|
||||
point_type: 'peoplePositionCzks',
|
||||
label: item.realName
|
||||
label: item.realName,
|
||||
|
||||
}
|
||||
czksPerLoc.push(perLoc)
|
||||
ry_drag.addEntity(perLoc)
|
||||
|
|
|
|||
Loading…
Reference in New Issue