Merge branch 'master-500-dev-xwx' into 'master-500-dev'
aj配置功能还原 See merge request !483
Showing
4 changed files
with
17 additions
and
10 deletions
@@ -71,7 +71,7 @@ | @@ -71,7 +71,7 @@ | ||
71 | <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio> | 71 | <el-radio v-model="ajConfigFrom.type" label="0" size="large">菜单</el-radio> |
72 | <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio> | 72 | <el-radio v-model="ajConfigFrom.type" label="1" size="large">按钮</el-radio> |
73 | <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio> | 73 | <el-radio v-model="ajConfigFrom.type" label="2" size="large">详情页</el-radio> |
74 | -<!-- <div style="height: 15px; color: darkgrey">说明:参数中间用'&'拼接</div>--> | 74 | + <!-- <div style="height: 15px; color: darkgrey">说明:参数中间用'&'拼接</div>--> |
75 | </el-form-item> | 75 | </el-form-item> |
76 | 76 | ||
77 | 77 |
@@ -10,7 +10,7 @@ export default { | @@ -10,7 +10,7 @@ export default { | ||
10 | id: [ | 10 | id: [ |
11 | { | 11 | { |
12 | required: true, | 12 | required: true, |
13 | - message: '请填写文档编号!', | 13 | + message: '请填写配置编号!', |
14 | trigger: 'blur', | 14 | trigger: 'blur', |
15 | } | 15 | } |
16 | ], | 16 | ], |
@@ -36,7 +36,6 @@ export default { | @@ -36,7 +36,6 @@ export default { | ||
36 | setup(props, {attrs, slots, emit}){ | 36 | setup(props, {attrs, slots, emit}){ |
37 | const {proxy} = Vue.getCurrentInstance(); | 37 | const {proxy} = Vue.getCurrentInstance(); |
38 | let height = Vue.ref(window.innerHeight - 10); | 38 | let height = Vue.ref(window.innerHeight - 10); |
39 | - | ||
40 | let configs = Vue.ref([{ | 39 | let configs = Vue.ref([{ |
41 | name:'resId', | 40 | name:'resId', |
42 | desc:'资源ID(资源列表可用)' | 41 | desc:'资源ID(资源列表可用)' |
@@ -339,7 +338,8 @@ export default { | @@ -339,7 +338,8 @@ export default { | ||
339 | menuList, | 338 | menuList, |
340 | menuOptions, | 339 | menuOptions, |
341 | getResType, | 340 | getResType, |
342 | - configs } | 341 | + configs |
342 | + } | ||
343 | } | 343 | } |
344 | 344 | ||
345 | } | 345 | } |
1 | -<div class="container" :style="{'height':height+'px','max-height':height+'px'}"> | 1 | +<div class="container" :style="{'height':height+'px','max-height':height+'px','background':'#fff'}"> |
2 | <iframe :src="getSrc" width="100%" height="100%" ></iframe> | 2 | <iframe :src="getSrc" width="100%" height="100%" ></iframe> |
3 | </div> | 3 | </div> |
@@ -12,8 +12,8 @@ export default { | @@ -12,8 +12,8 @@ export default { | ||
12 | let param={ | 12 | let param={ |
13 | id:ajConfig | 13 | id:ajConfig |
14 | } | 14 | } |
15 | - let params = ''; | ||
16 | - let designPage = ''; | 15 | + let params=''; |
16 | + let designPage=''; | ||
17 | proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) { | 17 | proxy.$http.get(`/api-web/ajConfig/findOneById`, param, function (res) { |
18 | if (res && res.success == true && res.object) { | 18 | if (res && res.success == true && res.object) { |
19 | // 参数替换 | 19 | // 参数替换 |
@@ -26,7 +26,7 @@ export default { | @@ -26,7 +26,7 @@ export default { | ||
26 | } | 26 | } |
27 | 27 | ||
28 | const replaceParams = (params) => { | 28 | const replaceParams = (params) => { |
29 | - return params.replace(/#lgn/g,localStorage.getItem('lgn')).replace(/#user_id/g,sessionStorage.getItem('user_id')).replace(/#access_token/g,localStorage.getItem("access_token")) | 29 | + return params.replace(/#lgn/g,localStorage.getItem('lgn')).replace(/#user_id/g,sessionStorage.getItem('access_token')).replace(/#access_token/g,localStorage.getItem("access_token")) |
30 | } | 30 | } |
31 | 31 | ||
32 | const getParamValue = (code) => { | 32 | const getParamValue = (code) => { |
@@ -36,15 +36,22 @@ export default { | @@ -36,15 +36,22 @@ export default { | ||
36 | // 获取localStorage | 36 | // 获取localStorage |
37 | } | 37 | } |
38 | 38 | ||
39 | - | ||
40 | // 挂载完 | 39 | // 挂载完 |
41 | Vue.onMounted(() => { | 40 | Vue.onMounted(() => { |
42 | getUrl(); | 41 | getUrl(); |
42 | + //start lsq 监听跨域iframe子页面向父页面发送数据(子页面点击名称进入详情页) 2022-03-15 | ||
43 | + window.addEventListener('message',function(e){ | ||
44 | + if(e.data.type=='detail'){ | ||
45 | + proxy.$global.openDetail(e.data.data.resId, e.data.data.resType, proxy); | ||
46 | + }else{ | ||
47 | + } | ||
48 | + }) | ||
49 | + //end lsq 2022-03-15 | ||
43 | }) | 50 | }) |
44 | 51 | ||
45 | return { | 52 | return { |
46 | height, | 53 | height, |
47 | - getSrc | 54 | + getSrc, |
48 | } | 55 | } |
49 | } | 56 | } |
50 | } | 57 | } |
-
Please register or login to post a comment