diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 16e92605..306ec096 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -368,6 +368,7 @@ style="width: 100%; color: #737996" @selection-change="handleCheckedCitiesChange" :show-header="false" + :row-class-name="tableRowClassName" > + + + + + @@ -1879,7 +1996,9 @@ import { sendWorkerInfoByIdApi, updateByIdWorkerInfo, sendBatchWokerApi, - importImgDataApi + importImgDataApi, + xmglXzHikvisionSyncGetNewestList, + xmglXzHikvisionSyncRetryAPI } from '@/assets/js/api/laborPerson' import { selectUserDevAuthorityByUserIdApi } from '@/assets/js/api/configManage' import { getProjectConfigListApi } from '@/assets/js/api/project.js' @@ -1898,6 +2017,9 @@ export default { }, data() { return { + issuePointList: [], + issueTeamDialog:false, + whoId:'', typeRadio: 1, refreshPage: true, key: false, @@ -3644,6 +3766,37 @@ export default { this.$message.error(this.$t('message.laborMange.hint10')) //身份证信息识别失败 } }) + }, + tableRowClassName ({ row, rowIndex }) { + if (row.sendSuccessStatus === 1) { + return 'green2' + } + if (row.sendSuccessStatus === 2) { + return 'red2' + } + if (row.sendSuccessStatus === 3) { + return 'yellow2' + } + }, + async issueTeamEvent (id) { + this.issueTeamDialog = true +this.whoId = id + this.getNewestList() + }, + async getNewestList(){ + const res = await xmglXzHikvisionSyncGetNewestList({ + // pageNo:this.issuePage.pageNo, + // pageSize:this.issuePage.pageSize, + whoId: this.whoId + }) + console.log(res, '---------------------') + this.issuePointList = res.result + }, + async retryEvent(id){ + const res = await xmglXzHikvisionSyncRetryAPI({ + id:id +}) +console.log(res); } } } @@ -3903,4 +4056,42 @@ export default { line-height: 16px; } } + +.valuesColor { + color: #fff; + padding: 3px; +} + +.yellow { + background-color: #fbe000; +} +.green { + background-color: #72cb40; +} +.red { + background-color: #ec373e; +} + +::v-deep { + .el-table .yellow2 { + background-color: #fffce6; + } + .el-table .green2 { + background-color: #f1faec; + } + .el-table .red2 { + background-color: #feebed; + } + + .dialog-footer { + margin-top: 20px; + } + .pagerBox { + margin-top: 0; + } + + .tableBtns .operationText { + margin-right:0 + } +} diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 42bd4406..b0862a9e 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -4810,5 +4810,9 @@ console.log(res); .pagerBox { margin-top: 0; } + + .tableBtns .operationText { + margin-right:0 + } } diff --git a/src/views/projectFront/laborManage/visitRecord.vue b/src/views/projectFront/laborManage/visitRecord.vue index 7c3bc54e..21f68df4 100644 --- a/src/views/projectFront/laborManage/visitRecord.vue +++ b/src/views/projectFront/laborManage/visitRecord.vue @@ -7,7 +7,7 @@ :model="searchForm" ref="searchForm" > -
+