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-05-17 20:15:00 +08:00
commit 2b55770511
12 changed files with 62 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/views/projectFront/materialManage/materialEntryManage.vue
View File

@ -37,7 +37,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="入场时间" prop="materialName"> <el-form-item label="材料入场有效时间" prop="materialName">
<el-date-picker <el-date-picker
size="medium" size="medium"
v-model="queryInfo.timeRange" v-model="queryInfo.timeRange"
@ -80,8 +80,13 @@
<el-table-column <el-table-column
prop="entryTime" prop="entryTime"
align="center" align="center"
label="入场时间" label="入场有效时间"
></el-table-column> >
<template slot-scope="scope">
开始：{{scope.row.entryTime}} <br/>
结束：{{scope.row.entryTime}}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="280"> <el-table-column align="center" label="操作" width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div

11
src/views/projectFront/materialManage/materialExitManage.vue
View File

@ -37,7 +37,7 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出场时间" prop="materialName"> <el-form-item label="材料出场有效时间" prop="materialName">
<el-date-picker <el-date-picker
size="medium" size="medium"
v-model="queryInfo.timeRange" v-model="queryInfo.timeRange"
@ -80,8 +80,13 @@
<el-table-column <el-table-column
prop="entryTime" prop="entryTime"
align="center" align="center"
label="出场时间" label="出场有效时间"
></el-table-column> >
<template slot-scope="scope">
开始：{{scope.row.entryTime}} <br/>
结束：{{scope.row.entryTime}}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="280"> <el-table-column align="center" label="操作" width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<div <div

8
src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
View File

@ -509,9 +509,9 @@ export default {
moveOnMouseWheel: true, // 开启滚轮平移 moveOnMouseWheel: true, // 开启滚轮平移
moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移 moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
preventDefaultMouseMove: false, preventDefaultMouseMove: false,
start:100, // start:100,
startValue: 0, startValue: this.safeList.length - 1,
endValue: 3, endValue: this.safeList.length - 4,
// 滚动条高度 // 滚动条高度
width: 8, width: 8,
// 滚动条显示位置 // 滚动条显示位置
@ -521,7 +521,7 @@ export default {
// 控制手柄的尺寸 // 控制手柄的尺寸
handleSize: 0, handleSize: 0,
filterMode: 'empty', filterMode: 'empty',
top: "top", // top: "top",
}, },
], ],
series: [ series: [

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

@ -14,10 +14,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -137,7 +137,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="4" :COMPANY_Type="'longguang'" @cancleSave="goBack"
:workDetail="workDetail" v-if="isEdit"> :workDetail="workDetail" v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">
@ -178,7 +178,7 @@
{{workDetail.pipelineParameter&& JSON.parse(workDetail.pipelineParameter) instanceof Array && JSON.parse(workDetail.pipelineParameter).map(item => `介质(${item.materialQuality ? item.materialQuality : ''})、温度(${item.specifications ? item.specifications : ''})、压力(${item.number ? item.number : ''})`).join('，')}} {{workDetail.pipelineParameter&& JSON.parse(workDetail.pipelineParameter) instanceof Array && JSON.parse(workDetail.pipelineParameter).map(item => `介质(${item.materialQuality ? item.materialQuality : ''})、温度(${item.specifications ? item.specifications : ''})、压力(${item.number ? item.number : ''})`).join('，')}}
</el-form-item> </el-form-item>
<el-form-item label="盲板参数：" :label-width="formLabelWidthDetail"> <el-form-item label="盲板参数：" :label-width="formLabelWidthDetail">
{{workDetail.blindPlateParameter&& JSON.parse(workDetail.blindPlateParameter) instanceof Array && JSON.parse(workDetail.blindPlateParameter).map(item => `材质(${item.materialQuality? item.materialQuality : ''})、规格(${item.specifications? item.specifications : ''})、编号(${item.number? item.number : ''})`).join('，')}} {{workDetail.blindPlateParameter&& JSON.parse(workDetail.blindPlateParameter) instanceof Array && JSON.parse(workDetail.blindPlateParameter).map(item => `材质(${item.medium? item.medium : ''})、规格(${item.temperature? item.temperature : ''})、编号(${item.pressure? item.pressure : ''})`).join('，')}}
</el-form-item> </el-form-item>
<!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail"> <!-- <el-form-item label="介质：" :label-width="formLabelWidthDetail">

6
src/views/projectFront/specialWork/confinedSpaceWork.vue
View File

@ -14,10 +14,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -299,7 +299,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="3" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
v-if="isEdit"> v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">

28
src/views/projectFront/specialWork/detail.vue
View File

@ -58,7 +58,8 @@
</el-row> </el-row>
</div> --> </div> -->
</div> </div>
<div v-if="COMPANY != 'longguang'" class="others-info"> <!-- v-if="COMPANY != 'longguang'" -->
<div class="others-info">
<div class="top"> <div class="top">
<div class="info-item"> <div class="info-item">
<div class="box-title"> <div class="box-title">
@ -920,7 +921,7 @@ import {
import moment from "moment"; import moment from "moment";
export default { export default {
props: ["id", "isSuperDanger", "COMPANY_Type","workDetail"], props: ["id", "isSuperDanger", "COMPANY_Type","workDetail","workType"],
data() { data() {
return { return {
responsibilityList: [], responsibilityList: [],
@ -1160,7 +1161,7 @@ export default {
queryDetail() { queryDetail() {
let data = { let data = {
id: this.id, id: this.id,
type:2, type:this.workType,
}; };
queryDangerousEngineeringRecordByIdApi(data).then((res) => { queryDangerousEngineeringRecordByIdApi(data).then((res) => {
console.log(res.result, "----详情"); console.log(res.result, "----详情");
@ -1210,9 +1211,11 @@ export default {
}, },
// 查询进度 // 查询进度
selectDangerousEngineeringProgressRecord() { selectDangerousEngineeringProgressRecord() {
console.log(this.$store.state);
selectDangerousEngineeringProgressRecordApi({ selectDangerousEngineeringProgressRecordApi({
engineeringId: this.id, engineeringId: this.id,
type:2, type:this.workType,
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
}).then((res) => { }).then((res) => {
console.log(res.result, "----进度"); console.log(res.result, "----进度");
if (res.code == 200 && res.result) { if (res.code == 200 && res.result) {
@ -1233,7 +1236,8 @@ export default {
// selectDangerousEngineeringAcceptanceCheckApi({ // selectDangerousEngineeringAcceptanceCheckApi({
selectFinalDangerousEngineeringAcceptanceCheckApi({ selectFinalDangerousEngineeringAcceptanceCheckApi({
engineeringId: this.id, engineeringId: this.id,
type:2, type:this.workType,
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
}).then((res) => { }).then((res) => {
console.log(res.result, "-----最终验收"); console.log(res.result, "-----最终验收");
console.log(res.result, "-----最终验收"); console.log(res.result, "-----最终验收");
@ -1259,7 +1263,8 @@ export default {
selectDangerousEngineeringSideStation() { selectDangerousEngineeringSideStation() {
selectDangerousEngineeringSideStationApi({ selectDangerousEngineeringSideStationApi({
engineeringId: this.id, engineeringId: this.id,
type:2, type:this.workType,
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
}).then( }).then(
(res) => { (res) => {
console.log(res.result, "-----旁站记录"); console.log(res.result, "-----旁站记录");
@ -1286,7 +1291,8 @@ export default {
pageNo: 1, pageNo: 1,
pageSize: 1000, pageSize: 1000,
engineeringId: this.id, engineeringId: this.id,
type:2, type:this.workType,
assignmentPersonInCharge: this.$store.state.userInfo.accountType == 6 ? this.$store.state.userInfo.userId : '',
}; };
// selectHiddenDangerInspectRecordApi(data).then((res) => { // selectHiddenDangerInspectRecordApi(data).then((res) => {
await selectFinalHiddenDangerInspectRecordApi(data).then((res) => { await selectFinalHiddenDangerInspectRecordApi(data).then((res) => {
@ -1338,7 +1344,7 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
deleteDangerousEngineeringProgressRecordApi({ id: val, type:2, }).then( deleteDangerousEngineeringProgressRecordApi({ id: val, type:this.workType, }).then(
(res) => { (res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
@ -1369,7 +1375,7 @@ export default {
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
deleteDangerousEngineeringSideStationApi({ id: val, type:2, }).then((res) => { deleteDangerousEngineeringSideStationApi({ id: val, type:this.workType, }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",
@ -1399,7 +1405,7 @@ export default {
}) })
.then(() => { .then(() => {
// deleteDangerousEngineeringAcceptanceCheckApi({ id: val }).then( // deleteDangerousEngineeringAcceptanceCheckApi({ id: val }).then(
deleteFinalDangerousEngineeringAcceptanceCheckApi({ id: val, type:2, }).then( deleteFinalDangerousEngineeringAcceptanceCheckApi({ id: val, type:this.workType, }).then(
(res) => { (res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
@ -1431,7 +1437,7 @@ export default {
}) })
.then(() => { .then(() => {
// deletehiddenDangerInspectRecordApi({ id: val }).then((res) => { // deletehiddenDangerInspectRecordApi({ id: val }).then((res) => {
deleteFinlahiddenDangerInspectRecordApi({ id: val, type:2, }).then((res) => { deleteFinlahiddenDangerInspectRecordApi({ id: val, type:this.workType, }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",

6
src/views/projectFront/specialWork/disconnectionWork.vue
View File

@ -10,10 +10,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -127,7 +127,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="9" :COMPANY_Type="'longguang'" @cancleSave="goBack"
:workDetail="workDetail" v-if="isEdit"> :workDetail="workDetail" v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">

6
src/views/projectFront/specialWork/fireWork.vue
View File

@ -14,10 +14,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="动火人"> <!-- <el-form-item label="动火人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -307,7 +307,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" @cancleSave="goBack" :workDetail="workDetail" <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="2" @cancleSave="goBack" :workDetail="workDetail"
v-if="isEdit"> v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">

6
src/views/projectFront/specialWork/riggingOutWork.vue
View File

@ -10,10 +10,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -130,7 +130,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="6" :COMPANY_Type="'longguang'" @cancleSave="goBack"
:workDetail="workDetail" v-if="isEdit"> :workDetail="workDetail" v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">

6
src/views/projectFront/specialWork/startBuildingWork.vue
View File

@ -10,10 +10,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -127,7 +127,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit"> <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="8" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">
<el-form class="form-box" :model="workDetail"> <el-form class="form-box" :model="workDetail">

6
src/views/projectFront/specialWork/temporaryPowerWork.vue
View File

@ -10,10 +10,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -133,7 +133,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit"> <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="7" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">
<el-form class="form-box" :model="workDetail"> <el-form class="form-box" :model="workDetail">

6
src/views/projectFront/specialWork/towerOverWork.vue
View File

@ -14,10 +14,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业人"> <!-- <el-form-item label="作业人">
<el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px"> <el-input placeholder="请输入" v-model="formInline.firemanName" clearable style="width: 200px">
</el-input> </el-input>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSubmit" plain>{{ <el-button type="primary" @click="onSubmit" plain>{{
$t('message.quality.inquire') $t('message.quality.inquire')
@ -133,7 +133,7 @@
<el-page-header @back="goBack" :content="dialogTitle" class="backText" <el-page-header @back="goBack" :content="dialogTitle" class="backText"
:class="{ dark: styleType == 2 }"></el-page-header> :class="{ dark: styleType == 2 }"></el-page-header>
<!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> --> <!-- <addPlan @cancleSave="goBack" v-if="isAdd"></addPlan> -->
<detail :id="detailId" :isSuperDanger="isSuperDanger" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail" <detail :id="detailId" :isSuperDanger="isSuperDanger" :workType="5" :COMPANY_Type="'longguang'" @cancleSave="goBack" :workDetail="workDetail"
v-if="isEdit"> v-if="isEdit">
<template v-slot:basicinfo> <template v-slot:basicinfo>
<div class="info-content"> <div class="info-content">