Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev
This commit is contained in:
kun
commit
0fb5bf5f69
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -15,7 +15,7 @@ export default {
|
||||
OnlineStatusStatistics:'在线状态统计',
|
||||
equipmentTypeOverview:'设备类型概况',
|
||||
attendanceYesterday:'昨日出勤人数',
|
||||
numberOfWorkersPresentToday:'今日劳务人员出勤人数',
|
||||
numberOfWorkersPresentToday:'今日施工人员出勤人数',
|
||||
attendanceOfManagementToday:'今日管理人员出勤人数',
|
||||
totalNumberOfAlarmsToday:'今日报警总数',
|
||||
PM25theAlarmNumber:'PM2.5报警数',
|
||||
|
||||
@ -18,12 +18,12 @@ export default {
|
||||
itemInner1: '在职甲方管理人员',
|
||||
itemInner2: '在职监理方管理人员',
|
||||
itemInner3: '在职乙方管理人员',
|
||||
itemInner4: '在职劳务人员',
|
||||
itemInner4: '在职施工人员',
|
||||
text2: '在场总人数',
|
||||
},
|
||||
Block3: {
|
||||
itemInner1: '在场管理人员',
|
||||
itemInner2: '在场劳务人员',
|
||||
itemInner2: '在场施工人员',
|
||||
itemInner3: '在场甲方管理人员',
|
||||
itemInner4: '在场监理方管理人员',
|
||||
itemInner5: '在场乙方管理人员',
|
||||
|
||||
@ -251,7 +251,7 @@ export default {
|
||||
companyAttendanceRanking: '企业出勤排名',
|
||||
presenceOfPersonnel: '在场人员',
|
||||
managePeople: '管理人员',
|
||||
contractWorkers: '劳务人员',
|
||||
contractWorkers: '施工人员',
|
||||
temporaryWorkers: '临时人员',
|
||||
noPersonnel: '暂无人员',
|
||||
personnelType: '人员类型',
|
||||
|
||||
@ -2,7 +2,7 @@ export default {
|
||||
placeholder1: '请输入企业名称',
|
||||
placeholder2: '请输入',
|
||||
pleaseChoose: '请选择',
|
||||
modules: '劳务人员',
|
||||
modules: '施工人员',
|
||||
modules1: '管理人员',
|
||||
modules2: '临时人员',
|
||||
theNewTeam: '新增班组',
|
||||
@ -573,7 +573,7 @@ export default {
|
||||
],
|
||||
},
|
||||
|
||||
//劳务人员 录入校验
|
||||
//施工人员 录入校验
|
||||
personFormRules2: {
|
||||
workerName: [
|
||||
{
|
||||
|
||||
@ -32,7 +32,7 @@ export default {
|
||||
operation: '操作',
|
||||
edit: '编辑',
|
||||
delete: '删除',
|
||||
personTypeText_1: '劳务人员',
|
||||
personTypeText_1: '施工人员',
|
||||
personTypeText_2: '管理人员',
|
||||
confirmText: '确定删除',
|
||||
Tips: '提示',
|
||||
@ -167,7 +167,7 @@ export default {
|
||||
equipment_online_rate_statis: '设备在线率统计',
|
||||
attendance_ratio_type_work: '各工种出勤占比',
|
||||
staffTotal: '员工总数',
|
||||
laborPersonnel: '劳务人员',
|
||||
laborPersonnel: '施工人员',
|
||||
management: '管理人员',
|
||||
attendance_today: '今日出勤人数',
|
||||
layer: '层',
|
||||
|
||||
@ -472,7 +472,7 @@ export default {
|
||||
],
|
||||
},
|
||||
|
||||
//劳务人员 录入校验
|
||||
//施工人员 录入校验
|
||||
personFormRules2: {
|
||||
workerName: [
|
||||
{
|
||||
|
||||
@ -31,7 +31,7 @@ export default {
|
||||
operation: '操作',
|
||||
edit: '编辑',
|
||||
delete: '删除',
|
||||
personTypeText_1: '劳务人员',
|
||||
personTypeText_1: '施工人员',
|
||||
personTypeText_2: '管理人员',
|
||||
confirmText: '确定删除',
|
||||
Tips: '提示',
|
||||
@ -166,7 +166,7 @@ export default {
|
||||
equipment_online_rate_statis: '设备在线率统计',
|
||||
attendance_ratio_type_work: '各工种出勤占比',
|
||||
staffTotal: '员工总数',
|
||||
laborPersonnel: '劳务人员',
|
||||
laborPersonnel: '施工人员',
|
||||
management: '管理人员',
|
||||
attendance_today: '今日出勤人数',
|
||||
layer: '层',
|
||||
|
||||
@ -9,7 +9,7 @@ export const getEnterpriseTypeList = data => get('xmgl/enterpriseType/list', dat
|
||||
export const setEnterpriseInfo = data => post('xmgl/enterpriseInfo/add', data); //新增企业 -- 确认 新增 企业
|
||||
export const editEnterpriseInfo = data => post('xmgl/enterpriseInfo/edit', data); //新增企业 -- 确认 编辑 企业
|
||||
export const deleteEnterprise = data => post('xmgl/enterpriseInfo/delete', data); // 删除 企业
|
||||
export const getTeamInfoList = data => post('xmgl/teamInfo/getTeamInfoList', data); // 获取 班组 列表 劳务人员模块
|
||||
export const getTeamInfoList = data => post('xmgl/teamInfo/getTeamInfoList', data); // 获取 班组 列表 施工人员模块
|
||||
export const getWorkerTypeList = data => post('xmgl/workerType/list', data); // 获取班组 工种下拉 列表
|
||||
export const addTeamInfo = data => post('xmgl/teamInfo/add', data); // 新增 班组 保存
|
||||
export const deleteTeamInfo = data => post('xmgl/teamInfo/delete', data); // 删除 班组
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
<div class="item1">项目预警统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -115,7 +115,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0, //单位类型,
|
||||
currentUnitType: 0,
|
||||
|
||||
@ -98,7 +98,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0 //单位类型
|
||||
}
|
||||
|
||||
@ -96,7 +96,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0 //单位类型
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
<div class="item1">项目设备情况统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
<div class="item1">项目列表</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<div class="item1">项目预警统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -185,7 +185,7 @@ export default {
|
||||
personType: 0,
|
||||
organizationSn: '',
|
||||
organizationList: [], //组织列表
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
tableData: [],
|
||||
imgSrc: '', //
|
||||
img: false, //头像放大弹窗
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -320,7 +320,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -653,7 +653,7 @@ export default {
|
||||
workerTypeList: [], //工种列表
|
||||
|
||||
managermentPersonTotal: 0, //管理人员
|
||||
workerPersonTotal: 0, //劳务人员
|
||||
workerPersonTotal: 0, //施工人员
|
||||
totalRegPersonNum: [], //在册人员
|
||||
totalRegPersonNum2: 0, //在册人员
|
||||
trained: 0, // 已培训人数
|
||||
@ -731,7 +731,7 @@ export default {
|
||||
(this.wokerTypePersonNum = []), //各工种人数
|
||||
(this.workerTypeList = []), //工种列表
|
||||
(this.managermentPersonTotal = 0), //管理人员
|
||||
(this.workerPersonTotal = 0), //劳务人员
|
||||
(this.workerPersonTotal = 0), //施工人员
|
||||
(this.totalRegPersonNum = []), //在册人员
|
||||
(this.totalRegPersonNum2 = 0), //在册人员
|
||||
(this.trained = 0), // 已培训人数
|
||||
@ -1375,7 +1375,7 @@ export default {
|
||||
// orient: "horizontal",
|
||||
// x: "50%",
|
||||
// y: "0",
|
||||
// data: ["劳务人员"],
|
||||
// data: ["施工人员"],
|
||||
// icon: "rect",
|
||||
// itemWidth: 7,
|
||||
// itemHeight: 3,
|
||||
@ -1469,7 +1469,7 @@ export default {
|
||||
// },
|
||||
|
||||
// {
|
||||
// name: "劳务人员",
|
||||
// name: "施工人员",
|
||||
// type: "bar",
|
||||
// emphasis: {
|
||||
// focus: "series",
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -265,7 +265,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -531,7 +531,7 @@ export default {
|
||||
workerTypeList: [], //工种列表
|
||||
|
||||
managermentPersonTotal: 0, //管理人员
|
||||
workerPersonTotal: 0, //劳务人员
|
||||
workerPersonTotal: 0, //施工人员
|
||||
totalRegPersonNum: [], //在册人员
|
||||
totalRegPersonNum2: 0, //在册人员
|
||||
trained: 0, // 已培训人数
|
||||
@ -599,7 +599,7 @@ export default {
|
||||
(this.wokerTypePersonNum = []), //各工种人数
|
||||
(this.workerTypeList = []), //工种列表
|
||||
(this.managermentPersonTotal = 0), //管理人员
|
||||
(this.workerPersonTotal = 0), //劳务人员
|
||||
(this.workerPersonTotal = 0), //施工人员
|
||||
(this.totalRegPersonNum = []), //在册人员
|
||||
(this.totalRegPersonNum2 = 0), //在册人员
|
||||
(this.trained = 0), // 已培训人数
|
||||
@ -1242,7 +1242,7 @@ export default {
|
||||
// orient: "horizontal",
|
||||
// x: "50%",
|
||||
// y: "0",
|
||||
// data: ["劳务人员"],
|
||||
// data: ["施工人员"],
|
||||
// icon: "rect",
|
||||
// itemWidth: 7,
|
||||
// itemHeight: 3,
|
||||
@ -1336,7 +1336,7 @@ export default {
|
||||
// },
|
||||
|
||||
// {
|
||||
// name: "劳务人员",
|
||||
// name: "施工人员",
|
||||
// type: "bar",
|
||||
// emphasis: {
|
||||
// focus: "series",
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
<li>
|
||||
<div class="people-box">
|
||||
<img src="./../../../assets/images/bigScreen/serve-people.png"/>
|
||||
劳务人员
|
||||
施工人员
|
||||
</div>
|
||||
<div class="people-detail">
|
||||
<div class="detail-item">实名数： <span>{{workerCount.lwPersonTotal}}</span></div>
|
||||
|
||||
@ -115,7 +115,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0, //单位类型,
|
||||
currentUnitType: 0,
|
||||
|
||||
@ -98,7 +98,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0 //单位类型
|
||||
}
|
||||
|
||||
@ -96,7 +96,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0 //单位类型
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
<div class="item1">项目列表</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<div class="item1">项目预警统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -179,7 +179,7 @@ export default {
|
||||
personType: 0,
|
||||
organizationSn: '',
|
||||
organizationList: [], //组织列表
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
tableData: [],
|
||||
imgSrc: '', //
|
||||
img: false, //头像放大弹窗
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<img src="../../../../assets/images/longguang/cutimage/laowurenyuan.png" alt="">
|
||||
<div class="counts">
|
||||
<span>{{workerPersonTotal}}</span>
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -177,7 +177,7 @@ import tagVue from '../../../../components/tag.vue';
|
||||
workerTypeList:[], //工种列表
|
||||
|
||||
managermentPersonTotal:0, //管理人员
|
||||
workerPersonTotal:0, //劳务人员
|
||||
workerPersonTotal:0, //施工人员
|
||||
totalRegPersonNum:[], //在册人员
|
||||
|
||||
firstPartCompanyNum:[], //甲方单位出勤数
|
||||
@ -233,7 +233,7 @@ import tagVue from '../../../../components/tag.vue';
|
||||
this.workerTypeList=[], //工种列表
|
||||
|
||||
this.managermentPersonTotal=0, //管理人员
|
||||
this.workerPersonTotal=0, //劳务人员
|
||||
this.workerPersonTotal=0, //施工人员
|
||||
this.totalRegPersonNum=[], //在册人员
|
||||
|
||||
this.firstPartCompanyNum=[], //甲方单位出勤数
|
||||
@ -696,7 +696,7 @@ import tagVue from '../../../../components/tag.vue';
|
||||
orient:'horizontal',
|
||||
x:'50%',
|
||||
y:'0',
|
||||
data:['劳务人员'],
|
||||
data:['施工人员'],
|
||||
icon:'rect',
|
||||
itemWidth:7,
|
||||
itemHeight:3,
|
||||
@ -792,7 +792,7 @@ import tagVue from '../../../../components/tag.vue';
|
||||
},
|
||||
|
||||
{
|
||||
name: '劳务人员',
|
||||
name: '施工人员',
|
||||
type: 'bar',
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
<div class="item1">项目预警统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -115,7 +115,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0, //单位类型,
|
||||
currentUnitType: 0,
|
||||
|
||||
@ -98,7 +98,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0 //单位类型
|
||||
}
|
||||
|
||||
@ -96,7 +96,7 @@ export default {
|
||||
pageSize: 10, //一页多少条
|
||||
total: 50, //总条数
|
||||
personType: 0, //人员类型
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
currentPersonType: 0,
|
||||
unitType: 0 //单位类型
|
||||
}
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
<div class="item1">项目设备情况统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
<div class="item1">项目列表</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<div class="item1">项目预警统计</div>
|
||||
<!-- <div class="item2">
|
||||
<div class="active">全部</div>
|
||||
<div>劳务人员</div>
|
||||
<div>施工人员</div>
|
||||
<div>管理人员</div>
|
||||
<div>
|
||||
默认排序
|
||||
|
||||
@ -185,7 +185,7 @@ export default {
|
||||
personType: 0,
|
||||
organizationSn: '',
|
||||
organizationList: [], //组织列表
|
||||
personTypeList: ['全部', '劳务人员', '管理人员'],
|
||||
personTypeList: ['全部', '施工人员', '管理人员'],
|
||||
tableData: [],
|
||||
imgSrc: '', //
|
||||
img: false, //头像放大弹窗
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -320,7 +320,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -653,7 +653,7 @@ export default {
|
||||
workerTypeList: [], //工种列表
|
||||
|
||||
managermentPersonTotal: 0, //管理人员
|
||||
workerPersonTotal: 0, //劳务人员
|
||||
workerPersonTotal: 0, //施工人员
|
||||
totalRegPersonNum: [], //在册人员
|
||||
totalRegPersonNum2: 0, //在册人员
|
||||
trained: 0, // 已培训人数
|
||||
@ -731,7 +731,7 @@ export default {
|
||||
(this.wokerTypePersonNum = []), //各工种人数
|
||||
(this.workerTypeList = []), //工种列表
|
||||
(this.managermentPersonTotal = 0), //管理人员
|
||||
(this.workerPersonTotal = 0), //劳务人员
|
||||
(this.workerPersonTotal = 0), //施工人员
|
||||
(this.totalRegPersonNum = []), //在册人员
|
||||
(this.totalRegPersonNum2 = 0), //在册人员
|
||||
(this.trained = 0), // 已培训人数
|
||||
@ -1376,7 +1376,7 @@ export default {
|
||||
// orient: "horizontal",
|
||||
// x: "50%",
|
||||
// y: "0",
|
||||
// data: ["劳务人员"],
|
||||
// data: ["施工人员"],
|
||||
// icon: "rect",
|
||||
// itemWidth: 7,
|
||||
// itemHeight: 3,
|
||||
@ -1470,7 +1470,7 @@ export default {
|
||||
// },
|
||||
|
||||
// {
|
||||
// name: "劳务人员",
|
||||
// name: "施工人员",
|
||||
// type: "bar",
|
||||
// emphasis: {
|
||||
// focus: "series",
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -265,7 +265,7 @@
|
||||
alt=""
|
||||
/>
|
||||
<div class="counts">
|
||||
<span>劳务人员</span>
|
||||
<span>施工人员</span>
|
||||
<span>{{ workerPersonTotal }}</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -531,7 +531,7 @@ export default {
|
||||
workerTypeList: [], //工种列表
|
||||
|
||||
managermentPersonTotal: 0, //管理人员
|
||||
workerPersonTotal: 0, //劳务人员
|
||||
workerPersonTotal: 0, //施工人员
|
||||
totalRegPersonNum: [], //在册人员
|
||||
totalRegPersonNum2: 0, //在册人员
|
||||
trained: 0, // 已培训人数
|
||||
@ -599,7 +599,7 @@ export default {
|
||||
(this.wokerTypePersonNum = []), //各工种人数
|
||||
(this.workerTypeList = []), //工种列表
|
||||
(this.managermentPersonTotal = 0), //管理人员
|
||||
(this.workerPersonTotal = 0), //劳务人员
|
||||
(this.workerPersonTotal = 0), //施工人员
|
||||
(this.totalRegPersonNum = []), //在册人员
|
||||
(this.totalRegPersonNum2 = 0), //在册人员
|
||||
(this.trained = 0), // 已培训人数
|
||||
@ -1242,7 +1242,7 @@ export default {
|
||||
// orient: "horizontal",
|
||||
// x: "50%",
|
||||
// y: "0",
|
||||
// data: ["劳务人员"],
|
||||
// data: ["施工人员"],
|
||||
// icon: "rect",
|
||||
// itemWidth: 7,
|
||||
// itemHeight: 3,
|
||||
@ -1336,7 +1336,7 @@ export default {
|
||||
// },
|
||||
|
||||
// {
|
||||
// name: "劳务人员",
|
||||
// name: "施工人员",
|
||||
// type: "bar",
|
||||
// emphasis: {
|
||||
// focus: "series",
|
||||
|
||||
@ -143,7 +143,7 @@
|
||||
</el-row>
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否开启劳务人员资质证书到期预警" prop="isOpenCertificateExpireWarn">
|
||||
<el-form-item label="是否开启施工人员资质证书到期预警" prop="isOpenCertificateExpireWarn">
|
||||
<div class="form-item-content">
|
||||
<el-switch
|
||||
v-model="form.isOpenCertificateExpireWarn"
|
||||
@ -301,7 +301,7 @@ export default {
|
||||
dataCenter: '', //资料中心
|
||||
projectFront: '', // 项目前台
|
||||
isShowProjectFront: 0, // 是否显示项目前台
|
||||
isOpenCertificateExpireWarn: 0, // 是否开启劳务人员资质证书到期预警
|
||||
isOpenCertificateExpireWarn: 0, // 是否开启施工人员资质证书到期预警
|
||||
certificateExpireWarnAheadDay: 0, // 提前多少天
|
||||
},
|
||||
zoomType: '0',
|
||||
|
||||
@ -121,7 +121,7 @@
|
||||
<div class="dialog-person">
|
||||
<div class="labor-type">
|
||||
<div class="type-box" @click="laborChange(2)" :class="laborType == 2 ? 'laborActive' : ''">管理人员</div>
|
||||
<div class="type-box" @click="laborChange(1)" :class="laborType == 1 ? 'laborActive' : ''">劳务人员</div>
|
||||
<div class="type-box" @click="laborChange(1)" :class="laborType == 1 ? 'laborActive' : ''">施工人员</div>
|
||||
<div class="type-box" @click="laborChange(3)" :class="laborType == 3 ? 'laborActive' : ''">临时人员</div>
|
||||
</div>
|
||||
<vue-scroll style="height: calc(100% - 120px)">
|
||||
@ -234,7 +234,7 @@ export default {
|
||||
return {
|
||||
laborRadio: '', //选择
|
||||
laborInfo: '', //选中劳务信息
|
||||
laborType: 2, //劳务人员类型 1、劳务人员 2、管理人员 3、临时人员
|
||||
laborType: 2, //施工人员类型 1、施工人员 2、管理人员 3、临时人员
|
||||
fileUrl: '', //文件上传地址
|
||||
tableListData: [], // 劳务列表
|
||||
choicePerson: false,
|
||||
@ -406,7 +406,7 @@ export default {
|
||||
})
|
||||
},
|
||||
|
||||
// 获取*********劳务人员************数据
|
||||
// 获取*********施工人员************数据
|
||||
|
||||
laborClose() {
|
||||
console.log('选择人员弹窗关闭', this.addEditForm)
|
||||
@ -478,7 +478,7 @@ export default {
|
||||
submitPerson() {
|
||||
this.addEditForm.workerInfoId = this.laborInfo.id
|
||||
this.addEditForm.personName = this.laborInfo.workerName
|
||||
console.log('选中劳务人员', this.addEditForm)
|
||||
console.log('选中施工人员', this.addEditForm)
|
||||
this.choicePerson = false
|
||||
},
|
||||
|
||||
|
||||
@ -263,7 +263,7 @@ export default {
|
||||
getLaborManagementList() {
|
||||
getCrewListDataApi({ projectSn: this.$store.state.projectSn, workerName: '' }).then(result => {
|
||||
if (result.success) {
|
||||
console.log('劳务人员', result)
|
||||
console.log('施工人员', result)
|
||||
this.options = result.result
|
||||
}
|
||||
})
|
||||
|
||||
@ -498,7 +498,7 @@ export default {
|
||||
projectSn: this.$store.state.projectSn
|
||||
}).then((result) => {
|
||||
if (result.success) {
|
||||
console.log('劳务人员', result)
|
||||
console.log('施工人员', result)
|
||||
this.options = result.result
|
||||
}
|
||||
})
|
||||
|
||||
@ -311,7 +311,7 @@
|
||||
getLaborManagementList() {
|
||||
getLaborManagementInfoList({projectSn: this.$store.state.projectSn, workerName: ''}).then(result => {
|
||||
if (result.success) {
|
||||
console.log('劳务人员', result);
|
||||
console.log('施工人员', result);
|
||||
this.options = result.result;
|
||||
}
|
||||
})
|
||||
|
||||
@ -495,7 +495,7 @@ export default {
|
||||
projectSn: this.$store.state.projectSn
|
||||
}).then((result) => {
|
||||
if (result.success) {
|
||||
console.log('劳务人员', result)
|
||||
console.log('施工人员', result)
|
||||
this.options = result.result
|
||||
}
|
||||
})
|
||||
|
||||
@ -149,7 +149,7 @@
|
||||
</el-row>
|
||||
<el-row :gutter="12">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="是否开启劳务人员资质证书到期预警" prop="isOpenCertificateExpireWarn">
|
||||
<el-form-item label="是否开启施工人员资质证书到期预警" prop="isOpenCertificateExpireWarn">
|
||||
<div class="form-item-content">
|
||||
<el-switch
|
||||
v-model="form.isOpenCertificateExpireWarn"
|
||||
|
||||
@ -57,11 +57,11 @@
|
||||
<div class="countBox" style="display: flex">
|
||||
<div class="countBoxItem">
|
||||
<span>{{ statisticsCount.workercount.lwPersonTotal }}</span>
|
||||
<p>在册劳务人员数</p>
|
||||
<p>在册施工人员数</p>
|
||||
</div>
|
||||
<div class="countBoxItem">
|
||||
<span>{{ statisticsCount.presencecount.lwPersonTotal }}</span>
|
||||
<p>在场劳务人员数</p>
|
||||
<p>在场施工人员数</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -164,7 +164,7 @@
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <!– <div class="timeInner">-->
|
||||
<!-- <p>劳务人员</p>-->
|
||||
<!-- <p>施工人员</p>-->
|
||||
<!-- <div class="bg1 small"><span class="num">{{ statisticsCount.presencecount.lwPersonTotal }}</span></div>-->
|
||||
<!-- </div> –>-->
|
||||
<!-- <div class="timeInner">-->
|
||||
@ -1054,7 +1054,7 @@ export default {
|
||||
},
|
||||
{
|
||||
value: this.statisticsCount.workercount.lwPersonTotal,
|
||||
name: /* "劳务人员", */ this.$t(
|
||||
name: /* "施工人员", */ this.$t(
|
||||
'message.dataBoard.contractWorkers'
|
||||
)
|
||||
},
|
||||
|
||||
@ -49,11 +49,11 @@
|
||||
<div class="countBox" style="display:flex">
|
||||
<div class="countBoxItem">
|
||||
<span>{{statisticsCount.workercount.lwPersonTotal}}</span>
|
||||
<p>在册劳务人员数</p>
|
||||
<p>在册施工人员数</p>
|
||||
</div>
|
||||
<div class="countBoxItem">
|
||||
<span>{{statisticsCount.presencecount.lwPersonTotal}}</span>
|
||||
<p>在场劳务人员数</p>
|
||||
<p>在场施工人员数</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -142,7 +142,7 @@
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <!– <div class="timeInner">-->
|
||||
<!-- <p>劳务人员</p>-->
|
||||
<!-- <p>施工人员</p>-->
|
||||
<!-- <div class="bg1 small"><span class="num">{{ statisticsCount.presencecount.lwPersonTotal }}</span></div>-->
|
||||
<!-- </div> –>-->
|
||||
<!-- <div class="timeInner">-->
|
||||
@ -965,7 +965,7 @@ export default {
|
||||
},
|
||||
{
|
||||
value: this.statisticsCount.workercount.lwPersonTotal,
|
||||
name: /* "劳务人员", */this.$t('message.dataBoard.contractWorkers'),
|
||||
name: /* "施工人员", */this.$t('message.dataBoard.contractWorkers'),
|
||||
},
|
||||
{
|
||||
value: this.statisticsCount.workercount.lsPersonTotal,
|
||||
|
||||
@ -303,7 +303,7 @@ export default {
|
||||
},
|
||||
{
|
||||
value: this.statisticsCount.workercount.lwPersonTotal,
|
||||
name: /* "劳务人员", */ this.$t(
|
||||
name: /* "施工人员", */ this.$t(
|
||||
'message.dataBoard.contractWorkers'
|
||||
)
|
||||
},
|
||||
|
||||
@ -57,8 +57,8 @@
|
||||
<p class="person">{{statisticsCount.presencecount.lwPersonTotal}}</p>
|
||||
</div>
|
||||
<div class="persontype">
|
||||
<span>在册劳务人员数</span>
|
||||
<span>在场劳务人员数</span>
|
||||
<span>在册施工人员数</span>
|
||||
<span>在场施工人员数</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="minTit">
|
||||
|
||||
@ -86,7 +86,7 @@ export default {
|
||||
},
|
||||
data: [
|
||||
{ name: "管理人员", value: this.statisticsCount.workercount.glPersonTotal },
|
||||
{ name: "劳务人员", value: this.statisticsCount.workercount.lwPersonTotal },
|
||||
{ name: "施工人员", value: this.statisticsCount.workercount.lwPersonTotal },
|
||||
{ name: "临时人员", value: this.statisticsCount.workercount.lsPersonTotal },
|
||||
]
|
||||
}
|
||||
|
||||
@ -234,7 +234,7 @@ import {
|
||||
getLaborManagementList() {
|
||||
getProjectChilderSystemUserListApi({projectSn: this.$store.state.projectSn, workerName: ''}).then(result => {
|
||||
if (result.success) {
|
||||
console.log('劳务人员', result);
|
||||
console.log('施工人员', result);
|
||||
this.options = result.result;
|
||||
}
|
||||
})
|
||||
|
||||
@ -392,7 +392,7 @@ export default {
|
||||
getWorkerInfoList(data).then(res => {
|
||||
if (res.code == 200) {
|
||||
this.workerListOptions = res.result.records
|
||||
console.log('获取劳务人员下拉', this.workerListOptions)
|
||||
console.log('获取施工人员下拉', this.workerListOptions)
|
||||
} else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
|
||||
@ -693,7 +693,7 @@ import {
|
||||
// getLaborManagementList() {
|
||||
// getLaborManagementInfoList({projectSn: this.$store.state.projectSn, workerName: ''}).then(result => {
|
||||
// if (result.success) {
|
||||
// console.log('劳务人员', result);
|
||||
// console.log('施工人员', result);
|
||||
// this.options = result.result;
|
||||
// }
|
||||
// })
|
||||
|
||||
@ -75,34 +75,39 @@
|
||||
<div class="table_wrap whiteBlock">
|
||||
<el-table class="tables" :data="List">
|
||||
<el-table-column
|
||||
width="300"
|
||||
prop="enterpriseName"
|
||||
align="center"
|
||||
label="企业名称"
|
||||
show-overflow-tooltip
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
width="90"
|
||||
prop="carNumber"
|
||||
align="center"
|
||||
:label="$t('message.carManage.carNumber')"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
v-if="COMPANY != 'neimenggu'"
|
||||
prop="carColor"
|
||||
label="车身颜色"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
></el-table-column> -->
|
||||
<el-table-column
|
||||
width="100"
|
||||
prop="carTypeName"
|
||||
:label="$t('message.carManage.carType')"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="80"
|
||||
prop="driverWorkerName"
|
||||
:label="$t('message.carManage.driverName')"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
width="110"
|
||||
prop="driverTelephone"
|
||||
:label="$t('message.carManage.driverTelephone')"
|
||||
align="center"
|
||||
@ -110,6 +115,7 @@
|
||||
<!-- 黑白名单调控 -->
|
||||
<el-table-column
|
||||
prop="isBlack"
|
||||
width="90"
|
||||
:label="$t('message.carManage.isBlack')"
|
||||
align="center"
|
||||
>
|
||||
@ -136,7 +142,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
width="80"
|
||||
align="center"
|
||||
:label="$t('message.carManage.carPhotosUrl')"
|
||||
@ -164,13 +170,13 @@
|
||||
height="50px"
|
||||
/>
|
||||
</div>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
|
||||
<el-table-column
|
||||
prop="carModuleType"
|
||||
align="center"
|
||||
label="固定/临时/外来车辆"
|
||||
width="180"
|
||||
width="150"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.carModuleType === 1">固定车辆</span>
|
||||
@ -187,14 +193,17 @@
|
||||
>
|
||||
<template slot-scope="scope" v-if="[2,3].includes(scope.row.carModuleType)">
|
||||
<span v-if="[2,3].includes(scope.row.carModuleType) && scope.row.reserveStartTime">
|
||||
{{
|
||||
<!-- {{
|
||||
scope.row.reserveStartTime + " 至 " + scope.row.reserveEndTime
|
||||
}}
|
||||
}} -->
|
||||
<span>开始：{{scope.row.reserveStartTime}}</span><br>
|
||||
<span>结束：{{scope.row.reserveEndTime}}</span>
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
width="110"
|
||||
prop="entryAndExitPermit"
|
||||
align="center"
|
||||
:label="$t('message.carManage.entryAndExitPermit')"
|
||||
@ -204,7 +213,7 @@
|
||||
<span v-else-if="scope.row.entryAndExitPermit === 1">多次</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="车辆下发状态">
|
||||
<el-table-column width="110" align="center" label="车辆下发状态">
|
||||
<template v-slot="{ row }">
|
||||
<span
|
||||
:class="[
|
||||
@ -230,7 +239,7 @@
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
<!-- <el-table-column
|
||||
width="80"
|
||||
align="center"
|
||||
label="驾驶证"
|
||||
@ -345,11 +354,11 @@
|
||||
height="50px"
|
||||
/>
|
||||
</div>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
:label="$t('message.deviceManage.operation')"
|
||||
align="center"
|
||||
width="280px"
|
||||
width="320px"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<div class="tableBtns">
|
||||
@ -365,6 +374,14 @@
|
||||
/>
|
||||
<span>下发详情</span>
|
||||
</div>
|
||||
<div @click="showOtherDetailDialog(scope.row)" class="operationText">
|
||||
<img
|
||||
src="@/assets/images/icon-detail.png"
|
||||
width="15px"
|
||||
height="15px"
|
||||
/>
|
||||
<span>查看详情</span>
|
||||
</div>
|
||||
<div
|
||||
v-permission="{
|
||||
key: 'clgl_edit',
|
||||
@ -856,6 +873,310 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!-- <img :preview="showImgUrl" :src="showImgUrl" alt="">-->
|
||||
<!-- 其他详情 -->
|
||||
<!-- 下发详情 -->
|
||||
<el-dialog
|
||||
:modal-append-to-body="false"
|
||||
title="其他详情"
|
||||
:close-on-click-modal="false"
|
||||
:visible.sync="showOtherDetail"
|
||||
width="850px"
|
||||
>
|
||||
<!-- <div class="dialogOtherDetail">
|
||||
<vue-scroll>
|
||||
<div class="innerContainer">
|
||||
<div>企业名称：</div>
|
||||
<div>车牌号：</div>
|
||||
<div>车身颜色：</div>
|
||||
<div>车辆类型：</div>
|
||||
<div>司机姓名：</div>
|
||||
<div>司机电话：</div>
|
||||
<div>是否黑名单：</div>
|
||||
<div>车辆图片：</div>
|
||||
<div>固定/临时/外来车辆：</div>
|
||||
<div>预约时间：</div>
|
||||
<div>允许进出次数：</div>
|
||||
<div>车辆下发状态：</div>
|
||||
<div>驾驶证：</div>
|
||||
<div>行驶证：</div>
|
||||
<div>交强险：</div>
|
||||
<div>其他证明：</div>
|
||||
</div>
|
||||
</vue-scroll>
|
||||
</div> -->
|
||||
<div style="height: 420px">
|
||||
<vue-scroll>
|
||||
<div style="width: 800px">
|
||||
<!-- 隐患记录 超期整改 -->
|
||||
<div class="headerLeft">车辆记录详情</div>
|
||||
<div class="detailBox">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">企业名称：</span>
|
||||
<span class="value">{{entityDetail.enterpriseName}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">车牌号：</span>
|
||||
<span class="value">{{entityDetail.carNumber}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">车身颜色：</span>
|
||||
<span class="value">{{entityDetail.carColor}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">车辆类型：</span>
|
||||
<span class="value">{{entityDetail.carTypeName}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">司机姓名：</span>
|
||||
<span class="value">{{entityDetail.driverWorkerName}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">司机电话：</span>
|
||||
<span class="value">{{entityDetail.driverTelephone}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label" style="margin-left:0px">是否黑名单：</span>
|
||||
<span class="value">{{entityDetail.isBlack === 0 ? '是':'否'}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">固定/临时/外来车辆：</span>
|
||||
<span class="value" v-if="entityDetail.carModuleType === 1">固定车辆</span>
|
||||
<span class="value" v-else-if="entityDetail.carModuleType === 2">临时车辆</span>
|
||||
<span class="value" v-else>外来车辆</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">预约开始时间：</span>
|
||||
<span class="value">{{entityDetail.reserveStartTime}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">预约结束时间：</span>
|
||||
<span class="value">{{entityDetail.reserveEndTime}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">允许进出次数：</span>
|
||||
<span class="value" v-if="entityDetail.entryAndExitPermit === 0">单次</span>
|
||||
<span class="value" v-if="entityDetail.entryAndExitPermit === 1">多次</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">车辆下发状态：</span>
|
||||
<span class="value">
|
||||
<span :class="['valuesColor',
|
||||
entityDetail.sendSuccessStatus === 1
|
||||
? 'green'
|
||||
: entityDetail.sendSuccessStatus === 2
|
||||
? 'red'
|
||||
: entityDetail.sendSuccessStatus === 3
|
||||
? 'yellow'
|
||||
: '',
|
||||
]"
|
||||
>
|
||||
{{entityDetail.sendSuccessStatus === 1
|
||||
? "成功"
|
||||
: entityDetail.sendSuccessStatus === 2
|
||||
? "失败"
|
||||
: entityDetail.sendSuccessStatus === 3
|
||||
? "部分成功"
|
||||
: ""
|
||||
}}</span
|
||||
>
|
||||
</span>
|
||||
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">车辆图片：</span>
|
||||
<span class="value">
|
||||
<img
|
||||
v-if="
|
||||
entityDetail.carPhotosUrl &&
|
||||
JSON.parse(entityDetail.carPhotosUrl).length > 0
|
||||
"
|
||||
:preview="
|
||||
JSON.parse(entityDetail.carPhotosUrl)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.carPhotosUrl)[0].url
|
||||
: ''
|
||||
"
|
||||
:src="
|
||||
JSON.parse(entityDetail.carPhotosUrl)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.carPhotosUrl)[0].url
|
||||
: ''
|
||||
"
|
||||
alt=""
|
||||
width="50px"
|
||||
height="50px"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">驾驶证：</span>
|
||||
<span class="value">
|
||||
<img
|
||||
v-if="
|
||||
entityDetail.jsz &&
|
||||
JSON.parse(entityDetail.jsz).length > 0
|
||||
"
|
||||
:preview="
|
||||
JSON.parse(entityDetail.jsz)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.jsz)[0].url
|
||||
: ''
|
||||
"
|
||||
:src="
|
||||
JSON.parse(entityDetail.jsz)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.jsz)[0].url
|
||||
: ''
|
||||
"
|
||||
alt=""
|
||||
width="50px"
|
||||
height="50px"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">行驶证：</span>
|
||||
<span class="value">
|
||||
<img
|
||||
v-if="
|
||||
entityDetail.xsz &&
|
||||
JSON.parse(entityDetail.xsz).length > 0
|
||||
"
|
||||
:preview="
|
||||
JSON.parse(entityDetail.xsz)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.xsz)[0].url
|
||||
: ''
|
||||
"
|
||||
:src="
|
||||
JSON.parse(entityDetail.xsz)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.xsz)[0].url
|
||||
: ''
|
||||
"
|
||||
alt=""
|
||||
width="50px"
|
||||
height="50px"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">交强险：</span>
|
||||
<span class="value">
|
||||
<img
|
||||
v-if="
|
||||
entityDetail.jqx &&
|
||||
JSON.parse(entityDetail.jqx).length > 0
|
||||
"
|
||||
:preview="
|
||||
JSON.parse(entityDetail.jqx)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.jqx)[0].url
|
||||
: ''
|
||||
"
|
||||
:src="
|
||||
JSON.parse(entityDetail.jqx)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.jqx)[0].url
|
||||
: ''
|
||||
"
|
||||
alt=""
|
||||
width="50px"
|
||||
height="50px"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label">其他证明：</span>
|
||||
<span class="value">
|
||||
<img
|
||||
v-if="
|
||||
entityDetail.otherProve &&
|
||||
JSON.parse(entityDetail.otherProve).length > 0
|
||||
"
|
||||
:preview="
|
||||
JSON.parse(entityDetail.otherProve)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.otherProve)[0].url
|
||||
: ''
|
||||
"
|
||||
:src="
|
||||
JSON.parse(entityDetail.otherProve)[0]
|
||||
? $store.state.FILEURL +
|
||||
JSON.parse(entityDetail.otherProve)[0].url
|
||||
: ''
|
||||
"
|
||||
alt=""
|
||||
width="50px"
|
||||
height="50px"
|
||||
/>
|
||||
</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div class="grid-content">
|
||||
<span class="label"></span>
|
||||
<span class="value"></span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</vue-scroll>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -1105,6 +1426,10 @@ export default {
|
||||
},
|
||||
whoId: "",
|
||||
issuePointList: [],
|
||||
|
||||
showOtherDetail: false,
|
||||
entityDetail: {},
|
||||
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -1123,6 +1448,11 @@ export default {
|
||||
this.whoId = id;
|
||||
this.getNewestList();
|
||||
},
|
||||
// 展示其他详情
|
||||
showOtherDetailDialog(item) {
|
||||
this.showOtherDetail = true;
|
||||
this.entityDetail = item
|
||||
},
|
||||
async getNewestList() {
|
||||
const res = await xmglXzHikvisionSyncGetNewestList({
|
||||
// pageNo:this.issuePage.pageNo,
|
||||
@ -1690,7 +2020,50 @@ export default {
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.operationText{
|
||||
margin-right: 10px;
|
||||
}
|
||||
.detailBox {
|
||||
.grid-content {
|
||||
overflow: hidden;
|
||||
margin-bottom: 10px;
|
||||
.label {
|
||||
float: left;
|
||||
width: 150px;
|
||||
text-align: right;
|
||||
}
|
||||
.value {
|
||||
float: left;
|
||||
width: calc(80% - 150px);
|
||||
margin-left: 10px;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
}
|
||||
}
|
||||
}
|
||||
.headerLeft {
|
||||
height: 30px;
|
||||
background: #ededed;
|
||||
font-size: 14px;
|
||||
color: #616266;
|
||||
line-height: 30px;
|
||||
padding: 0 10px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.dialogOtherDetail{
|
||||
background-color: darkred;
|
||||
height: 550px;
|
||||
.innerContainer{
|
||||
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<style lang="less">
|
||||
|
||||
.tables {
|
||||
img {
|
||||
cursor: pointer;
|
||||
|
||||
@ -515,7 +515,7 @@ export default {
|
||||
workerName: "",
|
||||
}).then((result) => {
|
||||
if (result.success) {
|
||||
console.log("劳务人员", result);
|
||||
console.log("施工人员", result);
|
||||
this.options = result.result;
|
||||
}
|
||||
});
|
||||
|
||||
@ -218,7 +218,7 @@ export default {
|
||||
fontColor: "green",
|
||||
//下方结构
|
||||
flag: true,
|
||||
//劳务人员信息
|
||||
//施工人员信息
|
||||
WorkerInfo: {},
|
||||
//项目Sn
|
||||
projectSn: "",
|
||||
|
||||
@ -109,7 +109,7 @@
|
||||
<div>
|
||||
<!-- <el-select v-model="personType" style="width:128px;margin-left:9px" size="mini" placeholder="请选择" @change="getWorkerInfoList"> -->
|
||||
<el-select v-model="personType" style="width:128px;margin-left:9px" size="mini" placeholder="请选择">
|
||||
<el-option label="劳务人员" :value="1"></el-option>
|
||||
<el-option label="施工人员" :value="1"></el-option>
|
||||
<el-option label="管理人员" :value="2"></el-option>
|
||||
<el-option label="临时人员" :value="3"></el-option>
|
||||
</el-select>
|
||||
@ -347,7 +347,7 @@ export default {
|
||||
label: 'workerName',
|
||||
},
|
||||
|
||||
laborPersonList: [], // 劳务人员列表
|
||||
laborPersonList: [], // 施工人员列表
|
||||
adminPersonList: [], // 管理人员列表
|
||||
tempPersonList: [], // 临时人员列表
|
||||
checkedPersonList: [], // 源列表已选人员列表
|
||||
@ -509,7 +509,7 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
async getLaborPersonList(){ //获取劳务人员列表
|
||||
async getLaborPersonList(){ //获取施工人员列表
|
||||
let data = {
|
||||
personType: 1,
|
||||
projectSn: this.projectSn,
|
||||
@ -527,7 +527,7 @@ export default {
|
||||
})
|
||||
}
|
||||
this.laborPersonList = this.teamInfoList
|
||||
console.log('==========劳务人员列表==========',this.laborPersonList)
|
||||
console.log('==========施工人员列表==========',this.laborPersonList)
|
||||
},
|
||||
async getAdminPersonList(){ //获取管理人员列表
|
||||
let data = {
|
||||
@ -583,7 +583,7 @@ export default {
|
||||
})
|
||||
}
|
||||
this.laborPersonList = this.teamInfoList
|
||||
console.log('==========劳务人员列表==========',this.laborPersonList)
|
||||
console.log('==========施工人员列表==========',this.laborPersonList)
|
||||
}
|
||||
if(this.personType === 2){
|
||||
for(let i = 0;i<this.departmentList.length;i++){
|
||||
@ -738,7 +738,7 @@ export default {
|
||||
},
|
||||
clearObj(){ //清空表单
|
||||
this.addCourseForm = {}
|
||||
this.laborPersonList = [] //劳务人员
|
||||
this.laborPersonList = [] //施工人员
|
||||
this.adminPersonList = [] //管理人员
|
||||
this.tempPersonList = [] //临时人员
|
||||
this.compulsoryList = []
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
// 人员类型选项
|
||||
export const personTypeOptions = [
|
||||
{
|
||||
label: '劳务人员',
|
||||
label: '施工人员',
|
||||
value: 1,
|
||||
},
|
||||
{
|
||||
|
||||
@ -350,7 +350,7 @@ export default {
|
||||
personTypeOptions,
|
||||
// 人员类型枚举
|
||||
personTypeEnum: {
|
||||
'1': '劳务人员',
|
||||
'1': '施工人员',
|
||||
'2': '管理人员',
|
||||
},
|
||||
// 所属企业选项
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user