Showing
1 changed file
with
76 additions
and
54 deletions
@@ -307,6 +307,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -307,6 +307,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
307 | var seriousvalue =$(this).closest(".cont-base").find("div#seriousvalue"); | 307 | var seriousvalue =$(this).closest(".cont-base").find("div#seriousvalue"); |
308 | var devTypevalue =$(this).closest(".cont-base").find("div#seriousdevTypevalue"); | 308 | var devTypevalue =$(this).closest(".cont-base").find("div#seriousdevTypevalue"); |
309 | var joinTypevalue =$(this).closest(".cont-base").find("div#seriousjoinTypevalue"); | 309 | var joinTypevalue =$(this).closest(".cont-base").find("div#seriousjoinTypevalue"); |
310 | + | ||
311 | + var commondevTypevalue =$(this).closest(".cont-base").find("div[id^=devTypevalue-]"); | ||
310 | if(seriousvalue){ | 312 | if(seriousvalue){ |
311 | seriousvalue.remove(); | 313 | seriousvalue.remove(); |
312 | } | 314 | } |
@@ -316,6 +318,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -316,6 +318,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
316 | if(joinTypevalue){ | 318 | if(joinTypevalue){ |
317 | joinTypevalue.remove(); | 319 | joinTypevalue.remove(); |
318 | } | 320 | } |
321 | + if(commondevTypevalue){ | ||
322 | + commondevTypevalue.remove(); | ||
323 | + } | ||
319 | if (data.value != ''){ | 324 | if (data.value != ''){ |
320 | //加载对应的参数 | 325 | //加载对应的参数 |
321 | if(data.value == "device_id"){ | 326 | if(data.value == "device_id"){ |
@@ -351,37 +356,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -351,37 +356,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
351 | $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousdevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); | 356 | $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousdevTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); |
352 | var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); | 357 | var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); |
353 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 358 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
354 | - //回填数据 | ||
355 | - // common.openWin("baseconfig/resourcetype/index", "选择设备类型", | ||
356 | - // { | ||
357 | - // "resTypes": seriousresTypes | ||
358 | - // }, ["选择"], function () { | ||
359 | - // //找到选择的资源类型 并且订阅 | ||
360 | - // var resourcetype = layui.resourcetype({"resTypes": seriousresTypes}); | ||
361 | - // var data = resourcetype.getResTypeChecks(); | ||
362 | - // var resTypes = '' | ||
363 | - // seriousresTypes = []; | ||
364 | - // if(data.length>0){ | ||
365 | - // resTypes = data.substring(1,data.length) | ||
366 | - // } | ||
367 | - // seriousresTypes.push(resTypes.split(",")[0]) | ||
368 | - // dev_type.val(resTypes); | ||
369 | - // return resTypes; | ||
370 | - // }); | ||
371 | $.ajax({ | 359 | $.ajax({ |
372 | - url:domainName +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, | 360 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, |
373 | method:"get", | 361 | method:"get", |
374 | success(res){ | 362 | success(res){ |
375 | if (res.code==200) | 363 | if (res.code==200) |
376 | // 资源类型下拉框 | 364 | // 资源类型下拉框 |
377 | var data = res.data; | 365 | var data = res.data; |
378 | - var logFmtList = res.data.map(item => { | ||
379 | - return { | ||
380 | - name: item.name, | ||
381 | - value: item.id, | ||
382 | - parentId: item.pId | ||
383 | - } | ||
384 | - }); | ||
385 | let option = handleTree(res.data, 'id', 'pId','children','name'); | 366 | let option = handleTree(res.data, 'id', 'pId','children','name'); |
386 | xmSelect.render({ | 367 | xmSelect.render({ |
387 | el: '#seriousdevTypevalue', | 368 | el: '#seriousdevTypevalue', |
@@ -434,26 +415,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -434,26 +415,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
434 | $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); | 415 | $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousjoinTypevalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); |
435 | var join_type= $(this).closest(".cont-base").find("input[type=tel]"); | 416 | var join_type= $(this).closest(".cont-base").find("input[type=tel]"); |
436 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 417 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
437 | - //回填数据 | ||
438 | - // common.openWin("baseconfig/bustype/index", "选择业务类型", | ||
439 | - // { | ||
440 | - // "busIds": seriousJoinTypes | ||
441 | - // }, ["选择"], function () { | ||
442 | - // //找到选择的所有业务 并且订阅 | ||
443 | - // var bustype = layui.bustype({"busIds": seriousJoinTypes}); | ||
444 | - // var data = bustype.getData(); | ||
445 | - // var joinTypes = '' | ||
446 | - // seriousJoinTypes = []; | ||
447 | - // if(data.length>0){ | ||
448 | - // joinTypes = data.substring(1,data.length) | ||
449 | - // } | ||
450 | - // seriousJoinTypes.push(joinTypes.split(",")[0]); | ||
451 | - // console.log(seriousJoinTypes); | ||
452 | - // join_type.val(joinTypes); | ||
453 | - // return joinTypes | ||
454 | - // }); | ||
455 | $.ajax({ | 418 | $.ajax({ |
456 | - url:domainName +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, | 419 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, |
457 | method:"get", | 420 | method:"get", |
458 | success(res){ | 421 | success(res){ |
459 | if (res.code==200) | 422 | if (res.code==200) |
@@ -514,7 +477,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -514,7 +477,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
514 | //inkeys.hide(); | 477 | //inkeys.hide(); |
515 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 478 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
516 | admin.req({ | 479 | admin.req({ |
517 | - url: domainName + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken, | 480 | + url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken, |
518 | async: false, | 481 | async: false, |
519 | success: function (res) { | 482 | success: function (res) { |
520 | // 资源类型下拉框 | 483 | // 资源类型下拉框 |
@@ -560,6 +523,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -560,6 +523,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
560 | } | 523 | } |
561 | var devTypevalue =$(this).closest(".cont-base").find("div#importantdevTypevalue"); | 524 | var devTypevalue =$(this).closest(".cont-base").find("div#importantdevTypevalue"); |
562 | var joinTypevalue =$(this).closest(".cont-base").find("div#importantjoinTypevalue"); | 525 | var joinTypevalue =$(this).closest(".cont-base").find("div#importantjoinTypevalue"); |
526 | + var commondevTypevalue =$(this).closest(".cont-base").find("div[id^=devTypevalue-]"); | ||
563 | 527 | ||
564 | if(devTypevalue){ | 528 | if(devTypevalue){ |
565 | devTypevalue.remove(); | 529 | devTypevalue.remove(); |
@@ -567,6 +531,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -567,6 +531,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
567 | if(joinTypevalue){ | 531 | if(joinTypevalue){ |
568 | joinTypevalue.remove(); | 532 | joinTypevalue.remove(); |
569 | } | 533 | } |
534 | + if(commondevTypevalue){ | ||
535 | + commondevTypevalue.remove(); | ||
536 | + } | ||
570 | if (data.value != ''){ | 537 | if (data.value != ''){ |
571 | //加载对应的参数 | 538 | //加载对应的参数 |
572 | if(data.value == "device_id"){ | 539 | if(data.value == "device_id"){ |
@@ -599,7 +566,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -599,7 +566,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
599 | var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); | 566 | var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); |
600 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 567 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
601 | $.ajax({ | 568 | $.ajax({ |
602 | - url:domainName +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, | 569 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, |
603 | method:"get", | 570 | method:"get", |
604 | success(res){ | 571 | success(res){ |
605 | if (res.code==200) | 572 | if (res.code==200) |
@@ -658,7 +625,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -658,7 +625,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
658 | var join_type= $(this).closest(".cont-base").find("input[type=tel]"); | 625 | var join_type= $(this).closest(".cont-base").find("input[type=tel]"); |
659 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 626 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
660 | $.ajax({ | 627 | $.ajax({ |
661 | - url:domainName +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, | 628 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, |
662 | method:"get", | 629 | method:"get", |
663 | success(res){ | 630 | success(res){ |
664 | if (res.code==200) | 631 | if (res.code==200) |
@@ -720,7 +687,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -720,7 +687,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
720 | //inkeys.hide(); | 687 | //inkeys.hide(); |
721 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 688 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
722 | admin.req({ | 689 | admin.req({ |
723 | - url: domainName + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken, | 690 | + url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken, |
724 | async: false, | 691 | async: false, |
725 | success: function (res) { | 692 | success: function (res) { |
726 | // 资源类型下拉框 | 693 | // 资源类型下拉框 |
@@ -766,6 +733,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -766,6 +733,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
766 | } | 733 | } |
767 | var devTypevalue =$(this).closest(".cont-base").find("div#commonlydevTypevalue"); | 734 | var devTypevalue =$(this).closest(".cont-base").find("div#commonlydevTypevalue"); |
768 | var joinTypevalue =$(this).closest(".cont-base").find("div#commonlyjoinTypevalue"); | 735 | var joinTypevalue =$(this).closest(".cont-base").find("div#commonlyjoinTypevalue"); |
736 | + var commondevTypevalue =$(this).closest(".cont-base").find("div[id^=devTypevalue-]"); | ||
769 | 737 | ||
770 | if(devTypevalue){ | 738 | if(devTypevalue){ |
771 | devTypevalue.remove(); | 739 | devTypevalue.remove(); |
@@ -773,6 +741,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -773,6 +741,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
773 | if(joinTypevalue){ | 741 | if(joinTypevalue){ |
774 | joinTypevalue.remove(); | 742 | joinTypevalue.remove(); |
775 | } | 743 | } |
744 | + if(commondevTypevalue){ | ||
745 | + commondevTypevalue.remove(); | ||
746 | + } | ||
776 | if (data.value != ''){ | 747 | if (data.value != ''){ |
777 | //加载对应的参数 | 748 | //加载对应的参数 |
778 | if(data.value == "device_id"){ | 749 | if(data.value == "device_id"){ |
@@ -805,7 +776,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -805,7 +776,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
805 | var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); | 776 | var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); |
806 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 777 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
807 | $.ajax({ | 778 | $.ajax({ |
808 | - url:domainName +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, | 779 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, |
809 | method:"get", | 780 | method:"get", |
810 | success(res){ | 781 | success(res){ |
811 | if (res.code==200) | 782 | if (res.code==200) |
@@ -864,7 +835,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -864,7 +835,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
864 | var join_type= $(this).closest(".cont-base").find("input[type=tel]"); | 835 | var join_type= $(this).closest(".cont-base").find("input[type=tel]"); |
865 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 836 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
866 | $.ajax({ | 837 | $.ajax({ |
867 | - url:domainName +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, | 838 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logjoin_dirs/queryTreeList?access_token="+accessToken, |
868 | method:"get", | 839 | method:"get", |
869 | success(res){ | 840 | success(res){ |
870 | if (res.code==200) | 841 | if (res.code==200) |
@@ -926,7 +897,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -926,7 +897,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
926 | //inkeys.hide(); | 897 | //inkeys.hide(); |
927 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { | 898 | $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { |
928 | admin.req({ | 899 | admin.req({ |
929 | - url: domainName + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken, | 900 | + url: "http://192.168.0.44:8080" + '/log-access/v1/lm2_logjoin_info_views?access_token=' + accessToken, |
930 | async: false, | 901 | async: false, |
931 | success: function (res) { | 902 | success: function (res) { |
932 | // 资源类型下拉框 | 903 | // 资源类型下拉框 |
@@ -1354,10 +1325,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -1354,10 +1325,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
1354 | //获取最后一个添加的id | 1325 | //获取最后一个添加的id |
1355 | var doms = $(`div[id^=${id}][id$='condition'][id!=${id}]`); | 1326 | var doms = $(`div[id^=${id}][id$='condition'][id!=${id}]`); |
1356 | var lastid =''; | 1327 | var lastid =''; |
1357 | - console.log(doms); | ||
1358 | if($(doms)&&$(doms).length>0) { | 1328 | if($(doms)&&$(doms).length>0) { |
1359 | - | ||
1360 | - | ||
1361 | $(doms).each(function (i, v) { | 1329 | $(doms).each(function (i, v) { |
1362 | var $domId = $(v).attr("id"); | 1330 | var $domId = $(v).attr("id"); |
1363 | var trimdomid = $domId.substring(0,$domId.length-10) | 1331 | var trimdomid = $domId.substring(0,$domId.length-10) |
@@ -1369,6 +1337,60 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | @@ -1369,6 +1337,60 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl | ||
1369 | lastid = id; | 1337 | lastid = id; |
1370 | } | 1338 | } |
1371 | $(`#${lastid}`).after(clone).after(cond); | 1339 | $(`#${lastid}`).after(clone).after(cond); |
1340 | + clone.find("input[type=tel]").before('<div id="devTypevalue-'+times+'" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>'); | ||
1341 | + var dev_type= $(this).closest(".cont-base").find("input[type=tel]"); | ||
1342 | + clone.find("input[type=tel]").unbind('click').on("click",function () { | ||
1343 | + $.ajax({ | ||
1344 | + url:"http://192.168.0.44:8080" +"/log-access/v1/lm2_logfmt_dirs/queryTreeList?access_token="+accessToken, | ||
1345 | + method:"get", | ||
1346 | + success(res){ | ||
1347 | + if (res.code==200) | ||
1348 | + // 资源类型下拉框 | ||
1349 | + var data = res.data; | ||
1350 | + let option = handleTree(res.data, 'id', 'pId','children','name'); | ||
1351 | + xmSelect.render({ | ||
1352 | + el: '#devTypevalue-'+times, | ||
1353 | + name:'devType', | ||
1354 | + tips: '=设备类型=', | ||
1355 | + radio: false, | ||
1356 | + clickClose: false, | ||
1357 | + //checkChild:true, | ||
1358 | + //radio: true, | ||
1359 | + //clickClose: true, | ||
1360 | + // initValue: [resType], | ||
1361 | + prop: { | ||
1362 | + name: 'name', | ||
1363 | + value: 'id' | ||
1364 | + }, | ||
1365 | + filterable: true, | ||
1366 | + layVerify: 'required', | ||
1367 | + //layVerType: 'msg', | ||
1368 | + //initValue: [seriousInkeys.split(",")[0]], | ||
1369 | + toolbar: { | ||
1370 | + show: true, | ||
1371 | + list: ['CLEAR'] | ||
1372 | + }, | ||
1373 | + tree: { | ||
1374 | + //是否显示树状结构 | ||
1375 | + show: true, | ||
1376 | + //是否展示三角图标 | ||
1377 | + showFolderIcon: true, | ||
1378 | + //是否显示虚线 | ||
1379 | + showLine: false, | ||
1380 | + //是否严格遵守父子模式 | ||
1381 | + strict: true | ||
1382 | + }, | ||
1383 | + data:option, | ||
1384 | + on: function (data) { | ||
1385 | + let resTypes = data.arr.map(item => item.id).join(','); | ||
1386 | + dev_type.val(resTypes); | ||
1387 | + return resTypes; | ||
1388 | + } | ||
1389 | + }); | ||
1390 | + return data; | ||
1391 | + } | ||
1392 | + }); | ||
1393 | + }); | ||
1372 | form.render(); | 1394 | form.render(); |
1373 | //渲染新增事件 | 1395 | //渲染新增事件 |
1374 | $("i.policy-input-add").off("click").on("click",function (){ | 1396 | $("i.policy-input-add").off("click").on("click",function (){ |
-
Please register or login to post a comment