diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue index 56ced59a..673193e6 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/commonPhrases/index.vue @@ -78,7 +78,7 @@ export default { result.data.processConfigList?.forEach(it => { const phrs = it.commonPhrases.split(','); phrs?.forEach(phr => { - if (!this.tableData.find(op => op.phrases == phr)) this.tableData.push({ phrases: phr }) + if (phr && !this.tableData.find(op => op.phrases == phr)) this.tableData.push({ phrases: phr }) }) }) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue index 29785a60..524c397d 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/emergencyProcessManagement/disposalProcess/index.vue @@ -15,7 +15,8 @@ - + @@ -124,20 +125,23 @@ export default { method: "get", }).then(result => { if (result.code != 200) return Message.error(result.msg); - this.tableData = result.data.processConfigList; this.eventType = result.data.eventType; result.data.processConfigList?.forEach(it => { const phrs = it.commonPhrases.split(','); if (addFlg) { phrs?.forEach(phr => { - if (!this.options.find(op => op.key == phr)) this.options.push({ key: phr }) + if (phr && !this.options.find(op => op.key == phr)) this.options.push({ key: phr }) }) } - - it.commonPhrases = phrs + if(phrs && phrs[0]) { + it.commonPhrases = phrs + } }) + this.tableData = result.data.processConfigList; + // console.log('this.tableData', this.tableData) + }) @@ -201,14 +205,33 @@ export default { \ No newline at end of file