删除debugger;卡片名称获取菜单的名称
Showing
7 changed files
with
18 additions
and
8 deletions
@@ -100,7 +100,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | @@ -100,7 +100,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', | ||
100 | , { | 100 | , { |
101 | field: 'createTime', title: '创建时间', align: 'center', sort: true, | 101 | field: 'createTime', title: '创建时间', align: 'center', sort: true, |
102 | templet: function (d) { | 102 | templet: function (d) { |
103 | - debugger | 103 | + |
104 | // return new Date(parseInt(d.createTime) * 1000).toLocaleString().replace(/:\d{1,2}$/,' '); | 104 | // return new Date(parseInt(d.createTime) * 1000).toLocaleString().replace(/:\d{1,2}$/,' '); |
105 | return layui.util.toDateString(d.createTime*1000, 'yyyy-MM-dd HH:mm:ss'); | 105 | return layui.util.toDateString(d.createTime*1000, 'yyyy-MM-dd HH:mm:ss'); |
106 | } | 106 | } |
@@ -140,10 +140,17 @@ layui.extend({ | @@ -140,10 +140,17 @@ layui.extend({ | ||
140 | if(setter.pageTabs && pathURL !== '/'){ | 140 | if(setter.pageTabs && pathURL !== '/'){ |
141 | if(!matchTo){ | 141 | if(!matchTo){ |
142 | var tabName='' // tab标签名 | 142 | var tabName='' // tab标签名 |
143 | - var url=pathURL.substring(1) | 143 | + var href = pathURL; |
144 | tabList.forEach((e) =>{ | 144 | tabList.forEach((e) =>{ |
145 | - if(url === e.path){ | ||
146 | - tabName=e.name | 145 | + var url = e.path; |
146 | + if(url && !url.startsWith('/')){ | ||
147 | + url = '/'+url; | ||
148 | + } | ||
149 | + if(href && !href.startsWith('/')){ | ||
150 | + href = '/'+href; | ||
151 | + } | ||
152 | + if(url === href){ | ||
153 | + tabName = e.name | ||
147 | } | 154 | } |
148 | }); | 155 | }); |
149 | if(!tabName){ | 156 | if(!tabName){ |
@@ -238,7 +245,7 @@ layui.extend({ | @@ -238,7 +245,7 @@ layui.extend({ | ||
238 | let path = router.path.join('/') | 245 | let path = router.path.join('/') |
239 | if(pathURL.indexOf('/user/login') != -1){ | 246 | if(pathURL.indexOf('/user/login') != -1){ |
240 | var loginIndex = 'default'; | 247 | var loginIndex = 'default'; |
241 | - debugger | 248 | + |
242 | let loginSkin = sessionStorage.getItem("loginSkin"); | 249 | let loginSkin = sessionStorage.getItem("loginSkin"); |
243 | if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){ | 250 | if(loginSkin && ["default",'skin1','skin2'].indexOf(loginSkin) != -1){ |
244 | loginIndex = loginSkin; | 251 | loginIndex = loginSkin; |
1 | <title>设计器预览</title> | 1 | <title>设计器预览</title> |
2 | <script type="text/html" template> | 2 | <script type="text/html" template> |
3 | {{# | 3 | {{# |
4 | + | ||
5 | + | ||
4 | var viewURL = window.location.origin + '/vue3/index.html#/ajConfig/view'; | 6 | var viewURL = window.location.origin + '/vue3/index.html#/ajConfig/view'; |
5 | layui.use(['sessions','common','admin'], function () { | 7 | layui.use(['sessions','common','admin'], function () { |
6 | var $ = layui.$; | 8 | var $ = layui.$; |
@@ -24,6 +24,7 @@ export default { | @@ -24,6 +24,7 @@ export default { | ||
24 | if (res && res.success == true) { | 24 | if (res && res.success == true) { |
25 | params=res.object.param; | 25 | params=res.object.param; |
26 | designPage=res.object.designPage; | 26 | designPage=res.object.designPage; |
27 | + | ||
27 | } | 28 | } |
28 | getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token"); | 29 | getSrc.value=sessionStorage.getItem("ajWeb")+'/#/bigscreen/viewer?reportCode='+designPage+params+'&access_token=' + localStorage.getItem("access_token"); |
29 | 30 |
@@ -235,7 +235,7 @@ export default { | @@ -235,7 +235,7 @@ export default { | ||
235 | */ | 235 | */ |
236 | let deleteItem = (row,index) =>{ | 236 | let deleteItem = (row,index) =>{ |
237 | proxy.$global.confirm("将永久删除该配置选项,请确认!", function () { | 237 | proxy.$global.confirm("将永久删除该配置选项,请确认!", function () { |
238 | - debugger | 238 | + |
239 | proxy.$http.get(`/api-web/alarmsubscribe/exclude/delete/${row.id}`, {}, function (res) { | 239 | proxy.$http.get(`/api-web/alarmsubscribe/exclude/delete/${row.id}`, {}, function (res) { |
240 | if (res && res.success) { | 240 | if (res && res.success) { |
241 | proxy.$global.showMsg('保存成功!'); | 241 | proxy.$global.showMsg('保存成功!'); |
@@ -415,7 +415,7 @@ export default { | @@ -415,7 +415,7 @@ export default { | ||
415 | let getPageInfo = ({page, limit}) => { | 415 | let getPageInfo = ({page, limit}) => { |
416 | searchForm.value.page = page; | 416 | searchForm.value.page = page; |
417 | searchForm.value.pageSize = limit; | 417 | searchForm.value.pageSize = limit; |
418 | -debugger | 418 | + |
419 | // 下一页搜索 | 419 | // 下一页搜索 |
420 | getPage(); | 420 | getPage(); |
421 | } | 421 | } |
@@ -415,7 +415,7 @@ export default { | @@ -415,7 +415,7 @@ export default { | ||
415 | let getPageInfo = ({page, limit}) => { | 415 | let getPageInfo = ({page, limit}) => { |
416 | searchForm.value.page = page; | 416 | searchForm.value.page = page; |
417 | searchForm.value.pageSize = limit; | 417 | searchForm.value.pageSize = limit; |
418 | -debugger | 418 | + |
419 | // 下一页搜索 | 419 | // 下一页搜索 |
420 | getPage(); | 420 | getPage(); |
421 | } | 421 | } |
-
Please register or login to post a comment