|
@@ -154,7 +154,8 @@
|
|
type="text"
|
|
type="text"
|
|
icon="el-icon-edit"
|
|
icon="el-icon-edit"
|
|
@click="addNewPipe(scope.row)"
|
|
@click="addNewPipe(scope.row)"
|
|
- >新增顶管工程</el-button>
|
|
|
|
|
|
+ >新增顶管工程
|
|
|
|
+ </el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -168,132 +169,149 @@
|
|
/>
|
|
/>
|
|
<EngineePipe ref="enginPipe"/>
|
|
<EngineePipe ref="enginPipe"/>
|
|
<!-- 添加或修改民用工程对话框 -->
|
|
<!-- 添加或修改民用工程对话框 -->
|
|
- <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
|
|
|
|
|
|
+ <el-dialog :title="title" :visible.sync="open" width="500" append-to-body>
|
|
<el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
|
|
<el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
|
|
- <el-form-item label="行政区" prop="district">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.district"
|
|
|
|
- placeholder="请选择行政区"
|
|
|
|
- @change="districtHasChanged"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in dict.type.district"
|
|
|
|
- :key="e.value"
|
|
|
|
- :label="e.label"
|
|
|
|
- :value="e.value"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="小区" prop="areaId">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.areaId"
|
|
|
|
- placeholder="请选择小区"
|
|
|
|
- @change="communityHasChanged"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in communityOptions"
|
|
|
|
- :key="e.id"
|
|
|
|
- :label="e.name"
|
|
|
|
- :value="e.id"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="楼栋" prop="buildingId">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.buildingId"
|
|
|
|
- placeholder="请选择楼栋"
|
|
|
|
- @change="buildingHasChanged"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in buildingOptions"
|
|
|
|
- :key="e.id"
|
|
|
|
- :label="e.name"
|
|
|
|
- :value="e.id"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="单元" prop="unitId">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.unitId"
|
|
|
|
- placeholder="请选择单元"
|
|
|
|
- @change="unitHasChanged"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in unitOptions"
|
|
|
|
- :key="e.id"
|
|
|
|
- :label="e.name"
|
|
|
|
- :value="e.id"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="房间" prop="houseId">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.houseId"
|
|
|
|
- placeholder="请选择房间"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in houseOptions"
|
|
|
|
- :key="e.id"
|
|
|
|
- :label="e.name"
|
|
|
|
- :value="e.id"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <!-- <el-form-item label="工程类型" prop="enginType">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.enginType"
|
|
|
|
- placeholder="请选择工程类型"
|
|
|
|
- @change="enginTypeHasChanged"
|
|
|
|
|
|
+
|
|
|
|
+ <el-row>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="行政区" prop="district">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.district"
|
|
|
|
+ placeholder="请选择行政区"
|
|
|
|
+ @change="districtHasChanged"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in dict.type.district"
|
|
|
|
+ :key="e.value"
|
|
|
|
+ :label="e.label"
|
|
|
|
+ :value="e.value"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="小区" prop="areaId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.areaId"
|
|
|
|
+ placeholder="请选择小区"
|
|
|
|
+ @change="communityHasChanged"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in communityOptions"
|
|
|
|
+ :key="e.id"
|
|
|
|
+ :label="e.name"
|
|
|
|
+ :value="e.id"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-row>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="楼栋" prop="buildingId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.buildingId"
|
|
|
|
+ placeholder="请选择楼栋"
|
|
|
|
+ @change="buildingHasChanged"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in buildingOptions"
|
|
|
|
+ :key="e.id"
|
|
|
|
+ :label="e.name"
|
|
|
|
+ :value="e.id"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="单元" prop="unitId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.unitId"
|
|
|
|
+ placeholder="请选择单元"
|
|
|
|
+ @change="unitHasChanged"
|
|
>
|
|
>
|
|
- <el-option
|
|
|
|
- v-for="e in enginTypeOption"
|
|
|
|
- :key="e.value"
|
|
|
|
- :label="e.label"
|
|
|
|
- :value="e.value"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item> -->
|
|
|
|
- <!-- <el-form-item label="工程类型">
|
|
|
|
- <el-cascader
|
|
|
|
- v-model="value"
|
|
|
|
- :options="options"
|
|
|
|
- @change="currentEnginTypeChange">
|
|
|
|
- </el-cascader>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="工程节点">
|
|
|
|
- <el-select
|
|
|
|
- v-model="enginClassification"
|
|
|
|
- placeholder="请选择工程节点"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in enginClassificationOption"
|
|
|
|
- :key="e.value"
|
|
|
|
- :label="e.label"
|
|
|
|
- :value="e.value"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item> -->
|
|
|
|
- <el-form-item label="工程周期" prop="enginCycle">
|
|
|
|
- <el-select
|
|
|
|
- v-model="queryParams.enginCycle"
|
|
|
|
- placeholder="请填写工程周期"
|
|
|
|
- >
|
|
|
|
- <el-option
|
|
|
|
- v-for="e in dict.type.engin_cycle"
|
|
|
|
- :key="e.value"
|
|
|
|
- :label="e.label"
|
|
|
|
- :value="e.value"
|
|
|
|
- ></el-option>
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <!-- <el-form-item label="备注" prop="remark">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.remark"
|
|
|
|
- type="textarea"
|
|
|
|
- placeholder="请输入内容"
|
|
|
|
- class="remark_input"
|
|
|
|
- />
|
|
|
|
- </el-form-item> -->
|
|
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in unitOptions"
|
|
|
|
+ :key="e.id"
|
|
|
|
+ :label="e.name"
|
|
|
|
+ :value="e.id"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-row>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="房间" prop="houseId">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.houseId"
|
|
|
|
+ placeholder="请选择房间"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in houseOptions"
|
|
|
|
+ :key="e.id"
|
|
|
|
+ :label="e.name"
|
|
|
|
+ :value="e.id"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="工程类型" prop="enginType">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.enginType"
|
|
|
|
+ placeholder="请选择工程类型"
|
|
|
|
+ @change="enginTypeHasChanged"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in enginTypeOption"
|
|
|
|
+ :key="e.value"
|
|
|
|
+ :label="e.label"
|
|
|
|
+ :value="e.value"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-row>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="工程分类" prop="currentEnginTypeChange">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.currentEnginTypeChange"
|
|
|
|
+ placeholder="请选择工程分类"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in currentEnginTypeChangeOptions"
|
|
|
|
+ :key="e.dictValue"
|
|
|
|
+ :label="e.dictLabel"
|
|
|
|
+ :value="e.dictValue"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ <el-col :span="12">
|
|
|
|
+ <el-form-item label="工程周期" prop="enginCycle">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model="queryParams.enginCycle"
|
|
|
|
+ placeholder="请填写工程周期"
|
|
|
|
+ @change="q"
|
|
|
|
+ >
|
|
|
|
+ <el-option
|
|
|
|
+ v-for="e in dict.type.engin_cycle"
|
|
|
|
+ :key="e.value"
|
|
|
|
+ :label="e.label"
|
|
|
|
+ :value="e.value"
|
|
|
|
+ ></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
|
|
+ </el-col>
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-tabs type="border-card">
|
|
|
|
+ <el-tab-pane label="用户管理">用户管理</el-tab-pane>
|
|
|
|
+ <el-tab-pane label="配置管理">配置管理</el-tab-pane>
|
|
|
|
+ <el-tab-pane label="角色管理">角色管理</el-tab-pane>
|
|
|
|
+ <el-tab-pane label="定时任务补偿">定时任务补偿</el-tab-pane>
|
|
|
|
+ </el-tabs>
|
|
</el-form>
|
|
</el-form>
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
<!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button> -->
|
|
<!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">确定</el-button> -->
|
|
@@ -331,8 +349,10 @@ import {getUnits} from "@/api/zdsz/unit";
|
|
import EngineeNode from '@/components/EngineeNode/index'
|
|
import EngineeNode from '@/components/EngineeNode/index'
|
|
import EngineePipe from "@/components/EngineePipe"
|
|
import EngineePipe from "@/components/EngineePipe"
|
|
import {resetForm} from "@/utils/ruoyi";
|
|
import {resetForm} from "@/utils/ruoyi";
|
|
|
|
+import {getDicts} from "@/api/system/dict/data";
|
|
|
|
+
|
|
export default {
|
|
export default {
|
|
- components:{
|
|
|
|
|
|
+ components: {
|
|
EngineeNode,
|
|
EngineeNode,
|
|
EngineePipe
|
|
EngineePipe
|
|
},
|
|
},
|
|
@@ -342,60 +362,31 @@ export default {
|
|
'is_repair',
|
|
'is_repair',
|
|
'engin_type',
|
|
'engin_type',
|
|
'self_closing_valve_type',
|
|
'self_closing_valve_type',
|
|
- 'visit_type','district',
|
|
|
|
|
|
+ 'visit_type', 'district',
|
|
'new_built_indoor_engin',
|
|
'new_built_indoor_engin',
|
|
"old_renovation_indoor_engin",
|
|
"old_renovation_indoor_engin",
|
|
- "old_renovation_courtyard_engin",
|
|
|
|
|
|
+ "old_renovation_courtyard",
|
|
"old_renovation_overhead",
|
|
"old_renovation_overhead",
|
|
"new_built_indoor_engin",
|
|
"new_built_indoor_engin",
|
|
- "new_built_courtyard_engin",
|
|
|
|
|
|
+ "new_built_courtyard",
|
|
"new_built_overhead",
|
|
"new_built_overhead",
|
|
"engin_cycle"],
|
|
"engin_cycle"],
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
- enginClassificationinfo:'',
|
|
|
|
- enginClassification:'',
|
|
|
|
- enginClassificationOption:[],
|
|
|
|
- options: [
|
|
|
|
|
|
+ enginClassificationinfo: '',
|
|
|
|
+ enginClassification: '',
|
|
|
|
+ enginClassificationOption: [],
|
|
|
|
+ enginTypeOption: [
|
|
{
|
|
{
|
|
value: 'old_renovation',
|
|
value: 'old_renovation',
|
|
- label: '旧改',
|
|
|
|
- children: [
|
|
|
|
- {
|
|
|
|
- value: 'old_renovation_indoor_engin',
|
|
|
|
- label: '室内',
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- value: 'old_renovation_courtyard_engin',
|
|
|
|
- label: '庭院',
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- value: 'old_renovation_overhead',
|
|
|
|
- label: '架空',
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
|
|
+ label: '旧改'
|
|
|
|
+ }, {
|
|
value: 'new_built',
|
|
value: 'new_built',
|
|
- label: '新建',
|
|
|
|
- children: [
|
|
|
|
- {
|
|
|
|
- value: 'new_built_indoor_engin',
|
|
|
|
- label: '室内',
|
|
|
|
-
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- value: 'new_built_courtyard_engin',
|
|
|
|
- label: '庭院',
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- value: 'new_built_overhead',
|
|
|
|
- label: '架空',
|
|
|
|
- }
|
|
|
|
- ]
|
|
|
|
|
|
+ label: '新建'
|
|
},
|
|
},
|
|
],
|
|
],
|
|
|
|
+ currentEnginTypeChangeOptions: [],
|
|
|
|
+
|
|
// 按钮loading
|
|
// 按钮loading
|
|
buttonLoading: false,
|
|
buttonLoading: false,
|
|
// 遮罩层
|
|
// 遮罩层
|
|
@@ -447,7 +438,7 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- queryParams1:{
|
|
|
|
|
|
+ queryParams1: {
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 10,
|
|
pageSize: 10,
|
|
district: undefined,
|
|
district: undefined,
|
|
@@ -461,22 +452,22 @@ export default {
|
|
completionStatus: undefined,
|
|
completionStatus: undefined,
|
|
imgUrl: undefined,
|
|
imgUrl: undefined,
|
|
},
|
|
},
|
|
- zEngineeringInfoBo:{
|
|
|
|
- constructAddre:'', // 施工地址
|
|
|
|
- constructPhone:'', // 施工人电话
|
|
|
|
- constructUser:'', // 施工人
|
|
|
|
- headName:'', // 负责人
|
|
|
|
- headPhone:'', // 负责人电话
|
|
|
|
- constructAccordingDrawings:'', // 是否按图纸施工
|
|
|
|
- segmentedCompressionQualified:'', // 分段打压是否合格
|
|
|
|
- selfClosingValveType:'', // 自闭阀类型
|
|
|
|
- visitType:'', // 上门类型
|
|
|
|
- backfillTime:'', // 回填时间
|
|
|
|
- constructTime:'', // 施工时间
|
|
|
|
- zEngiineeringPhotoBoList:[], // 图片列表
|
|
|
|
- zEngineeringMaterialBo:[],// 用料对象
|
|
|
|
|
|
+ zEngineeringInfoBo: {
|
|
|
|
+ constructAddre: '', // 施工地址
|
|
|
|
+ constructPhone: '', // 施工人电话
|
|
|
|
+ constructUser: '', // 施工人
|
|
|
|
+ headName: '', // 负责人
|
|
|
|
+ headPhone: '', // 负责人电话
|
|
|
|
+ constructAccordingDrawings: '', // 是否按图纸施工
|
|
|
|
+ segmentedCompressionQualified: '', // 分段打压是否合格
|
|
|
|
+ selfClosingValveType: '', // 自闭阀类型
|
|
|
|
+ visitType: '', // 上门类型
|
|
|
|
+ backfillTime: '', // 回填时间
|
|
|
|
+ constructTime: '', // 施工时间
|
|
|
|
+ zEngiineeringPhotoBoList: [], // 图片列表
|
|
|
|
+ zEngineeringMaterialBo: [],// 用料对象
|
|
},
|
|
},
|
|
- nodeList:[],
|
|
|
|
|
|
+ nodeList: [],
|
|
// 表单参数
|
|
// 表单参数
|
|
form: {},
|
|
form: {},
|
|
value: [],
|
|
value: [],
|
|
@@ -522,16 +513,15 @@ export default {
|
|
areaList: [],
|
|
areaList: [],
|
|
buildingList: [],
|
|
buildingList: [],
|
|
unitList: [],
|
|
unitList: [],
|
|
- currentDistrict:null, // 当前行政区
|
|
|
|
- currentCommunity:null, // 当前小区
|
|
|
|
- currentBuilding:null, // 当前楼宇
|
|
|
|
- currentUnit:null, // 当前单元
|
|
|
|
- communityOptions:[
|
|
|
|
- ],
|
|
|
|
- buildingOptions:[], // 楼栋集合
|
|
|
|
- unitOptions:[], // 单元集合
|
|
|
|
- houseOptions:[], // 房间集合
|
|
|
|
- enginClassification_list:[]// 室内节点
|
|
|
|
|
|
+ currentDistrict: null, // 当前行政区
|
|
|
|
+ currentCommunity: null, // 当前小区
|
|
|
|
+ currentBuilding: null, // 当前楼宇
|
|
|
|
+ currentUnit: null, // 当前单元
|
|
|
|
+ communityOptions: [],
|
|
|
|
+ buildingOptions: [], // 楼栋集合
|
|
|
|
+ unitOptions: [], // 单元集合
|
|
|
|
+ houseOptions: [], // 房间集合
|
|
|
|
+ enginClassification_list: []// 室内节点
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
@@ -540,23 +530,24 @@ export default {
|
|
mounted() {
|
|
mounted() {
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- // 新增顶管工程
|
|
|
|
- addNewPipe(data) {
|
|
|
|
- this.$refs.enginPipe.openDialog({
|
|
|
|
- id: data.id,
|
|
|
|
- type: this.form.zEngineeringNodeBo.type
|
|
|
|
- }, 'add')
|
|
|
|
- },
|
|
|
|
- currentEnginTypeChange(val){
|
|
|
|
|
|
+
|
|
|
|
+ // // 新增顶管工程
|
|
|
|
+ // addNewPipe(data) {
|
|
|
|
+ // this.$refs.enginPipe.openDialog({
|
|
|
|
+ // id: data.id,
|
|
|
|
+ // type: this.form.zEngineeringNodeBo.type
|
|
|
|
+ // }, 'add')
|
|
|
|
+ // },
|
|
|
|
+ currentEnginTypeChange(val) {
|
|
const enginDict = val[1]
|
|
const enginDict = val[1]
|
|
const enginType = val[0]
|
|
const enginType = val[0]
|
|
this.queryParams.enginType = enginType
|
|
this.queryParams.enginType = enginType
|
|
- this.enginClassification=enginDict
|
|
|
|
|
|
+ this.enginClassification = enginDict
|
|
this.enginClassificationOption = this.dict.type[enginDict]
|
|
this.enginClassificationOption = this.dict.type[enginDict]
|
|
console.log(this.value)
|
|
console.log(this.value)
|
|
},
|
|
},
|
|
// 当前所选行政区发生改变 查询当前小区集合
|
|
// 当前所选行政区发生改变 查询当前小区集合
|
|
- districtHasChanged(district){
|
|
|
|
|
|
+ districtHasChanged(district) {
|
|
this.queryParams.areaId = null
|
|
this.queryParams.areaId = null
|
|
this.queryParams.buildingId = null
|
|
this.queryParams.buildingId = null
|
|
this.queryParams.unitId = null
|
|
this.queryParams.unitId = null
|
|
@@ -565,34 +556,34 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 当前所选小区发生改变 查询当前楼栋集合
|
|
// 当前所选小区发生改变 查询当前楼栋集合
|
|
- communityHasChanged(areaId){
|
|
|
|
|
|
+ communityHasChanged(areaId) {
|
|
this.queryParams.buildingId = null
|
|
this.queryParams.buildingId = null
|
|
this.queryParams.unitId = null
|
|
this.queryParams.unitId = null
|
|
getBuildingList({areaId}).then(res => {
|
|
getBuildingList({areaId}).then(res => {
|
|
this.buildingOptions = res.data
|
|
this.buildingOptions = res.data
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- buildingHasChanged(buildingId){
|
|
|
|
|
|
+ buildingHasChanged(buildingId) {
|
|
console.log(buildingId)
|
|
console.log(buildingId)
|
|
this.queryParams.unitId = null
|
|
this.queryParams.unitId = null
|
|
getUnitList({buildingId}).then(res => {
|
|
getUnitList({buildingId}).then(res => {
|
|
this.unitOptions = res.data
|
|
this.unitOptions = res.data
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- unitHasChanged(unitId){
|
|
|
|
|
|
+ unitHasChanged(unitId) {
|
|
getHousesList({unitId}).then(res => {
|
|
getHousesList({unitId}).then(res => {
|
|
console.log(res)
|
|
console.log(res)
|
|
this.houseOptions = res.data
|
|
this.houseOptions = res.data
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- enginTypeHasChanged(val){
|
|
|
|
- if(val == 'old_renovation'){
|
|
|
|
-
|
|
|
|
- }else if(val == 'new_built'){
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
|
|
+ enginTypeHasChanged() {
|
|
|
|
+ this.queryParams.currentEnginTypeChange = undefined
|
|
|
|
+ this.currentEnginTypeChangeOptions = []
|
|
|
|
+ getDicts(this.queryParams.enginType).then(res => {
|
|
|
|
+ this.currentEnginTypeChangeOptions = res.data
|
|
|
|
+ })
|
|
},
|
|
},
|
|
- closeToSucceed(){
|
|
|
|
|
|
+ closeToSucceed() {
|
|
this.open = false;
|
|
this.open = false;
|
|
},
|
|
},
|
|
getAreaList(district) {
|
|
getAreaList(district) {
|
|
@@ -646,7 +637,7 @@ export default {
|
|
updateBy: undefined,
|
|
updateBy: undefined,
|
|
updateTime: undefined
|
|
updateTime: undefined
|
|
};
|
|
};
|
|
- this.queryParams= {
|
|
|
|
|
|
+ this.queryParams = {
|
|
district: undefined,
|
|
district: undefined,
|
|
areaId: undefined,
|
|
areaId: undefined,
|
|
buildingId: undefined,
|
|
buildingId: undefined,
|
|
@@ -676,7 +667,7 @@ export default {
|
|
// }
|
|
// }
|
|
// },
|
|
// },
|
|
}
|
|
}
|
|
- this.enginClassification=null
|
|
|
|
|
|
+ this.enginClassification = null
|
|
this.resetForm("form");
|
|
this.resetForm("form");
|
|
},
|
|
},
|
|
/** 搜索按钮操作 */
|
|
/** 搜索按钮操作 */
|
|
@@ -696,20 +687,20 @@ export default {
|
|
this.multiple = !selection.length
|
|
this.multiple = !selection.length
|
|
},
|
|
},
|
|
// 新增顶管工程
|
|
// 新增顶管工程
|
|
- addNewPipe(data){
|
|
|
|
|
|
+ addNewPipe(data) {
|
|
this.$refs.enginPipe.openDialog({
|
|
this.$refs.enginPipe.openDialog({
|
|
- id:data.id
|
|
|
|
- },'add')
|
|
|
|
|
|
+ id: data.id
|
|
|
|
+ }, 'add')
|
|
},
|
|
},
|
|
- nodeCancel(){
|
|
|
|
|
|
+ nodeCancel() {
|
|
this.nodeDetailVisible = false
|
|
this.nodeDetailVisible = false
|
|
},
|
|
},
|
|
- toNodeDetail(){
|
|
|
|
- getDictList({enginType:['new_built','old_renovation']}).then(res => {
|
|
|
|
|
|
+ toNodeDetail() {
|
|
|
|
+ getDictList({enginType: ['new_built', 'old_renovation']}).then(res => {
|
|
this.nodeList = res.data
|
|
this.nodeList = res.data
|
|
|
|
|
|
- if(this.currentType == 'put'){
|
|
|
|
- this.$refs.childNode.open(this.queryParams,16)
|
|
|
|
|
|
+ if (this.currentType == 'put') {
|
|
|
|
+ this.$refs.childNode.open(this.queryParams, 16)
|
|
this.currentType = null
|
|
this.currentType = null
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -720,10 +711,10 @@ export default {
|
|
// this.queryParams.zEngineeringNodeBo.type = this.enginClassification
|
|
// this.queryParams.zEngineeringNodeBo.type = this.enginClassification
|
|
// this.queryParams.enginClassification = result
|
|
// this.queryParams.enginClassification = result
|
|
// console.log(this.queryParams)
|
|
// console.log(this.queryParams)
|
|
- this.$refs.childNode.open(this.queryParams,0,this.nodeList)
|
|
|
|
|
|
+ this.$refs.childNode.open(this.queryParams, 0, this.nodeList)
|
|
return
|
|
return
|
|
this.$refs['form'].validate(e => {
|
|
this.$refs['form'].validate(e => {
|
|
- if(e){
|
|
|
|
|
|
+ if (e) {
|
|
this.nodeDetailVisible = true
|
|
this.nodeDetailVisible = true
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -738,7 +729,7 @@ export default {
|
|
/** 修改按钮操作 */
|
|
/** 修改按钮操作 */
|
|
handleUpdate(row) {
|
|
handleUpdate(row) {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
- // this.reset();
|
|
|
|
|
|
+ // this.reset();
|
|
const id = row.id || this.ids
|
|
const id = row.id || this.ids
|
|
// getEngineeringCivil(id).then(response => {
|
|
// getEngineeringCivil(id).then(response => {
|
|
// this.loading = false;
|
|
// this.loading = false;
|
|
@@ -753,32 +744,27 @@ export default {
|
|
console.log(newData)
|
|
console.log(newData)
|
|
console.log(res.data.zEngineeringNodeBoList[0].type)
|
|
console.log(res.data.zEngineeringNodeBoList[0].type)
|
|
let zEngineeringNodeBo = {
|
|
let zEngineeringNodeBo = {
|
|
- type:res.data.zEngineeringNodeBoList[0].type,
|
|
|
|
- zEngineeringInfoBo:res.data.zEngineeringNodeBoList[0].zEngineeringInfoBo
|
|
|
|
|
|
+ type: res.data.zEngineeringNodeBoList[0].type,
|
|
|
|
+ zEngineeringInfoBo: res.data.zEngineeringNodeBoList[0].zEngineeringInfoBo
|
|
}
|
|
}
|
|
- if (res.data.areaId!=''&&res.data.areaId!=null)
|
|
|
|
- {
|
|
|
|
|
|
+ if (res.data.areaId != '' && res.data.areaId != null) {
|
|
this.communityHasChanged(res.data.areaId)
|
|
this.communityHasChanged(res.data.areaId)
|
|
}
|
|
}
|
|
- if (res.data.district!=''&&res.data.district!=null)
|
|
|
|
- {
|
|
|
|
|
|
+ if (res.data.district != '' && res.data.district != null) {
|
|
this.districtHasChanged(res.data.district)
|
|
this.districtHasChanged(res.data.district)
|
|
}
|
|
}
|
|
- if (res.data.buildingId!=''&&res.data.buildingId!=null)
|
|
|
|
- {
|
|
|
|
|
|
+ if (res.data.buildingId != '' && res.data.buildingId != null) {
|
|
this.buildingHasChanged(res.data.buildingId)
|
|
this.buildingHasChanged(res.data.buildingId)
|
|
}
|
|
}
|
|
- if (res.data.unitId!=''&&res.data.unitId!=null)
|
|
|
|
- {
|
|
|
|
|
|
+ if (res.data.unitId != '' && res.data.unitId != null) {
|
|
this.unitHasChanged(res.data.unitId)
|
|
this.unitHasChanged(res.data.unitId)
|
|
}
|
|
}
|
|
- this.value[0]=res.data.enginType
|
|
|
|
- this.value[1]=res.data.enginClassification
|
|
|
|
- if (res.data.enginClassification!=null&&res.data.enginClassification!='')
|
|
|
|
- {
|
|
|
|
|
|
+ this.value[0] = res.data.enginType
|
|
|
|
+ this.value[1] = res.data.enginClassification
|
|
|
|
+ if (res.data.enginClassification != null && res.data.enginClassification != '') {
|
|
this.enginClassificationOption = this.dict.type[res.data.enginClassification]
|
|
this.enginClassificationOption = this.dict.type[res.data.enginClassification]
|
|
}
|
|
}
|
|
- this.enginClassification=zEngineeringNodeBo.type
|
|
|
|
|
|
+ this.enginClassification = zEngineeringNodeBo.type
|
|
newData.zEngineeringNodeBo = zEngineeringNodeBo
|
|
newData.zEngineeringNodeBo = zEngineeringNodeBo
|
|
this.currentType = 'put'
|
|
this.currentType = 'put'
|
|
this.queryParams = newData
|
|
this.queryParams = newData
|
|
@@ -838,52 +824,57 @@ export default {
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
-::v-deep .appendElDialog{
|
|
|
|
|
|
+::v-deep .appendElDialog {
|
|
width: 70%;
|
|
width: 70%;
|
|
height: 80%;
|
|
height: 80%;
|
|
|
|
|
|
|
|
|
|
- .el-dialog__body{
|
|
|
|
|
|
+ .el-dialog__body {
|
|
height: 85%;
|
|
height: 85%;
|
|
}
|
|
}
|
|
|
|
|
|
- .el-form-item{
|
|
|
|
|
|
+ .el-form-item {
|
|
margin-bottom: 22px;
|
|
margin-bottom: 22px;
|
|
width: 44%;
|
|
width: 44%;
|
|
display: inline-block;
|
|
display: inline-block;
|
|
}
|
|
}
|
|
- .el-form-item:nth-child(2n+2){
|
|
|
|
|
|
+
|
|
|
|
+ .el-form-item:nth-child(2n+2) {
|
|
margin-left: 5%;
|
|
margin-left: 5%;
|
|
}
|
|
}
|
|
- .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%;
|
|
}
|
|
}
|
|
- .remark_input{
|
|
|
|
- .el-textarea__inner{
|
|
|
|
|
|
+
|
|
|
|
+ .remark_input {
|
|
|
|
+ .el-textarea__inner {
|
|
width: 238%;
|
|
width: 238%;
|
|
height: 190px;
|
|
height: 190px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-::v-deep .appendElNodeDialog{
|
|
|
|
|
|
+::v-deep .appendElNodeDialog {
|
|
// width: 70%;
|
|
// width: 70%;
|
|
height: 80%;
|
|
height: 80%;
|
|
|
|
|
|
|
|
|
|
- .el-dialog__body{
|
|
|
|
|
|
+ .el-dialog__body {
|
|
height: 85%;
|
|
height: 85%;
|
|
}
|
|
}
|
|
|
|
|
|
- .el-form-item{
|
|
|
|
|
|
+ .el-form-item {
|
|
margin-bottom: 22px;
|
|
margin-bottom: 22px;
|
|
width: 44%;
|
|
width: 44%;
|
|
display: inline-block;
|
|
display: inline-block;
|
|
}
|
|
}
|
|
- .el-form-item:nth-child(2n+2){
|
|
|
|
|
|
+
|
|
|
|
+ .el-form-item:nth-child(2n+2) {
|
|
margin-left: 5%;
|
|
margin-left: 5%;
|
|
}
|
|
}
|
|
- .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%;
|
|
}
|
|
}
|
|
}
|
|
}
|