diff --git a/src/page/main/forewarning/indicator-config/edit/index.vue b/src/page/main/forewarning/indicator-config/edit/index.vue index 389dd009e6d5e3e782b54c8549baee7c1e04f52f..c67e1fff5ce0afdee730b42c45d70af51c48f0e6 100644 --- a/src/page/main/forewarning/indicator-config/edit/index.vue +++ b/src/page/main/forewarning/indicator-config/edit/index.vue @@ -34,7 +34,7 @@ const SaveSubmit = async () => { }); }; const Cancle = () => { - router.go(-1); + router.push(`/forewarning/indicator-config?class_id=${class_id}`); }; const getInfoData = () => { axios diff --git a/src/page/main/forewarning/indicator-config/modules/slide.vue b/src/page/main/forewarning/indicator-config/modules/slide.vue index 68f947d40ac9f8852311ebeaf4e761e01c088324..2e27422a0b66c795f3fc760dd87d1797a079e54b 100644 --- a/src/page/main/forewarning/indicator-config/modules/slide.vue +++ b/src/page/main/forewarning/indicator-config/modules/slide.vue @@ -107,6 +107,9 @@ import { nextTick, onBeforeMount, reactive, ref } from "vue"; import GapTitle from "@/components/gap-title.vue"; import axios from "@/request/http.js"; import { ElMessage } from "element-plus"; +import { useRoute } from "vue-router"; +const route = useRoute(); +const { class_id } = route.query; const props = defineProps({ modelValue: { type: Object, @@ -123,9 +126,31 @@ const treeProps = { const treeRef = ref(null); const selectId = ref(""); const getSlideTree = () => { - axios.get("/v1/api/alert_class/tree").then(async (res) => { + axios.get("/v1/api/alert_class/tree").then((res) => { if (res.data.code == 200) { slideTree.value = res.data.data; + async function nodeChoose(item) { + await nextTick(); + treeRef.value.setCurrentKey(item.class_id); + const node = treeRef.value.getNode(item); + if (node) { + treeNodeChoose(item, node); + } + } + if (class_id) { + let item = null; + slideTree.value.forEach((e) => { + if (e.children && e.children.length > 0) { + e.children.forEach((e) => { + if (e.class_id == class_id) { + item = e; + } + }); + } + }); + nodeChoose(item); + return; + } try { slideTree.value.forEach((e) => { if (e.children && e.children.length > 0) { @@ -133,12 +158,7 @@ const getSlideTree = () => { } }); } catch (item) { - await nextTick(); - treeRef.value.setCurrentKey(item.class_id); - const node = treeRef.value.getNode(item); - if (node) { - treeNodeChoose(item, node); - } + nodeChoose(item); } } else { ElMessage.error(res.data.msg); @@ -156,7 +176,7 @@ const Search = async () => { const Add = () => { addWarnType.value = true; }; -const emits = defineEmits(["undate:modelValue"]); +const emits = defineEmits(["update:modelValue"]); const treeNodeChoose = (data, node) => { emits("update:modelValue", { data, node }); }; diff --git a/src/page/main/forewarning/indicator-config/modules/warning-scope.vue b/src/page/main/forewarning/indicator-config/modules/warning-scope.vue index c9fc53afc5c67bb243ee82cbe24e027c97abc7e2..a1313cb988ae4783bacac7446b940ed72b8c0612 100644 --- a/src/page/main/forewarning/indicator-config/modules/warning-scope.vue +++ b/src/page/main/forewarning/indicator-config/modules/warning-scope.vue @@ -349,7 +349,6 @@ const Submit = async () => { form_ref.value.validate((res) => resolve(res)); }); let isFull = true; - console.log(state.form.warningScopeRows); try { state.form.warningScopeRows.forEach((e, i) => { if (e.indicator_scope == "" || e.indicator_tag == "") {