monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 袁晋鹏
Commit f593090226854fdb4ba8f5f5a1f7c687908bc13a 1 parent 4c956fde

下拉复选优化

Inline Side-by-side
Showing 2 changed files with 124 additions and 82 deletions
@@ -16,9 +16,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -16,9 +16,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
16 var seriousInkeySelect ; 16 var seriousInkeySelect ;
17 var options = ''; 17 var options = '';
18 var defaultoptions = ''; 18 var defaultoptions = '';
19 - var conditionoptions = "<option value=\"2\">等于</option>\n" +  
20 - " <option value=\"6\">包含</option>\n" +  
21 - " <option value=\"9\">不包含</option>"; 19 + var conditionoptions = "<option value=\"6\">等于</option>\n" +
  20 + " <option value=\"8\">包含</option>\n" +
  21 + " <option value=\"11\">不包含</option>";
22 var seriousresIds = []; 22 var seriousresIds = [];
23 var importantresIds = []; 23 var importantresIds = [];
24 var commonlyresIds = []; 24 var commonlyresIds = [];
@@ -84,11 +84,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -84,11 +84,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
84 var cond = ''; 84 var cond = '';
85 if(seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '0'){ 85 if(seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '0'){
86 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition"> 86 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition">
87 - <input type="checkbox" lay-skin="switch" lay-text="或|且" value="是"> 87 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
88 </div>`; 88 </div>`;
89 }else if(seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '1'){ 89 }else if(seriousItems[i].relationSymbol && seriousItems[i].relationSymbol == '1'){
90 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition"> 90 cond = `<div class="layui-form-item cont-base" id="serious-policy-box-${times}-condition">
91 - <input type="checkbox" lay-skin="switch" lay-text="或|且" checked value="否"> 91 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" ><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked>
92 </div>`; 92 </div>`;
93 } 93 }
94 var clone = "" 94 var clone = ""
@@ -112,6 +112,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -112,6 +112,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
112 $(`#serious-policy-box-${timestr} select.policyparam`).val(seriousItems[i].confNo); 112 $(`#serious-policy-box-${timestr} select.policyparam`).val(seriousItems[i].confNo);
113 $(`#serious-policy-box-${timestr} select.condition`).val(seriousItems[i].operatorSymbol); 113 $(`#serious-policy-box-${timestr} select.condition`).val(seriousItems[i].operatorSymbol);
114 $(`#serious-policy-box-${timestr} input[type=tel]`).val(seriousItems[i].operatorValue); 114 $(`#serious-policy-box-${timestr} input[type=tel]`).val(seriousItems[i].operatorValue);
  115 + $(`#serious-policy-box-${timestr} input[type=tel]`).attr("style","width:480px");
  116 + $(`#serious-policy-box-${timestr} input[type=tel]`).parent().attr("style","width:490px");
115 } 117 }
116 form.render(); 118 form.render();
117 } 119 }
@@ -124,11 +126,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -124,11 +126,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
124 var cond = ''; 126 var cond = '';
125 if(importantItems[i].relationSymbol && importantItems[i].relationSymbol == '0'){ 127 if(importantItems[i].relationSymbol && importantItems[i].relationSymbol == '0'){
126 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition"> 128 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition">
127 - <input type="checkbox" lay-skin="switch" lay-text="或|且" value="是"> 129 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
128 </div>`; 130 </div>`;
129 }else if(importantItems[i].relationSymbol && importantItems[i].relationSymbol == '1'){ 131 }else if(importantItems[i].relationSymbol && importantItems[i].relationSymbol == '1'){
130 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition"> 132 cond = `<div class="layui-form-item cont-base" id="important-policy-box-${times}-condition">
131 - <input type="checkbox" checked lay-skin="switch" lay-text="或|且" value="否"> 133 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" ><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked>
132 </div>`; 134 </div>`;
133 } 135 }
134 var clone = "" 136 var clone = ""
@@ -152,6 +154,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -152,6 +154,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
152 $(`#important-policy-box-${timestr} select.policyparam`).val(importantItems[i].confNo); 154 $(`#important-policy-box-${timestr} select.policyparam`).val(importantItems[i].confNo);
153 $(`#important-policy-box-${timestr} select.condition`).val(importantItems[i].operatorSymbol); 155 $(`#important-policy-box-${timestr} select.condition`).val(importantItems[i].operatorSymbol);
154 $(`#important-policy-box-${timestr} input[type=tel]`).val(importantItems[i].operatorValue); 156 $(`#important-policy-box-${timestr} input[type=tel]`).val(importantItems[i].operatorValue);
  157 + $(`#important-policy-box-${timestr} input[type=tel]`).attr("style","width:480px");
  158 + $(`#important-policy-box-${timestr} input[type=tel]`).parent().attr("style","width:490px");
155 } 159 }
156 form.render(); 160 form.render();
157 } 161 }
@@ -164,11 +168,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -164,11 +168,11 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
164 var cond = ''; 168 var cond = '';
165 if(commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '0'){ 169 if(commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '0'){
166 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition"> 170 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition">
167 - <input type="checkbox" lay-skin="switch" lay-text="或|且" value="是"> 171 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
168 </div>`; 172 </div>`;
169 }else if(commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '1'){ 173 }else if(commonlyItems[i].relationSymbol && commonlyItems[i].relationSymbol == '1'){
170 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition"> 174 cond = `<div class="layui-form-item cont-base" id="commonly-policy-box-${times}-condition">
171 - <input type="checkbox" checked lay-skin="switch" lay-text="或|且" value="否"> 175 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且"><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" checked>
172 </div>`; 176 </div>`;
173 } 177 }
174 var clone = "" 178 var clone = ""
@@ -192,6 +196,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -192,6 +196,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
192 $(`#commonly-policy-box-${timestr} select.policyparam`).val(commonlyItems[i].confNo); 196 $(`#commonly-policy-box-${timestr} select.policyparam`).val(commonlyItems[i].confNo);
193 $(`#commonly-policy-box-${timestr} select.condition`).val(commonlyItems[i].operatorSymbol); 197 $(`#commonly-policy-box-${timestr} select.condition`).val(commonlyItems[i].operatorSymbol);
194 $(`#commonly-policy-box-${timestr} input[type=tel]`).val(commonlyItems[i].operatorValue); 198 $(`#commonly-policy-box-${timestr} input[type=tel]`).val(commonlyItems[i].operatorValue);
  199 + $(`#commonly-policy-box-${timestr} input[type=tel]`).attr("style","width:480px");
  200 + $(`#commonly-policy-box-${timestr} input[type=tel]`).parent().attr("style","width:490px");
195 } 201 }
196 202
197 form.render(); 203 form.render();
@@ -249,6 +255,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -249,6 +255,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
249 }); 255 });
250 } 256 }
251 form.on('select(serious_policy_param)', function(data){ 257 form.on('select(serious_policy_param)', function(data){
  258 + var seriousvalue =$(this).closest(".cont-base").find("div#seriousvalue");
  259 + if(seriousvalue){
  260 + seriousvalue.remove();
  261 + }
252 if (data.value != ''){ 262 if (data.value != ''){
253 //加载对应的参数 263 //加载对应的参数
254 if(data.value == "device_id"){ 264 if(data.value == "device_id"){
@@ -270,7 +280,6 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -270,7 +280,6 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
270 if(device.length>0){ 280 if(device.length>0){
271 device = device.substring(0,device.length-1) 281 device = device.substring(0,device.length-1)
272 } 282 }
273 - console.log(device_id)  
274 device_id.val(device); 283 device_id.val(device);
275 return device; 284 return device;
276 }) 285 })
@@ -321,9 +330,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -321,9 +330,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
321 }); 330 });
322 }else if(data.value == "inKey"){ 331 }else if(data.value == "inKey"){
323 //绑定资源类型下拉选择 332 //绑定资源类型下拉选择
324 - $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousvalue" class="xm-select-demo" style="width: 278px"></div>'); 333 + $(this).closest(".cont-base").find("input[type=tel]").before('<div id="seriousvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
325 var inkeys= $(this).closest(".cont-base").find("input[type=tel]"); 334 var inkeys= $(this).closest(".cont-base").find("input[type=tel]");
326 - var seriousvalue =$(this).closest(".cont-base").find("div#seriousvalue");  
327 //inkeys.hide(); 335 //inkeys.hide();
328 $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { 336 $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {
329 admin.req({ 337 admin.req({
@@ -335,12 +343,16 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -335,12 +343,16 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
335 xmSelect.render({ 343 xmSelect.render({
336 el: '#seriousvalue', 344 el: '#seriousvalue',
337 tips: '=inKey=', 345 tips: '=inKey=',
338 - filterable: true,  
339 - //radio: false, 346 + radio: false,
340 clickClose: false, 347 clickClose: false,
341 - initValue: [seriousInkeys.split(",")[0]], 348 + prop: {
  349 + name: 'name',
  350 + value: 'inKey'
  351 + },
  352 + filterable: true,
342 layVerify: 'required', 353 layVerify: 'required',
343 - autoRow: true, 354 + layVerType: 'msg',
  355 + //initValue: [seriousInkeys.split(",")[0]],
344 toolbar: { 356 toolbar: {
345 show: true, 357 show: true,
346 list: ['CLEAR'] 358 list: ['CLEAR']
@@ -350,8 +362,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -350,8 +362,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
350 seriousInkeys = data.arr.map(item => item.inKey).join(','); 362 seriousInkeys = data.arr.map(item => item.inKey).join(',');
351 inkeys.val(seriousInkeys); 363 inkeys.val(seriousInkeys);
352 if(data && data.isAdd) { 364 if(data && data.isAdd) {
353 - seriousvalue.remove();  
354 - inkeys.show(); 365 + //seriousvalue.remove();
  366 + //inkeys.show();
355 } 367 }
356 return seriousInkeys 368 return seriousInkeys
357 } 369 }
@@ -363,6 +375,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -363,6 +375,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
363 } 375 }
364 }); 376 });
365 form.on('select(important_policy_param)', function(data){ 377 form.on('select(important_policy_param)', function(data){
  378 + var importantvalue =$(this).closest(".cont-base").find("div#importantvalue");
  379 + if(importantvalue){
  380 + importantvalue.remove();
  381 + }
366 if (data.value != ''){ 382 if (data.value != ''){
367 //加载对应的参数 383 //加载对应的参数
368 if(data.value == "device_id"){ 384 if(data.value == "device_id"){
@@ -434,9 +450,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -434,9 +450,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
434 }); 450 });
435 }else if(data.value == "inKey"){ 451 }else if(data.value == "inKey"){
436 //绑定资源类型下拉选择 452 //绑定资源类型下拉选择
437 - $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantvalue" class="xm-select-demo" style="width: 278px"></div>'); 453 + $(this).closest(".cont-base").find("input[type=tel]").before('<div id="importantvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
438 var inkeys= $(this).closest(".cont-base").find("input[type=tel]"); 454 var inkeys= $(this).closest(".cont-base").find("input[type=tel]");
439 - var importantvalue =$(this).closest(".cont-base").find("div#importantvalue"); 455 + //var importantvalue =$(this).closest(".cont-base").find("div#importantvalue");
440 //inkeys.hide(); 456 //inkeys.hide();
441 $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { 457 $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {
442 admin.req({ 458 admin.req({
@@ -448,25 +464,28 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -448,25 +464,28 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
448 xmSelect.render({ 464 xmSelect.render({
449 el: '#importantvalue', 465 el: '#importantvalue',
450 tips: '=inKey=', 466 tips: '=inKey=',
451 - filterable: true,  
452 - //radio: false, 467 + radio: false,
453 clickClose: false, 468 clickClose: false,
454 - initValue: [importantInkeys.split(",")[0]], 469 + prop: {
  470 + name: 'name',
  471 + value: 'inKey'
  472 + },
  473 + filterable: true,
455 layVerify: 'required', 474 layVerify: 'required',
456 - autoRow: true, 475 + layVerType: 'msg',
457 toolbar: { 476 toolbar: {
458 show: true, 477 show: true,
459 list: [ 'CLEAR'] 478 list: [ 'CLEAR']
460 }, 479 },
461 - //height: '300px', 480 + height: 'auto',
462 data: logjoinList, 481 data: logjoinList,
463 on: function (data) { 482 on: function (data) {
464 importantInkeys = data.arr.map(item => item.inKey).join(','); 483 importantInkeys = data.arr.map(item => item.inKey).join(',');
465 inkeys.val(importantInkeys); 484 inkeys.val(importantInkeys);
466 - if(data && data.isAdd) {  
467 - importantvalue.remove();  
468 - inkeys.show();  
469 - } 485 + // if(data && data.isAdd) {
  486 + // importantvalue.remove();
  487 + // inkeys.show();
  488 + // }
470 return importantInkeys 489 return importantInkeys
471 } 490 }
472 }); 491 });
@@ -477,6 +496,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -477,6 +496,10 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
477 } 496 }
478 }); 497 });
479 form.on('select(commonly_policy_param)', function(data){ 498 form.on('select(commonly_policy_param)', function(data){
  499 + var commonlyvalue =$(this).closest(".cont-base").find("div#commonlyvalue");
  500 + if(commonlyvalue){
  501 + commonlyvalue.remove();
  502 + }
480 if (data.value != ''){ 503 if (data.value != ''){
481 //加载对应的参数 504 //加载对应的参数
482 if(data.value == "device_id"){ 505 if(data.value == "device_id"){
@@ -548,9 +571,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -548,9 +571,9 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
548 }); 571 });
549 }else if(data.value == "inKey"){ 572 }else if(data.value == "inKey"){
550 //绑定资源类型下拉选择 573 //绑定资源类型下拉选择
551 - $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlyvalue" class="xm-select-demo" style="width: 278px"></div>'); 574 + $(this).closest(".cont-base").find("input[type=tel]").before('<div id="commonlyvalue" class="xm-select-demo" style="width:478px;position: absolute;z-index: 999"></div>');
552 var inkeys= $(this).closest(".cont-base").find("input[type=tel]"); 575 var inkeys= $(this).closest(".cont-base").find("input[type=tel]");
553 - var commonlyvalue =$(this).closest(".cont-base").find("div#commonlyvalue"); 576 +
554 //inkeys.hide(); 577 //inkeys.hide();
555 $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () { 578 $(this).closest(".cont-base").find("input[type=tel]").unbind('click').on("click",function () {
556 admin.req({ 579 admin.req({
@@ -562,25 +585,28 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -562,25 +585,28 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
562 xmSelect.render({ 585 xmSelect.render({
563 el: '#commonlyvalue', 586 el: '#commonlyvalue',
564 tips: '=inKey=', 587 tips: '=inKey=',
565 - filterable: true,  
566 - //radio: false, 588 + radio: false,
567 clickClose: false, 589 clickClose: false,
568 - initValue: [commonlyInkeys.split(",")[0]], 590 + prop: {
  591 + name: 'name',
  592 + value: 'inKey'
  593 + },
  594 + filterable: true,
569 layVerify: 'required', 595 layVerify: 'required',
570 - autoRow: true, 596 + layVerType: 'msg',
571 toolbar: { 597 toolbar: {
572 show: true, 598 show: true,
573 list: ['CLEAR'] 599 list: ['CLEAR']
574 }, 600 },
575 - //height: '300px', 601 + height: 'auto',
576 data: logjoinList, 602 data: logjoinList,
577 on: function (data) { 603 on: function (data) {
578 commonlyInkeys = data.arr.map(item => item.inKey).join(','); 604 commonlyInkeys = data.arr.map(item => item.inKey).join(',');
579 inkeys.val(commonlyInkeys); 605 inkeys.val(commonlyInkeys);
580 - if(data && data.isAdd) {  
581 - commonlyvalue.remove();  
582 - inkeys.show();  
583 - } 606 + // if(data && data.isAdd) {
  607 + // commonlyvalue.remove();
  608 + // inkeys.show();
  609 + // }
584 return commonlyInkeys 610 return commonlyInkeys
585 } 611 }
586 }); 612 });
@@ -647,25 +673,23 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -647,25 +673,23 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
647 return false; 673 return false;
648 } 674 }
649 var policyFlag = $(this).data("flag"); 675 var policyFlag = $(this).data("flag");
650 - var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"equals","6":"contains","7":"startsWith","8":"endsWith","9":"nocontains"}; 676 + var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"!=","6":"equals","7":"!equals","8":"contains","9":"startsWith","10":"endsWith","11":"!contains"};
651 var doms = $(`[id^=${policyFlag}-policy-box]`); 677 var doms = $(`[id^=${policyFlag}-policy-box]`);
652 var policyStr = ''; 678 var policyStr = '';
653 - var relationobj = {"1": 0,"3":1,"5":2,"7":3,"9":4,"11":5,"13":6,"15":7} 679 + var relationobj = {"1": 0,"3":1,"5":2,"7":3,"9":4,"11":5,"13":6,"15":7,"17":8,"19":9,"21":10}
654 if(policyFlag.indexOf("serious")!=-1) { 680 if(policyFlag.indexOf("serious")!=-1) {
655 seriouspolicyItems = []; 681 seriouspolicyItems = [];
656 $(doms).each(function (i, v) { 682 $(doms).each(function (i, v) {
657 var domId = $(v).attr("id"); 683 var domId = $(v).attr("id");
658 if (domId.indexOf("condition") != -1) {//条件 684 if (domId.indexOf("condition") != -1) {//条件
659 var j = relationobj[''+i+'']; 685 var j = relationobj[''+i+''];
660 - console.log(j);  
661 - var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch");  
662 - if (open) {  
663 - policyStr += "||"  
664 -  
665 - seriouspolicyItems[j].relationSymbol= "1" 686 + var open = $(v).find('input[type=radio].condition:checked').val();
  687 + if (open == "||") {
  688 + policyStr += open;
  689 + seriouspolicyItems[j].relationSymbol= "1";
666 } else { 690 } else {
667 - policyStr += "&&"  
668 - seriouspolicyItems[j].relationSymbol= "0" 691 + policyStr += open;
  692 + seriouspolicyItems[j].relationSymbol= "0";
669 } 693 }
670 } else { //值 694 } else { //值
671 var conditon = $(v).find(".condition").val(); 695 var conditon = $(v).find(".condition").val();
@@ -721,13 +745,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -721,13 +745,13 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
721 var domId = $(v).attr("id"); 745 var domId = $(v).attr("id");
722 if (domId.indexOf("condition") != -1) {//条件 746 if (domId.indexOf("condition") != -1) {//条件
723 var j = relationobj[''+i+'']; 747 var j = relationobj[''+i+''];
724 - var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch");  
725 - if (open) {  
726 - policyStr += "||"  
727 - importantpolicyItems[j].relationSymbol= "1" 748 + var open = $(v).find('input[type=radio].condition:checked').val();
  749 + if (open == "||") {
  750 + policyStr += open;
  751 + importantpolicyItems[j].relationSymbol= "1";
728 } else { 752 } else {
729 - policyStr += "&&"  
730 - importantpolicyItems[j].relationSymbol= "0" 753 + policyStr += open;
  754 + importantpolicyItems[j].relationSymbol= "0";
731 } 755 }
732 } else { //值 756 } else { //值
733 var conditon = $(v).find(".condition").val(); 757 var conditon = $(v).find(".condition").val();
@@ -784,12 +808,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -784,12 +808,12 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
784 var domId = $(v).attr("id"); 808 var domId = $(v).attr("id");
785 if (domId.indexOf("condition") != -1) {//条件 809 if (domId.indexOf("condition") != -1) {//条件
786 var j = relationobj[''+i+'']; 810 var j = relationobj[''+i+''];
787 - var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch");  
788 - if (open) {  
789 - policyStr += "||" 811 + var open = $(v).find('input[type=radio].condition:checked').val();
  812 + if (open == "||") {
  813 + policyStr += open;
790 commonlypolicyItems[j].relationSymbol= "1"; 814 commonlypolicyItems[j].relationSymbol= "1";
791 } else { 815 } else {
792 - policyStr += "&&" 816 + policyStr += open;
793 commonlypolicyItems[j].relationSymbol= "0"; 817 commonlypolicyItems[j].relationSymbol= "0";
794 } 818 }
795 } else { //值 819 } else { //值
@@ -923,7 +947,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -923,7 +947,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
923 function clonePolicyDoms(id){ 947 function clonePolicyDoms(id){
924 var times = new Date().getTime() 948 var times = new Date().getTime()
925 var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition"> 949 var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition">
926 - <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且"> 950 + <input type="radio" class="condition" name="policy-${times}-condition" value="&&" title="且" checked><input type="radio" class="condition" name="policy-${times}-condition" value="||" title="或" >
927 </div>`; 951 </div>`;
928 var clone = $(`#${id}`).clone(); 952 var clone = $(`#${id}`).clone();
929 clone.attr("id",id+"-"+times).find("i.policy-input-add").addClass("hide") 953 clone.attr("id",id+"-"+times).find("i.policy-input-add").addClass("hide")
@@ -933,7 +957,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl @@ -933,7 +957,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist','tabl
933 //console.log(clone.find("select.policyparam").html(options)) 957 //console.log(clone.find("select.policyparam").html(options))
934 clone.find("select.policyparam").html(options); 958 clone.find("select.policyparam").html(options);
935 clone.find("select.condition").html(conditionoptions); 959 clone.find("select.condition").html(conditionoptions);
936 - clone.find("input[type=tel]").val(''); 960 + clone.find("input[type=tel]").attr("style","width:480px").val('');
  961 + clone.find("input[type=tel]").parent().attr("style","width:490px");
937 //获取最后一个添加的id 962 //获取最后一个添加的id
938 var doms = $(`div[id^=${id}][id$='condition'][id!=${id}]`); 963 var doms = $(`div[id^=${id}][id$='condition'][id!=${id}]`);
939 var lastid =''; 964 var lastid ='';
@@ -118,13 +118,16 @@ @@ -118,13 +118,16 @@
118 <option value="2">等于</option> 118 <option value="2">等于</option>
119 <option value="3">大于等于</option> 119 <option value="3">大于等于</option>
120 <option value="4">小于等于</option> 120 <option value="4">小于等于</option>
121 - <option value="5">字符串等于</option>  
122 - <option value="6">字符串包含</option>  
123 - <option value="7">字符串前匹配</option>  
124 - <option value="8">字符串后匹配</option> 121 + <option value="5">不等于</option>
  122 + <option value="6">字符串等于</option>
  123 + <option value="7">字符串不等于</option>
  124 + <option value="8">字符串包含</option>
  125 + <option value="9">字符串前匹配</option>
  126 + <option value="10">字符串后匹配</option>
  127 + <option value="11">字符串不包含</option>
125 </select> 128 </select>
126 </div> 129 </div>
127 - <div class="layui-input-inline smallwith"> 130 + <div class="layui-input-inline">
128 <input type="tel" autocomplete="off" class="layui-input seriousvalue" flag="serious_value" > 131 <input type="tel" autocomplete="off" class="layui-input seriousvalue" flag="serious_value" >
129 </div> 132 </div>
130 <div class="layui-form-mid layui-word-aux"><i data-id="serious-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div> 133 <div class="layui-form-mid layui-word-aux"><i data-id="serious-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div>
@@ -195,13 +198,16 @@ @@ -195,13 +198,16 @@
195 <option value="2">等于</option> 198 <option value="2">等于</option>
196 <option value="3">大于等于</option> 199 <option value="3">大于等于</option>
197 <option value="4">小于等于</option> 200 <option value="4">小于等于</option>
198 - <option value="5">字符串等于</option>  
199 - <option value="6">字符串包含</option>  
200 - <option value="7">字符串前匹配</option>  
201 - <option value="8">字符串后匹配</option> 201 + <option value="5">不等于</option>
  202 + <option value="6">字符串等于</option>
  203 + <option value="7">字符串不等于</option>
  204 + <option value="8">字符串包含</option>
  205 + <option value="9">字符串前匹配</option>
  206 + <option value="10">字符串后匹配</option>
  207 + <option value="11">字符串不包含</option>
202 </select> 208 </select>
203 </div> 209 </div>
204 - <div class="layui-input-inline smallwith"> 210 + <div class="layui-input-inline">
205 <input type="tel" autocomplete="off" class="layui-input importantvalue" flag="important_value" > 211 <input type="tel" autocomplete="off" class="layui-input importantvalue" flag="important_value" >
206 </div> 212 </div>
207 <div class="layui-form-mid layui-word-aux"><i data-id="important-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div> 213 <div class="layui-form-mid layui-word-aux"><i data-id="important-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div>
@@ -272,13 +278,16 @@ @@ -272,13 +278,16 @@
272 <option value="2">等于</option> 278 <option value="2">等于</option>
273 <option value="3">大于等于</option> 279 <option value="3">大于等于</option>
274 <option value="4">小于等于</option> 280 <option value="4">小于等于</option>
275 - <option value="5">字符串等于</option>  
276 - <option value="6">字符串包含</option>  
277 - <option value="7">字符串前匹配</option>  
278 - <option value="8">字符串后匹配</option> 281 + <option value="5">不等于</option>
  282 + <option value="6">字符串等于</option>
  283 + <option value="7">字符串不等于</option>
  284 + <option value="8">字符串包含</option>
  285 + <option value="9">字符串前匹配</option>
  286 + <option value="10">字符串后匹配</option>
  287 + <option value="11">字符串不包含</option>
279 </select> 288 </select>
280 </div> 289 </div>
281 - <div class="layui-input-inline smallwith"> 290 + <div class="layui-input-inline">
282 <input type="tel" autocomplete="off" class="layui-input commonlyvalue" flag="commonly_value"> 291 <input type="tel" autocomplete="off" class="layui-input commonlyvalue" flag="commonly_value">
283 </div> 292 </div>
284 <div class="layui-form-mid layui-word-aux"><i data-id="commonly-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div> 293 <div class="layui-form-mid layui-word-aux"><i data-id="commonly-policy-box" class="layui-icon oper-icon policy-input-add">&#xe624;</i></div>
@@ -336,15 +345,19 @@ @@ -336,15 +345,19 @@
336 <div class="layui-form-item cont-base" id="filter-policy-box"> 345 <div class="layui-form-item cont-base" id="filter-policy-box">
337 <div class="layui-input-inline smallwith"> 346 <div class="layui-input-inline smallwith">
338 <select class="filter_condition"> 347 <select class="filter_condition">
  348 + <option value="">运算符</option>
339 <option value="0">大于</option> 349 <option value="0">大于</option>
340 <option value="1">小于</option> 350 <option value="1">小于</option>
341 <option value="2">等于</option> 351 <option value="2">等于</option>
342 <option value="3">大于等于</option> 352 <option value="3">大于等于</option>
343 <option value="4">小于等于</option> 353 <option value="4">小于等于</option>
344 - <option value="5">字符串等于</option>  
345 - <option value="6">字符串包含</option>  
346 - <option value="7">字符串前匹配</option>  
347 - <option value="8">字符串后匹配</option> 354 + <option value="5">不等于</option>
  355 + <option value="6">字符串等于</option>
  356 + <option value="7">字符串不等于</option>
  357 + <option value="8">字符串包含</option>
  358 + <option value="9">字符串前匹配</option>
  359 + <option value="10">字符串后匹配</option>
  360 + <option value="11">字符串不包含</option>
348 </select> 361 </select>
349 </div> 362 </div>
350 <div class="layui-input-inline smallwith"> 363 <div class="layui-input-inline smallwith">
@@ -443,9 +456,13 @@ @@ -443,9 +456,13 @@
443 input[type=tel]{ 456 input[type=tel]{
444 width: 280px; 457 width: 280px;
445 min-width: 280px; 458 min-width: 280px;
  459 + position: absolute;
446 } 460 }
447 .layui-word-aux{ 461 .layui-word-aux{
448 - left: 110px; 462 + left: 10px;
  463 + }
  464 + .layui-form-pane .oper-icon{
  465 + color: #01aaed;
449 } 466 }
450 467
451 </style> 468 </style>