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

flx:提交弹弓下发详情弹窗

Browse Source
This commit is contained in:
Rain_ 2025-03-13 16:02:58 +08:00
parent 2231d3565d
commit e7057217d3
3 changed files with 134 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/js/api/laborPerson.js
View File

@ -26,6 +26,10 @@ export const pullMemberDataApi = data => post('xmgl/hikvision/getDoorEvents', da
export const importImgDataApi = data => post('xmgl/workerInfo/uploadWorkerInfoImgs', data); // 导入照片数据 export const importImgDataApi = data => post('xmgl/workerInfo/uploadWorkerInfoImgs', data); // 导入照片数据
export const xmglXzHikvisionSyncGetNewestList = data => post('xmgl/xzHikvisionSync/getNewestList', data); // 导入照片数据 export const xmglXzHikvisionSyncGetNewestList = data => post('xmgl/xzHikvisionSync/getNewestList', data); // 导入照片数据
export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/retry', data); // 导入照片数据 export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/retry', data); // 导入照片数据
// 查找弹弓下发详情
export const getDangongWorkerFaceStatusPageList = data => get('xmgl/dangongWorkerFaceStatus/page', data);
//详情 //详情
@ -275,4 +279,4 @@ export const getHikvisionManualCompareApi = data => post('xmgl/xzHikvisionCompar
export const checkfaceHikvisionApi = data => post('xmgl/recognition/checkFace', data); export const checkfaceHikvisionApi = data => post('xmgl/recognition/checkFace', data);
//人员管理批量删除 //人员管理批量删除
export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data); export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data);

102
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -322,6 +322,7 @@
> >
<!-- v-if="isIscDevice" --> <!-- v-if="isIscDevice" -->
<el-button <el-button
v-if="!isDangong"
v-permission="{ v-permission="{
key: 'rygl_distributeAccessEquipment', key: 'rygl_distributeAccessEquipment',
menuPath: '/project/labor/personManage', menuPath: '/project/labor/personManage',
@ -438,7 +439,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="下发状态" v-if="isDangong"> <!-- <el-form-item label="下发状态" v-if="isDangong">
<el-select <el-select
v-model="tableParameter.dangongStatus" v-model="tableParameter.dangongStatus"
style="width: 120px" style="width: 120px"
@ -450,7 +451,7 @@
:value="index" :value="index"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<!-- 查询 --> <!-- 查询 -->
<el-button <el-button
@ -611,12 +612,12 @@
}}</span }}</span
> >
</div> </div>
<div v-else-if="isDangong"> <!-- <div v-else-if="isDangong">
下发状态： 下发状态：
<span <span
:class="{valuesColor: row.dangongStatus || row.dangongStatus == 0, green: row.dangongStatus == 0, red: row.dangongStatus == 2 || row.dangongStatus == 4, yellow: row.dangongStatus == 1 || row.dangongStatus == 3 || row.dangongStatus == 5 || row.dangongStatus == 6}" :class="{valuesColor: row.dangongStatus || row.dangongStatus == 0, green: row.dangongStatus == 0, red: row.dangongStatus == 2 || row.dangongStatus == 4, yellow: row.dangongStatus == 1 || row.dangongStatus == 3 || row.dangongStatus == 5 || row.dangongStatus == 6}"
>{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span> >{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
</div> </div> -->
<div class="personItemBottom"> <div class="personItemBottom">
所属企业： 所属企业：
<span class="values">{{ row.enterpriseName }}</span> <span class="values">{{ row.enterpriseName }}</span>
@ -2135,34 +2136,45 @@
align="center" align="center"
:label="$t('message.personnelPosition.beaconManage.table.index')" :label="$t('message.personnelPosition.beaconManage.table.index')"
></el-table-column> ></el-table-column>
<el-table-column <template v-if="!isDangong">
prop="detail" <el-table-column
label="任务名称" prop="detail"
align="center" label="任务名称"
></el-table-column> align="center"
<el-table-column prop="isSuccess" label="执行结果" align="center"> ></el-table-column>
<template v-slot="{ row }">{{ <el-table-column prop="isSuccess" label="执行结果" align="center">
row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : "" <template v-slot="{ row }">{{
}}</template> row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
</el-table-column> }}</template>
</el-table-column>
<el-table-column <el-table-column
:label=" :label="
$t('message.personnelPosition.beaconManage.table.operation') $t('message.personnelPosition.beaconManage.table.operation')
" "
align="center" align="center"
width="150" width="150"
> >
<template v-slot="{ row }"> <template v-slot="{ row }">
<div <div
class="operationText" class="operationText"
@click="retryEvent(row.id)" @click="retryEvent(row.id)"
v-if="row.isSuccess === 0" v-if="row.isSuccess === 0"
> >
<span style="color: #5381f6">重试</span> <span style="color: #5381f6">重试</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</template>
<template v-else>
<el-table-column prop="dangongStatus" label="执行结果" align="center">
<template v-slot="{ row }">{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</template>
</el-table-column>
<el-table-column prop="dangongStatus" label="消息详情" align="center">
<template v-slot="{ row }">
{{row.msg}}
</template>
</el-table-column>
</template>
<!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> --> <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
</el-table> </el-table>
<!-- <el-pagination <!-- <el-pagination
@ -2231,6 +2243,7 @@ import {
sendBatchWokerApi, sendBatchWokerApi,
importImgDataApi, importImgDataApi,
xmglXzHikvisionSyncGetNewestList, xmglXzHikvisionSyncGetNewestList,
getDangongWorkerFaceStatusPageList,
xmglXzHikvisionSyncRetryAPI, xmglXzHikvisionSyncRetryAPI,
checkfaceHikvisionApi, checkfaceHikvisionApi,
} from "@/assets/js/api/laborPerson"; } from "@/assets/js/api/laborPerson";
@ -2948,7 +2961,7 @@ export default {
if (result.success) { if (result.success) {
if (result.result) { if (result.result) {
this.isUploadToHouse = result.result.housing ? true : false; this.isUploadToHouse = result.result.housing ? true : false;
this.isIscDevice = result.result.supplierType == 9 ? true : false; this.isIscDevice = result.result.supplierType == 9 || result.result.supplierType == 8 ? true : false;
this.isDangong = result.result.supplierType == 8 ? true : false; this.isDangong = result.result.supplierType == 8 ? true : false;
} }
} }
@ -4259,13 +4272,26 @@ export default {
this.getNewestList(); this.getNewestList();
}, },
async getNewestList() { async getNewestList() {
const res = await xmglXzHikvisionSyncGetNewestList({ const isDangongFn = this.isDangong ? getDangongWorkerFaceStatusPageList : xmglXzHikvisionSyncGetNewestList;
// pageNo:this.issuePage.pageNo, const params = {
// pageNo:this.issuePage.pageNo,
// pageSize:this.issuePage.pageSize, // pageSize:this.issuePage.pageSize,
whoId: this.whoId, // whoId: this.whoId,
}); }
if(this.isDangong) {
params.pageNo = -1;
params.pageSize = 10;
params.workerId = this.whoId;
} else {
params.whoId = this.whoId;
}
const res = await isDangongFn(params);
console.log(res, "---------------------"); console.log(res, "---------------------");
this.issuePointList = res.result; if(this.isDangong) {
this.issuePointList = res.result.records;
} else {
this.issuePointList = res.result;
}
}, },
async retryEvent(id) { async retryEvent(id) {
this.$notify({ this.$notify({

103
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -283,6 +283,7 @@
> >
<!-- v-if="isIscDevice" --> <!-- v-if="isIscDevice" -->
<el-button <el-button
v-if="!isDangong"
v-permission="{ v-permission="{
key: 'rygl_distributeAccessEquipment', key: 'rygl_distributeAccessEquipment',
menuPath: '/project/labor/personManage', menuPath: '/project/labor/personManage',
@ -399,7 +400,7 @@
> >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="下发状态" v-if="isDangong"> <!-- <el-form-item label="下发状态" v-if="isDangong">
<el-select <el-select
v-model="tableParameter.dangongStatus" v-model="tableParameter.dangongStatus"
style="width: 120px" style="width: 120px"
@ -411,7 +412,7 @@
:value="index" :value="index"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<!-- 查询 --> <!-- 查询 -->
<el-button <el-button
@ -577,12 +578,12 @@
}}</span }}</span
> >
</div> </div>
<div v-else-if="isDangong"> <!-- <div v-else-if="isDangong">
下发状态： 下发状态：
<span <span
:class="{valuesColor: row.dangongStatus || row.dangongStatus == 0, green: row.dangongStatus == 0, red: row.dangongStatus == 2 || row.dangongStatus == 4, yellow: row.dangongStatus == 1 || row.dangongStatus == 3 || row.dangongStatus == 5 || row.dangongStatus == 6}" :class="{valuesColor: row.dangongStatus || row.dangongStatus == 0, green: row.dangongStatus == 0, red: row.dangongStatus == 2 || row.dangongStatus == 4, yellow: row.dangongStatus == 1 || row.dangongStatus == 3 || row.dangongStatus == 5 || row.dangongStatus == 6}"
>{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span> >{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
</div> </div> -->
<div class="personItemBottom"> <div class="personItemBottom">
所属企业： 所属企业：
<span class="values">{{ row.enterpriseName }}</span> <span class="values">{{ row.enterpriseName }}</span>
@ -2384,34 +2385,46 @@
align="center" align="center"
:label="$t('message.personnelPosition.beaconManage.table.index')" :label="$t('message.personnelPosition.beaconManage.table.index')"
></el-table-column> ></el-table-column>
<el-table-column <template v-if="!isDangong">
prop="detail" <el-table-column
label="任务名称" prop="detail"
align="center" label="任务名称"
></el-table-column> align="center"
<el-table-column prop="isSuccess" label="执行结果" align="center"> ></el-table-column>
<template v-slot="{ row }">{{ <el-table-column prop="isSuccess" label="执行结果" align="center">
row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : "" <template v-slot="{ row }">{{
}}</template> row.isSuccess === 1 ? "成功" : row.isSuccess === 0 ? "失败" : ""
</el-table-column> }}</template>
</el-table-column>
<el-table-column <el-table-column
:label=" :label="
$t('message.personnelPosition.beaconManage.table.operation') $t('message.personnelPosition.beaconManage.table.operation')
" "
align="center" align="center"
width="150" width="150"
> >
<template v-slot="{ row }"> <template v-slot="{ row }">
<div <div
class="operationText" class="operationText"
@click="retryEvent(row.id)" @click="retryEvent(row.id)"
v-if="row.isSuccess === 0" v-if="row.isSuccess === 0"
> >
<span style="color: #5381f6">重试</span> <span style="color: #5381f6">重试</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</template>
<template v-else>
<el-table-column prop="dangongStatus" label="执行结果" align="center">
<template v-slot="{ row }">{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</template>
</el-table-column>
<el-table-column prop="dangongStatus" label="消息详情" align="center">
<template v-slot="{ row }">
{{row.msg}}
</template>
</el-table-column>
</template>
<!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> --> <!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
</el-table> </el-table>
<!-- <el-pagination <!-- <el-pagination
@ -2481,6 +2494,7 @@ import {
importImgDataApi, importImgDataApi,
xmglXzHikvisionSyncGetNewestList, xmglXzHikvisionSyncGetNewestList,
xmglXzHikvisionSyncRetryAPI, xmglXzHikvisionSyncRetryAPI,
getDangongWorkerFaceStatusPageList,
checkfaceHikvisionApi, checkfaceHikvisionApi,
onBatchDeletionApi, onBatchDeletionApi,
} from "@/assets/js/api/laborPerson"; } from "@/assets/js/api/laborPerson";
@ -3247,7 +3261,7 @@ export default {
if (result.success) { if (result.success) {
if (result.result) { if (result.result) {
this.isUploadToHouse = result.result.housing ? true : false; this.isUploadToHouse = result.result.housing ? true : false;
this.isIscDevice = result.result.supplierType == 9 ? true : false; this.isIscDevice = result.result.supplierType == 9 || result.result.supplierType == 8 ? true : false;
this.isDangong = result.result.supplierType == 8 ? true : false; this.isDangong = result.result.supplierType == 8 ? true : false;
} }
} }
@ -5005,13 +5019,26 @@ export default {
this.getNewestList(); this.getNewestList();
}, },
async getNewestList() { async getNewestList() {
const res = await xmglXzHikvisionSyncGetNewestList({ const isDangongFn = this.isDangong ? getDangongWorkerFaceStatusPageList : xmglXzHikvisionSyncGetNewestList;
// pageNo:this.issuePage.pageNo, const params = {
// pageNo:this.issuePage.pageNo,
// pageSize:this.issuePage.pageSize, // pageSize:this.issuePage.pageSize,
whoId: this.whoId, // whoId: this.whoId,
}); }
if(this.isDangong) {
params.pageNo = -1;
params.pageSize = 10;
params.workerId = this.whoId;
} else {
params.whoId = this.whoId;
}
const res = await isDangongFn(params);
console.log(res, "---------------------"); console.log(res, "---------------------");
this.issuePointList = res.result; if(this.isDangong) {
this.issuePointList = res.result.records;
} else {
this.issuePointList = res.result;
}
}, },
async retryEvent(id) { async retryEvent(id) {
this.$notify({ this.$notify({