From b021493e7da9a719458b3132d7983fa34e613b3f Mon Sep 17 00:00:00 2001 From: zhanghan11 Date: Wed, 3 Apr 2024 09:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/inspur/web/controller/ipc/IpcDataShowController.java | 4 ++-- tzipc-ui/src/views/ipc/faultTree/faultTreeConfig.vue | 3 +++ tzipc-ui/src/views/ipc/faultTree/ruleConfigDialog.vue | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tzipc-server/tzipc-admin/src/main/java/com/inspur/web/controller/ipc/IpcDataShowController.java b/tzipc-server/tzipc-admin/src/main/java/com/inspur/web/controller/ipc/IpcDataShowController.java index ff308bb..9180eac 100644 --- a/tzipc-server/tzipc-admin/src/main/java/com/inspur/web/controller/ipc/IpcDataShowController.java +++ b/tzipc-server/tzipc-admin/src/main/java/com/inspur/web/controller/ipc/IpcDataShowController.java @@ -16,14 +16,14 @@ import org.springframework.web.bind.annotation.RestController; * @author inspur */ @RestController -@RequestMapping("ipc/dataShow") +@RequestMapping("/ipc/dataShow") public class IpcDataShowController extends BaseController { @Autowired private IIpcDataShowService iIpcDataShowService; /** * 获取展示数据 */ -// @PreAuthorize("@ss.hasPermi('ipc:dataShow:query')") + @PreAuthorize("@ss.hasPermi('ipc:dataShow:query')") @GetMapping(value = "/byPart/{parts}") public AjaxResult getShowData(@PathVariable("parts") String[] parts) { diff --git a/tzipc-ui/src/views/ipc/faultTree/faultTreeConfig.vue b/tzipc-ui/src/views/ipc/faultTree/faultTreeConfig.vue index c865c80..f5a3b7a 100644 --- a/tzipc-ui/src/views/ipc/faultTree/faultTreeConfig.vue +++ b/tzipc-ui/src/views/ipc/faultTree/faultTreeConfig.vue @@ -719,6 +719,9 @@ export default { this.form = response.data; this.open = true; this.title = "修改故障树配置"; + if (this.form.isLeaf == "1") { + this.isShowRuleConfig = true; + } }); }, /** 提交按钮 */ diff --git a/tzipc-ui/src/views/ipc/faultTree/ruleConfigDialog.vue b/tzipc-ui/src/views/ipc/faultTree/ruleConfigDialog.vue index ab1ed4c..5f40f8f 100644 --- a/tzipc-ui/src/views/ipc/faultTree/ruleConfigDialog.vue +++ b/tzipc-ui/src/views/ipc/faultTree/ruleConfigDialog.vue @@ -5,6 +5,7 @@ :visible.sync="openRuleDia" width="800px" append-to-body + :close-on-click-modal="false" >