fix: BUG修改
This commit is contained in:
kun
parent
e49b2eaab8
commit
68fcd3862d
@ -122,6 +122,7 @@ export const getPageListApi = data => post('xmgl/workerAttendance/list', data);/
|
||||
export const getAdministratorCertificateApi = data => post('xmgl/workerCertificate/selectProjectManageCertificateTotal', data);//分页查询考勤信息
|
||||
export const getWorkerTeamStatisticsApi = data => post('xmgl/workerInfo/selectWorkerTeamStatistics', data);//查询项目下按照班组统计
|
||||
export const getPersonTypeAndEduStatisticsApi = data => post('xmgl/workerInfo/selectPersonTypeAndEduStatistics', data);//查询人员总览人员类型和教育统计
|
||||
export const getSafetyPerformanceAnalysisApi = data => post('xmgl/workerAttendance/safetyPerformanceAnalysis', data);
|
||||
|
||||
//评价中心
|
||||
export const getAssessmentListApi = data => post('xmgl/workerEvaluate/selectWorkerEvaluatePageList', data);//查询人员评价信息 不良 、奖励
|
||||
|
||||
@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
|
||||
// axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地
|
||||
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
|
||||
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
|
||||
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
|
||||
@ -97,7 +97,7 @@ if (process.env.NODE_ENV == 'development') {
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
|
||||
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
|
||||
// axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
|
||||
axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
|
||||
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
|
||||
|
||||
} else if (process.env.NODE_ENV == 'debug') {
|
||||
|
||||
@ -54,23 +54,23 @@
|
||||
</div>
|
||||
<div class="work-data-analysis" v-show="timeRadio == '3'">
|
||||
<div class="analysis-item">
|
||||
<span>18/98</span>
|
||||
<span>{{safeData.notPerformNum || 0}}/{{safeData.inServiceNum || 0}}</span>
|
||||
<span>未履职人员</span>
|
||||
</div>
|
||||
<div class="analysis-item">
|
||||
<span>18/98</span>
|
||||
<span>{{safeData.xmjlNotPerformNum || 0}}/{{safeData.xmjlInServiceNum || 0}}</span>
|
||||
<span>项目经理</span>
|
||||
</div>
|
||||
<div class="analysis-item">
|
||||
<span>18/98</span>
|
||||
<span>{{safeData.aqyNotPerformNum || 0}}/{{safeData.aqyInServiceNum || 0}}</span>
|
||||
<span>安全员</span>
|
||||
</div>
|
||||
<div class="analysis-item">
|
||||
<span>18/98</span>
|
||||
<span>{{safeData.zlyNotPerformNum || 0}}/{{safeData.zlyInServiceNum || 0}}</span>
|
||||
<span>质量员</span>
|
||||
</div>
|
||||
<div class="analysis-item">
|
||||
<span>18/98</span>
|
||||
<span>{{safeData.jlNotPerformNum || 0}}/{{safeData.jlInServiceNum || 0}}</span>
|
||||
<span>监理</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -81,30 +81,50 @@
|
||||
height="95%"
|
||||
>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
prop="enterpriseName"
|
||||
align="center"
|
||||
label="企业名称"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="未履职人数"
|
||||
></el-table-column>
|
||||
>
|
||||
<template v-slot="{ row }">
|
||||
<span>{{row.notPerformNum || 0}}/{{row.inServiceNum || 0}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="项目经理"
|
||||
></el-table-column>
|
||||
>
|
||||
<template v-slot="{ row }">
|
||||
<span>{{row.xmjlNotPerformNum || 0}}/{{row.xmjlInServiceNum || 0}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="安全员"
|
||||
></el-table-column>
|
||||
>
|
||||
<template v-slot="{ row }">
|
||||
<span>{{row.aqyNotPerformNum || 0}}/{{row.aqyInServiceNum || 0}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="质量员"
|
||||
></el-table-column>
|
||||
>
|
||||
<template v-slot="{ row }">
|
||||
<span>{{row.zlyNotPerformNum || 0}}/{{row.zlyInServiceNum || 0}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="监理"
|
||||
>
|
||||
<template v-slot="{ row }">
|
||||
<span>{{row.jlNotPerformNum || 0}}/{{row.jlInServiceNum || 0}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="echarts" ref="safetyTraining" v-show="timeRadio == '4'"></div>
|
||||
@ -470,6 +490,7 @@ import {
|
||||
getEnterpriseInfoList,
|
||||
getWorkerTeamStatisticsApi,
|
||||
getPersonTypeAndEduStatisticsApi,
|
||||
getSafetyPerformanceAnalysisApi
|
||||
} from "@/assets/js/api/laborPerson";
|
||||
import { selectProjectComapnyWorkTotalListApi } from "@/assets/js/api/dataBoard.js";
|
||||
|
||||
@ -507,6 +528,7 @@ export default {
|
||||
enterpriseListData: [],
|
||||
teamListData: [],
|
||||
departmentListData: [],
|
||||
safeData: {}
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -516,6 +538,7 @@ export default {
|
||||
|
||||
this.selectWorkerTeamStatistics();
|
||||
this.selectPersonTypeAndEduStatistics();
|
||||
this.selectSafetyPerformanceAnalysisFn();
|
||||
// this.getCertificateList();
|
||||
this.getCrewRealTimeData();
|
||||
this.getCompanyAttendData();
|
||||
@ -526,6 +549,7 @@ export default {
|
||||
this.interval = setInterval(() => {
|
||||
this.selectWorkerTeamStatistics();
|
||||
this.selectPersonTypeAndEduStatistics();
|
||||
this.selectSafetyPerformanceAnalysisFn();
|
||||
// this.getCertificateList();
|
||||
this.getCrewRealTimeData();
|
||||
this.getCompanyAttendData();
|
||||
@ -819,6 +843,17 @@ export default {
|
||||
this.teamList = res.result;
|
||||
});
|
||||
},
|
||||
//查询安全履职分析数据
|
||||
selectSafetyPerformanceAnalysisFn() {
|
||||
let that = this;
|
||||
getSafetyPerformanceAnalysisApi({
|
||||
projectSn: this.$store.state.projectSn,
|
||||
userEnterpriseId: this.$store.state.userInfo.userEnterpriseId,
|
||||
}).then((res) => {
|
||||
that.safeData = res.result;
|
||||
that.safeWorkList = res.result.list || [];
|
||||
});
|
||||
},
|
||||
//查询人员类型和教育统计
|
||||
selectPersonTypeAndEduStatistics() {
|
||||
getPersonTypeAndEduStatisticsApi({
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user