Merge branch 'master-v32-lushangqing' into 'master'
【1433】A6，指令模板功能的指令名称：列宽存在问题，导致展示样式异常 #1 See merge request !720
Showing
5 changed files
with
34 additions
and
9 deletions
| @@ -67,10 +67,10 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin', | @@ -67,10 +67,10 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin', | ||
| 67 | , height: 'full-80' | 67 | , height: 'full-80' |
| 68 | , data: dataArr | 68 | , data: dataArr |
| 69 | , cols: [[ | 69 | , cols: [[ |
| 70 | - {field: 'dirctiveName', title: '指令名称', align: 'center', width: 230 | 70 | + {field: 'dirctiveName', title: '指令名称', align: 'center', minWidth: 230 |
| 71 | ,templet:'<div><span data-id="{{d.dirctiveId}}" >{{d.dirctiveName}}</span></div>'} | 71 | ,templet:'<div><span data-id="{{d.dirctiveId}}" >{{d.dirctiveName}}</span></div>'} |
| 72 | , {field: 'outputNum', title: '输出指标数量', align: 'center', width: 150} | 72 | , {field: 'outputNum', title: '输出指标数量', align: 'center', width: 150} |
| 73 | - , {field: 'frequencyType', title: '周期时间类型', align: 'center', minWidth: 80,templet: function (d) { | 73 | + , {field: 'frequencyType', title: '周期时间类型', align: 'center', width:180,minWidth: 180,templet: function (d) { |
| 74 | var html = '<select name="frequencyType" lay-filter="frequency-type">' + | 74 | var html = '<select name="frequencyType" lay-filter="frequency-type">' + |
| 75 | '<option value="often" >常用周期</option>'+ | 75 | '<option value="often" >常用周期</option>'+ |
| 76 | '<option value="cron">CronTab表达式</option>'+ | 76 | '<option value="cron">CronTab表达式</option>'+ |
| @@ -83,7 +83,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin', | @@ -83,7 +83,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin', | ||
| 83 | }) | 83 | }) |
| 84 | return $dom.prop("outerHTML"); | 84 | return $dom.prop("outerHTML"); |
| 85 | }} | 85 | }} |
| 86 | - , {field: 'collFrequency', title: '周期', align: 'center', width: 220,templet:function (d) { | 86 | + , {field: 'collFrequency', title: '周期', align: 'center', width: 180,templet:function (d) { |
| 87 | var selectStr = getTableSelectDom().select; | 87 | var selectStr = getTableSelectDom().select; |
| 88 | var inputStr = getTableSelectDom().input; | 88 | var inputStr = getTableSelectDom().input; |
| 89 | if(d.frequencyType == 'often'){ | 89 | if(d.frequencyType == 'often'){ |
| @@ -100,7 +100,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin', | @@ -100,7 +100,7 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','laydate','admin', | ||
| 100 | return $dom.prop("outerHTML"); | 100 | return $dom.prop("outerHTML"); |
| 101 | } | 101 | } |
| 102 | }} | 102 | }} |
| 103 | - , {title: '操作', align: 'center', minWidth: 100,templet: '<div><span checkTemplate-data-delete="{{d.dirctiveId}}" class="layui-table-link">删除</span>'} | 103 | + , {title: '操作', align: 'center', width:100,minWidth: 100,templet: '<div><span checkTemplate-data-delete="{{d.dirctiveId}}" class="layui-table-link">删除</span>'} |
| 104 | ]], | 104 | ]], |
| 105 | done: function (res, curr, count) { | 105 | done: function (res, curr, count) { |
| 106 | form.render(); | 106 | form.render(); |
| @@ -20,7 +20,8 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart | @@ -20,7 +20,8 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart | ||
| 20 | var list = []; | 20 | var list = []; |
| 21 | var dataList = []; | 21 | var dataList = []; |
| 22 | var date = '2021'; | 22 | var date = '2021'; |
| 23 | - | 23 | + //lsq 调用获取今年和去年年份 2022-07-04 |
| 24 | + getYearDate(); | ||
| 24 | getChartData(); | 25 | getChartData(); |
| 25 | // loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表'); | 26 | // loadAlarmOverChart1(alarmTrendChart,null,'24小时趋势表'); |
| 26 | loadResourceTable('resType','overviewResTypeTable'); | 27 | loadResourceTable('resType','overviewResTypeTable'); |
| @@ -435,5 +436,22 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart | @@ -435,5 +436,22 @@ layui.define(['admin', 'form', 'table', 'element', 'sessions', 'common', 'echart | ||
| 435 | alink.click(); | 436 | alink.click(); |
| 436 | document.body.removeChild(alink); | 437 | document.body.removeChild(alink); |
| 437 | } | 438 | } |
| 439 | + | ||
| 440 | + //lsq 获取今年和去年的年份赋值给按钮 2022-07-04 | ||
| 441 | + function getYearDate(){ | ||
| 442 | + let myDate=new Date(); | ||
| 443 | + let thisYear=getDateTime(myDate); | ||
| 444 | + myDate.setFullYear(myDate.getFullYear()-1); | ||
| 445 | + let lastYear=getDateTime(myDate); | ||
| 446 | + $('#thisYear').attr('data-years',thisYear); | ||
| 447 | + $('#lastYear').attr('data-years',lastYear); | ||
| 448 | + date=thisYear; | ||
| 449 | + } | ||
| 450 | + //获取时间点 转年月日的方法 | ||
| 451 | + function getDateTime(newDate){ | ||
| 452 | + let year=newDate.getFullYear();//获取年 | ||
| 453 | + return year; | ||
| 454 | + } | ||
| 455 | + | ||
| 438 | }); | 456 | }); |
| 439 | }); | 457 | }); |
| @@ -8032,4 +8032,11 @@ form[lay-filter="activewarning-form"] .layui-inline { | @@ -8032,4 +8032,11 @@ form[lay-filter="activewarning-form"] .layui-inline { | ||
| 8032 | cursor: pointer; | 8032 | cursor: pointer; |
| 8033 | text-decoration: underline; | 8033 | text-decoration: underline; |
| 8034 | } | 8034 | } |
| 8035 | -/*end lsq 2022-06-28*/ | ||
| 8035 | +/*end lsq 2022-06-28*/ | ||
| 8036 | +/*lsq 指令模板编辑指令时的指令名称样式 2022-07-04*/ | ||
| 8037 | +.table-edit.table-edit-textoverflow td[data-field="dirctiveName"] .layui-table-cell{ | ||
| 8038 | + overflow: hidden; | ||
| 8039 | + text-overflow: ellipsis; | ||
| 8040 | + white-space: nowrap; | ||
| 8041 | + | ||
| 8042 | +} |
| @@ -69,8 +69,8 @@ | @@ -69,8 +69,8 @@ | ||
| 69 | <li>业务系统</li> | 69 | <li>业务系统</li> |
| 70 | <li>业务域</li> | 70 | <li>业务域</li> |
| 71 | <div class="layui-btn-group time-group" id="overview_time" style="margin-left: 60%"> | 71 | <div class="layui-btn-group time-group" id="overview_time" style="margin-left: 60%"> |
| 72 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" data-years="2020">去年</button> | ||
| 73 | - <button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" data-years="2021">今年</button> | 72 | + <button type="button" class="layui-btn layui-btn-primary layui-btn-sm" id="lastYear" data-years="2020">去年</button> |
| 73 | + <button type="button" class="layui-btn layui-btn-primary layui-btn-sm active" id="thisYear" data-years="2021">今年</button> | ||
| 74 | </div> | 74 | </div> |
| 75 | <button class="layui-btn layui-btn-sm layui-btn-normal tab-button" id="btn_overview_export_excel"> | 75 | <button class="layui-btn layui-btn-sm layui-btn-normal tab-button" id="btn_overview_export_excel"> |
| 76 | <i class="layui-icon"></i>导出到Excel | 76 | <i class="layui-icon"></i>导出到Excel |
| @@ -36,7 +36,7 @@ | @@ -36,7 +36,7 @@ | ||
| 36 | <a class="layui-btn layui-btn-xs layui-btn-normal" id="checkTemplateChooseKpi"><i class="layui-icon"></i></a> | 36 | <a class="layui-btn layui-btn-xs layui-btn-normal" id="checkTemplateChooseKpi"><i class="layui-icon"></i></a> |
| 37 | </legend> | 37 | </legend> |
| 38 | </fieldset> | 38 | </fieldset> |
| 39 | - <div class="layui-form-item table-edit"> | 39 | + <div class="layui-form-item table-edit table-edit-textoverflow"> |
| 40 | <table id="checkTemplate_add_table"></table> | 40 | <table id="checkTemplate_add_table"></table> |
| 41 | </div> | 41 | </div> |
| 42 | </form> | 42 | </form> |
-
Please register or login to post a comment