From fb19dd3e4e7e99f3c11d91a35b5eccfb64bd4dc0 Mon Sep 17 00:00:00 2001
From: yongdaidai <7805924+yongdaidai@user.noreply.gitee.com>
Date: 星期五, 31 七月 2020 14:59:23 +0800
Subject: [PATCH] update ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml. 解决如果导入多个同名部门dept_name,parent_id相同,但是删除状态(del_flag)不同,导致查询结果为多条,mybatis不能映射为一条数据的问题.
---
ruoyi-ui/src/components/HeaderSearch/index.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index 8974171..114ae04 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -70,7 +70,12 @@
this.show = false
},
change(val) {
- this.$router.push(val.path)
+ if(this.ishttp(val.path)) {
+ // http(s):// 路径新窗口打开
+ window.open(val.path, "_blank");
+ } else {
+ this.$router.push(val.path)
+ }
this.search = ''
this.options = []
this.$nextTick(() => {
@@ -104,7 +109,7 @@
if (router.hidden) { continue }
const data = {
- path: path.resolve(basePath, router.path),
+ path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
title: [...prefixTitle]
}
@@ -134,6 +139,9 @@
} else {
this.options = []
}
+ },
+ ishttp(url) {
+ return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
}
}
@@ -159,7 +167,7 @@
display: inline-block;
vertical-align: middle;
- /deep/ .el-input__inner {
+ ::v-deep .el-input__inner {
border-radius: 0;
border: 0;
padding-left: 0;
--
Gitblit v1.9.2