合并冲突
This commit is contained in:
commit
2a555817f7
14
package-lock.json
generated
14
package-lock.json
generated
@ -63,6 +63,7 @@
|
|||||||
"vue-seamless-scroll": "^1.1.23",
|
"vue-seamless-scroll": "^1.1.23",
|
||||||
"vue-simple-uploader": "^0.7.6",
|
"vue-simple-uploader": "^0.7.6",
|
||||||
"vue2-scale-box": "^0.1.7",
|
"vue2-scale-box": "^0.1.7",
|
||||||
|
"vuedraggable": "^2.24.3",
|
||||||
"vuescroll": "^4.16.1",
|
"vuescroll": "^4.16.1",
|
||||||
"vuex": "^3.4.0",
|
"vuex": "^3.4.0",
|
||||||
"vuex-persistedstate": "^3.1.0",
|
"vuex-persistedstate": "^3.1.0",
|
||||||
@ -21908,6 +21909,11 @@
|
|||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/sortablejs": {
|
||||||
|
"version": "1.10.2",
|
||||||
|
"resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz",
|
||||||
|
"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
|
||||||
|
},
|
||||||
"node_modules/source-list-map": {
|
"node_modules/source-list-map": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
|
"resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
|
||||||
@ -26606,6 +26612,14 @@
|
|||||||
"resolved": "https://registry.npmmirror.com/vue2-scale-box/-/vue2-scale-box-0.1.7.tgz",
|
"resolved": "https://registry.npmmirror.com/vue2-scale-box/-/vue2-scale-box-0.1.7.tgz",
|
||||||
"integrity": "sha512-mI/eEaBg5+9Op8i7sHBPEWnxRC744xBZnl4lf6yF+2ShhURTunipWz7dMcJ0nhgZ1jK+I4rv2BF1oK+0K7CmlA=="
|
"integrity": "sha512-mI/eEaBg5+9Op8i7sHBPEWnxRC744xBZnl4lf6yF+2ShhURTunipWz7dMcJ0nhgZ1jK+I4rv2BF1oK+0K7CmlA=="
|
||||||
},
|
},
|
||||||
|
"node_modules/vuedraggable": {
|
||||||
|
"version": "2.24.3",
|
||||||
|
"resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz",
|
||||||
|
"integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
|
||||||
|
"dependencies": {
|
||||||
|
"sortablejs": "1.10.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/vuescroll": {
|
"node_modules/vuescroll": {
|
||||||
"version": "4.18.1",
|
"version": "4.18.1",
|
||||||
"resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.18.1.tgz",
|
"resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.18.1.tgz",
|
||||||
|
|||||||
@ -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);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//详情
|
//详情
|
||||||
|
|||||||
@ -81,6 +81,8 @@ export default new Vuex.Store({
|
|||||||
// FILEURL: "http://192.168.34.155:19111/image/", //洁本地
|
// FILEURL: "http://192.168.34.155:19111/image/", //洁本地
|
||||||
// UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
|
// UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
|
||||||
// FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
|
// FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
|
||||||
|
UPLOADURL: 'http://192.168.34.221:19112/upload/image/', // 郭圣雄本地
|
||||||
|
FILEURL: 'http://192.168.34.221:19112/image/', //郭圣雄本地
|
||||||
// WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地)
|
// WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地)
|
||||||
// WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)
|
// WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)
|
||||||
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
|
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
|
||||||
@ -100,6 +102,8 @@ export default new Vuex.Store({
|
|||||||
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
|
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
|
||||||
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
|
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
|
||||||
|
|
||||||
|
// UPLOADURL: 'http://jxj.zhgdyun.com:100/upload/image', //演示平台
|
||||||
|
// FILEURL: 'http://jxj.zhgdyun.com:100/image/', //演示平台
|
||||||
// WORKFLOWURL: "http://jxj.zhgdyun.com:33982/#/workspace/forms", //演示平台工作流
|
// WORKFLOWURL: "http://jxj.zhgdyun.com:33982/#/workspace/forms", //演示平台工作流
|
||||||
// UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工
|
// UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工
|
||||||
// FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工
|
// FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工
|
||||||
|
|||||||
@ -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,6 +439,19 @@
|
|||||||
>
|
>
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!-- <el-form-item label="下发状态" v-if="isDangong">
|
||||||
|
<el-select
|
||||||
|
v-model="tableParameter.dangongStatus"
|
||||||
|
style="width: 120px"
|
||||||
|
clearable
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in dangongStatusList" :key="item.id"
|
||||||
|
:label="item.dangongStatusName"
|
||||||
|
:value="index"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item> -->
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<!-- 查询 -->
|
<!-- 查询 -->
|
||||||
<el-button
|
<el-button
|
||||||
@ -598,6 +612,12 @@
|
|||||||
}}</span
|
}}</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- <div v-else-if="isDangong">
|
||||||
|
下发状态：
|
||||||
|
<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}"
|
||||||
|
>{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
|
||||||
|
</div> -->
|
||||||
<div class="personItemBottom">
|
<div class="personItemBottom">
|
||||||
所属企业：
|
所属企业：
|
||||||
<span class="values">{{ row.enterpriseName }}</span>
|
<span class="values">{{ row.enterpriseName }}</span>
|
||||||
@ -2116,34 +2136,50 @@
|
|||||||
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>
|
||||||
|
<el-table-column prop="devName" label="设备名称" align="center">
|
||||||
|
<template v-slot="{ row }">
|
||||||
|
{{row.devName}}
|
||||||
|
</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
|
||||||
@ -2212,6 +2248,7 @@ import {
|
|||||||
sendBatchWokerApi,
|
sendBatchWokerApi,
|
||||||
importImgDataApi,
|
importImgDataApi,
|
||||||
xmglXzHikvisionSyncGetNewestList,
|
xmglXzHikvisionSyncGetNewestList,
|
||||||
|
getDangongWorkerFaceStatusPageList,
|
||||||
xmglXzHikvisionSyncRetryAPI,
|
xmglXzHikvisionSyncRetryAPI,
|
||||||
checkfaceHikvisionApi,
|
checkfaceHikvisionApi,
|
||||||
} from "@/assets/js/api/laborPerson";
|
} from "@/assets/js/api/laborPerson";
|
||||||
@ -2303,6 +2340,7 @@ export default {
|
|||||||
sendSuccessStatus: null,
|
sendSuccessStatus: null,
|
||||||
enterDate: "",
|
enterDate: "",
|
||||||
codeState: "",
|
codeState: "",
|
||||||
|
dangongStatus:"",
|
||||||
},
|
},
|
||||||
tableListData: [], //表格数据
|
tableListData: [], //表格数据
|
||||||
personDialogTitle: this.$t("message.laborMange.managementEntry"),
|
personDialogTitle: this.$t("message.laborMange.managementEntry"),
|
||||||
@ -2380,6 +2418,29 @@ export default {
|
|||||||
base64Type: "data:image/jpeg;base64,",
|
base64Type: "data:image/jpeg;base64,",
|
||||||
isUploadToHouse: false, //是否显示上传到住建局按钮
|
isUploadToHouse: false, //是否显示上传到住建局按钮
|
||||||
isIscDevice: false, //是否是海康门禁isc设备
|
isIscDevice: false, //是否是海康门禁isc设备
|
||||||
|
isDangong: false, // 是否是弹弓设备
|
||||||
|
dangongStatusList: [{
|
||||||
|
id: 1,
|
||||||
|
dangongStatusName: "成功"
|
||||||
|
},{
|
||||||
|
id: 2,
|
||||||
|
dangongStatusName: "没有照片"
|
||||||
|
},{
|
||||||
|
id: 3,
|
||||||
|
dangongStatusName: "入库失败"
|
||||||
|
},{
|
||||||
|
id: 4,
|
||||||
|
dangongStatusName: "与 XXX 相似度高"
|
||||||
|
},{
|
||||||
|
id: 5,
|
||||||
|
dangongStatusName: "下载失败"
|
||||||
|
},{
|
||||||
|
id: 6,
|
||||||
|
dangongStatusName: "照片太大"
|
||||||
|
},{
|
||||||
|
id: 7,
|
||||||
|
dangongStatusName: "其他"
|
||||||
|
}], //弹弓设备状态列表
|
||||||
attendRulesList: [],
|
attendRulesList: [],
|
||||||
enterpriseTypeId: "",
|
enterpriseTypeId: "",
|
||||||
enterpriseTypeList: [],
|
enterpriseTypeList: [],
|
||||||
@ -2893,6 +2954,8 @@ export default {
|
|||||||
this.tableParameter.enterDate +
|
this.tableParameter.enterDate +
|
||||||
"&codeState=" +
|
"&codeState=" +
|
||||||
this.tableParameter.codeState +
|
this.tableParameter.codeState +
|
||||||
|
"&dangongStatus=" +
|
||||||
|
this.tableParameter.dangongStatus +
|
||||||
"&enterpriseId=" +
|
"&enterpriseId=" +
|
||||||
this.checkedId;
|
this.checkedId;
|
||||||
},
|
},
|
||||||
@ -2903,7 +2966,8 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -3591,6 +3655,7 @@ export default {
|
|||||||
this.tableParameter.sendSuccessStatus = null;
|
this.tableParameter.sendSuccessStatus = null;
|
||||||
this.tableParameter.enterDate = "";
|
this.tableParameter.enterDate = "";
|
||||||
this.tableParameter.codeState = "";
|
this.tableParameter.codeState = "";
|
||||||
|
this.tableParameter.dangongStatus = "";
|
||||||
this.getTableData();
|
this.getTableData();
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -4212,13 +4277,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({
|
||||||
|
|||||||
@ -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,6 +400,19 @@
|
|||||||
>
|
>
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!-- <el-form-item label="下发状态" v-if="isDangong">
|
||||||
|
<el-select
|
||||||
|
v-model="tableParameter.dangongStatus"
|
||||||
|
style="width: 120px"
|
||||||
|
clearable
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in dangongStatusList" :key="item.id"
|
||||||
|
:label="item.dangongStatusName"
|
||||||
|
:value="index"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item> -->
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<!-- 查询 -->
|
<!-- 查询 -->
|
||||||
<el-button
|
<el-button
|
||||||
@ -564,6 +578,12 @@
|
|||||||
}}</span
|
}}</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
<!-- <div v-else-if="isDangong">
|
||||||
|
下发状态：
|
||||||
|
<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}"
|
||||||
|
>{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
|
||||||
|
</div> -->
|
||||||
<div class="personItemBottom">
|
<div class="personItemBottom">
|
||||||
所属企业：
|
所属企业：
|
||||||
<span class="values">{{ row.enterpriseName }}</span>
|
<span class="values">{{ row.enterpriseName }}</span>
|
||||||
@ -2365,34 +2385,51 @@
|
|||||||
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
|
||||||
|
:label="
|
||||||
|
$t('message.personnelPosition.beaconManage.table.operation')
|
||||||
|
"
|
||||||
|
align="center"
|
||||||
|
width="150"
|
||||||
|
>
|
||||||
|
<template v-slot="{ row }">
|
||||||
|
<div
|
||||||
|
class="operationText"
|
||||||
|
@click="retryEvent(row.id)"
|
||||||
|
v-if="row.isSuccess === 0"
|
||||||
|
>
|
||||||
|
<span style="color: #5381f6">重试</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</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>
|
||||||
|
<el-table-column prop="devName" label="设备名称" align="center">
|
||||||
|
<template v-slot="{ row }">
|
||||||
|
{{row.devName}}
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</template>
|
||||||
|
|
||||||
<el-table-column
|
|
||||||
:label="
|
|
||||||
$t('message.personnelPosition.beaconManage.table.operation')
|
|
||||||
"
|
|
||||||
align="center"
|
|
||||||
width="150"
|
|
||||||
>
|
|
||||||
<template v-slot="{ row }">
|
|
||||||
<div
|
|
||||||
class="operationText"
|
|
||||||
@click="retryEvent(row.id)"
|
|
||||||
v-if="row.isSuccess === 0"
|
|
||||||
>
|
|
||||||
<span style="color: #5381f6">重试</span>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
|
<!-- <div slot="empty">{{$t('message.personnelPosition.empty')}}</div> -->
|
||||||
</el-table>
|
</el-table>
|
||||||
<!-- <el-pagination
|
<!-- <el-pagination
|
||||||
@ -2462,6 +2499,7 @@ import {
|
|||||||
importImgDataApi,
|
importImgDataApi,
|
||||||
xmglXzHikvisionSyncGetNewestList,
|
xmglXzHikvisionSyncGetNewestList,
|
||||||
xmglXzHikvisionSyncRetryAPI,
|
xmglXzHikvisionSyncRetryAPI,
|
||||||
|
getDangongWorkerFaceStatusPageList,
|
||||||
checkfaceHikvisionApi,
|
checkfaceHikvisionApi,
|
||||||
onBatchDeletionApi,
|
onBatchDeletionApi,
|
||||||
} from "@/assets/js/api/laborPerson";
|
} from "@/assets/js/api/laborPerson";
|
||||||
@ -2594,6 +2632,7 @@ export default {
|
|||||||
sendSuccessStatus: null,
|
sendSuccessStatus: null,
|
||||||
enterDate: "",
|
enterDate: "",
|
||||||
codeState: "",
|
codeState: "",
|
||||||
|
dangongStatus: "",
|
||||||
},
|
},
|
||||||
tableListData: [], //表格数据
|
tableListData: [], //表格数据
|
||||||
personDialogTitle: this.$t("message.laborMange.personnelEntry"),
|
personDialogTitle: this.$t("message.laborMange.personnelEntry"),
|
||||||
@ -2672,6 +2711,29 @@ export default {
|
|||||||
base64Type: "data:image/jpeg;base64,",
|
base64Type: "data:image/jpeg;base64,",
|
||||||
isUploadToHouse: false, //是否显示上传到住建局按钮
|
isUploadToHouse: false, //是否显示上传到住建局按钮
|
||||||
isIscDevice: false, //是否是海康门禁isc设备
|
isIscDevice: false, //是否是海康门禁isc设备
|
||||||
|
isDangong: false, // 是否是弹弓设备
|
||||||
|
dangongStatusList: [{
|
||||||
|
id: 1,
|
||||||
|
dangongStatusName: "成功"
|
||||||
|
},{
|
||||||
|
id: 2,
|
||||||
|
dangongStatusName: "没有照片"
|
||||||
|
},{
|
||||||
|
id: 3,
|
||||||
|
dangongStatusName: "入库失败"
|
||||||
|
},{
|
||||||
|
id: 4,
|
||||||
|
dangongStatusName: "与 XXX 相似度高"
|
||||||
|
},{
|
||||||
|
id: 5,
|
||||||
|
dangongStatusName: "下载失败"
|
||||||
|
},{
|
||||||
|
id: 6,
|
||||||
|
dangongStatusName: "照片太大"
|
||||||
|
},{
|
||||||
|
id: 7,
|
||||||
|
dangongStatusName: "其他"
|
||||||
|
}], //弹弓设备状态列表
|
||||||
attendRulesList: [],
|
attendRulesList: [],
|
||||||
enterpriseTypeId: "",
|
enterpriseTypeId: "",
|
||||||
cropperOption: {
|
cropperOption: {
|
||||||
@ -3190,8 +3252,12 @@ export default {
|
|||||||
this.tableParameter.enterDate +
|
this.tableParameter.enterDate +
|
||||||
"&codeState=" +
|
"&codeState=" +
|
||||||
this.tableParameter.codeState +
|
this.tableParameter.codeState +
|
||||||
|
"&dangongStatus=" +
|
||||||
|
this.tableParameter.dangongStatus +
|
||||||
"&enterpriseId=" +
|
"&enterpriseId=" +
|
||||||
this.checkedId;
|
this.checkedId;
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
getConfig() {
|
getConfig() {
|
||||||
getProjectUfaceConfigInfo({
|
getProjectUfaceConfigInfo({
|
||||||
@ -3200,7 +3266,8 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -4164,6 +4231,7 @@ export default {
|
|||||||
this.tableParameter.sendSuccessStatus = null;
|
this.tableParameter.sendSuccessStatus = null;
|
||||||
this.tableParameter.enterDate = "";
|
this.tableParameter.enterDate = "";
|
||||||
this.tableParameter.codeState = "";
|
this.tableParameter.codeState = "";
|
||||||
|
this.tableParameter.dangongStatus = "";
|
||||||
this.getTableData();
|
this.getTableData();
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -4956,13 +5024,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({
|
||||||
|
|||||||
@ -123,6 +123,18 @@
|
|||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="下发状态" v-if="isDangong">
|
||||||
|
<el-select
|
||||||
|
v-model="tableParameter.dangongStatus"
|
||||||
|
clearable
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="(item, index) in dangongStatusList" :key="item.id"
|
||||||
|
:label="item.dangongStatusName"
|
||||||
|
:value="index"
|
||||||
|
></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button
|
<el-button
|
||||||
v-permission="{
|
v-permission="{
|
||||||
@ -151,6 +163,7 @@
|
|||||||
tableParameter.personType = '';
|
tableParameter.personType = '';
|
||||||
tableParameter.idCard = '';
|
tableParameter.idCard = '';
|
||||||
tableParameter.sendSuccessStatus = null;
|
tableParameter.sendSuccessStatus = null;
|
||||||
|
tableParameter.dangongStatus = '';
|
||||||
getInfoList();
|
getInfoList();
|
||||||
"
|
"
|
||||||
plain
|
plain
|
||||||
@ -428,6 +441,12 @@
|
|||||||
}}</span
|
}}</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-else-if="isDangong">
|
||||||
|
下发状态：
|
||||||
|
<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}"
|
||||||
|
>{{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }}</span>
|
||||||
|
</div>
|
||||||
<!-- <div>企业类型：{{scope.row.idCard}}</div>-->
|
<!-- <div>企业类型：{{scope.row.idCard}}</div>-->
|
||||||
<div>
|
<div>
|
||||||
{{ $t("message.laborMange.companies") }}：{{
|
{{ $t("message.laborMange.companies") }}：{{
|
||||||
@ -1124,6 +1143,7 @@ export default {
|
|||||||
enterpriseId: "",
|
enterpriseId: "",
|
||||||
inserviceType: "",
|
inserviceType: "",
|
||||||
codeState: "",
|
codeState: "",
|
||||||
|
dangongStatus: "",
|
||||||
},
|
},
|
||||||
editProjectSettingDialog: false,
|
editProjectSettingDialog: false,
|
||||||
needAudit: 0,
|
needAudit: 0,
|
||||||
@ -1142,6 +1162,29 @@ export default {
|
|||||||
},
|
},
|
||||||
whoId: "",
|
whoId: "",
|
||||||
isIscDevice: false,
|
isIscDevice: false,
|
||||||
|
isDangong: false, // 是否是弹弓设备
|
||||||
|
dangongStatusList: [{
|
||||||
|
id: 1,
|
||||||
|
dangongStatusName: "成功"
|
||||||
|
},{
|
||||||
|
id: 2,
|
||||||
|
dangongStatusName: "没有照片"
|
||||||
|
},{
|
||||||
|
id: 3,
|
||||||
|
dangongStatusName: "入库失败"
|
||||||
|
},{
|
||||||
|
id: 4,
|
||||||
|
dangongStatusName: "与 XXX 相似度高"
|
||||||
|
},{
|
||||||
|
id: 5,
|
||||||
|
dangongStatusName: "下载失败"
|
||||||
|
},{
|
||||||
|
id: 6,
|
||||||
|
dangongStatusName: "照片太大"
|
||||||
|
},{
|
||||||
|
id: 7,
|
||||||
|
dangongStatusName: "其他"
|
||||||
|
}], //弹弓设备状态列表
|
||||||
topicName: "topic",
|
topicName: "topic",
|
||||||
userId: "",
|
userId: "",
|
||||||
};
|
};
|
||||||
@ -1279,6 +1322,8 @@ export default {
|
|||||||
if (result.success) {
|
if (result.success) {
|
||||||
if (result.result) {
|
if (result.result) {
|
||||||
this.isIscDevice = result.result.supplierType == 9 ? true : false;
|
this.isIscDevice = result.result.supplierType == 9 ? true : false;
|
||||||
|
this.isDangong = result.result.supplierType == 8 ? true : false;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -1309,6 +1354,8 @@ export default {
|
|||||||
this.tableParameter.personType +
|
this.tableParameter.personType +
|
||||||
"&codeState=" +
|
"&codeState=" +
|
||||||
this.tableParameter.codeState +
|
this.tableParameter.codeState +
|
||||||
|
"&dangongStatus=" +
|
||||||
|
this.tableParameter.dangongStatus +
|
||||||
"&userEnterpriseId=" +
|
"&userEnterpriseId=" +
|
||||||
this.$store.state.userInfo.userEnterpriseId;
|
this.$store.state.userInfo.userEnterpriseId;
|
||||||
},
|
},
|
||||||
@ -1330,6 +1377,8 @@ export default {
|
|||||||
this.tableParameter.personType +
|
this.tableParameter.personType +
|
||||||
"&codeState=" +
|
"&codeState=" +
|
||||||
this.tableParameter.codeState +
|
this.tableParameter.codeState +
|
||||||
|
"&dangongStatus=" +
|
||||||
|
this.tableParameter.dangongStatus +
|
||||||
"&userEnterpriseId=" +
|
"&userEnterpriseId=" +
|
||||||
this.$store.state.userInfo.userEnterpriseId +
|
this.$store.state.userInfo.userEnterpriseId +
|
||||||
"&userId=" +
|
"&userId=" +
|
||||||
@ -1419,6 +1468,7 @@ export default {
|
|||||||
sendSuccessStatus: this.tableParameter.sendSuccessStatus, // 下发状态
|
sendSuccessStatus: this.tableParameter.sendSuccessStatus, // 下发状态
|
||||||
workerName: this.tableParameter.workerName, //姓名
|
workerName: this.tableParameter.workerName, //姓名
|
||||||
codeState: this.tableParameter.codeState,
|
codeState: this.tableParameter.codeState,
|
||||||
|
dangongStatus: this.tableParameter.dangongStatus, // 弹弓状态
|
||||||
projectSn: this.projectSn,
|
projectSn: this.projectSn,
|
||||||
pageNo: this.page,
|
pageNo: this.page,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user