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

fix: 合并代码解决冲突

Browse Source
This commit is contained in:
kun 2024-06-14 18:56:11 +08:00
commit c370f12058
10 changed files with 173 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/i18n/langs/cn/laborManage/personManage.js
View File

@ -71,7 +71,8 @@ export default {
highBeatDownload: '高拍仪插件下载',
IdCardHead: '身份证头像',
spotFaceCollection: '现场采集人脸',
imgHint: '现场采集人脸要求：人脸正面免冠照，jpeg或jpg格式，图片像素需为640x480像素或以上，图片大小需不超过500KB,人脸眼间距需大于60像素点',
// '现场采集人脸要求：人脸正面免冠照，jpeg或jpg格式，图片像素需为640x480像素或以上，图片大小需不超过500KB,人脸眼间距需大于60像素点'
imgHint: '现场采集人脸要求：人脸正面免冠照，jpg格式，图片像素需为640x480像素或以上，图片大小需为10-200KB,人脸大小占整张图片1/3以上',
cancel: '取消',
confirm: '确定',
noData: '暂无数据',

2
src/assets/js/http.js
View File

@ -174,7 +174,7 @@ if (process.env.NODE_ENV == "development") {
// 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.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://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头

1
src/components/header.vue
View File

@ -141,6 +141,7 @@
<img src="@/assets/images/icon-bigData.png" alt srcset />
指挥部大屏
</p> -->
<p
v-show="
$route.path.indexOf('projectIndex') != -1 &&

2
src/components/message.vue
View File

@ -312,12 +312,14 @@ export default {
// this.$emit('sendMsg')
// }
// }
setTimeout(() => {
this.$emit('sendMsg', message)
this.$notify({
title: message.title,
message: message.content,
position: 'bottom-right'
})
}, 500)
})
// 断开发起重连
// client.on("reconnect", (error) => {

1
src/views/projectFront/examination/test.vue
View File

@ -31,6 +31,7 @@
}}、{{ data.optionName }}</el-radio>
</el-radio-group>
</div>
<div style="height:350px"></div>
</vue-scroll>
<button type="primary" class="btn submitBtn big" @click="submitData()">
交卷

2
src/views/projectFront/laborManage/dataValidation.vue
View File

@ -52,7 +52,7 @@
prop="workerName" label="人员姓名"></el-table-column>
<el-table-column show-overflow-tooltip v-else-if="activeName == '4'" align="center" prop="carNumber"
label="车牌号"></el-table-column>
<el-table-column show-overflow-tooltip v-if="activeName == '3'" align="center" prop="idCard"
<el-table-column show-overflow-tooltip v-if="activeName == '2' || activeName == '3'" align="center" prop="idCard"
label="身份证号"></el-table-column>
<el-table-column align="center" label="ISC校验结果">
<template slot-scope="scope">

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

@ -157,7 +157,7 @@
</div>
</div>
<div id="workerQRcode" ref="workerQRcode"></div>
<el-button v-permission="{key: 'exportDetails', menuPath: '/project/labor/personDetails'}" type="primary" size="medium" class="exportrecord" @click="exportRecord()">导出教育档案</el-button>
<el-button v-permission="{key: 'exportDetails', menuPath: '/project/labor/personManage'}" type="primary" size="medium" class="exportrecord" @click="exportRecord()">导出教育档案</el-button>
</div>
<div id="details" class="table">
<div class="pageTitle">

2
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -3461,7 +3461,7 @@ export default {
handleBeforeUpload(file, type) {
if (type == 4) {
if (
file.type != "image/jpeg" &&
// file.type != "image/jpeg" &&
file.type != "image/jpg"
// file.type != "image/png"
) {

199
src/views/projectFront/specialWork/blindPlugWork.vue
View File

@ -2,7 +2,12 @@
<div class="dangerousBigProject">
<div v-if="dialogFormVisible">
<div class="search-box">
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
<el-form
:inline="true"
:model="formInline"
class="demo-form-inline"
size="small"
>
<el-form-item label="作业票编号">
<el-input
placeholder="请输入"
@ -13,7 +18,11 @@
</el-input>
</el-form-item>
<el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-select
v-model="formInline.enterpriseId"
filterable
placeholder="请选择"
>
<el-option
:label="item.enterpriseName"
:value="item.id"
@ -53,7 +62,11 @@
:header-cell-style="{ 'text-align': 'center' }"
>
<!-- <el-table-column type="selection" align="center" width="60px"></el-table-column> -->
<el-table-column label="序号" type="index" align="center"></el-table-column>
<el-table-column
label="序号"
type="index"
align="center"
></el-table-column>
<el-table-column
align="center"
width="200"
@ -63,7 +76,11 @@
<template slot-scope="scope">
<div
class=""
style="display: flex; justify-content: center; font-weight: bold"
style="
display: flex;
justify-content: center;
font-weight: bold;
"
>
<div
style="display: flex"
@ -94,18 +111,22 @@
label="盲板编号"
prop="blindPlateNo"
></el-table-column>
<el-table-column align="center" label="作业申请单位" show-overflow-tooltip>
<el-table-column
align="center"
label="作业申请单位"
show-overflow-tooltip
>
<!-- 作业申请单位 -->
<template slot-scope="scope">
{{ scope.row.jobApplicationUnitName }}
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
align="center"
label="实际作业开始时间"
prop="workExecutionBeginTime"
show-overflow-tooltip
></el-table-column>
></el-table-column> -->
<el-table-column
align="center"
label="作业类别"
@ -198,7 +219,8 @@
<el-button
v-if="
$store.state.userInfo.accountType != 6 ||
$store.state.userInfo.userId == scope.row.assignmentPersonInCharge
$store.state.userInfo.userId ==
scope.row.assignmentPersonInCharge
"
v-permission="{
key: 'blindPlugWork_delete',
@ -270,10 +292,16 @@
<template v-slot:basicinfo>
<div class="info-content">
<el-form class="form-box" :model="workDetail">
<el-form-item label="作业票编号：" :label-width="formLabelWidthDetail">
<el-form-item
label="作业票编号："
:label-width="formLabelWidthDetail"
>
{{ workDetail.workTicketCode }}
</el-form-item>
<el-form-item label="作业类别：" :label-width="formLabelWidthDetail">
<el-form-item
label="作业类别："
:label-width="formLabelWidthDetail"
>
<span
v-for="(item, i) in workDetail.pipelineParameter &&
JSON.parse(workDetail.pipelineParameter) instanceof Array &&
@ -284,7 +312,10 @@
</span>
<!-- {{ workDetail.jobType }} -->
</el-form-item>
<el-form-item label="作业单位：" :label-width="formLabelWidthDetail">
<el-form-item
label="作业单位："
:label-width="formLabelWidthDetail"
>
<el-select
v-model="workDetail.operatingUnit"
placeholder="请选择作业单位"
@ -299,7 +330,10 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="申请单位：" :label-width="formLabelWidthDetail">
<el-form-item
label="申请单位："
:label-width="formLabelWidthDetail"
>
<el-select
v-model="workDetail.jobApplicationUnit"
placeholder="请选择作业申请单位"
@ -314,10 +348,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="作业负责人：" :label-width="formLabelWidthDetail">
<el-form-item
label="作业负责人："
:label-width="formLabelWidthDetail"
>
{{ workDetail.assignmentPersonInChargeName }}
</el-form-item>
<el-form-item label="编制时间：" :label-width="formLabelWidthDetail">
<el-form-item
label="编制时间："
:label-width="formLabelWidthDetail"
>
{{ workDetail.organizerDate }}
</el-form-item>
<!-- <el-form-item label="设备、管道名称：" :label-width="formLabelWidthDetail">
@ -348,10 +388,16 @@
<el-form-item label="编号：" :label-width="formLabelWidthDetail">
{{ workDetail.jobContent }}
</el-form-item> -->
<el-form-item label="作业人：" :label-width="formLabelWidthDetail">
<el-form-item
label="作业人："
:label-width="formLabelWidthDetail"
>
{{ workDetail.jobPersonName }}
</el-form-item>
<el-form-item label="盲板位置图：" :label-width="formLabelWidthDetail">
<el-form-item
label="盲板位置图："
:label-width="formLabelWidthDetail"
>
<span
class="value"
v-if="
@ -367,7 +413,9 @@
"
>
<div
v-for="(item, index) in JSON.parse(workDetail.blindPlatePic)"
v-for="(item, index) in JSON.parse(
workDetail.blindPlatePic
)"
:key="index"
style=""
>
@ -376,7 +424,9 @@
<el-image
style="width: 50px; height: 50px; margin-right: 10px"
:src="item ? $store.state.FILEURL + item.url : ''"
:preview-src-list="[item ? $store.state.FILEURL + item.url : '']"
:preview-src-list="[
item ? $store.state.FILEURL + item.url : '',
]"
>
</el-image>
</div>
@ -384,7 +434,10 @@
<!-- {{ workDetail.blindPlatePic }} -->
<!-- {{workDetail.blindPlatePic&& JSON.parse(workDetail.blindPlatePic) instanceof Array && JSON.parse(workDetail.blindPlatePic).map(item => item.name).join('、')}} -->
</el-form-item>
<el-form-item label="盲板编号：" :label-width="formLabelWidthDetail">
<el-form-item
label="盲板编号："
:label-width="formLabelWidthDetail"
>
{{ workDetail.blindPlateNo }}
</el-form-item>
<!-- <el-form-item label="气体分析时间：" :label-width="formLabelWidthDetail">
@ -396,13 +449,22 @@
<!-- <el-form-item label="证书编号：" :label-width="formLabelWidthDetail">
{{ workDetail.certificateNo }}
</el-form-item> -->
<el-form-item label="监护人：" :label-width="formLabelWidthDetail">
<el-form-item
label="监护人："
:label-width="formLabelWidthDetail"
>
{{ workDetail.guardianName }}
</el-form-item>
<el-form-item label="编制人：" :label-width="formLabelWidthDetail">
<el-form-item
label="编制人："
:label-width="formLabelWidthDetail"
>
{{ workDetail.organizer }}
</el-form-item>
<el-form-item label="风险辨识结果：" :label-width="formLabelWidthDetail">
<el-form-item
label="风险辨识结果："
:label-width="formLabelWidthDetail"
>
{{ workDetail.riskIdentificationResult }}
</el-form-item>
<el-form-item
@ -414,7 +476,7 @@
<!-- <el-form-item label="安全作业票编码：" :label-width="formLabelWidthDetail">
{{ workDetail.safetyWorkTicketCode }}
</el-form-item> -->
<el-form-item
<!-- <el-form-item
label="实际作业开始时间："
:label-width="formLabelWidthDetail"
>
@ -425,8 +487,28 @@
:disabled="isDisabledDetail"
>
</el-date-picker>
</el-form-item> -->
<el-form-item
label="作业实施时间："
:label-width="formLabelWidthDetail"
>
<el-date-picker
v-model="workDetail.hotWorkExecutionTime"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
:disabled="isDisabledDetail"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
<!-- -->
<!-- :picker-options="pickerOptions" -->
</el-form-item>
<el-form-item label="现场作业环境：" :label-width="formLabelWidthDetail">
<el-form-item
label="现场作业环境："
:label-width="formLabelWidthDetail"
>
<div class="img-show">
<el-image
v-for="(item, index) in workDetail.fieldWorkingEnvironment"
@ -443,7 +525,10 @@
</el-image>
</div>
</el-form-item>
<el-form-item label="安全技术交底：" :label-width="formLabelWidthDetail">
<el-form-item
label="安全技术交底："
:label-width="formLabelWidthDetail"
>
<!-- <div class="img-show">
<div v-for="(item, index) in workDetail.safetyAndTechnologyDisclosure" :key="index">
<el-image v-if="item.isImage"
@ -459,7 +544,9 @@
</div> -->
<div>
<div
v-for="(item, index) in workDetail.safetyAndTechnologyDisclosure"
v-for="(
item, index
) in workDetail.safetyAndTechnologyDisclosure"
:key="index"
>
<a
@ -649,7 +736,9 @@ export default {
this.workDetail.blindPlateParameter &&
JSON.parse(this.workDetail.blindPlateParameter) instanceof Array
) {
const blindPlateParameter = JSON.parse(this.workDetail.blindPlateParameter);
const blindPlateParameter = JSON.parse(
this.workDetail.blindPlateParameter
);
newResult = newResult.reduce((prev, item, index) => {
prev.push({
...item,
@ -819,8 +908,10 @@ export default {
people: val[index].personLiable,
unit: val[index].responsibilityCompany,
};
this.safeStatus = val[index].securityConstructionSchemeType == 2 ? true : false;
this.safeStatus2 = val[index].specialConstructionSchemeType == 2 ? true : false;
this.safeStatus =
val[index].securityConstructionSchemeType == 2 ? true : false;
this.safeStatus2 =
val[index].specialConstructionSchemeType == 2 ? true : false;
this.safeStatus3 = val[index].technicalDisclosureType == 2 ? true : false;
this.file1 = val[index].securityConstructionSchemeFile;
this.file2 = val[index].specialConstructionSchemeFile;
@ -885,7 +976,9 @@ export default {
getCooperatorListApi(data).then((res) => {
if (res.code == 200) {
if (res.result.records.length > 0) {
this.cooperatorList = JSON.parse(JSON.stringify(res.result.records));
this.cooperatorList = JSON.parse(
JSON.stringify(res.result.records)
);
this.cooperatorList.forEach((item) => {
item.value = item.enterpriseLegalPerson;
item.label = item.enterpriseName;
@ -899,7 +992,8 @@ export default {
// 获取类别
getType() {
selectDangerousEngineeringTypeApi({
sn: JSON.parse(window.sessionStorage.getItem("vuex")).userInfo.headquartersSn,
sn: JSON.parse(window.sessionStorage.getItem("vuex")).userInfo
.headquartersSn,
}).then((res) => {
if (res.result) {
// console.log(res.result)
@ -914,15 +1008,21 @@ export default {
addData() {
if (this.addForm.name == "") {
// 请输入危大工程名称
this.$message.error(this.$t("message.dangerousBigProject.verifyMessage1"));
this.$message.error(
this.$t("message.dangerousBigProject.verifyMessage1")
);
return;
} else if (this.addForm.category == "") {
// 请选择危大工程类别
this.$message.error(this.$t("message.dangerousBigProject.verifyMessage2"));
this.$message.error(
this.$t("message.dangerousBigProject.verifyMessage2")
);
return;
} else if (this.addForm.describe == "") {
// 请选择类别描述
this.$message.error(this.$t("message.dangerousBigProject.verifyMessage3"));
this.$message.error(
this.$t("message.dangerousBigProject.verifyMessage3")
);
return;
}
// console.log(this.addForm)
@ -937,9 +1037,11 @@ export default {
planEndTime: this.addForm.date[1],
planStartTime: this.addForm.date[0],
projectSn: this.projectSn,
securityConstructionSchemeFile: this.fileList.length > 0 ? this.file1 : "", //安全专项施工方案附件
securityConstructionSchemeFile:
this.fileList.length > 0 ? this.file1 : "", //安全专项施工方案附件
securityConstructionSchemeType: this.safeStatus ? 2 : 1, //是否完成安全专项施工方案交底，1未完成，2完成
specialConstructionSchemeFile: this.fileList2.length > 0 ? this.file2 : "", //专项施工方案附件
specialConstructionSchemeFile:
this.fileList2.length > 0 ? this.file2 : "", //专项施工方案附件
specialConstructionSchemeType: this.safeStatus2 ? 2 : 1, //是否完成专项施工方案交底，1未完成，2完成
technicalDisclosureFile: this.fileList3.length > 0 ? this.file3 : "", //技术交底文件
technicalDisclosureType: this.safeStatus3 ? 2 : 1, //是否完成安全技术交底，1未完成，2完成
@ -949,7 +1051,9 @@ export default {
// "新增"
if (this.dialogTitle == this.$t("message.dangerousBigProject.add")) {
console.log(data);
data.responsibilityCompany = this.addForm.unit ? this.addForm.unit.join(",") : "";
data.responsibilityCompany = this.addForm.unit
? this.addForm.unit.join(",")
: "";
addDangerousEngineeringRecordApi(data).then((res) => {
if ((res.code = 200)) {
this.$message.success(
@ -961,7 +1065,9 @@ export default {
}
console.log(res);
});
} else if (this.dialogTitle == this.$t("message.dangerousBigProject.edit")) {
} else if (
this.dialogTitle == this.$t("message.dangerousBigProject.edit")
) {
// "编辑"
data.id = this.editParms.id;
data.typeDescribeId = this.editParms.typeDescribeId;
@ -973,7 +1079,9 @@ export default {
editDangerousEngineeringRecordApi(data).then((res) => {
if ((res.code = 200)) {
// "修改成功！"
this.$message.success(this.$t("message.dangerousBigProject.editSuccess"));
this.$message.success(
this.$t("message.dangerousBigProject.editSuccess")
);
this.initData();
}
console.log(res);
@ -1026,7 +1134,8 @@ export default {
console.log("fileList");
console.log(fileList);
this.fileList = fileList;
this.file1 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
this.file1 =
this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
},
uploadError(err, file, fileList) {
// 上传失败！
@ -1049,7 +1158,8 @@ export default {
console.log("fileList");
console.log(fileList);
this.fileList2 = fileList;
this.file2 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
this.file2 =
this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
},
uploadError2(err, file, fileList) {
// 上传失败！
@ -1072,7 +1182,8 @@ export default {
console.log("fileList");
console.log(fileList);
this.fileList3 = fileList;
this.file3 = this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
this.file3 =
this.$store.state.FILEURL + fileList[0].response.data[0].imageUrl;
},
uploadError3(err, file, fileList) {
// 上传失败！
@ -1098,8 +1209,8 @@ export default {
...res.result,
// xzGasAnalyzeList: res.result.xzGasAnalyzeList,
hotWorkExecutionTime: [
res.result.hotWorkExecutionBeginTime,
res.result.hotWorkExecutionEndTime,
res.result.workExecutionBeginTime ? res.result.workExecutionBeginTime : "",
res.result.workExecutionEndTime ? res.result.workExecutionEndTime: "",
],
};
if (this.workDetail.fieldWorkingEnvironment) {

3
src/views/resetPassword/index.vue
View File

@ -59,8 +59,9 @@
<img :src="codeImgData.img" @click="getImgCode" alt="" />
</div>
</el-form-item>
<!-- 找回方式 -->
<el-form-item
label="找回方式"
label="邮箱"
prop="backEmail"
v-if="[1].includes(stepActive) && firstNext"
>