fix: 数据校验同步报告以及花名册批量选择功能接口对接

This commit is contained in:
kun 2024-06-14 20:34:41 +08:00
parent dd7ef882b5
commit 153e8d9687
3 changed files with 33 additions and 27 deletions

View File

@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // 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:28889/' //郭圣雄本地
axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// 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://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程

View File

@ -52,23 +52,23 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://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/',//郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试
BASEURL: baseUrl ? // BASEURL: baseUrl ?
baseUrl : // baseUrl :
window.location.protocol + "//" + window.location.host + "/", //正式环境 // window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// 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", //鞍钢测试平台工作流地址
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl
// ? baseUrl // ? baseUrl

View File

@ -180,10 +180,10 @@
@click="memberRegister" @click="memberRegister"
>人员录入</el-button >人员录入</el-button
> >
<!-- <el-button type="primary" @click="checkAllFn">全选</el-button> --> <el-button type="primary" @click="checkAllFn">全选</el-button>
<!-- <el-button type="primary" @click="onBatchSynchronization" <el-button type="primary" @click="onBatchSynchronization"
>批量授权门禁权限</el-button >批量授权门禁权限</el-button
> --> >
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
@ -198,13 +198,13 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- <el-table-column <el-table-column
align="center" align="center"
type="selection" type="selection"
width="55" width="55"
:reserve-selection="true" :reserve-selection="true"
> >
</el-table-column> --> </el-table-column>
<el-table-column prop="attendanceNumber"> <el-table-column prop="attendanceNumber">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex3" style="padding-left: 20px"> <div class="flex3" style="padding-left: 20px">
@ -387,6 +387,8 @@
? 'red' ? 'red'
: row.sendSuccessStatus === 3 : row.sendSuccessStatus === 3
? 'yellow' ? 'yellow'
: row.sendSuccessStatus === 4
? ''
: '', : '',
]" ]"
> >
@ -397,6 +399,8 @@
? "失败" ? "失败"
: row.sendSuccessStatus === 3 : row.sendSuccessStatus === 3
? "部分成功" ? "部分成功"
: row.sendSuccessStatus === 4
? "未下发"
: "" : ""
}}</span }}</span
> >
@ -990,6 +994,7 @@ import {
xmglXzHikvisionSyncGetNewestList, xmglXzHikvisionSyncGetNewestList,
xmglXzHikvisionSyncRetryAPI, xmglXzHikvisionSyncRetryAPI,
getProjectUfaceConfigInfo, getProjectUfaceConfigInfo,
sendBatchWokerApi,
} from "@/assets/js/api/laborPerson"; } from "@/assets/js/api/laborPerson";
import { import {
getProjectConfigListApi, getProjectConfigListApi,
@ -1009,7 +1014,7 @@ export default {
isAllChecked: false, isAllChecked: false,
loading: false, loading: false,
sendStatusArr: [ sendStatusArr: [
// { name: "", value: 1 }, { name: "未下发", value: 4 },
{ name: "成功", value: 1 }, { name: "成功", value: 1 },
{ name: "失败", value: 2 }, { name: "失败", value: 2 },
{ name: "部分成功", value: 3 }, { name: "部分成功", value: 3 },
@ -1150,22 +1155,23 @@ export default {
this.$message.warning("请选择需要授权的数据!"); this.$message.warning("请选择需要授权的数据!");
return; return;
} }
console.log(this.multipleSelection); console.log(this.multipleSelection);
const ids = this.multipleSelection.map((item) => item.id).join(","); const ids = this.multipleSelection.map((item) => item.id).join(",");
this.onBatchSynchronizationDeal(ids); this.onBatchSynchronizationDeal(ids);
}, },
onBatchSynchronizationDeal(ids) { onBatchSynchronizationDeal(ids) {
// getHikvisionSyncApi({ sendBatchWokerApi({
// projectSn: this.projectSn, projectSn: this.projectSn,
// ids, userId: this.$store.state.userInfo.userId,
// }).then((res) => { workerIds: ids,
// if (res.code == 200) { }).then((res) => {
// this.$message.success(res.message); if (res.code == 200) {
// } else { this.$message({
// this.$message.error(res.result.msg); message: "操作成功,已授权,请稍后查看!",
// } type: "success",
// }); });
}
});
}, },
// //
handleSelectionChange(val) { handleSelectionChange(val) {