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

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-24 21:42:08 +08:00
parent 42fe9932cf
commit f494e3b9fe
5 changed files with 149 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/store/index.js
View File

@ -50,10 +50,10 @@ export default new Vuex.Store({
// FILEURL:' http://101.43.164.214:11111/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色
// 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://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", //坤工作流地址(本地)
// 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/',//郭圣雄远程

18
src/views/projectFront/inspecPoint/inspection.vue
View File

@ -68,14 +68,14 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="inspectUserNames" prop="inspectUserNames"
label="检查人员" label="责任人"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <!-- <el-table-column
prop="noticeUserNames" prop="noticeUserNames"
label="通知人" label="通知人"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column prop="qrCode" label="二维码" align="center"> <el-table-column prop="qrCode" label="二维码" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
@ -278,7 +278,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="巡检记录通知人员：" prop="noticeUserIds"> <!-- <el-form-item label="巡检记录通知人员：" prop="noticeUserIds">
<el-select <el-select
:disabled="cardDialogTitle == '详情'" :disabled="cardDialogTitle == '详情'"
collapse-tags collapse-tags
@ -297,7 +297,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="巡检时间范围：" prop="startTime"> <el-form-item label="巡检时间范围：" prop="startTime">
<!-- 开始日期 结束日期 -->
<el-date-picker <el-date-picker
:disabled="cardDialogTitle == '详情'" :disabled="cardDialogTitle == '详情'"
style="width: 320px" style="width: 320px"
@ -321,7 +320,6 @@
:controls="false" :controls="false"
> >
</el-input-number> </el-input-number>
<!-- 检查频次 选择单位 -->
<el-select <el-select
:disabled="cardDialogTitle == '详情'" :disabled="cardDialogTitle == '详情'"
class="smallInput" class="smallInput"
@ -337,7 +335,7 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<!-- <!--
<el-form-item label="经度：" prop="longitude"> <el-form-item label="经度：" prop="longitude">
<el-input v-model="cardForm.longitude"></el-input> <el-input v-model="cardForm.longitude"></el-input>
@ -951,7 +949,7 @@ export default {
data.createUserName = this.$store.state.userInfo.account; data.createUserName = this.$store.state.userInfo.account;
data.inspectUserIds = data.inspectUserIds.join(","); data.inspectUserIds = data.inspectUserIds.join(",");
data.enterpriseId = data.enterpriseId.join(","); data.enterpriseId = data.enterpriseId.join(",");
data.noticeUserIds = data.noticeUserIds.join(","); // data.noticeUserIds = data.noticeUserIds.join(",");
data.template = JSON.stringify(formTemplate); data.template = JSON.stringify(formTemplate);
if (this.cardDialogTitle == "新建巡检点") { if (this.cardDialogTitle == "新建巡检点") {
addPointApi(data).then((res) => { addPointApi(data).then((res) => {
@ -1099,4 +1097,8 @@ export default {
::v-deep .el-tag { ::v-deep .el-tag {
max-width: 200px; max-width: 200px;
} }
// 图片预览的关闭按钮
::v-deep .el-image-viewer__btn.el-image-viewer__close{
color: white;
}
</style> </style>

58
src/views/projectFront/inspecPoint/selfInspect.vue
View File

@ -580,30 +580,40 @@ export default {
}, },
// 查询 // 查询
getPointList() { getPointList() {
let data = new FormData(); //new出来的对象 // let data = new FormData(); //new出来的对象
data.append("queryStr", this.queryStr); // data.append("queryStr", this.queryStr);
data.append("projectSn", this.$store.state.projectSn); // data.append("projectSn", this.$store.state.projectSn);
data.append("pageNo", this.pageNo); // data.append("pageNo", this.pageNo);
data.append("pageSize", this.pageSize); // data.append("pageSize", this.pageSize);
data.append( // data.append(
"checkingPointName", // "checkingPointName",
this.searchForm.checkingPointName // this.searchForm.checkingPointName
? this.searchForm.checkingPointName // ? this.searchForm.checkingPointName
: "" // : ""
); // );
data.append( // data.append(
"status", // "status",
this.searchForm.status ? this.searchForm.status : "" // this.searchForm.status ? this.searchForm.status : ""
); // );
data.append( // data.append(
"queryEndTime", // "queryEndTime",
this.searchForm.queryEndTime ? this.searchForm.queryEndTime : "" // this.searchForm.queryEndTime ? this.searchForm.queryEndTime : ""
); // );
data.append( // data.append(
"queryStartTime", // "queryStartTime",
this.searchForm.queryStartTime ? this.searchForm.queryStartTime : "" // this.searchForm.queryStartTime ? this.searchForm.queryStartTime : ""
); // );
getCheckPointApi(data).then((res) => { let requestData = {
queryStr: this.queryStr,
projectSn: this.$store.state.projectSn,
pageNo: this.pageNo,
pageSize: this.pageSize,
checkingPointName: this.searchForm.checkingPointName ? this.searchForm.checkingPointName: "",
status: this.searchForm.status ? this.searchForm.status : "",
queryEndTime: this.searchForm.queryEndTime ? this.searchForm.queryEndTime : "",
queryStartTime: this.searchForm.queryStartTime ? this.searchForm.queryStartTime : ""
}
getCheckPointApi(requestData).then((res) => {
console.log("res111111111", res); console.log("res111111111", res);
this.tableData = res.result.records; this.tableData = res.result.records;
this.total = Number(res.result.total); this.total = Number(res.result.total);

138
src/views/projectFront/inspectRoute/routeManage.vue
View File

@ -145,7 +145,7 @@
style="width: 100%" style="width: 100%"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="区域名称：" prop="qualityRegionId"> <!-- <el-form-item label="区域名称：" prop="qualityRegionId">
<el-select <el-select
style="width: 100%" style="width: 100%"
:disabled="cardDialogTitle == '详情'" :disabled="cardDialogTitle == '详情'"
@ -163,8 +163,8 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="企业名称：" prop="enterpriseId"> <el-form-item label="分包单位：" prop="enterpriseId">
<el-select <el-select
style="width: 100%" style="width: 100%"
:disabled="cardDialogTitle == '详情'" :disabled="cardDialogTitle == '详情'"
@ -241,7 +241,7 @@
<el-form-item label="检查频次：" prop="frequencyNum"> <el-form-item label="检查频次：" prop="frequencyNum">
<el-input-number <el-input-number
style="width: 47%" style="width: 47%"
:disabled="cardDialogTitle == '详情'" :disabled="true"
v-model="cardForm.frequencyNum" v-model="cardForm.frequencyNum"
:min="1" :min="1"
:controls="false" :controls="false"
@ -268,7 +268,7 @@
<div class="route-manage-title"> <div class="route-manage-title">
<span>巡检路线</span> <span>巡检路线</span>
</div> </div>
<vue-scroll style="height: 80%; margin-top: 10px"> <vue-scroll style="height: 300px; margin-top: 10px">
<div class="route-manage-list"> <div class="route-manage-list">
<el-form <el-form
size="medium" size="medium"
@ -609,7 +609,10 @@ import {
getCheckPointApi, getCheckPointApi,
routeTaskDeleteApi, routeTaskDeleteApi,
} from "@/assets/js/api/insect.js"; } from "@/assets/js/api/insect.js";
import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage"; import {
getProjectChilderSystemUserListApi,
getEnterpriseInfoListApi,
} from "@/assets/js/api/configManage.js";
import dynamicForms from "./components/dynamicForms/index.vue"; import dynamicForms from "./components/dynamicForms/index.vue";
// import QRCode from "qrcodejs2"; // import QRCode from "qrcodejs2";
var mouseTool; var mouseTool;
@ -631,8 +634,9 @@ export default {
sort: [ sort: [
{ {
required: true, required: true,
message: "请输入", message: "请输入正整数数字",
trigger: "blur", trigger: "blur",
pattern: /^\d+$/
}, },
], ],
checkingPointId: [ checkingPointId: [
@ -665,9 +669,9 @@ export default {
cardForm: { cardForm: {
routeName: "", routeName: "",
position: "", position: "",
qualityRegionId: "", // 区域ID // qualityRegionId: "", // 区域ID
enterpriseId: "", // 责任企业 enterpriseId: "", // 责任企业
inspectUserIds: "", //检查人 inspectUserIds: [], //检查人
noticeUserIds: "", //通知人 noticeUserIds: "", //通知人
startTime: "", startTime: "",
endTime: "", endTime: "",
@ -689,9 +693,9 @@ export default {
position: [ position: [
{ required: true, message: "请输入巡检位置", trigger: "blur" }, { required: true, message: "请输入巡检位置", trigger: "blur" },
], ],
qualityRegionId: [ // qualityRegionId: [
{ required: true, message: "请选择", trigger: "change" }, // { required: true, message: "请选择", trigger: "change" },
], // ],
enterpriseId: [ enterpriseId: [
{ required: true, message: "请选择", trigger: "change" }, { required: true, message: "请选择", trigger: "change" },
], ],
@ -731,8 +735,18 @@ export default {
this.getRouteList(); this.getRouteList();
this.getPointAreaFn(); this.getPointAreaFn();
this.getPointList(); this.getPointList();
this.getUpdateUnitListFn();
}, },
methods: { methods: {
// 获取分包单位列表
getUpdateUnitListFn() {
getEnterpriseInfoListApi({ projectSn: this.projectSn }).then((res) => {
console.log(res);
if (res.code == 200) {
this.enterpriseList = res.result;
}
});
},
recordDetail(row) { recordDetail(row) {
this.recordRowObj = row; this.recordRowObj = row;
this.detailsShow = true; this.detailsShow = true;
@ -821,19 +835,20 @@ export default {
this.cardForm.noticeUserIds = this.cardForm.noticeUserIds =
this.cardForm.noticeUserIds.split(","); this.cardForm.noticeUserIds.split(",");
} }
let findItem = this.pointAreaList.find((item) => { // let findItem = this.pointAreaList.find((item) => {
return item.id == this.cardForm.qualityRegionId; // return item.id == this.cardForm.qualityRegionId;
}); // });
if (findItem) { // if (findItem) {
this.areaData = findItem; // this.areaData = findItem;
this.chargerList = findItem.systemUsers; // this.chargerList = findItem.systemUsers;
this.enterpriseList = findItem.enterpriseInfos; // this.enterpriseList = findItem.enterpriseInfos;
} // }
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.cardForm.clearValidate(); this.$refs.cardForm.clearValidate();
this.$refs.routeForm.clearValidate(); this.$refs.routeForm.clearValidate();
}); });
this.getAccountList(); this.getAccountList();
this.getUpdatePersonListFn();
} }
}); });
}, },
@ -845,33 +860,65 @@ export default {
}, },
//切换 整改人 //切换 整改人
changeDutyId(value) { changeDutyId(value) {
console.log(this.cardForm, 777888); console.log(value);
console.log(this.cardForm, 666777);
console.log(this.chargerList, 888999);
if (this.cardForm.enterpriseId.length > 0) { if (this.cardForm.enterpriseId.length > 0) {
this.chargerList = this.areaData.systemUsers.filter((item) => {
return this.cardForm.enterpriseId.includes(item.enterpriseId);
});
let shouldHavePersonIdList = this.chargerList.map((item) => { let shouldHavePersonIdList = this.chargerList.map((item) => {
if (this.cardForm.enterpriseId.includes(item.enterpriseId)) { if (this.cardForm.enterpriseId.includes(item.enterpriseId)) {
return item.userId; return item.userId;
} }
}); });
if (this.cardForm.inspectUserIds) { const newArr = this.cardForm.inspectUserIds.filter((item) =>
const newArr = this.cardForm.inspectUserIds.filter((item) => shouldHavePersonIdList.includes(item)
shouldHavePersonIdList.includes(item) );
); this.cardForm.inspectUserIds = newArr;
this.cardForm.inspectUserIds = newArr;
}
} else { } else {
this.chargerList = this.areaData.systemUsers; this.form.inspectUserIds = [];
this.cardForm.inspectUserIds = "";
} }
this.getUpdatePersonListFn();
}, },
// 获取整改人列表
getUpdatePersonListFn() {
let data = {
projectSn: this.projectSn,
enterpriseId: this.cardForm.enterpriseId ? this.cardForm.enterpriseId.join(",") : "",
};
getProjectChilderSystemUserListApi(data).then((res) => {
console.log(res);
if (res.code == 200) {
this.chargerList = res.result;
}
});
},
// changeDutyId(value) {
// console.log(this.cardForm, 777888);
// if (this.cardForm.enterpriseId.length > 0) {
// this.chargerList = this.areaData.systemUsers.filter((item) => {
// return this.cardForm.enterpriseId.includes(item.enterpriseId);
// });
// let shouldHavePersonIdList = this.chargerList.map((item) => {
// if (this.cardForm.enterpriseId.includes(item.enterpriseId)) {
// return item.userId;
// }
// });
// if (this.cardForm.inspectUserIds) {
// const newArr = this.cardForm.inspectUserIds.filter((item) =>
// shouldHavePersonIdList.includes(item)
// );
// this.cardForm.inspectUserIds = newArr;
// }
// } else {
// this.chargerList = this.areaData.systemUsers;
// this.cardForm.inspectUserIds = "";
// }
// },
updateArea() { updateArea() {
let findItem = this.pointAreaList.find((item) => { let findItem = this.pointAreaList.find((item) => {
return item.id == this.cardForm.qualityRegionId; return item.id == this.cardForm.qualityRegionId;
}); });
this.cardForm.enterpriseId = ""; this.cardForm.enterpriseId = "";
this.cardForm.inspectUserIds = ""; this.cardForm.inspectUserIds = [];
console.log(findItem, 777888); console.log(findItem, 777888);
if (findItem) { if (findItem) {
this.areaData = findItem; this.areaData = findItem;
@ -1025,6 +1072,7 @@ export default {
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
projectSn: this.projectSn, projectSn: this.projectSn,
routeName: this.searchForm.routeName
}; };
routeCheckPageApi(data).then((res) => { routeCheckPageApi(data).then((res) => {
console.log("----巡检点列表", res); console.log("----巡检点列表", res);
@ -1064,14 +1112,14 @@ export default {
if (this.cardForm.noticeUserIds) { if (this.cardForm.noticeUserIds) {
this.cardForm.noticeUserIds = this.cardForm.noticeUserIds.split(","); this.cardForm.noticeUserIds = this.cardForm.noticeUserIds.split(",");
} }
let findItem = this.pointAreaList.find((item) => { // let findItem = this.pointAreaList.find((item) => {
return item.id == this.cardForm.qualityRegionId; // return item.id == this.cardForm.qualityRegionId;
}); // });
if (findItem) { // if (findItem) {
this.areaData = findItem; // this.areaData = findItem;
this.chargerList = findItem.systemUsers; // this.chargerList = findItem.systemUsers;
this.enterpriseList = findItem.enterpriseInfos; // this.enterpriseList = findItem.enterpriseInfos;
} // }
this.getAccountList(); this.getAccountList();
}, },
// 新增 // 新增
@ -1089,7 +1137,7 @@ export default {
this.cardDialogTitle = "新建巡检路线"; this.cardDialogTitle = "新建巡检路线";
this.areaData = {}; this.areaData = {};
this.chargerList = []; this.chargerList = [];
this.enterpriseList = []; // this.enterpriseList = [];
this.resetForm(); this.resetForm();
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.cardForm.clearValidate(); this.$refs.cardForm.clearValidate();
@ -1242,9 +1290,9 @@ export default {
this.cardForm = { this.cardForm = {
routeName: "", routeName: "",
position: "", position: "",
qualityRegionId: "", // 区域ID // qualityRegionId: "", // 区域ID
enterpriseId: "", // 责任企业 enterpriseId: "", // 责任企业
inspectUserIds: "", //检查人 inspectUserIds: [], //检查人
noticeUserIds: "", //通知人 noticeUserIds: "", //通知人
startTime: "", startTime: "",
endTime: "", endTime: "",
@ -1364,7 +1412,7 @@ export default {
.add-route { .add-route {
width: 203px; width: 203px;
height: 32px; height: 32px;
margin: 0 auto; margin: 8px auto;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

12
src/views/projectFront/laborManage/personDetails.vue
View File

@ -1008,7 +1008,8 @@
</div> </div>
<div id="pact" class="table"> <div id="pact" class="table">
<div class="pageTitle"> <div class="pageTitle">
{{ $t("message.laborMange.contractInfo") }} <!-- {{ $t("message.laborMange.contractInfo") }} -->
劳动合同
<el-button <el-button
type="text" type="text"
@click="editPactInfo" @click="editPactInfo"
@ -1679,7 +1680,8 @@
</div> </div>
<div id="insurance" class="table"> <div id="insurance" class="table">
<div class="pageTitle"> <div class="pageTitle">
{{ $t("message.laborMange.insuranceInfo") }} <!-- {{ $t("message.laborMange.insuranceInfo") }} -->
工伤保险
<el-button <el-button
type="text" type="text"
@click="addTableInfo(3)" @click="addTableInfo(3)"
@ -2192,7 +2194,8 @@
:class="activeClass == 2 ? 'checkedClass' : ''" :class="activeClass == 2 ? 'checkedClass' : ''"
@click="getActiveClass(2)" @click="getActiveClass(2)"
> >
{{ $t("message.laborMange.contractInfo") }} <!-- {{ $t("message.laborMange.contractInfo") }} -->
劳动合同
</div> </div>
<div <div
:class="activeClass == 3 ? 'checkedClass' : ''" :class="activeClass == 3 ? 'checkedClass' : ''"
@ -2210,7 +2213,8 @@
:class="activeClass == 5 ? 'checkedClass' : ''" :class="activeClass == 5 ? 'checkedClass' : ''"
@click="getActiveClass(5)" @click="getActiveClass(5)"
> >
{{ $t("message.laborMange.insuranceInfo") }} <!-- {{ $t("message.laborMange.insuranceInfo") }} -->
工伤保险
</div> </div>
<div <div
:class="activeClass == 6 ? 'checkedClass' : ''" :class="activeClass == 6 ? 'checkedClass' : ''"