diff --git a/src/main/resources/static/js/basis/tools/testStandardsList.js b/src/main/resources/static/js/basis/tools/testStandardsList.js
index bdbba30..b933584 100644
--- a/src/main/resources/static/js/basis/tools/testStandardsList.js
+++ b/src/main/resources/static/js/basis/tools/testStandardsList.js
@@ -72,7 +72,7 @@ function initTable(dataList, limit, page) {
let html = '';
let del=""
let edit="";
- let search="";
+ let search="";
html=search+edit+del;
return html;
}
@@ -136,7 +136,7 @@ function reloadData() {
pages(pageNum, limitSize);
}
-// 新增/修改平台用户
+// 试验标准新增、修改
function addData(id) {
let title = '新增试验标准'
if (id) {
@@ -145,7 +145,15 @@ function addData(id) {
let param = {
'id': id
}
- openIframe2("addOrEditTestStandards", title, "child/addTestStandards.html", '1000px', '625px', param);
+ openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '1000px', '625px', param);
+}
+
+// 查看试验标准
+function checkData(id) {
+ let param = {
+ 'id': id
+ }
+ openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '1000px', '625px', param);
}
/*删除用户*/
diff --git a/src/main/resources/static/js/openIframe.js b/src/main/resources/static/js/openIframe.js
index ed79813..cbb283c 100644
--- a/src/main/resources/static/js/openIframe.js
+++ b/src/main/resources/static/js/openIframe.js
@@ -126,4 +126,33 @@ function openIframe6(id, title, content, width, height, params) {
iframeWin.setParams(JSON.stringify(params));
},
});
+}
+
+
+
+/*新增页面*/
+function openIframeMax(id, title, content, width, height, params) {
+ let layerIndex = layer.open({
+ id: id,
+ type: 2,
+ title: ['' + title + '
', 'font-size:16px;background-color:#f0f0f0;display: flex;align-items: center;'],
+ content: content,
+ shade: 0.3,
+ shadeClose: false,
+ area: [width, height],
+ maxmin: true,
+ move: false,
+ success: function () {
+ let iframeWin = window["layui-layer-iframe" + layerIndex];
+ console.log(params)
+ iframeWin.setParams(JSON.stringify(params));
+ },
+ cancel:function () {
+ // 视频监控-历史回放关闭前回调
+ if(params.videoMonitor){
+ let iframeWin = window["layui-layer-iframe" + layerIndex];
+ iframeWin.clickLogout();
+ }
+ }
+ });
}
\ No newline at end of file
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 82e2bb9..3d11979 100644
--- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
@@ -13,7 +13,7 @@
- 用户-新增/修改
+ 试验标准新增、修改
+
+
+
+
+
+
+
+
+
+
+