Browse Source

Merge branch 'release-sy-v1.0.0' into 'dev'

fix: 修复一些可能报错的bug

See merge request project/water/shuili-vue!131
sy-water-data-board-ui
潘裕艺 10 months ago
parent
commit
34fa21ec8c
  1. 6
      src/views/dike/runManage/enginerring/inspectionPlan/index.vue
  2. 5
      src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

6
src/views/dike/runManage/enginerring/inspectionPlan/index.vue

@ -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;

5
src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

@ -602,14 +602,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
@ -676,7 +676,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;
}, },

Loading…
Cancel
Save