diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html index 59cc538..724bf72 100644 --- a/web/pages/modeltable.html +++ b/web/pages/modeltable.html @@ -135,7 +135,7 @@ {{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(items, function(indexss, itemss) { }} - {{itemss}} + {{itemss}} {{# }); }} {{# }); }} @@ -175,7 +175,7 @@ {{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(items, function(indexss, itemss){ }} - {{itemss}} + {{itemss}} {{# }); }} {{# }); }} diff --git a/web/srczip/logic/datacheck.js b/web/srczip/logic/datacheck.js index 7d3eee2..3fde845 100644 --- a/web/srczip/logic/datacheck.js +++ b/web/srczip/logic/datacheck.js @@ -104,11 +104,25 @@ $(document).off('click','.condition-input').on('blur','.condition-input',function(){ var index = $(this).attr('data-index'); + if(conditionarr[index] == undefined){ + var arr = { + 'conditionname':'', + 'v':'' + } + conditionarr.push(arr); + } conditionarr[index]['conditionname'] = $(this).val(); }); $(document).off('click','.condition-v-input').on('blur','.condition-v-input',function(){ var index = $(this).attr('data-index'); + if(conditionarr[index] == undefined){ + var arr = { + 'conditionname':'', + 'v':'' + } + conditionarr.push(arr); + } conditionarr[index]['v'] = $(this).val(); }); diff --git a/web/static/css/projectadmin.css b/web/static/css/projectadmin.css index 1ed7427..c53547d 100644 --- a/web/static/css/projectadmin.css +++ b/web/static/css/projectadmin.css @@ -276,7 +276,7 @@ .datarights-box { background-color: #fff; width: 100%; height: 100%; border-radius: 2px; } .datarights-top-box { height: 64px; display: flex; align-items: center; justify-content: space-between; padding: 0 24px; border-bottom: 1px solid #f0f0f0; } .datarights-tit-box { font-size: 16px; font-weight: 500; color: #202d3f; } -.datarights-tit-box img { margin-left: 8px; } +.datarights-tit-box img { margin-left: 8px; cursor: pointer;} .datarights-add-box { cursor: pointer; padding: 0 8px; background-color: #3d90ff; color: #fff; height: 32px; font-weight: 400; font-size: 14px; line-height: 30px; border-radius: 2px; } .datarights-tab-box { padding: 24px; } @@ -358,3 +358,11 @@ .updatapassword-qx { color: #42546d; border: 1px solid #f0f0f0; } .updatapassword-qd { background-color: #3d90ff; color: #fff; } +/* 操作记录 */ +.operation-box { background-color: #fff; width: 100%; height: 100%; border-radius: 2px; } +.operation-top-box { height: 64px; display: flex; align-items: center; justify-content: space-between; padding: 0 24px; border-bottom: 1px solid #f0f0f0; } +.operation-tit-box { font-size: 16px; font-weight: 500; color: #202d3f; } +.operation-tit-box img { margin-left: 8px; cursor: pointer;} +.operation-list-box { padding: 24px; } +.operation-list-box p { margin-top: 16px; color: #666; font-size: 14px; } +.operation-list-box p span { color: red; } diff --git a/web/static/css/style.css b/web/static/css/style.css index e9e44ef..0e9bc2e 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -852,6 +852,9 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; } .table-view .table th, .table-view .table td { white-space: nowrap; text-align: center; + overflow: hidden; + text-overflow: ellipsis; + cursor: pointer; } .table-view .table tbody tr td:hover{