fix: BUG修改
This commit is contained in:
kun
parent
1186b1804a
commit
8e8a177e53
@ -60,35 +60,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-dialog v-model="dialogVisible" title="人员履职情况分析(整改人)" width="1200">
|
||||
<div class="dialogContainer">
|
||||
<div class="tabList">
|
||||
<div>姓名</div>
|
||||
<div>整改总数</div>
|
||||
<div>超期整改数</div>
|
||||
<div>超期未整改数</div>
|
||||
<div>整改率</div>
|
||||
<div>及时整改率</div>
|
||||
</div>
|
||||
<div class="listBox">
|
||||
<el-scrollbar height="350">
|
||||
<div v-for="(item, index) in tabList" :key="index" class="listStyle">
|
||||
<div>{{ item.workerName }}</div>
|
||||
<div>{{ item.count }}</div>
|
||||
<div>{{ item.count }}</div>
|
||||
<div>{{ 0 }}</div>
|
||||
<div>{{ item.rate }}</div>
|
||||
<div>{{ item.immediateRate }}</div>
|
||||
</div>
|
||||
</el-scrollbar>
|
||||
<div class="notoDta" v-if="tabList.length == 0">
|
||||
<img src="@/assets/images/noData.png" alt="" />
|
||||
<p>暂无数据</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -104,7 +75,6 @@ const store = GlobalStore();
|
||||
const emits = defineEmits(["openDialog"])
|
||||
const activeName = ref("first");
|
||||
const activeIndex = ref("0" as any);
|
||||
const dialogVisible = ref(false);
|
||||
const dateRange = ref([]);
|
||||
const tabList = ref([] as any);
|
||||
const inspectTabList = ref([] as any);
|
||||
@ -134,7 +104,7 @@ let dataList2 = ref([
|
||||
}
|
||||
},
|
||||
{
|
||||
value: 765,
|
||||
value: 0,
|
||||
show: true,
|
||||
name: "完成人员",
|
||||
itemStyle: {
|
||||
@ -145,7 +115,7 @@ let dataList2 = ref([
|
||||
}
|
||||
},
|
||||
{
|
||||
value: 765,
|
||||
value: 0,
|
||||
show: true,
|
||||
name: "现场人员",
|
||||
itemStyle: {
|
||||
@ -162,26 +132,30 @@ const openDialogData = (obj:any) => {
|
||||
}
|
||||
//获取人员数据
|
||||
const getPersonList = async () => {
|
||||
const res = await getPersonTypeAndEduStatisticsApi({
|
||||
const res:any = await getPersonTypeAndEduStatisticsApi({
|
||||
projectSn: store.sn
|
||||
});
|
||||
if (res.result) {
|
||||
dataList2.value[1].value = res.result.personType.toaltPerson.totalPerson
|
||||
dataList2.value[2].value = res.result.personType.toaltPerson.totalPerson
|
||||
console.log('安全教育智能分析666',res)
|
||||
}
|
||||
};
|
||||
// 获取人员履职情况分析数据--整改人
|
||||
const getMemberJobStatusFn = async () => {
|
||||
let requestData:any = {
|
||||
projectSn: store.sn
|
||||
projectSn: store.sn,
|
||||
pageSize: 5,
|
||||
pageNo: 1
|
||||
}
|
||||
if(dateRange.value.length > 0){
|
||||
requestData.inspectTime_begin = dateRange.value[0];
|
||||
requestData.inspectTime_end = dateRange.value[1];
|
||||
}
|
||||
const res = await getMemberJobStatusApi(requestData);
|
||||
const res:any = await getMemberJobStatusApi(requestData);
|
||||
console.log('人员履职情况res--整改人',res)
|
||||
if(res.result){
|
||||
tabList.value = res.result;
|
||||
tabList.value = res.result.records;
|
||||
} else {
|
||||
tabList.value = [];
|
||||
}
|
||||
@ -189,16 +163,18 @@ const getMemberJobStatusFn = async () => {
|
||||
// 获取人员履职情况分析数据--检查人
|
||||
const getInspectManStatusFn = async () => {
|
||||
let requestData:any = {
|
||||
projectSn: store.sn
|
||||
projectSn: store.sn,
|
||||
pageSize: 5,
|
||||
pageNo: 1
|
||||
}
|
||||
if(dateRange.value.length > 0){
|
||||
requestData.inspectTime_begin = dateRange.value[0];
|
||||
requestData.inspectTime_end = dateRange.value[1];
|
||||
}
|
||||
const res = await getInspectManStatusApi(requestData);
|
||||
const res:any = await getInspectManStatusApi(requestData);
|
||||
console.log('人员履职情况res--检查人',res)
|
||||
if(res.result){
|
||||
tabList.value = res.result;
|
||||
tabList.value = res.result.records;
|
||||
} else {
|
||||
tabList.value = [];
|
||||
}
|
||||
@ -206,16 +182,18 @@ const getInspectManStatusFn = async () => {
|
||||
// 获取人员履职情况分析数据--按分包单位分析
|
||||
const getEnterpriseStatusFn = async () => {
|
||||
let requestData:any = {
|
||||
projectSn: store.sn
|
||||
projectSn: store.sn,
|
||||
pageSize: 5,
|
||||
pageNo: 1
|
||||
}
|
||||
if(dateRange.value.length > 0){
|
||||
requestData.inspectTime_begin = dateRange.value[0];
|
||||
requestData.inspectTime_end = dateRange.value[1];
|
||||
}
|
||||
const res = await getEnterpriseStatusApi(requestData);
|
||||
const res:any = await getEnterpriseStatusApi(requestData);
|
||||
console.log('人员履职情况res--按分包单位分析',res)
|
||||
if(res.result){
|
||||
tabList.value = res.result;
|
||||
tabList.value = res.result.records;
|
||||
} else {
|
||||
tabList.value = [];
|
||||
}
|
||||
@ -521,7 +499,12 @@ onMounted(async () => {
|
||||
// height: 10%;
|
||||
.hLeft {
|
||||
width: 50%;
|
||||
color: white;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
background-image: linear-gradient(to bottom left, #c8E3FF, #007AFF);
|
||||
-webkit-background-clip: text;
|
||||
background-clip: text;
|
||||
color: transparent;
|
||||
}
|
||||
.hRight {
|
||||
width: 50%;
|
||||
@ -537,7 +520,6 @@ onMounted(async () => {
|
||||
// width: 100%;
|
||||
height: 60%;
|
||||
// background-color: #fff;
|
||||
padding: 0 20px;
|
||||
position: relative;
|
||||
.leftTop {
|
||||
width: 100%;
|
||||
@ -546,13 +528,18 @@ onMounted(async () => {
|
||||
// width: 100%;
|
||||
// height: 100%;
|
||||
display: flex;
|
||||
// align-items: center;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 20px 20px;
|
||||
border-bottom: 1px solid #0059ff;
|
||||
.hLeft {
|
||||
width: 50%;
|
||||
color: white;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
background-image: linear-gradient(to bottom left, #c8E3FF, #007AFF);
|
||||
-webkit-background-clip: text;
|
||||
background-clip: text;
|
||||
color: transparent;
|
||||
}
|
||||
.hRight {
|
||||
width: 50%;
|
||||
|
||||
@ -107,7 +107,13 @@ onMounted(async () => {
|
||||
border-bottom: 1px solid #0059ff;
|
||||
.hLeft {
|
||||
width: 50%;
|
||||
color: white;
|
||||
// color: white;
|
||||
font-size: 20px;
|
||||
font-weight: bold;
|
||||
background-image: linear-gradient(to bottom left, #c8E3FF, #007AFF);
|
||||
-webkit-background-clip: text;
|
||||
background-clip: text;
|
||||
color: transparent;
|
||||
}
|
||||
.hRight {
|
||||
width: 50%;
|
||||
@ -119,7 +125,7 @@ onMounted(async () => {
|
||||
margin-top: 10px;
|
||||
margin-left: 20px;
|
||||
&-info:not(:first-child){
|
||||
margin-top: 10px;
|
||||
margin-top: 11px;
|
||||
}
|
||||
&-info{
|
||||
display: flex;
|
||||
|
||||
@ -12,12 +12,12 @@
|
||||
</div>
|
||||
<el-scrollbar class="listBox" ref="refScrollbar">
|
||||
<div v-for="(item, index) in partyMemberList" class="listStyle" :key="item.id">
|
||||
<div>{{index + 1}}</div>
|
||||
<div>{{item.workerName}}</div>
|
||||
<div>{{item.workerName}}</div>
|
||||
<div>{{item.phoneNumber}}</div>
|
||||
<div>{{item.personType == 1?item.teamName:item.personType == 2?item.departmentName:''}}</div>
|
||||
<div>{{item.phoneNumber}}</div>
|
||||
<div>{{item.rectifiedNum}}</div>
|
||||
<div>{{item.overTimeRectifiedNum}}</div>
|
||||
<div>{{item.overTimeNotRectifiedNum}}</div>
|
||||
<div>{{item.rectifiedNumRatio}}</div>
|
||||
<div>{{item.rectifiedNumRatioTimely}}</div>
|
||||
</div>
|
||||
<div class="notoDta" v-if="partyMemberList.length == 0">
|
||||
<img src="@/assets/images/noData.png" alt="" />
|
||||
@ -26,142 +26,27 @@
|
||||
</el-scrollbar>
|
||||
</div>
|
||||
</div>
|
||||
<div class="list-detail" v-if="showDialog" @click="handleDetailClick">
|
||||
<div class="dialog-content">
|
||||
<div class="dialog-icon"><img src="@/assets/images/titleIcon.png" /></div>
|
||||
<div class="dialog-title"><i>抓拍详情</i></div>
|
||||
<div class="dialog-detail">
|
||||
<div class="detail-text">
|
||||
<div class="text-box">
|
||||
<div class="type">告警类型</div>
|
||||
<div class="text">{{ detailData.alarmType ? getWarnName(detailData.alarmType) : "" }}</div>
|
||||
</div>
|
||||
<div class="text-box" style="margin-top: 5%">
|
||||
<div class="type">设备名称</div>
|
||||
<div class="text">{{ detailData.hardwareName || "" }}</div>
|
||||
</div>
|
||||
<div class="text-box" style="margin-top: 5%">
|
||||
<div class="type">记录时间</div>
|
||||
<div class="text">{{ detailData.createTime }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="big-pic">
|
||||
<img :src="BASEURL + '/image/' + detailData.imageUrl" />
|
||||
</div>
|
||||
<div class="close-icon" @click="closeDialog">
|
||||
<el-icon><Close /></el-icon>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, onMounted } from "vue";
|
||||
import { GlobalStore } from "@/stores";
|
||||
import { getCompanyDataList, getMemberInfoList } from "@/api/modules/labor";
|
||||
import type { TabsPaneContext } from 'element-plus'
|
||||
import { getAlarmTypeOption } from "@/api/modules/aIEarlyWarn";
|
||||
import { getMemberJobStatusApi } from "@/api/modules/agjtCommandApi";
|
||||
const store = GlobalStore();
|
||||
const props = defineProps(["tip"]);
|
||||
const BASEURL = import.meta.env.VITE_API_URL;
|
||||
let showDialog = ref(false as any);
|
||||
const activeName = ref('first')
|
||||
const activeIndex = ref('1' as any)
|
||||
const onlineWorkList = ref([
|
||||
{ name: "在职", value: 1 },
|
||||
{ name: "离职", value: 2 }
|
||||
])
|
||||
const enterpriseListData = ref([] as any);
|
||||
const memberTypeList = ref([
|
||||
{ name: "劳务人员", value: 1 },
|
||||
{ name: "管理人员", value: 2 },
|
||||
{ name: "临时人员", value: 3 }
|
||||
]);
|
||||
const alarmTypeList = ref(["报警", "预警"]);
|
||||
let pageNo = ref(1 as any);
|
||||
let moreScroll = ref(true as any);
|
||||
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
|
||||
const deviceList = ref([] as any); // 设备列表
|
||||
const detailData = ref({} as any);
|
||||
const searchForm = ref({
|
||||
memberType: '',
|
||||
belongCompany: '',
|
||||
workState: '',
|
||||
name: '',
|
||||
idCard: ''
|
||||
});
|
||||
|
||||
const partyMemberList = ref({} as any);
|
||||
let aiAlarmTypeEnum = ref([] as any);
|
||||
//获取告警类型枚举
|
||||
const getWarnTypeOption = async () => {
|
||||
const res: any = await getAlarmTypeOption({ projectSn: store.sn });
|
||||
// console.log("获取告警类型", res.result);
|
||||
let warnType = res.result.map((item: any) => {
|
||||
return {
|
||||
id: Number(item.data),
|
||||
value: item.name
|
||||
};
|
||||
});
|
||||
aiAlarmTypeEnum.value = warnType;
|
||||
console.log("获取告警类型**", aiAlarmTypeEnum.value);
|
||||
};
|
||||
// 返回对应的枚举名称
|
||||
function getWarnName(warnType: any) {
|
||||
let enumObj = aiAlarmTypeEnum.value.find((item: any) => item.id === warnType);
|
||||
return enumObj ? enumObj.value : "";
|
||||
}
|
||||
// 打开详情弹窗
|
||||
function openDetailDialog(item: any) {
|
||||
// console.log(item, "当前行数据");
|
||||
detailData.value = item;
|
||||
showDialog.value = true;
|
||||
}
|
||||
// 关闭详情弹窗
|
||||
function closeDialog() {
|
||||
showDialog.value = false;
|
||||
detailData.value = {};
|
||||
}
|
||||
function handleDetailClick(event: any) {
|
||||
// console.log("点击", event.target.className);
|
||||
if (event.target.className == "list-detail") {
|
||||
closeDialog();
|
||||
}
|
||||
}
|
||||
//获取企业列表
|
||||
const getCompanyList = async () => {
|
||||
let data = {
|
||||
projectSn: store.sn,
|
||||
enterpriseName: "",
|
||||
userEnterpriseId: store.userInfo?.userEnterpriseId
|
||||
};
|
||||
const res: any = await getCompanyDataList(data);
|
||||
if (res.code == 200) {
|
||||
enterpriseListData.value = res.result;
|
||||
}
|
||||
};
|
||||
//获取数据
|
||||
const getMemberCountList = async (tip:any) => {
|
||||
let requestData:any = {
|
||||
projectSn: store.sn,
|
||||
personType: searchForm.value.memberType, //人员类型
|
||||
enterpriseId: searchForm.value.belongCompany, //所属企业
|
||||
inserviceType: searchForm.value.workState, //在职状态
|
||||
idCard: searchForm.value.idCard, //身份证号
|
||||
workerName: searchForm.value.name, //姓名
|
||||
pageNo: tip == 'search'?1:pageNo.value,
|
||||
pageSize: 100
|
||||
pageSize: 100,
|
||||
pageNo: 1
|
||||
}
|
||||
if(props.tip == '实时'){
|
||||
requestData.presence = 1;
|
||||
} else if(props.tip == '日累积') {
|
||||
requestData.attendance = 1;
|
||||
} else {
|
||||
requestData.inserviceType = 1;
|
||||
}
|
||||
const res: any = await getMemberInfoList(requestData);
|
||||
const res: any = await getMemberJobStatusApi(requestData);
|
||||
console.log("获取人员信息列表", res);
|
||||
if(tip == 'more'){
|
||||
partyMemberList.value = partyMemberList.value.concat(res.result.records);
|
||||
@ -180,9 +65,7 @@ const getMemberCountList = async (tip:any) => {
|
||||
};
|
||||
|
||||
onMounted(async () => {
|
||||
await getCompanyList();
|
||||
await getMemberCountList('search');
|
||||
getWarnTypeOption();
|
||||
refScrollbar.value.wrapRef.addEventListener("scroll", (e: any) => {
|
||||
// console.log("滚动容器", e);
|
||||
const scrollTop = e.target.scrollTop;
|
||||
@ -205,107 +88,6 @@ onMounted(async () => {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.list-detail {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
top: 0%;
|
||||
left: 0%;
|
||||
background: rgba(7, 28, 49, 0.5);
|
||||
z-index: 20;
|
||||
.dialog-content {
|
||||
position: absolute;
|
||||
box-sizing: border-box;
|
||||
padding: 1%;
|
||||
left: 38%;
|
||||
top: 30%;
|
||||
width: 25%;
|
||||
height: 45%;
|
||||
background: url("@/assets/images/aIEarlyWarning/dialogBg.png") no-repeat;
|
||||
background-size: 100% 100%;
|
||||
z-index: 21;
|
||||
.dialog-icon {
|
||||
position: absolute;
|
||||
left: 3%;
|
||||
top: 3%;
|
||||
width: 7%;
|
||||
height: 7%;
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
.pic-icon {
|
||||
position: absolute;
|
||||
left: 3%;
|
||||
top: 40%;
|
||||
width: 7%;
|
||||
height: 7%;
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
.close-icon {
|
||||
position: absolute;
|
||||
right: 3%;
|
||||
top: 3%;
|
||||
cursor: pointer;
|
||||
color: #ffffff;
|
||||
font-size: 18px;
|
||||
}
|
||||
.dialog-title {
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
margin-left: 8%;
|
||||
font-size: 18px;
|
||||
font-family: "OPPOSans-Bold";
|
||||
}
|
||||
.dialog-detail {
|
||||
width: 100%;
|
||||
height: 25%;
|
||||
margin-top: 5%;
|
||||
.detail-text {
|
||||
width: 95%;
|
||||
height: 100%;
|
||||
.text-box {
|
||||
height: 25%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
background: url("@/assets/images/aIEarlyWarning/contentBg.png") no-repeat;
|
||||
background-size: 100% 100%;
|
||||
.type {
|
||||
width: 20%;
|
||||
margin-left: 3%;
|
||||
color: #a1accb;
|
||||
font-size: 12px;
|
||||
}
|
||||
.text {
|
||||
font-size: 12px;
|
||||
color: #ffffff;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.pic-title {
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
font-size: 18px;
|
||||
font-family: "OPPOSans-Bold";
|
||||
margin-top: 5%;
|
||||
margin-left: 8%;
|
||||
}
|
||||
.big-pic {
|
||||
width: 100%;
|
||||
height: 50%;
|
||||
margin-top: 10%;
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.political-outlook {
|
||||
height: 97%;
|
||||
margin: 0 60px;
|
||||
@ -345,7 +127,7 @@ onMounted(async () => {
|
||||
text-align: center;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
margin-bottom: 5px;
|
||||
padding: 5px 0px;
|
||||
.list-img {
|
||||
.el-img {
|
||||
width: 30px;
|
||||
|
||||
@ -61,6 +61,7 @@ import { initDynamicRouter } from "@/routers/modules/dynamicRouter";
|
||||
// import { CircleClose, UserFilled } from "@element-plus/icons-vue";
|
||||
import type { ElForm } from "element-plus";
|
||||
import { log } from "console";
|
||||
import { COMPANY } from "@/config/config";
|
||||
|
||||
const router = useRouter();
|
||||
const tabsStore = TabsStore();
|
||||
@ -101,7 +102,12 @@ const login = (formEl: FormInstance | undefined) => {
|
||||
tabsStore.closeMultipleTab();
|
||||
keepAlive.setKeepAliveName();
|
||||
|
||||
router.push("/projectOverview");
|
||||
if (COMPANY === "agjtCommand") {
|
||||
// menuList.value = AGJTCommandMenu;
|
||||
router.push("/commandScreen");
|
||||
} else {
|
||||
router.push("/projectOverview");
|
||||
}
|
||||
// router.push(arr.value[result.accountType - 1]);
|
||||
// 4.跳转到首页
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user