|
@@ -74,17 +74,17 @@
|
|
>删除
|
|
>删除
|
|
</el-button>
|
|
</el-button>
|
|
</el-col>
|
|
</el-col>
|
|
-<!-- <el-col :span="1.5">
|
|
|
|
- <el-button
|
|
|
|
- type="warning"
|
|
|
|
- plain
|
|
|
|
- icon="el-icon-download"
|
|
|
|
- size="mini"
|
|
|
|
- @click="handleExport"
|
|
|
|
- v-hasPermi="['zdsz:engineeringDangerous:export']"
|
|
|
|
- >导出
|
|
|
|
- </el-button>
|
|
|
|
- </el-col>-->
|
|
|
|
|
|
+ <!-- <el-col :span="1.5">
|
|
|
|
+ <el-button
|
|
|
|
+ type="warning"
|
|
|
|
+ plain
|
|
|
|
+ icon="el-icon-download"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="handleExport"
|
|
|
|
+ v-hasPermi="['zdsz:engineeringDangerous:export']"
|
|
|
|
+ >导出
|
|
|
|
+ </el-button>
|
|
|
|
+ </el-col>-->
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
@@ -154,13 +154,13 @@
|
|
@click="addNewPipe(scope.row)"
|
|
@click="addNewPipe(scope.row)"
|
|
>新增顶管工程
|
|
>新增顶管工程
|
|
</el-button>
|
|
</el-button>
|
|
-<!-- <el-button
|
|
|
|
- type="text"
|
|
|
|
- icon="el-icon-edit"
|
|
|
|
- size="mini"
|
|
|
|
- @click="viewSource(scope.row)"
|
|
|
|
- >历史
|
|
|
|
- </el-button>-->
|
|
|
|
|
|
+ <!-- <el-button
|
|
|
|
+ type="text"
|
|
|
|
+ icon="el-icon-edit"
|
|
|
|
+ size="mini"
|
|
|
|
+ @click="viewSource(scope.row)"
|
|
|
|
+ >历史
|
|
|
|
+ </el-button>-->
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -399,59 +399,21 @@
|
|
</el-row>
|
|
</el-row>
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
<el-col :span="24">
|
|
<el-col :span="24">
|
|
- <el-form-item label="附件" prop="" v-if="currentType==='put'">
|
|
|
|
|
|
+ <el-form-item label="附件" prop="">
|
|
<ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
<ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
:file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
|
|
:file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
|
|
:value="form.pics"
|
|
:value="form.pics"
|
|
></ObsFileUpload>
|
|
></ObsFileUpload>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="附件" prop="" v-if="currentType==='add'">
|
|
|
|
- <ObsFileUpload ref="obsFileUpload" :file-size="100"
|
|
|
|
- :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg']" :limit="9999"
|
|
|
|
- :value="form.files"
|
|
|
|
- ></ObsFileUpload>
|
|
|
|
- </el-form-item>
|
|
|
|
</el-col>
|
|
</el-col>
|
|
</el-row>
|
|
</el-row>
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer" style="margin-top: 20%;">
|
|
<div slot="footer" class="dialog-footer" style="margin-top: 20%;">
|
|
<el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
|
|
<el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
|
|
-<!-- <el-button :loading="buttonLoading" type="primary" @click="openNode">填写节点信息</el-button>-->
|
|
|
|
-<!-- <el-button :loading="buttonLoading" type="primary" @click="toNodeDetail">填写节点信息</el-button>-->
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
<el-button @click="cancel">取 消</el-button>
|
|
</div>
|
|
</div>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
- <!-- 节点信息dialog -->
|
|
|
|
-<!-- <el-dialog :visible="openNodeForm" :rules="nodesRule" title="节点信息" append-to-body customClass="appendElNodeDialog" width="70% !important">
|
|
|
|
- <el-form ref="nodeForm" :model="zEngineeringInfoBo" :rules="nodeRules" label-width="200px">
|
|
|
|
- <el-form-item label="施工时间" prop="constructTime">
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="zEngineeringInfoBo.constructTime"
|
|
|
|
- value-format="yyyy-MM-dd hh:mm:ss"
|
|
|
|
- type="datetime"
|
|
|
|
- placeholder="请选择施工时间">
|
|
|
|
- </el-date-picker>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" style="width: 100%;">
|
|
|
|
- <ObsImageUpload ref="obsImageUpload" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="zEngineeringInfoBo.zEngiineeringPhotoBoList"
|
|
|
|
- @input="getUrl"></ObsImageUpload>
|
|
|
|
- </el-form-item>
|
|
|
|
- <div style="display: flex;margin-top: 3%;">
|
|
|
|
- <div style="width: 80%;"></div>
|
|
|
|
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
|
|
|
|
- <el-button @click="nodeCancel">取 消</el-button>
|
|
|
|
- </div>
|
|
|
|
- </el-form>
|
|
|
|
- </el-dialog>-->
|
|
|
|
-<!-- <enginee-node
|
|
|
|
- ref="childNode"
|
|
|
|
- @closeToSucceed="closeToSucceed"
|
|
|
|
- />-->
|
|
|
|
- <EngineePipe ref="enginPipe"/>
|
|
|
|
- <ConstructionDetails
|
|
|
|
- ref="ConstructionDetails"
|
|
|
|
- :currentCollapses="currentCollapses"
|
|
|
|
- />
|
|
|
|
|
|
+
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -461,14 +423,10 @@ import {
|
|
getEngineeringDangerous,
|
|
getEngineeringDangerous,
|
|
delEngineeringDangerous, queryEngineeringDangerous, updateEngineeringDangerous, addEngineeringDangerous,
|
|
delEngineeringDangerous, queryEngineeringDangerous, updateEngineeringDangerous, addEngineeringDangerous,
|
|
} from "@/api/zdsz/engineeringDangerous";
|
|
} from "@/api/zdsz/engineeringDangerous";
|
|
-import EngineeNode from "@/components/EngineeNode/index";
|
|
|
|
import data from "@/views/system/dict/data.vue";
|
|
import data from "@/views/system/dict/data.vue";
|
|
-import EngineePipe from '@/components/EngineePipe'
|
|
|
|
-import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
|
|
|
|
import {validPhoneMobile, checkPositiveDecimal} from "@/api/rules";
|
|
import {validPhoneMobile, checkPositiveDecimal} from "@/api/rules";
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
export default {
|
|
export default {
|
|
name: "EngineeringDangerous",
|
|
name: "EngineeringDangerous",
|
|
computed: {
|
|
computed: {
|
|
@@ -476,13 +434,11 @@ export default {
|
|
return data
|
|
return data
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- components: {
|
|
|
|
- EngineePipe, EngineeNode, ConstructionDetails
|
|
|
|
- },
|
|
|
|
|
|
+ components: {},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
//备用
|
|
//备用
|
|
- // openNodeForm:false,
|
|
|
|
|
|
+ // openNodeForm:false,
|
|
//备用
|
|
//备用
|
|
currentCollapses: [],
|
|
currentCollapses: [],
|
|
nodeType: "危险作业工程",
|
|
nodeType: "危险作业工程",
|
|
@@ -509,7 +465,7 @@ export default {
|
|
open: false,
|
|
open: false,
|
|
// 查询参数
|
|
// 查询参数
|
|
queryParams: {
|
|
queryParams: {
|
|
- files: [],
|
|
|
|
|
|
+ pics: [],
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
basicInformation: undefined,
|
|
basicInformation: undefined,
|
|
@@ -545,10 +501,10 @@ export default {
|
|
backfill: undefined,
|
|
backfill: undefined,
|
|
tamp: undefined,
|
|
tamp: undefined,
|
|
levelingTheSite: undefined,
|
|
levelingTheSite: undefined,
|
|
- /* zEngineeringNodeBo: {
|
|
|
|
- type: "危险作业工程",
|
|
|
|
- zEngineeringInfoBo: {} //节点信息
|
|
|
|
- }*/
|
|
|
|
|
|
+ /* zEngineeringNodeBo: {
|
|
|
|
+ type: "危险作业工程",
|
|
|
|
+ zEngineeringInfoBo: {} //节点信息
|
|
|
|
+ }*/
|
|
},
|
|
},
|
|
zEngineeringInfoBo: {
|
|
zEngineeringInfoBo: {
|
|
constructAddre: '', // 施工地址
|
|
constructAddre: '', // 施工地址
|
|
@@ -598,9 +554,9 @@ export default {
|
|
enginAddre: [
|
|
enginAddre: [
|
|
{required: true, message: "工程地点不能为空", trigger: "blur"}
|
|
{required: true, message: "工程地点不能为空", trigger: "blur"}
|
|
],
|
|
],
|
|
- /* enginTime: [
|
|
|
|
- {required: true, message: "工程时间不能为空", trigger: "blur"}
|
|
|
|
- ],*/
|
|
|
|
|
|
+ /* enginTime: [
|
|
|
|
+ {required: true, message: "工程时间不能为空", trigger: "blur"}
|
|
|
|
+ ],*/
|
|
hazardousWorkPitsLong: [
|
|
hazardousWorkPitsLong: [
|
|
//{required: true, message: "危险作业坑大小(长)不能为空", trigger: "blur"},
|
|
//{required: true, message: "危险作业坑大小(长)不能为空", trigger: "blur"},
|
|
{validator: checkPositiveDecimal, trigger: 'blur'},
|
|
{validator: checkPositiveDecimal, trigger: 'blur'},
|
|
@@ -617,125 +573,8 @@ export default {
|
|
// {required: true, message: "现场负责人电话不能为空", trigger: "blur"}
|
|
// {required: true, message: "现场负责人电话不能为空", trigger: "blur"}
|
|
{validator: validPhoneMobile, trigger: 'blur'},
|
|
{validator: validPhoneMobile, trigger: 'blur'},
|
|
],
|
|
],
|
|
- /* pipeDiameter: [
|
|
|
|
- {required: true, message: "管径不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- tubularProduct: [
|
|
|
|
- {required: true, message: "管材不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- casingPresent: [
|
|
|
|
- {required: true, message: "是否存在套管不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- pipePressure: [
|
|
|
|
- {required: true, message: "管道压力不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- gasSourceDirection: [
|
|
|
|
- {required: true, message: "气源方向不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- taskPosition: [
|
|
|
|
- {required: true, message: "作业位置不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- valvePosition: [
|
|
|
|
- {required: true, message: "与作业相关阀门位置不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- stressReport: [
|
|
|
|
- {required: true, message: "压力报告不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- supervisionRecord: [
|
|
|
|
- {required: true, message: "监理旁站记录不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- workContactForm: [
|
|
|
|
- {required: true, message: "工作联系单不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- linePatrolConfirmationForm: [
|
|
|
|
- {required: true, message: "巡线确认单不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- hazardousWorkPitsLong: [
|
|
|
|
- {required: true, message: "危险作业坑大小(长)不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- hazardousWorkPitsWide: [
|
|
|
|
- {required: true, message: "危险作业坑大小(宽)不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- hazardousWorkPitsDeep: [
|
|
|
|
- {required: true, message: "危险作业坑大小(深)不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- needSupport: [
|
|
|
|
- {required: true, message: "是否需要支护不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- otherPipelineConditionsWorkPit: [
|
|
|
|
- {required: true, message: "作业坑内其他管道情况不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- siteHead: [
|
|
|
|
- {required: true, message: "现场负责人不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- siteHeadPhone: [
|
|
|
|
- {required: true, message: "现场负责人电话不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- operatorInformation: [
|
|
|
|
- {required: true, message: "作业人员信息不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- inspectionPort: [
|
|
|
|
- {required: true, message: "检口不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- pipelinePainting: [
|
|
|
|
- {required: true, message: "管道刷油不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- pipelineSupport: [
|
|
|
|
- {required: true, message: "管道支护不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- pipelineCorrosionProtection: [
|
|
|
|
- {required: true, message: "管道防腐不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- masonryValveWell: [
|
|
|
|
- {required: true, message: "砌筑阀门井不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- protectionWell: [
|
|
|
|
- {required: true, message: "保护井不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- pipeProtectionWelMasonry: [
|
|
|
|
- {required: true, message: "管件保护井砌筑不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- backfill: [
|
|
|
|
- {required: true, message: "回填不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- tamp: [
|
|
|
|
- {required: true, message: "夯实不能为空", trigger: "blur"}
|
|
|
|
- ],
|
|
|
|
- levelingTheSite: [
|
|
|
|
- {required: true, message: "平整场地不能为空", trigger: "blur"}
|
|
|
|
- ],*/
|
|
|
|
- },
|
|
|
|
- // 节点规则校验
|
|
|
|
- /* nodeRules: {
|
|
|
|
- type: [
|
|
|
|
- {required: true, message: "节点类型不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- constructAddre: [
|
|
|
|
- {required: true, message: "施工地址不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- constructPhone: [
|
|
|
|
- {required: true, message: "施工人电话不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- constructUser: [
|
|
|
|
- {required: true, message: "施工人不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- headName: [
|
|
|
|
- {required: true, message: "负责人不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- headPhone: [
|
|
|
|
- {required: true, message: "负责人电话不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
|
|
|
|
- },*/
|
|
|
|
- //备用
|
|
|
|
- /* nodesRule:{
|
|
|
|
- zEngiineeringPhotoBoList: [
|
|
|
|
- {required: true, message: "图片不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- constructTime: [
|
|
|
|
- {required: true, message: "施工时间不能为空", trigger: 'blur'}
|
|
|
|
- ],
|
|
|
|
- },*/
|
|
|
|
|
|
+ },
|
|
//备用
|
|
//备用
|
|
currentType: null, // 组件类型 put修改 add新增
|
|
currentType: null, // 组件类型 put修改 add新增
|
|
};
|
|
};
|
|
@@ -745,11 +584,13 @@ export default {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
submitForm() {
|
|
submitForm() {
|
|
|
|
+ debugger
|
|
this.$refs["form"].validate(valid => {
|
|
this.$refs["form"].validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
this.buttonLoading = true;
|
|
this.buttonLoading = true;
|
|
if (this.form.id != null) {
|
|
if (this.form.id != null) {
|
|
- this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
|
|
+ debugger
|
|
|
|
+ this.form.pics = this.$refs.obsFileUpload.fileList
|
|
updateEngineeringDangerous(this.form).then(response => {
|
|
updateEngineeringDangerous(this.form).then(response => {
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.open = false;
|
|
this.open = false;
|
|
@@ -758,7 +599,8 @@ export default {
|
|
this.buttonLoading = false;
|
|
this.buttonLoading = false;
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
- this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
|
|
+ debugger
|
|
|
|
+ this.form.pics = this.$refs.obsFileUpload.fileList
|
|
addEngineeringDangerous(this.form).then(response => {
|
|
addEngineeringDangerous(this.form).then(response => {
|
|
this.$modal.msgSuccess("新增成功");
|
|
this.$modal.msgSuccess("新增成功");
|
|
this.open = false;
|
|
this.open = false;
|
|
@@ -771,64 +613,64 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//备用
|
|
//备用
|
|
- /* openNode(){
|
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
|
- if (valid){
|
|
|
|
- this.openNodeForm=true
|
|
|
|
- console.log(this.form.id)
|
|
|
|
- if (this.form.id !== undefined){
|
|
|
|
- getEngineeringDangerous(this.form.id).then((res)=>{
|
|
|
|
- console.log(res.data)
|
|
|
|
- this.zEngineeringInfoBo = res.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
|
|
|
|
- this.nodeType = res.data.zEngineeringNodeBoList[0].type
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ /* openNode(){
|
|
|
|
+ this.$refs["form"].validate(valid => {
|
|
|
|
+ if (valid){
|
|
|
|
+ this.openNodeForm=true
|
|
|
|
+ console.log(this.form.id)
|
|
|
|
+ if (this.form.id !== undefined){
|
|
|
|
+ getEngineeringDangerous(this.form.id).then((res)=>{
|
|
|
|
+ console.log(res.data)
|
|
|
|
+ this.zEngineeringInfoBo = res.data.zEngineeringNodeBoList[0].zEngineeringInfoBoList[0]
|
|
|
|
+ this.nodeType = res.data.zEngineeringNodeBoList[0].type
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
- })
|
|
|
|
- },
|
|
|
|
- nodeCancel(){
|
|
|
|
- this.resetNodeForm()
|
|
|
|
- this.openNodeForm = false
|
|
|
|
- },
|
|
|
|
- resetNodeForm(){
|
|
|
|
- this.$refs['nodeForm'].resetFields()
|
|
|
|
- this.resetForm("nodeForm");
|
|
|
|
- },
|
|
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ nodeCancel(){
|
|
|
|
+ this.resetNodeForm()
|
|
|
|
+ this.openNodeForm = false
|
|
|
|
+ },
|
|
|
|
+ resetNodeForm(){
|
|
|
|
+ this.$refs['nodeForm'].resetFields()
|
|
|
|
+ this.resetForm("nodeForm");
|
|
|
|
+ },
|
|
|
|
|
|
- submitForm() {
|
|
|
|
- this.$refs["nodeForm"].validate(valid => {
|
|
|
|
- if (valid) {
|
|
|
|
- if (this.form.id == null) {
|
|
|
|
- this.form.zEngineeringNodeBo = {}
|
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
|
|
|
|
- this.form.zEngineeringNodeBo.type = this.nodeType
|
|
|
|
- this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
|
|
|
|
- console.log(this.form)
|
|
|
|
- addEngineeringDangerous(this.form).then(res => {
|
|
|
|
- this.$modal.msgSuccess("新增成功");
|
|
|
|
- this.open = false;
|
|
|
|
- this.openNodeForm = false
|
|
|
|
- this.getList();
|
|
|
|
- })
|
|
|
|
- } else {
|
|
|
|
- // 危险修改
|
|
|
|
- this.form.zEngineeringNodeBo = {}
|
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
|
|
|
|
- this.form.zEngineeringNodeBo.type = this.nodeType
|
|
|
|
- this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
- this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
|
|
|
|
- updateEngineeringDangerous(this.form).then(res => {
|
|
|
|
- this.$modal.msgSuccess("修改成功");
|
|
|
|
- this.open = false;
|
|
|
|
- this.openNodeForm = false
|
|
|
|
- this.getList();
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
- },*/
|
|
|
|
|
|
+ submitForm() {
|
|
|
|
+ this.$refs["nodeForm"].validate(valid => {
|
|
|
|
+ if (valid) {
|
|
|
|
+ if (this.form.id == null) {
|
|
|
|
+ this.form.zEngineeringNodeBo = {}
|
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
|
|
|
|
+ this.form.zEngineeringNodeBo.type = this.nodeType
|
|
|
|
+ this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
|
|
|
|
+ console.log(this.form)
|
|
|
|
+ addEngineeringDangerous(this.form).then(res => {
|
|
|
|
+ this.$modal.msgSuccess("新增成功");
|
|
|
|
+ this.open = false;
|
|
|
|
+ this.openNodeForm = false
|
|
|
|
+ this.getList();
|
|
|
|
+ })
|
|
|
|
+ } else {
|
|
|
|
+ // 危险修改
|
|
|
|
+ this.form.zEngineeringNodeBo = {}
|
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo = this.zEngineeringInfoBo
|
|
|
|
+ this.form.zEngineeringNodeBo.type = this.nodeType
|
|
|
|
+ this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
+ this.form.zEngineeringNodeBo.zEngineeringInfoBo.zEngineeringMaterialBo = []
|
|
|
|
+ updateEngineeringDangerous(this.form).then(res => {
|
|
|
|
+ this.$modal.msgSuccess("修改成功");
|
|
|
|
+ this.open = false;
|
|
|
|
+ this.openNodeForm = false
|
|
|
|
+ this.getList();
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ },*/
|
|
//备用
|
|
//备用
|
|
viewSource(e) {
|
|
viewSource(e) {
|
|
this.currentId = e.id
|
|
this.currentId = e.id
|
|
@@ -854,12 +696,12 @@ export default {
|
|
this.$refs["form"].validate(valid => {
|
|
this.$refs["form"].validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
if (this.currentType === 'put') {
|
|
if (this.currentType === 'put') {
|
|
- this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
|
|
+ this.form.pics = this.$refs.obsFileUpload.fileList
|
|
this.$refs.childNode.open(this.form, 37, [{name: "危险作业工程"}])
|
|
this.$refs.childNode.open(this.form, 37, [{name: "危险作业工程"}])
|
|
return
|
|
return
|
|
}
|
|
}
|
|
if (this.currentType === 'add') {
|
|
if (this.currentType === 'add') {
|
|
- this.form.files = this.$refs.obsFileUpload.fileList
|
|
|
|
|
|
+ this.form.pics = this.$refs.obsFileUpload.fileList
|
|
this.$refs.childNode.open(this.form, 3, [{name: "危险作业工程"}])
|
|
this.$refs.childNode.open(this.form, 3, [{name: "危险作业工程"}])
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -867,12 +709,12 @@ export default {
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
- /* return
|
|
|
|
- this.$refs['form'].validate(e => {
|
|
|
|
- if (e) {
|
|
|
|
- this.nodeDetailVisible = true
|
|
|
|
- }
|
|
|
|
- })*/
|
|
|
|
|
|
+ /* return
|
|
|
|
+ this.$refs['form'].validate(e => {
|
|
|
|
+ if (e) {
|
|
|
|
+ this.nodeDetailVisible = true
|
|
|
|
+ }
|
|
|
|
+ })*/
|
|
|
|
|
|
},
|
|
},
|
|
// 新增顶管工程
|
|
// 新增顶管工程
|
|
@@ -880,25 +722,25 @@ export default {
|
|
this.$refs.enginPipe.openDialog({
|
|
this.$refs.enginPipe.openDialog({
|
|
id: data.id,
|
|
id: data.id,
|
|
type: "危险作业工程"
|
|
type: "危险作业工程"
|
|
- }, 'add',data)
|
|
|
|
|
|
+ }, 'add', data)
|
|
},
|
|
},
|
|
getUrl(url) {
|
|
getUrl(url) {
|
|
this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
|
|
this.zEngineeringInfoBo.zEngiineeringPhotoBoList = this.$refs.obsImageUpload.fileList ? this.$refs.obsImageUpload.fileList.map(e => e.url) : [];
|
|
},
|
|
},
|
|
/** 查询危险工程列表 */
|
|
/** 查询危险工程列表 */
|
|
- /* getList() {
|
|
|
|
- this.loading = true;
|
|
|
|
- listEngineeringDangerous({
|
|
|
|
- basicInformation: this.queryParams.basicInformation,
|
|
|
|
- enginName: this.queryParams.enginName,
|
|
|
|
- enginAddre: this.queryParams.enginAddre,
|
|
|
|
- params: this.queryParams
|
|
|
|
- }).then(res => {
|
|
|
|
- this.engineeringDangerousList = res.rows;
|
|
|
|
- this.total = res.total;
|
|
|
|
- this.loading = false;
|
|
|
|
- });
|
|
|
|
- },*/
|
|
|
|
|
|
+ /* getList() {
|
|
|
|
+ this.loading = true;
|
|
|
|
+ listEngineeringDangerous({
|
|
|
|
+ basicInformation: this.queryParams.basicInformation,
|
|
|
|
+ enginName: this.queryParams.enginName,
|
|
|
|
+ enginAddre: this.queryParams.enginAddre,
|
|
|
|
+ params: this.queryParams
|
|
|
|
+ }).then(res => {
|
|
|
|
+ this.engineeringDangerousList = res.rows;
|
|
|
|
+ this.total = res.total;
|
|
|
|
+ this.loading = false;
|
|
|
|
+ });
|
|
|
|
+ },*/
|
|
getList() {
|
|
getList() {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
listEngineeringDangerous(this.queryParams).then(response => {
|
|
listEngineeringDangerous(this.queryParams).then(response => {
|
|
@@ -1045,7 +887,8 @@ export default {
|
|
.el-form-item:not(:nth-child(1):nth-child(2)) {
|
|
.el-form-item:not(:nth-child(1):nth-child(2)) {
|
|
margin-top: 0.5%;
|
|
margin-top: 0.5%;
|
|
}
|
|
}
|
|
- .el-form-item__error{
|
|
|
|
|
|
+
|
|
|
|
+ .el-form-item__error {
|
|
width: 200px;
|
|
width: 200px;
|
|
color: #ff4949;
|
|
color: #ff4949;
|
|
font-size: 12px;
|
|
font-size: 12px;
|
|
@@ -1055,6 +898,7 @@ export default {
|
|
top: 100%;
|
|
top: 100%;
|
|
left: 0;
|
|
left: 0;
|
|
}
|
|
}
|
|
|
|
+
|
|
.remark_input {
|
|
.remark_input {
|
|
.el-textarea__inner {
|
|
.el-textarea__inner {
|
|
width: 238%;
|
|
width: 238%;
|