diff --git a/src/main/resources/static/js/basis/standard/child/testForm.js b/src/main/resources/static/js/basis/standard/child/testForm.js index 26bec80..e5826ce 100644 --- a/src/main/resources/static/js/basis/standard/child/testForm.js +++ b/src/main/resources/static/js/basis/standard/child/testForm.js @@ -800,7 +800,7 @@ function generateRows(data,sampleDeviceVos){ - + `; // 遍历itemList的长度,而不是itemList本身,以匹配表头的列数 diff --git a/src/main/resources/static/js/basis/standard/child/testList.js b/src/main/resources/static/js/basis/standard/child/testList.js index 46d0d18..acec85d 100644 --- a/src/main/resources/static/js/basis/standard/child/testList.js +++ b/src/main/resources/static/js/basis/standard/child/testList.js @@ -180,7 +180,7 @@ var devOpenIndex=''; function getMouseover(data){ // console.log(data) // openIframeTable(data) - var html = '' + + var html = '
' + '' + '' + '' + @@ -195,7 +195,7 @@ function getMouseover(data){ html += '' + '' + '' + - '' + + '' + ''; } }else{ @@ -209,7 +209,7 @@ function getMouseover(data){ devOpenIndex = layer.open({ type: 0, title: '设备信息', - area: ['300px', '300px'], + area: ['400px', '500px'], content: html, btn: ['关闭'], yes: function (index, layero) { diff --git a/src/main/resources/static/js/basis/standard/testManagementList.js b/src/main/resources/static/js/basis/standard/testManagementList.js index 324ed53..2970c5f 100644 --- a/src/main/resources/static/js/basis/standard/testManagementList.js +++ b/src/main/resources/static/js/basis/standard/testManagementList.js @@ -133,7 +133,7 @@ function initTable(dataList, limit, page) { var customNum = d.customNum var edit = buttonTest(id,customNum, "sys:experimentalTest:query", pers); return edit; - //return ''; + } }, ], @@ -260,8 +260,7 @@ function buttonTest(id,customNum, permission, pers){ return ""; } } - //return ''; - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } function testClick(id,customNum) { diff --git a/src/main/resources/static/js/basis/tools/testStandardsList.js b/src/main/resources/static/js/basis/tools/testStandardsList.js index b073b60..c94af29 100644 --- a/src/main/resources/static/js/basis/tools/testStandardsList.js +++ b/src/main/resources/static/js/basis/tools/testStandardsList.js @@ -136,7 +136,7 @@ function buttonEdit(id, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } function addData(id) { @@ -158,7 +158,7 @@ function buttonSearch(id, permission, pers){ } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } function checkData(id) { @@ -176,7 +176,7 @@ function buttonDel(id, permission, pers){ return ""; } } - var btn = $(""); + var btn = $(""); return btn.prop("outerHTML"); } diff --git a/src/main/resources/static/pages/basic/standard/child/testForm.html b/src/main/resources/static/pages/basic/standard/child/testForm.html index b1c2c86..7f12f1b 100644 --- a/src/main/resources/static/pages/basic/standard/child/testForm.html +++ b/src/main/resources/static/pages/basic/standard/child/testForm.html @@ -192,8 +192,8 @@
- - + +
diff --git a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html index 20381d0..cdc0bf3 100644 --- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html +++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html @@ -6,6 +6,8 @@ + +
序号
' + (i+1) + '' + data[i].devCode + '' + data[i].testResult + '' + data[i].testResult + '