Browse Source

fix: 修改动物防治接口和字典匹配

sy-water-data-board-ui
panyuyi 1 year ago
parent
commit
562e38d9d6
  1. 46
      src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
  2. 67
      src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

46
src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@ -25,40 +25,7 @@ export default {
prohibitEditing: false, prohibitEditing: false,
planList: [], // planList: [], //
personnelList: [], // personnelList: [], //
embankmentList: [ controlType: [],
{
label: "堤防1",
value: "1",
id: "1",
},
{
label: "堤防2",
value: "2",
id: "2",
},
{
label: "堤防3",
value: "3",
id: "3",
},
], //
controlType: [
{
id: 1,
label: "普查",
value: 0,
},
{
id: 2,
label: "防治",
value: 1,
},
{
id: 3,
label: "治理",
value: 2,
},
],
tableData: [], // tableData: [], //
workTable: [ workTable: [
{ {
@ -325,6 +292,9 @@ export default {
}, },
}, },
mounted() { mounted() {
this.getDicts("dh_jh_type").then((res) => {
this.controlType = res.data;
});
// //
this.getTableData(); this.getTableData();
}, },
@ -359,8 +329,8 @@ export default {
<el-option label="全部" :value="3" /> <el-option label="全部" :value="3" />
<el-option <el-option
v-for="item in controlType" v-for="item in controlType"
:label="item.label" :label="item.dictLabel"
:value="item.value" :value="item.dictValue"
:key="item.id" :key="item.id"
/> />
</el-select> </el-select>
@ -525,9 +495,9 @@ export default {
> >
<el-option <el-option
v-for="item in controlType" v-for="item in controlType"
:label="item.dictLabel"
:value="item.dictValue"
:key="item.id" :key="item.id"
:label="item.label"
:value="item.value"
> >
</el-option> </el-option>
</el-select> </el-select>

67
src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

@ -14,12 +14,15 @@ export default {
name: "InspectionItems", name: "InspectionItems",
data() { data() {
return { return {
searchInput: "", paramsData: {
controlInput: "", name: "",
dikeName: "",
selectLevel: "", selectLevel: "",
selectType: "", selectType: "",
},
dialogVisible: false, dialogVisible: false,
prohibitEditing: false, prohibitEditing: false,
dikeTypeList: [],
personnelList: [], // personnelList: [], //
patrolType: [], // patrolType: [], //
workMonth: [], // workMonth: [], //
@ -97,6 +100,27 @@ export default {
}, },
}, },
methods: { methods: {
//
resolveDikeGrad(dikeGrad) {
return (
this.dikeLevel.find((v) => v.dictValue === dikeGrad)?.dictLabel ||
dikeGrad
);
},
//
resolveDikeType(dikeType) {
return (
this.dikeTypeList.find((v) => v.dictValue == dikeType)?.dictLabel ||
dikeType
);
},
//
resolveType(type) {
console.log("type >>>>> ", type);
return (
this.controlType.find((v) => v.dictValue == type)?.dictLabel || type
);
},
// //
openAddDialog() { openAddDialog() {
// //
@ -217,7 +241,6 @@ export default {
}, },
// dialog // dialog
closeDialog(ruleForm = "ruleForm") { closeDialog(ruleForm = "ruleForm") {
console.log("触发关闭dialog", ruleForm);
this.$refs[ruleForm].resetFields(); this.$refs[ruleForm].resetFields();
this.ruleForm = { this.ruleForm = {
dikeCode: "", dikeCode: "",
@ -249,11 +272,16 @@ export default {
timeView: { timeView: {
timeField: "create_time", timeField: "create_time",
}, },
name: this.paramsData.name,
type: this.paramsData.type,
dikeName: this.paramsData.dikeName,
dikeGrad: this.paramsData.dikeGrad,
dikeType: this.paramsData.dikeType,
}, },
cv: { cv: {
name: "name", name: "name",
type: "like", type: "like",
value: this.searchInput, value: this.name,
}, },
params: { params: {
orderBy: "create_time", orderBy: "create_time",
@ -270,7 +298,7 @@ export default {
}, },
// //
resetSearch() { resetSearch() {
this.searchInput = ""; this.name = "";
this.selectStatus = "2"; this.selectStatus = "2";
this.getTableData(); this.getTableData();
}, },
@ -306,6 +334,11 @@ export default {
// this.dikeDetailsDialog.id = res?.id || '' // this.dikeDetailsDialog.id = res?.id || ''
}, },
}, },
created() {
this.getDicts("embankment_type").then((response) => {
this.dikeTypeList = response.data;
});
},
mounted() { mounted() {
// //
this.getTableData(); this.getTableData();
@ -328,17 +361,17 @@ export default {
<span>防治计划名称</span> <span>防治计划名称</span>
<el-input <el-input
class="search-input" class="search-input"
v-model="searchInput" v-model="paramsData.name"
placeholder="请输入" placeholder="请输入"
/> />
<span>防治堤防</span> <span>防治堤防</span>
<el-input <el-input
class="search-input" class="search-input"
v-model="controlInput" v-model="paramsData.dikeName"
placeholder="请输入" placeholder="请输入"
/> />
<span>堤防级别</span> <span>堤防级别</span>
<el-select v-model="selectLevel" placeholder="请选择"> <el-select v-model="paramsData.dikeGrad" placeholder="请选择">
<el-option label="全部" value="0" /> <el-option label="全部" value="0" />
<el-option <el-option
v-for="item in dikeLevel" v-for="item in dikeLevel"
@ -348,7 +381,7 @@ export default {
/> />
</el-select> </el-select>
<span style="margin-left: 10px">防治类型</span> <span style="margin-left: 10px">防治类型</span>
<el-select v-model="selectType" placeholder="请选择"> <el-select v-model="paramsData.type" placeholder="请选择">
<el-option label="全部" value="3" /> <el-option label="全部" value="3" />
<el-option <el-option
v-for="item in controlType" v-for="item in controlType"
@ -373,9 +406,19 @@ export default {
<el-table-column type="index" align="center" label="序号" width="100" /> <el-table-column type="index" align="center" label="序号" width="100" />
<el-table-column prop="name" align="center" label="防治计划名称" /> <el-table-column prop="name" align="center" label="防治计划名称" />
<el-table-column prop="dikeCode" align="center" label="堤防名称" /> <el-table-column prop="dikeCode" align="center" label="堤防名称" />
<el-table-column prop="location" align="center" label="堤防级别" /> <el-table-column prop="dikeGrad" align="center" label="堤防级别">
<el-table-column prop="content" align="center" label="堤防类型" /> <template #default="{ row }">
<el-table-column prop="type" align="center" label="防治类型" /> {{ resolveDikeGrad(row.dikeGrad) }}
</template>
</el-table-column>
<el-table-column prop="dikeType" align="center" label="堤防类型">
<template #default="{ row }">{{
resolveDikeType(row.dikeType)
}}</template>
</el-table-column>
<el-table-column prop="type" align="center" label="防治类型">
<template #default="{ row }">{{ resolveType(row.type) }}</template>
</el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
align="center" align="center"

Loading…
Cancel
Save