diff --git a/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue b/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue index 980c3b2..463b7db 100644 --- a/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue +++ b/src/views/dike/runManage/enginerring/inspectionItems/inspectionItemDetails.vue @@ -321,6 +321,9 @@ export default { if (this.formData.id) { putInspectionProjectData(this.formData).then((res) => { this.$message.success("保存成功"); + setTimeout(() => { + this.$router.go(-1); + }, 500); }); } else { postInspectionProjectData(this.formData).then((res) => { @@ -328,6 +331,9 @@ export default { this.formData.id = res.data.id; } this.$message.success("保存成功"); + setTimeout(() => { + this.$router.go(-1); + }, 500); }); } }, diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue index 114ea90..eedb35f 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue @@ -565,28 +565,37 @@ export default { ...this.$refs.subFormRef.map((item) => item.validate()), ]) .then((res) => { - this.formData.contents.forEach((item) => { - item.startDate = item.planDateTimeArr[0] - ? item.planDateTimeArr[0] + " 00:00:00" - : ""; - item.endDate = item.planDateTimeArr[1] - ? item.planDateTimeArr[1] + " 23:59:59" - : ""; - }); - (this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({ - id: this.id || null, - ...this.formData, + // 二次确认 + this.$confirm("确认提交吗?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", }) - .then((res) => { - this.$message.success("提交成功"); - if (reset) { - this.reset(); - } - r(); + .then(() => { + this.formData.contents.forEach((item) => { + item.startDate = item.planDateTimeArr[0] + ? item.planDateTimeArr[0] + " 00:00:00" + : ""; + 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(() => { - j(); - }); + .catch(() => {}); }) .catch(() => { j(); diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index 3732c68..5b6a285 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -142,7 +142,7 @@ export default { this.$refs[formName].validate((valid) => { if (valid) { let user = []; - this.ruleForm.otherConfig.selectUser.forEach((element) => { + this.ruleForm.otherConfig.selectUser?.forEach((element) => { let a = { name: element.nickName, uid: element.id, @@ -316,12 +316,12 @@ export default { }, getDikeTypeName(type) { let name = ""; - this.embankmentTypeOptions.forEach((element) => { + this.embankmentTypeOptions?.forEach((element) => { if (element.dictValue === type) { name = element.dictLabel; } }); - return name; + return name || type; }, }, created() { @@ -330,7 +330,7 @@ export default { }); this.getDicts("xs_classfy").then((res) => { if (res.data && Array.isArray(res.data)) { - res.data.forEach((element) => { + res.data?.forEach((element) => { element.dictValue = element.dictValue; }); this.examType = res.data; @@ -438,8 +438,11 @@ export default { 新增 - - 删除 @@ -509,7 +512,7 @@ export default { @click="handleEdit(scope.row)" type="text" size="small" - v-hasPermi="['df:run:checking:plan:edit']" + v-hasPermi="['df:run:inspection:plan:item:edit']" >编辑 删除 diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue b/src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue index 01eaefd..a30e467 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue @@ -15,6 +15,13 @@ @click="handleSave(true)" >保存并继续新增 + 保存并完成巡查 取消 @@ -35,8 +42,8 @@ export default { }, created() {}, methods: { - handleSave(reset) { - this.$refs.formRef.submit(reset).then((res) => { + handleSave(reset, endXc = false) { + this.$refs.formRef.submit(reset, endXc).then((res) => { if (!reset) { this.$router.go(-1); } diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue b/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue index 8438fb0..8105327 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue @@ -79,9 +79,12 @@ - - - + - + { this.dutyHolderTypeOptions = response.data; }); + this.getDicts("xs_classfy").then((response) => { + this.xcClassfyOptions = response.data; + }); }, methods: { isSameArray(arr1, arr2) { @@ -697,36 +708,48 @@ export default { }, 30); } }, - submit(reset) { + submit(reset, endXc = false) { console.log("提交表单 >>>> ", this.formData); return new Promise((r, j) => { this.$refs.formRef.validate((valid) => { if (valid) { - this.items?.forEach((v) => { - if (v.hasProblem != "1") { - v.problem = ""; - v.problemImages = []; - } - }); - - (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] || "", + // 二次确认 + this.$confirm(`确认提交吗?`, "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", }) - .then((res) => { - this.$message.success("提交成功"); - if (reset) { - this.reset(); - } - r(); + .then(() => { + this.items?.forEach((v) => { + if (v.hasProblem != "1") { + v.problem = ""; + v.problemImages = []; + } + }); + + (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) => { - console.log("err >>>>> ", e); + .catch(() => { j(); }); } else { diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue b/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue index 02036d1..7c6f0f1 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue @@ -232,6 +232,7 @@ export default { labelMapData: {}, detailData: {}, treeData: [], + xcClassfyOptions: [], entries: {}, }; }, @@ -246,7 +247,11 @@ export default { immediate: true, }, }, - created() {}, + created() { + this.getDicts("xs_classfy").then((response) => { + this.xcClassfyOptions = response.data; + }); + }, methods: { handleChangeCollapse() {}, initData() { diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue index 7f3b62e..f5d52d2 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue @@ -86,7 +86,7 @@ export default { handleEdit(row) { this.$router.push({ path: "createInspectionRecords", - query: { id: row.id }, + query: { id: row.id, mode: "edit" }, }); }, handleDel(row) { @@ -108,6 +108,10 @@ export default { console.log("取消删除"); }); }, + calcHours(start, end) { + if (!start || !end) return "-"; + return dayjs(end).diff(dayjs(start), "hour"); + }, getTreeData() { getAreasData().then((items) => { // console.log("getAreasData", items.data); @@ -470,10 +474,15 @@ export default { 导出 - 删除 @@ -536,14 +545,16 @@ export default { label="巡查开始时间/结束时间" > @@ -560,16 +571,24 @@ export default { size="small" @click="handleEdit(scope.row)" :disabled="scope.row.status != '0'" + v-hasPermi="['df:run:inspection:record:item:edit']" >编辑 处置 - 删除 diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue index 8038f35..6d1c32b 100644 --- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue @@ -72,9 +72,12 @@ - - - + { this.projectTypeOptions = response.data; }); + this.getDicts("xs_classfy").then((response) => { + this.xcClassfyOptions = response.data; + }); }, mounted() {}, methods: { diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue index dd10b03..223e828 100644 --- a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue @@ -122,6 +122,7 @@ 平铺 @@ -135,9 +136,14 @@ size="small" v-if="tableCheckData.length" @click="handleExport" + v-hasPermi="['df:run:inspection:line:export']" >导出 - 删除 @@ -148,178 +154,190 @@ border @expand-change="handleTriggerRowExpand" @selection-change="handleSelectionChange" + v-loading="isLoading" > - - { - this.tableData = response.records; - this.pageData.total = response.total; - }); + }) + .then((response) => { + this.tableData = response.records; + this.pageData.total = response.total; + }) + .finally(() => { + this.isLoading = false; + }); } else { getProjectCheckingLine({ pageNum: this.pageData.pageNum, @@ -495,16 +514,20 @@ export default { data: { ...this.paramsData, }, - }).then((response) => { - this.tableData = response.records.map((v) => { - return { - ...v, - allChecked: false, - expendData: [], - }; + }) + .then((response) => { + this.tableData = response.records.map((v) => { + return { + ...v, + allChecked: false, + expendData: [], + }; + }); + this.pageData.total = response.total; + }) + .finally(() => { + this.isLoading = false; }); - this.pageData.total = response.total; - }); } }, getTreeData() { @@ -602,14 +625,14 @@ export default { }, handleChangeRowAllChecked(checked, row) { if (checked) { - row.expendData.forEach((v) => { + row.expendData?.forEach((v) => { v.isChecked = true; if (!this.tableCheckData.find((v1) => v1.id === v.id)) { this.tableCheckData.push(v); } }); } else { - row.expendData.forEach((v) => { + row.expendData?.forEach((v) => { v.isChecked = false; this.tableCheckData = this.tableCheckData.filter( (v1) => v1.id !== v.id @@ -657,7 +680,11 @@ export default { }); }, handleChangeDisplayType() { + this.tableData = []; this.getTableData(); + setTimeout(() => { + this.$forceUpdate(); + }, 30); }, handleAdd() { this.$router.push("createRoutePage"); @@ -676,7 +703,6 @@ export default { }, // 查看 handleCheck(row) { - console.log("row >>>>> ", row); this.$set(this, "currentRow", row); this.showRouteDetailDialog = true; },