From ba60f7537b2b664feb3b9596d768ba0f740ace12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Tue, 25 Jun 2024 11:30:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=A6=E5=8F=91=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/ManageNodeInformation/index.vue | 79 +++++++++++-------- .../system/editorialSpecialization/index.vue | 47 +++++------ 2 files changed, 72 insertions(+), 54 deletions(-) diff --git a/src/views/system/ManageNodeInformation/index.vue b/src/views/system/ManageNodeInformation/index.vue index d4eaf34..969049d 100644 --- a/src/views/system/ManageNodeInformation/index.vue +++ b/src/views/system/ManageNodeInformation/index.vue @@ -22,9 +22,10 @@ > + @@ -38,8 +39,8 @@ - + + - { if (res.code == 200) { this.$notify({ @@ -939,10 +936,13 @@ export default { title: "提示", message: "修改触发条件成功", }); + this.routeName = res.data; Cookies.remove("routeName"); Cookies.set("routeName", this.routeName); + // this.$router.go(0); + // window.location.reload(); } this.infolist(); // this.handlelist(); @@ -958,7 +958,7 @@ export default { triggerConditionName: "", triggerConditionOperator: "", triggerConditionValue: "", - triggerConditionName: "", + triggerConditionOperatorName: "", dictDataType: "STRING", @@ -978,7 +978,7 @@ export default { triggerConditionName: "", triggerConditionOperator: "", triggerConditionValue: "", - triggerConditionName: "", + triggerConditionOperatorName: "", dictDataType: "STRING", triggerLogic: "AND", @@ -1203,13 +1203,15 @@ export default { getList(dictType, this.dictDataType).then((res) => { this.optionstriggerConditionOperator = res.data; + console.log( + this.optionstriggerConditionOperator, + " this.optionstriggerConditionOperator " + ); }); }, // 包含 changetriggerLogic(e, index) { - console.log(e, index, "e包含,index"); - this.openlist.triggerConditionList[index].triggerConditionOperatorName = this.optionstriggerConditionOperator.find( (el) => el.dictValue == e @@ -1254,17 +1256,29 @@ export default { this.routeId = this.$route.query.id; triggerConditionList(this.routeId).then((res) => { this.openlist.triggerConditionList = res.data; - this.openlist.triggerConditionList.forEach((p) => { + res.data.forEach((p) => { this.optiononditionOperators(); p.dictDataType = this.optionsname.find( (el) => el.dictValue == p.triggerConditionCode )?.dictDataType; - console.log(p, "0000000000000000"); + var dictType = p.triggerConditionCode; + getAgencytype(dictType).then((res) => { + this.ConditionValue = res.data; + }); + // console.log(this.ConditionValue,'ConditionValueConditionValueConditionValueConditionValue') + + // this.handlelist(); + // var dictType = "trigger_condition_operator"; + + // getList(dictType, this.dictDataType).then((res) => { + // this.optionstriggerConditionOperator = res.data; + // }); }); - this.handlelist(); if (res.data.length == 1) { // 回显一条时 this.updata = res.data[0]; + console.log(this.updata, " this.updata"); + this.updata.triggerConditionOperatorName = this.optionstriggerConditionOperator.find( (el) => el.dictValue == this.updata.triggerConditionOperator @@ -1277,8 +1291,11 @@ export default { this.optionstriggerConditionOperator.find( (el) => el.dictValue == this.updata.triggerConditionOperator )?.dictLabel; + console.log(this.updata, " this.updata"); + res.data.splice(0, 1); this.updatalist = res.data; + console.log(this.updatalist, " this.updatalist"); this.updatalist.forEach((e) => { e.triggerConditionOperatorName = this.optionstriggerConditionOperator.find( @@ -1303,12 +1320,12 @@ export default { o.dictDataType = this.optionsname.find( (el) => el.dictValue == o.triggerConditionCode )?.dictDataType; - if (o.triggerConditionCode.includes("SEX")) { - var dictType = "SEX"; - getAgencytype(dictType).then((res) => { - this.ConditionValue = res.data; - }); - } + // if (o.triggerConditionCode.includes("SEX")) { + // var dictType = "SEX"; + // getAgencytype(dictType).then((res) => { + // this.ConditionValue = res.data; + // }); + // } }); this.$set(this.updata, "suitRange", this.openlist.suitRange); }); diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue index 95de306..83e2067 100644 --- a/src/views/system/editorialSpecialization/index.vue +++ b/src/views/system/editorialSpecialization/index.vue @@ -93,6 +93,7 @@ v-for="(uitem, uindex) in list.childrenRouteList" :key="uindex" > +
触发条件 @@ -473,10 +474,10 @@ export default { ).dictDataType; this.updata.triggerConditionList[index].dictDataType = this.optionsname.find((el) => el.dictValue == e).dictDataType; - console.log( - this.updata.triggerConditionList[index].dictDataType, - "this.dictDataType" - ); + // console.log( + // this.updata.triggerConditionList[index].dictDataType, + // "this.dictDataType" + // ); this.handlelist(); }, // 包含或等号接口 @@ -595,24 +596,24 @@ export default { this.editopen = false; this.resetForm("updataform"); }, - editupload() { - // const loading = this.$loading({ - // lock: true, - // text: "Loading", - // spinner: "el-icon-loading", - // background: "rgba(0, 0, 0, 0.7)", - // }); - triggerConditionedit(this.updataform).then((res) => { - // loading.close(); - this.$notify({ - type: "success", - title: "提示", - message: "修改触发条件成功", - }); - this.info(); - this.editopenfalse(); - }); - }, + // editupload() { + // // const loading = this.$loading({ + // // lock: true, + // // text: "Loading", + // // spinner: "el-icon-loading", + // // background: "rgba(0, 0, 0, 0.7)", + // // }); + // triggerConditionedit(this.updataform).then((res) => { + // // loading.close(); + // this.$notify({ + // type: "success", + // title: "提示", + // message: "修改触发条件成功", + // }); + // this.info(); + // this.editopenfalse(); + // }); + // }, openfalse() { this.updata.triggerConditionList = [ { @@ -651,7 +652,7 @@ export default { title: "提示", message: "新增触发条件成功", }); - this.info(); + // this.info(); this.openfalse(); } });