ljf
/
shuili-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'release-sy-v1.0.0'

sy-water-data-board-ui
hxh 10 months ago
parent
b3a49bf180 78e187d14d
commit
08b1dc96c0
9 changed files with 371 additions and 266 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
  2. 49
      src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
  3. 19
      src/views/dike/runManage/enginerring/inspectionPlan/index.vue
  4. 11
      src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue
  5. 79
      src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue
  6. 7
      src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue
  7. 35
      src/views/dike/runManage/enginerring/inspectionRecords/index.vue
  8. 13
      src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
  9. 418
      src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

6
src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue
View File

@ -321,6 +321,9 @@ export default {
if (this.formData.id) { if (this.formData.id) {
putInspectionProjectData(this.formData).then((res) => { putInspectionProjectData(this.formData).then((res) => {
this.$message.success("保存成功"); this.$message.success("保存成功");
setTimeout(() => {
this.$router.go(-1);
}, 500);
}); });
} else { } else {
postInspectionProjectData(this.formData).then((res) => { postInspectionProjectData(this.formData).then((res) => {
@ -328,6 +331,9 @@ export default {
this.formData.id = res.data.id; this.formData.id = res.data.id;
} }
this.$message.success("保存成功"); this.$message.success("保存成功");
setTimeout(() => {
this.$router.go(-1);
}, 500);
}); });
} }
}, },

49
src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue
View File

@ -565,28 +565,37 @@ export default {
...this.$refs.subFormRef.map((item) => item.validate()), ...this.$refs.subFormRef.map((item) => item.validate()),
]) ])
.then((res) => { .then((res) => {
this.formData.contents.forEach((item) => { // 二次确认
item.startDate = item.planDateTimeArr[0] this.$confirm("确认提交吗？", "提示", {
? item.planDateTimeArr[0] + " 00:00:00" confirmButtonText: "确定",
: ""; cancelButtonText: "取消",
item.endDate = item.planDateTimeArr[1] type: "warning",
? item.planDateTimeArr[1] + " 23:59:59"
: "";
});
(this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({
id: this.id || null,
...this.formData,
}) })
.then((res) => { .then(() => {
this.$message.success("提交成功"); this.formData.contents.forEach((item) => {
if (reset) { item.startDate = item.planDateTimeArr[0]
this.reset(); ? item.planDateTimeArr[0] + " 00:00:00"
} : "";
r(); item.endDate = item.planDateTimeArr[1]
? item.planDateTimeArr[1] + " 23:59:59"
: "";
});
(this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({
id: this.id || null,
...this.formData,
})
.then((res) => {
this.$message.success("提交成功");
if (reset) {
this.reset();
}
r();
})
.catch(() => {
j();
});
}) })
.catch(() => { .catch(() => {});
j();
});
}) })
.catch(() => { .catch(() => {
j(); j();

19
src/views/dike/runManage/enginerring/inspectionPlan/index.vue
View File

@ -142,7 +142,7 @@ export default {
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let user = []; let user = [];
this.ruleForm.otherConfig.selectUser.forEach((element) => { this.ruleForm.otherConfig.selectUser?.forEach((element) => {
let a = { let a = {
name: element.nickName, name: element.nickName,
uid: element.id, uid: element.id,
@ -316,12 +316,12 @@ export default {
}, },
getDikeTypeName(type) { getDikeTypeName(type) {
let name = ""; let name = "";
this.embankmentTypeOptions.forEach((element) => { this.embankmentTypeOptions?.forEach((element) => {
if (element.dictValue === type) { if (element.dictValue === type) {
name = element.dictLabel; name = element.dictLabel;
} }
}); });
return name; return name || type;
}, },
}, },
created() { created() {
@ -330,7 +330,7 @@ export default {
}); });
this.getDicts("xs_classfy").then((res) => { this.getDicts("xs_classfy").then((res) => {
if (res.data && Array.isArray(res.data)) { if (res.data && Array.isArray(res.data)) {
res.data.forEach((element) => { res.data?.forEach((element) => {
element.dictValue = element.dictValue; element.dictValue = element.dictValue;
}); });
this.examType = res.data; this.examType = res.data;
@ -438,8 +438,11 @@ export default {
<el-button type="primary" size="small" @click="handleAdd" <el-button type="primary" size="small" @click="handleAdd"
>新增</el-button >新增</el-button
> >
<!-- <el-button size="small">编辑</el-button> --> <el-button
<el-button type="danger" size="small" @click="handleDelAll" type="danger"
size="small"
@click="handleDelAll"
v-hasPermi="['df:run:inspection:plan:delAll']"
>删除</el-button >删除</el-button
> >
</div> </div>
@ -509,7 +512,7 @@ export default {
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
type="text" type="text"
size="small" size="small"
v-hasPermi="['df:run:checking:plan:edit']" v-hasPermi="['df:run:inspection:plan:item:edit']"
>编辑</el-button >编辑</el-button
> >
<el-popconfirm <el-popconfirm
@ -525,7 +528,7 @@ export default {
type="text" type="text"
size="small" size="small"
slot="reference" slot="reference"
v-hasPermi="['df:run:checking:plan:delete']" v-hasPermi="['df:run:inspection:plan:item:del']"
>删除</el-button >删除</el-button
> >
</el-popconfirm> </el-popconfirm>

11
src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue
View File

@ -15,6 +15,13 @@
@click="handleSave(true)" @click="handleSave(true)"
>保存并继续新增</el-button >保存并继续新增</el-button
> >
<el-button
type="primary"
size="small"
v-if="$route.query.mode === 'edit'"
@click="handleSave(false, true)"
>保存并完成巡查</el-button
>
<el-button size="small" @click="handleCancel">取消</el-button> <el-button size="small" @click="handleCancel">取消</el-button>
</div> </div>
</div> </div>
@ -35,8 +42,8 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
handleSave(reset) { handleSave(reset, endXc = false) {
this.$refs.formRef.submit(reset).then((res) => { this.$refs.formRef.submit(reset, endXc).then((res) => {
if (!reset) { if (!reset) {
this.$router.go(-1); this.$router.go(-1);
} }

79
src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue
View File

@ -79,9 +79,12 @@
</el-form-item> </el-form-item>
<el-form-item label="巡查路线类型" prop="lineType" class="ml-24"> <el-form-item label="巡查路线类型" prop="lineType" class="ml-24">
<el-select :disabled="true" class="w-240" v-model="formData.lineType"> <el-select :disabled="true" class="w-240" v-model="formData.lineType">
<el-option label="日常巡查" value="0"></el-option> <el-option
<el-option label="年度检查" value="1"></el-option> v-for="(item, index) in xcClassfyOptions"
<el-option label="特别检查" value="2"></el-option> :key="index"
:label="item.dictLabel"
:value="item.dictValue"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -210,7 +213,11 @@
v-for="(item, index) in this.currentItem.problemImages" v-for="(item, index) in this.currentItem.problemImages"
:key="item" :key="item"
> >
<el-image :src="item" class="w-240 h-124"></el-image> <el-image
:src="item"
class="w-240 h-124"
:preview-src-list="[url]"
></el-image>
<i <i
class="el-icon-error del-icon" class="el-icon-error del-icon"
:size="18" :size="18"
@ -295,6 +302,7 @@ export default {
filterText: "", filterText: "",
dutyHolderTypeOptions: [], dutyHolderTypeOptions: [],
xcProjectList: [], xcProjectList: [],
xcClassfyOptions: [],
planList: [], planList: [],
subPlanList: [], subPlanList: [],
treeData: [], treeData: [],
@ -330,6 +338,9 @@ export default {
this.getDicts("person_type").then((response) => { this.getDicts("person_type").then((response) => {
this.dutyHolderTypeOptions = response.data; this.dutyHolderTypeOptions = response.data;
}); });
this.getDicts("xs_classfy").then((response) => {
this.xcClassfyOptions = response.data;
});
}, },
methods: { methods: {
isSameArray(arr1, arr2) { isSameArray(arr1, arr2) {
@ -697,36 +708,48 @@ export default {
}, 30); }, 30);
} }
}, },
submit(reset) { submit(reset, endXc = false) {
console.log("提交表单 >>>> ", this.formData); console.log("提交表单 >>>> ", this.formData);
return new Promise((r, j) => { return new Promise((r, j) => {
this.$refs.formRef.validate((valid) => { this.$refs.formRef.validate((valid) => {
if (valid) { if (valid) {
this.items?.forEach((v) => { // 二次确认
if (v.hasProblem != "1") { this.$confirm(`确认提交吗？`, "提示", {
v.problem = ""; confirmButtonText: "确定",
v.problemImages = []; cancelButtonText: "取消",
} type: "warning",
});
(this.id ? updateRecordData : addRecordData)({
id: this.id || null,
...this.formData,
items: this.items,
startDate: this.xcDateArr[0] || "",
endDate: this.xcDateArr[1] || "",
subPlanStartDate: this.subPlanDateArr[0] || "",
subPlanEndDate: this.subPlanDateArr[1] || "",
}) })
.then((res) => { .then(() => {
this.$message.success("提交成功"); this.items?.forEach((v) => {
if (reset) { if (v.hasProblem != "1") {
this.reset(); v.problem = "";
} v.problemImages = [];
r(); }
});
(this.id ? updateRecordData : addRecordData)({
id: this.id || null,
...this.formData,
items: this.items,
startDate: this.xcDateArr[0] || "",
endDate: this.xcDateArr[1] || "",
subPlanStartDate: this.subPlanDateArr[0] || "",
subPlanEndDate: this.subPlanDateArr[1] || "",
status: endXc ? "1" : "0",
})
.then((res) => {
this.$message.success("提交成功");
if (reset) {
this.reset();
}
r();
})
.catch((e) => {
console.log("err >>>>> ", e);
j();
});
}) })
.catch((e) => { .catch(() => {
console.log("err >>>>> ", e);
j(); j();
}); });
} else { } else {

7
src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue
View File

@ -232,6 +232,7 @@ export default {
labelMapData: {}, labelMapData: {},
detailData: {}, detailData: {},
treeData: [], treeData: [],
xcClassfyOptions: [],
entries: {}, entries: {},
}; };
}, },
@ -246,7 +247,11 @@ export default {
immediate: true, immediate: true,
}, },
}, },
created() {}, created() {
this.getDicts("xs_classfy").then((response) => {
this.xcClassfyOptions = response.data;
});
},
methods: { methods: {
handleChangeCollapse() {}, handleChangeCollapse() {},
initData() { initData() {

35
src/views/dike/runManage/enginerring/inspectionRecords/index.vue
View File

@ -86,7 +86,7 @@ export default {
handleEdit(row) { handleEdit(row) {
this.$router.push({ this.$router.push({
path: "createInspectionRecords", path: "createInspectionRecords",
query: { id: row.id }, query: { id: row.id, mode: "edit" },
}); });
}, },
handleDel(row) { handleDel(row) {
@ -108,6 +108,10 @@ export default {
console.log("取消删除"); console.log("取消删除");
}); });
}, },
calcHours(start, end) {
if (!start || !end) return "-";
return dayjs(end).diff(dayjs(start), "hour");
},
getTreeData() { getTreeData() {
getAreasData().then((items) => { getAreasData().then((items) => {
// console.log("getAreasData", items.data); // console.log("getAreasData", items.data);
@ -470,10 +474,15 @@ export default {
<el-button <el-button
size="small" size="small"
v-if="tableCheckData.length" v-if="tableCheckData.length"
v-hasPermi="['df:run:inspection:record:export']"
@click="handleExport" @click="handleExport"
>导出</el-button >导出</el-button
> >
<el-button type="danger" size="small" @click="handleDelAll" <el-button
type="danger"
size="small"
@click="handleDelAll"
v-hasPermi="['df:run:inspection:record:delAll']"
>删除</el-button >删除</el-button
> >
</div> </div>
@ -536,14 +545,16 @@ export default {
label="巡查开始时间/结束时间" label="巡查开始时间/结束时间"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.startDate }}/{{ scope.row.endDate }}</span> <span
>{{ scope.row.startDate || "-" }}/{{
scope.row.endDate || "-"
}}</span
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="巡查时长/小时"> <el-table-column align="center" label="巡查时长/小时">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{ calcHours(scope.row.startDate, scope.row.endDate) }}</span>
dayjs(scope.row.endDate).diff(dayjs(scope.row.startDate), "hours")
}}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -560,16 +571,24 @@ export default {
size="small" size="small"
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
:disabled="scope.row.status != '0'" :disabled="scope.row.status != '0'"
v-hasPermi="['df:run:inspection:record:item:edit']"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.status == '0' ||scope.row.handleStatus != '1'" :disabled="
scope.row.status == '0' || scope.row.handleStatus != '1'
"
v-hasPermi="['df:run:inspection:record:item:deal']"
@click="handleCheckDetails(scope.row, true)" @click="handleCheckDetails(scope.row, true)"
>处置</el-button >处置</el-button
> >
<el-button type="text" size="small" @click="handleDel(scope.row)" <el-button
type="text"
size="small"
@click="handleDel(scope.row)"
v-hasPermi="['df:run:inspection:record:item:del']"
>删除</el-button >删除</el-button
> >
</template> </template>

13
src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue
View File

@ -72,9 +72,12 @@
</el-form-item> </el-form-item>
<el-form-item label="巡查路线类型" prop="type" class="ml-24"> <el-form-item label="巡查路线类型" prop="type" class="ml-24">
<el-select :disabled="!canEdit" class="w-240" v-model="formData.type"> <el-select :disabled="!canEdit" class="w-240" v-model="formData.type">
<el-option label="日常巡查" value="1"></el-option> <el-option
<el-option label="特殊检查" value="2"></el-option> v-for="(item, index) in xcClassfyOptions"
<el-option label="定期巡查" value="3"></el-option> :key="index"
:label="item.dictLabel"
:value="item.dictValue"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -222,6 +225,7 @@ export default {
filterText: "", filterText: "",
xcProjectList: [], xcProjectList: [],
projectTypeOptions: [], projectTypeOptions: [],
xcClassfyOptions: [],
dikeList: [], dikeList: [],
treeData: [], treeData: [],
checkTreeData: [], checkTreeData: [],
@ -254,6 +258,9 @@ export default {
this.getDicts("embankment_type").then((response) => { this.getDicts("embankment_type").then((response) => {
this.projectTypeOptions = response.data; this.projectTypeOptions = response.data;
}); });
this.getDicts("xs_classfy").then((response) => {
this.xcClassfyOptions = response.data;
});
}, },
mounted() {}, mounted() {},
methods: { methods: {

418
src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue
View File

@ -122,6 +122,7 @@
<el-radio-group <el-radio-group
size="small" size="small"
v-model="displayType" v-model="displayType"
:disabled="isLoading"
@change="handleChangeDisplayType" @change="handleChangeDisplayType"
> >
<el-radio-button label="2">平铺</el-radio-button> <el-radio-button label="2">平铺</el-radio-button>
@ -135,9 +136,14 @@
size="small" size="small"
v-if="tableCheckData.length" v-if="tableCheckData.length"
@click="handleExport" @click="handleExport"
v-hasPermi="['df:run:inspection:line:export']"
>导出</el-button >导出</el-button
> >
<el-button type="danger" size="small" @click="handleDelAll" <el-button
type="danger"
size="small"
@click="handleDelAll"
v-hasPermi="['df:run:inspection:line:delAll']"
>删除</el-button >删除</el-button
> >
</div> </div>
@ -148,178 +154,190 @@
border border
@expand-change="handleTriggerRowExpand" @expand-change="handleTriggerRowExpand"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
v-loading="isLoading"
> >
<el-table-column type="expand" v-if="displayType === '1'" key="expand"> <template v-if="displayType === '1'">
<template slot-scope="scope"> <el-table-column type="expand" key="expand">
<div class="expand-box"> <template slot-scope="scope">
<el-row class="row row-header flex"> <div class="expand-box">
<el-col class="row-item row-checkbox"> <el-row class="row row-header flex">
<el-checkbox <el-col class="row-item row-checkbox">
v-model="scope.row.allChecked" <el-checkbox
@change="(e) => handleChangeRowAllChecked(e, scope.row)" v-model="scope.row.allChecked"
></el-checkbox> @change="(e) => handleChangeRowAllChecked(e, scope.row)"
</el-col> ></el-checkbox>
<el-col class="row-item">路线名称</el-col> </el-col>
<el-col class="row-item">巡查类型</el-col> <el-col class="row-item">路线名称</el-col>
<el-col class="row-item">巡查人员类型</el-col> <el-col class="row-item">巡查类型</el-col>
<el-col class="row-item">巡查人员</el-col> <el-col class="row-item">巡查人员类型</el-col>
<el-col class="row-item">创建时间</el-col> <el-col class="row-item">巡查人员</el-col>
<el-col class="row-item row-operate">操作</el-col> <el-col class="row-item">创建时间</el-col>
</el-row> <el-col class="row-item row-operate">操作</el-col>
<el-row </el-row>
class="row row-body flex" <el-row
v-for="(item, index) in scope.row.expendData" class="row row-body flex"
:key="index" v-for="(item, index) in scope.row.expendData"
> :key="index"
<el-col class="row-item row-checkbox"> >
<el-checkbox <el-col class="row-item row-checkbox">
v-model="item.isChecked" <el-checkbox
@change="(e) => handleChangeRowChecked(e, scope.row, item)" v-model="item.isChecked"
></el-checkbox> @change="
</el-col> (e) => handleChangeRowChecked(e, scope.row, item)
<el-col class="row-item">{{ item.name }}</el-col> "
<el-col class="row-item">{{ ></el-checkbox>
getProTypeDictLabelName(item.dikeType) </el-col>
}}</el-col> <el-col class="row-item">{{ item.name }}</el-col>
<el-col class="row-item">{{ <el-col class="row-item">{{
getPersonTypeDictLabelName(item.dutyHolderType) getProTypeDictLabelName(item.dikeType)
}}</el-col> }}</el-col>
<el-col class="row-item"> <el-col class="row-item">{{
{{ getPersonTypeDictLabelName(item.dutyHolderType)
item.dutyHolders && }}</el-col>
item.dutyHolders.find((v) => v.dutyHolderType === "0") && <el-col class="row-item">
item.dutyHolders.find((v) => v.dutyHolderType === "0").name {{
}} item.dutyHolders &&
</el-col> item.dutyHolders.find((v) => v.dutyHolderType === "0") &&
<el-col class="row-item">{{ item.updateTime }}</el-col> item.dutyHolders.find((v) => v.dutyHolderType === "0")
<el-col class="row-item row-operate"> .name
<el-button }}
class="custom-btn" </el-col>
type="text" <el-col class="row-item">{{ item.updateTime }}</el-col>
@click="handleCheck(item)" <el-col class="row-item row-operate">
>查看</el-button <el-button
> class="custom-btn"
<el-button type="text"
class="custom-btn" @click="handleCheck(item)"
type="text" >查看</el-button
@click="handleEdit(item)" >
>编辑</el-button <el-button
> class="custom-btn"
<el-button type="text"
class="custom-btn" @click="handleEdit(item)"
type="text" >编辑</el-button
@click="handleDel(item)" >
>删除</el-button <el-button
> class="custom-btn"
</el-col> type="text"
</el-row> @click="handleDel(item)"
<el-row >删除</el-button
v-if="!scope.row.expendData || !scope.row.expendData.length" >
</el-col>
</el-row>
<el-row
v-if="!scope.row.expendData || !scope.row.expendData.length"
>
<div>暂无数据</div>
</el-row>
</div>
</template>
</el-table-column>
<el-table-column prop="dikeName" align="center" label="堤防名称" />
<el-table-column prop="dikeType" align="center" label="堤防类型">
<template #default="{ row }">
{{
projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
projectTypeOptions.find((v) => v.dictValue == row.dikeType)
.dictLabel
}}
</template>
</el-table-column>
<el-table-column
prop="operatorName"
align="center"
label="行政责任人"
>
<template #default="{ row }">
{{
row.dutyHolders &&
row.dutyHolders.find((v) => v.dutyHolderType == "2") &&
row.dutyHolders.find((v) => v.dutyHolderType == "2").name
}}
</template>
</el-table-column>
<el-table-column
prop="operatorName"
align="center"
label="巡查责任人"
>
<template #default="{ row }">
{{
row.dutyHolders &&
row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
row.dutyHolders.find((v) => v.dutyHolderType == "0").name
}}
</template>
</el-table-column>
<el-table-column
prop="operatorName"
align="center"
label="技术责任人"
>
<template #default="{ row }">
{{
row.dutyHolders &&
row.dutyHolders.find((v) => v.dutyHolderType == "1") &&
row.dutyHolders.find((v) => v.dutyHolderType == "1").name
}}
</template>
</el-table-column>
<el-table-column
prop="operate"
align="center"
label="操作"
fixed="right"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="handleCheckDetail(scope.row)"
>查看</el-button
> >
<div>暂无数据</div> </template>
</el-row> </el-table-column>
</div> </template>
</template> <template v-else-if="displayType === '2'">
</el-table-column> <el-table-column key="selection" type="selection"></el-table-column>
<el-table-column <el-table-column prop="dikeName" align="center" label="堤防名称" />
type="selection" <el-table-column prop="dikeType" align="center" label="堤防类型">
v-if="displayType === '2'" <template #default="{ row }">
key="selection" {{
></el-table-column> projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
<el-table-column projectTypeOptions.find((v) => v.dictValue == row.dikeType)
prop="dikeName" .dictLabel
align="center" }}
label="堤防名称" </template>
key="dikeName" </el-table-column>
/> <el-table-column prop="name" align="center" label="巡查路线名称" />
<el-table-column <el-table-column prop="type" align="center" label="巡查类型">
key="dikeType" <template #default="{ row }">
prop="dikeType" {{
align="center" lineTypeOptions.find((v) => v.dictValue == row.type) &&
label="堤防类型" lineTypeOptions.find((v) => v.dictValue == row.type).dictLabel
> }}
<template #default="{ row }"> </template>
{{ </el-table-column>
projectTypeOptions.find((v) => v.dictValue == row.dikeType) && <el-table-column
projectTypeOptions.find((v) => v.dictValue == row.dikeType) prop="operatorName"
.dictLabel align="center"
}} label="巡查责任人"
</template> >
</el-table-column> <template #default="{ row }">
<el-table-column {{
key="name" row.dutyHolders &&
prop="name" row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
align="center" row.dutyHolders.find((v) => v.dutyHolderType == "0").name
label="巡查路线名称" }}
v-if="displayType === '2'" </template>
/> </el-table-column>
<el-table-column <el-table-column
key="type" prop="operate"
prop="type" align="center"
align="center" label="操作"
label="巡查类型" fixed="right"
v-if="displayType === '2'" >
> <template slot-scope="scope">
<template #default="{ row }">
{{
lineTypeOptions.find((v) => v.dictValue == row.type) &&
lineTypeOptions.find((v) => v.dictValue == row.type).dictLabel
}}
</template>
</el-table-column>
<el-table-column
prop="operatorName"
key="operatorName2"
align="center"
label="行政责任人"
v-if="displayType === '1'"
>
<template #default="{ row }">
{{
row.dutyHolders &&
row.dutyHolders.find((v) => v.dutyHolderType == "2") &&
row.dutyHolders.find((v) => v.dutyHolderType == "2").name
}}
</template>
</el-table-column>
<el-table-column
key="operatorName0"
prop="operatorName"
align="center"
label="巡查责任人"
>
<template #default="{ row }">
{{
row.dutyHolders &&
row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
row.dutyHolders.find((v) => v.dutyHolderType == "0").name
}}
</template>
</el-table-column>
<el-table-column
key="operatorName1"
prop="operatorName"
align="center"
label="技术责任人"
v-if="displayType === '1'"
>
<template #default="{ row }">
{{
row.dutyHolders &&
row.dutyHolders.find((v) => v.dutyHolderType == "1") &&
row.dutyHolders.find((v) => v.dutyHolderType == "1").name
}}
</template>
</el-table-column>
<el-table-column
prop="operate"
align="center"
label="操作"
fixed="right"
>
<template slot-scope="scope">
<template v-if="displayType === '2'">
<el-button <el-button
class="custom-btn" class="custom-btn"
type="text" type="text"
@ -330,24 +348,19 @@
class="custom-btn" class="custom-btn"
type="text" type="text"
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
v-hasPermi="['df:run:inspection:line:item:edit']"
>编辑</el-button >编辑</el-button
> >
<el-button <el-button
class="custom-btn" class="custom-btn"
type="text" type="text"
@click="handleDel(scope.row)" @click="handleDel(scope.row)"
v-hasPermi="['df:run:inspection:line:item:del']"
>删除</el-button >删除</el-button
> >
</template> </template>
<el-button </el-table-column>
v-else </template>
type="text"
size="small"
@click="handleCheckDetail(scope.row)"
>查看</el-button
>
</template>
</el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
background background
@ -432,6 +445,7 @@ export default {
data() { data() {
return { return {
displayType: "1", // 1: 按堤防 2: 平铺 displayType: "1", // 1: 按堤防 2: 平铺
isLoading: false,
showBaseDetailDialog: false, showBaseDetailDialog: false,
showRouteDetailDialog: false, showRouteDetailDialog: false,
areasOptionProps: { areasOptionProps: {
@ -476,6 +490,7 @@ export default {
}, },
methods: { methods: {
getTableData() { getTableData() {
this.isLoading = true;
this.tableCheckData = []; this.tableCheckData = [];
if (this.displayType === "2") { if (this.displayType === "2") {
getProjectCheckingLineRoute({ getProjectCheckingLineRoute({
@ -484,10 +499,14 @@ export default {
data: { data: {
...this.paramsData, ...this.paramsData,
}, },
}).then((response) => { })
this.tableData = response.records; .then((response) => {
this.pageData.total = response.total; this.tableData = response.records;
}); this.pageData.total = response.total;
})
.finally(() => {
this.isLoading = false;
});
} else { } else {
getProjectCheckingLine({ getProjectCheckingLine({
pageNum: this.pageData.pageNum, pageNum: this.pageData.pageNum,
@ -495,16 +514,20 @@ export default {
data: { data: {
...this.paramsData, ...this.paramsData,
}, },
}).then((response) => { })
this.tableData = response.records.map((v) => { .then((response) => {
return { this.tableData = response.records.map((v) => {
...v, return {
allChecked: false, ...v,
expendData: [], allChecked: false,
}; expendData: [],
};
});
this.pageData.total = response.total;
})
.finally(() => {
this.isLoading = false;
}); });
this.pageData.total = response.total;
});
} }
}, },
getTreeData() { getTreeData() {
@ -602,14 +625,14 @@ export default {
}, },
handleChangeRowAllChecked(checked, row) { handleChangeRowAllChecked(checked, row) {
if (checked) { if (checked) {
row.expendData.forEach((v) => { row.expendData?.forEach((v) => {
v.isChecked = true; v.isChecked = true;
if (!this.tableCheckData.find((v1) => v1.id === v.id)) { if (!this.tableCheckData.find((v1) => v1.id === v.id)) {
this.tableCheckData.push(v); this.tableCheckData.push(v);
} }
}); });
} else { } else {
row.expendData.forEach((v) => { row.expendData?.forEach((v) => {
v.isChecked = false; v.isChecked = false;
this.tableCheckData = this.tableCheckData.filter( this.tableCheckData = this.tableCheckData.filter(
(v1) => v1.id !== v.id (v1) => v1.id !== v.id
@ -657,7 +680,11 @@ export default {
}); });
}, },
handleChangeDisplayType() { handleChangeDisplayType() {
this.tableData = [];
this.getTableData(); this.getTableData();
setTimeout(() => {
this.$forceUpdate();
}, 30);
}, },
handleAdd() { handleAdd() {
this.$router.push("createRoutePage"); this.$router.push("createRoutePage");
@ -676,7 +703,6 @@ export default {
}, },
// 查看 // 查看
handleCheck(row) { handleCheck(row) {
console.log("row >>>>> ", row);
this.$set(this, "currentRow", row); this.$set(this, "currentRow", row);
this.showRouteDetailDialog = true; this.showRouteDetailDialog = true;
}, },

Write Preview
Loading…
Cancel
Save