diff --git a/src/api/system/specialDiseaseNode.js b/src/api/system/specialDiseaseNode.js index e6ed3e9..08713a2 100644 --- a/src/api/system/specialDiseaseNode.js +++ b/src/api/system/specialDiseaseNode.js @@ -7,6 +7,13 @@ export function taskPartitionList(taskTypeId) { method: 'get', }) } + +export function getList(dictType,dictDataType) { + return request({ + url: `/system/dict/data/getList?dictType=${dictType}&dictDataType=${dictDataType}`, + method: 'get', + }) +} export function triggerCondition(data) { return request({ url: `/system/triggerCondition/edit`, diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index c182a19..9d53211 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -1,403 +1,621 @@ diff --git a/src/views/system/ManageNodeInformation/index.vue b/src/views/system/ManageNodeInformation/index.vue index 3e3ddd2..0f5b139 100644 --- a/src/views/system/ManageNodeInformation/index.vue +++ b/src/views/system/ManageNodeInformation/index.vue @@ -9,30 +9,30 @@
@@ -81,7 +81,7 @@
@@ -169,7 +169,7 @@ >
- + +
+ + + + { - loading.close(); if (res.code == 200) { + this.$notify({ type: "success", title: "提示", @@ -895,28 +881,30 @@ export default { Cookies.remove("routeName"); Cookies.set("routeName", this.routeName); - // Cookies.set("username", this.loginForm.username, { expires: 30 }); } this.infolist(); + this.handlelist(); + this.openfalse(); }); }, // 关闭弹框 openfalse() { - // this.openlist.triggerConditionList = [ - // { - // routeId: "", - // routeName: "", - // triggerConditionName: "", - // triggerConditionOperator: "", - // triggerConditionValue: "", - // triggerConditionName: "", - // triggerConditionOperatorName: "", + this.openlist.triggerConditionList = [ + { + routeId: "", + routeName: "", + triggerConditionName: "", + triggerConditionOperator: "", + triggerConditionValue: "", + triggerConditionName: "", + triggerConditionOperatorName: "", + dictDataType: "STRING", - // triggerLogic: "", - // triggerLogicName: "", - // }, - // ]; + triggerLogic: "AND", + triggerLogicName: "", + }, + ]; this.open = false; this.resetForm("openlist"); }, @@ -931,13 +919,13 @@ export default { triggerConditionValue: "", triggerConditionName: "", triggerConditionOperatorName: "", - - triggerLogic: "", + dictDataType: "STRING", + triggerLogic: "AND", triggerLogicName: "", }; if (this.openlist.triggerConditionList.length == 3) { - this.$message.error("最多批量添加2条"); + this.$message.error("至多仅支持两种属性"); } else { this.openlist.triggerConditionList.push(obj); } @@ -1017,6 +1005,9 @@ export default { this.parentDictCodelist = res.rows; }); }, + changetoday(e){ + console.log(e,'eeeeeeeeeeeeeooooooooooooo') + }, // 回显 info() { const loading = this.$loading({ @@ -1133,21 +1124,71 @@ export default { this.optionslistS = res.data; }); }, + // 诊断 + optiononditionOperators() { + var dictType = "trigger_condition_name"; + getAgencytype(dictType).then((res) => { + this.optionsname = res.data; + }); + }, + // 包含 + optiononditionOperator() { + var dictType = "trigger_condition_operator"; + getAgencytype(dictType).then((res) => { + this.optionstriggerConditionOperator = res.data; + }); + }, + // 包含或等号接口 + handlelist() { + var dictType = "trigger_condition_operator"; + + getList(dictType, this.dictDataType).then((res) => { + console.log(res, "res"); + this.optionstriggerConditionOperator = res.data; + }); + }, + // 包含 changetriggerLogic(e, index) { + console.log(e, index, "e包含,index"); + this.openlist.triggerConditionList[index].triggerConditionOperatorName = - this.optionstriggerConditionOperator.find((el) => el.value == e).label; + this.optionstriggerConditionOperator.find( + (el) => el.dictValue == e + ).dictLabel; this.openlist.triggerConditionList[index].triggerConditionValue = null; }, + // 数值=s + // changetriggerLogics(e,index){ + // console.log(e,index,'e,index') + // this.openlist.triggerConditionList[index].triggerConditionOperator = + // this.optionstriggerConditionOperator.find( + // (el) => el.dictValue == e + // ).dictLabel; + // this.openlist.triggerConditionList[index].triggerConditionValue = null; + // }, // 诊断 changetriggerConditionName(e, index) { + console.log(e, index, "e诊断, index"); + // this.dictDataType = e; this.openlist.triggerConditionList[index].triggerConditionName = - this.optionsname.find((el) => el.value == e).label; + this.optionsname.find((el) => el.dictValue == e).dictLabel; this.openlist.triggerConditionList[index].triggerConditionOperator = null; this.openlist.triggerConditionList[index].triggerConditionValue = null; + this.dictDataType = this.optionsname.find( + (el) => el.dictValue == e + ).dictDataType; + this.openlist.triggerConditionList[index].dictDataType = + this.optionsname.find((el) => el.dictValue == e).dictDataType; + console.log( + this.openlist.triggerConditionList[index].dictDataType, + "this.dictDataType" + ); + this.handlelist(); }, // 且或 changetriggerLogicsname(e, index) { + console.log(e,'qie') this.openlist.triggerConditionList[index].triggerLogic = e; this.openlist.triggerConditionList[index].triggerLogicName = this.optionslistS.find((el) => el.dictValue == e).dictLabel; @@ -1165,13 +1206,57 @@ export default { this.routeId = this.$route.query.id; triggerConditionList(this.routeId).then((res) => { this.openlist.triggerConditionList = res.data; + this.handlelist(); + + // this.openlist.triggerConditionList.forEach((o) => { + // // this.triggerConditionCode=o.triggerConditionCode + // this.handlelist(); + // // o.dictDataType = this.optionstriggerConditionOperator.find( + // // (el) => el.dictValue == o.triggerConditionOperator + // // )?.dictDataType; + // }); + // console.log( + // this.openlist.triggerConditionList, + // " this.openlist.triggerConditionList" + // ); + if (res.data.length == 1) { + // 新增一条时 this.updata = res.data[0]; + + this.updata.triggerConditionOperatorName = + this.optionstriggerConditionOperator.find( + (el) => el.dictValue == this.updata.triggerConditionOperator + )?.dictLabel; + console.log( + this.updata.triggerConditionOperatorName, + "updata.triggerConditionOperatorName" + ); + this.updatalist = []; } else { + // 新增两条或者三条 this.updata = res.data[0]; + // this.handlelist(); + this.updata.triggerConditionOperatorName = + this.optionstriggerConditionOperator.find( + (el) => el.dictValue == this.updata.triggerConditionOperator + )?.dictLabel; + console.log( + this.updata.triggerConditionOperatorName, + "updata.triggerConditionOperatorName" + ); res.data.splice(0, 1); this.updatalist = res.data; + this.updatalist.forEach((e) => { + e.triggerConditionOperatorName = + this.optionstriggerConditionOperator.find( + (el) => el.dictValue == e.triggerConditionOperator + )?.dictLabel; + }); + // this.updatalist.triggerConditionOperatorName = this.optionstriggerConditionOperator.find( + // (el) => el.dictValue == this.updatalist.triggerConditionOperator + // )?.dictLabel; } if (this.open == true) { this.$set(this.openlist, "suitRange", this.$route.query.suitRange); @@ -1185,6 +1270,18 @@ export default { this.routeId = this.$route.query.id; triggerConditionList(this.routeId).then((res) => { this.openlist.triggerConditionList = res.data; + this.openlist.triggerConditionList.forEach((o) => { + this.optiononditionOperators(); + o.dictDataType = this.optionsname.find( + (el) => el.dictValue == o.triggerConditionCode + )?.dictDataType; + console.log(o.dictDataType, "dict"); + }); + console.log( + this.openlist.triggerConditionList, + " this.openlist.triggerConditionList11111111111" + ); + this.$set(this.updata, "suitRange", this.openlist.suitRange); }); }, @@ -1192,6 +1289,7 @@ export default { edit() { this.open = true; this.infolistname(); + // this.infolist() }, //wangeditor传值 onNodeContent(item) { diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue index 778b4cc..1914db5 100644 --- a/src/views/system/editorialSpecialization/index.vue +++ b/src/views/system/editorialSpecialization/index.vue @@ -208,16 +208,11 @@ > - - + + + { + this.optionsname = res.data; + }); + }, + // 包含 + optiononditionOperator() { + var dictType = "trigger_condition_operator "; + getAgencytype(dictType).then((res) => { + this.optionstriggerConditionOperator = res.data; + }); + }, // 包含 changetriggerLogic(e, index) { this.updata.triggerConditionList[index].triggerConditionOperatorName = - this.optionstriggerConditionOperator.find((el) => el.value == e).label; + this.optionstriggerConditionOperator.find( + (el) => el.dictValue == e + ).dictLabel; this.updata.triggerConditionList[index].triggerConditionValue = null; }, // 诊断 changetriggerConditionName(e, index) { this.updata.triggerConditionList[index].triggerConditionName = - this.optionsname.find((el) => el.value == e).label; + this.optionsname.find((el) => el.dictValue == e).dictLabel; this.updata.triggerConditionList[index].triggerConditionOperator = null; this.updata.triggerConditionList[index].triggerConditionValue = null; + this.dictDataType = this.optionsname.find( + (el) => el.dictValue == e + ).dictDataType; + this.updata.triggerConditionList[index].dictDataType = + this.optionsname.find((el) => el.dictValue == e).dictDataType; + console.log( + this.updata.triggerConditionList[index].dictDataType, + "this.dictDataType" + ); + this.handlelist(); + }, + // 包含或等号接口 + handlelist() { + var dictType = "trigger_condition_operator"; + getList(dictType, this.dictDataType).then((res) => { + console.log(res, "res"); + this.optionstriggerConditionOperator = res.data; + }); }, changeoptions() {}, // 且或 @@ -563,8 +561,8 @@ export default { triggerConditionValue: "", triggerConditionName: "", triggerConditionOperatorName: "", - - triggerLogic: "", + dictDataType: "STRING", + triggerLogic: "AND", triggerLogicName: "", }; @@ -626,15 +624,18 @@ export default { e.routeId = this.$route.query.id; e.routeName = this.$route.query.routeName; }); + loading.close(); + triggerConditionadd(this.updata).then((res) => { - loading.close(); - this.$notify({ - type: "success", - title: "提示", - message: "新增触发条件成功", - }); - this.info(); - this.openfalse(); + if (res.code == 200) { + this.$notify({ + type: "success", + title: "提示", + message: "新增触发条件成功", + }); + this.info(); + this.openfalse(); + } }); }, //保存