fix: 修改劳务管理里面的数据校验同步、花名册的页面中的批量选择

This commit is contained in:
kun 2024-06-14 18:55:39 +08:00
parent 072bd482d2
commit 940c8674de
4 changed files with 92 additions and 19 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://192.168.34.221:28888/' //郭圣雄本地
// 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://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@ -185,7 +185,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";

View File

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

View File

@ -43,8 +43,8 @@
<el-tab-pane label="人员照片" name="3"></el-tab-pane>
<el-tab-pane label="车辆信息" name="4"></el-tab-pane>
</el-tabs>
<el-table class="tables" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55">
<el-table ref="multipleTable" class="tables" row-key="id" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55" :reserve-selection="true">
</el-table-column>
<el-table-column show-overflow-tooltip v-if="activeName == '1'" align="center" prop="orgName"
label="组织名称"></el-table-column>
@ -92,7 +92,7 @@
</el-table-column>
</el-table>
<el-pagination class="pagerBox" @size-change="sizeChange" @current-change="currentChange"
:current-page="pagInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pagInfo.pageSize"
:current-page="pagInfo.pageNo" :page-sizes="pageSizeList" :page-size="pagInfo.pageSize"
layout="total, sizes, prev, pager, next" :total="Number(pagInfo.total)" background></el-pagination>
</div>
</div>
@ -116,6 +116,7 @@ const options = {
export default {
data() {
return {
pageSizeList: [],
projectSn: "",
activeName: "1", //tab
pagInfo: {
@ -133,6 +134,7 @@ export default {
created() {
this.projectSn = this.$store.state.projectSn;
this.getHikvisionException();
this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
// this.tableList = [
// {
// id: "1",
@ -252,6 +254,9 @@ export default {
if (res.code == 200) {
this.tableList = res.result.records;
this.pagInfo.total = res.result.total;
if(+res.result.total>this.pageSizeList[this.pageSizeList.length - 1]){
this.pageSizeList.push(+res.result.total)
}
}
});
},
@ -260,6 +265,8 @@ export default {
handleClick(val) {
// console.log(val.name);
this.activeName = val.name;
this.$refs.multipleTable.clearSelection();
this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
this.initClear();
this.getHikvisionPage();
},

View File

@ -180,17 +180,31 @@
@click="memberRegister"
>人员录入</el-button
>
<el-button type="primary" @click="checkAllFn">全选</el-button>
<!-- <el-button type="primary" @click="onBatchSynchronization"
>批量授权门禁权限</el-button
> -->
</el-form-item>
</el-form>
</div>
<vue-scroll style="height: 86%">
<el-table
ref="multipleTable"
:data="tableData"
style="width: 100%"
row-key="id"
:header-cell-style="{ background: '#E2EBFF' }"
:show-header="false"
:row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
>
<el-table-column
align="center"
type="selection"
width="55"
:reserve-selection="true"
>
</el-table-column>
<el-table-column prop="attendanceNumber">
<template slot-scope="scope">
<div class="flex3" style="padding-left: 20px">
@ -456,7 +470,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="page"
:page-sizes="$store.state.PAGESIZRS"
:page-sizes="pageSizeList"
:page-size="pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(total)"
@ -990,8 +1004,12 @@ export default {
},
data() {
return {
pageSizeList: [],
multipleSelection: [],
isAllChecked: false,
loading: false,
sendStatusArr: [
// { name: "", value: 1 },
{ name: "成功", value: 1 },
{ name: "失败", value: 2 },
{ name: "部分成功", value: 3 },
@ -1086,7 +1104,7 @@ export default {
pageSize: 10,
},
whoId: "",
isIscDevice: false
isIscDevice: false,
};
},
computed: {
@ -1118,6 +1136,7 @@ export default {
created() {
this.projectSn = this.$store.state.projectSn;
this.company = COMPANY;
this.pageSizeList = JSON.parse(JSON.stringify(this.$store.state.PAGESIZRS));
this.getMachineList();
this.getInfoList();
this.getProjectList();
@ -1125,13 +1144,55 @@ export default {
this.getConfig();
},
methods: {
//
onBatchSynchronization() {
if (this.multipleSelection.length == 0) {
this.$message.warning("请选择需要授权的数据!");
return;
}
console.log(this.multipleSelection);
const ids = this.multipleSelection.map((item) => item.id).join(",");
this.onBatchSynchronizationDeal(ids);
},
onBatchSynchronizationDeal(ids) {
// getHikvisionSyncApi({
// projectSn: this.projectSn,
// ids,
// }).then((res) => {
// if (res.code == 200) {
// this.$message.success(res.message);
// } else {
// this.$message.error(res.result.msg);
// }
// });
},
//
handleSelectionChange(val) {
this.multipleSelection = val;
},
checkAllFn() {
//
this.isAllChecked = !this.isAllChecked;
this.$refs.multipleTable.toggleAllSelection();
// this.checkedDataFn();
},
checkedDataFn() {
if (this.isAllChecked) {
this.tableData.map((item) => {
this.$refs.multipleTable.toggleRowSelection(item, true);
});
} else {
this.$refs.multipleTable.clearSelection();
}
},
getConfig() {
getProjectUfaceConfigInfo({
projectSn: this.$store.state.projectSn,
}).then((result) => {
if (result.success) {
if (result.result) {
this.isIscDevice = result.result.supplierType == 9 ? true: false;
this.isIscDevice = result.result.supplierType == 9 ? true : false;
}
}
});
@ -1283,6 +1344,11 @@ export default {
console.log(res.result);
this.total = res.result.total;
this.tableData = JSON.parse(JSON.stringify(res.result.records));
if (
+res.result.total > this.pageSizeList[this.pageSizeList.length - 1]
) {
this.pageSizeList.push(+res.result.total);
}
}
});
},
@ -1547,8 +1613,8 @@ export default {
});
},
tableRowClassName({ row, rowIndex }) {
if(!this.isIscDevice){
return
if (!this.isIscDevice) {
return;
}
if (row.sendSuccessStatus === 1) {
return "green2";