From 2cb7dba8223ba5f82e0b725bfc98a4210f419534 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 26 十二月 2023 15:10:13 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/common.js | 12 +++++++++++-
zy-asrs-wms/src/main/webapp/views/resource/resource.html | 7 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java | 6 ++++++
zy-asrs-wms/src/main/webapp/views/index.html | 2 +-
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java
index 136004f..16a14e2 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -49,6 +50,11 @@
*/
private Short status;
+ /**
+ * URL鍙傛暟
+ */
+ private String param;
+
public Resource() {}
public Resource(String code,String name,Long resourceId,Short level,Integer sort,Short status) {
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index dc49a56..8edd976 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -77,7 +77,7 @@
}
var param = (child?parent.window:window).location.href.split("?")[1];
if (null != param) {
- var resourceId = param.split("=")[1];
+ var resourceId = getQueryVariable('resourceId')
$.ajax({
url: baseUrl+"/power/menu/"+resourceId+"/auth",
headers: {'token': localStorage.getItem('token')},
@@ -257,3 +257,13 @@
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
]
+function getQueryVariable(variable)
+{
+ var query = window.location.search.substring(1);
+ var vars = query.split("&");
+ for (var i=0;i<vars.length;i++) {
+ var pair = vars[i].split("=");
+ if(pair[0] == variable){return pair[1];}
+ }
+ return(false);
+}
diff --git a/zy-asrs-wms/src/main/webapp/views/index.html b/zy-asrs-wms/src/main/webapp/views/index.html
index 8d533cb..da16f45 100644
--- a/zy-asrs-wms/src/main/webapp/views/index.html
+++ b/zy-asrs-wms/src/main/webapp/views/index.html
@@ -261,7 +261,7 @@
<a><i class="layui-icon {{this.menuIcon}}"></i> <cite>{{this.menu}}</cite></a>
<dl class="layui-nav-child">
{{#each this.subMenu}}
- <dd><a lay-href="{{this.code}}?resourceId={{this.id}}">{{this.name}}</a></dd>
+ <dd><a lay-href="{{this.code}}?resourceId={{this.id}}&{{this.param}}">{{this.name}}</a></dd>
{{/each}}
</dl>
</li>
diff --git a/zy-asrs-wms/src/main/webapp/views/resource/resource.html b/zy-asrs-wms/src/main/webapp/views/resource/resource.html
index 92c2330..7fff387 100644
--- a/zy-asrs-wms/src/main/webapp/views/resource/resource.html
+++ b/zy-asrs-wms/src/main/webapp/views/resource/resource.html
@@ -62,6 +62,13 @@
</div>
<div class="layui-form-item">
+ <label class="layui-form-label">URL鍙傛暟</label>
+ <div class="layui-input-block">
+ <input name="param" placeholder="璇疯緭鍏RL鍙傛暟" class="layui-input" lay-vertype="tips">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
<label class="layui-form-label layui-form-required">绫诲瀷</label>
<div class="layui-input-block">
<select name="level" lay-vertype="tips" lay-verify="required" required="">
--
Gitblit v1.9.1