From da7a92ab6c80e6d16781d1aab18c6affea3f1d7d Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 23 Jul 2024 09:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/basis/standard/child/testForm.js | 566 ++++++++++++++++++
.../js/basis/standard/child/testList.js | 59 +-
.../js/basis/standard/testManagementList.js | 4 +-
.../js/basis/tools/child/addTestStandards.js | 1 -
.../js/basis/tools/testStandardsList.js | 4 +-
src/main/resources/static/js/openIframe.js | 2 +-
.../pages/basic/standard/child/testForm.html | 177 ++++++
.../basic/tools/child/addTestStandards.html | 114 ++--
8 files changed, 851 insertions(+), 76 deletions(-)
create mode 100644 src/main/resources/static/js/basis/standard/child/testForm.js
create mode 100644 src/main/resources/static/pages/basic/standard/child/testForm.html
diff --git a/src/main/resources/static/js/basis/standard/child/testForm.js b/src/main/resources/static/js/basis/standard/child/testForm.js
new file mode 100644
index 0000000..8cfd5c1
--- /dev/null
+++ b/src/main/resources/static/js/basis/standard/child/testForm.js
@@ -0,0 +1,566 @@
+let form, layer, dtree, util, idParam,devTypeCodeParam, phoneParam, selectInput, laydate, table;
+let arr = ['background', 'web', 'mobile', 'wx'];
+let background, web, mobile, wx;
+let data = [], appResList = [];
+// 角色下拉选
+let roleList;
+let orgData;
+
+var cols = []; // 初始化为空,因为我们将动态构建表头
+function setParams(params) {
+ idParam = JSON.parse(params).id;
+ devTypeCodeParam = JSON.parse(params).devTypeCode;
+ layui.config({
+ base: "../../../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径
+ }).extend({
+ dtree: 'dtree',
+ selectInput: 'selectInput/selectInput'
+ }).use(['form', 'layer', 'dtree', 'util', 'selectInput', 'laydate', 'table'], function () {
+ layer = layui.layer;
+ laydate = layui.laydate;
+ form = layui.form;
+ util = layui.util;
+ dtree = layui.dtree;
+ selectInput = layui.selectInput;
+ table = layui.table;
+
+ laydate.render({
+ elem: '#devContractDate'
+ });
+
+ if (idParam) {
+ getTestById();
+ }
+
+ //设备类别
+ getDicts("dev_code",'devTypeName',"","设备类别",30);
+
+ //试验地点
+ getDicts("sy_local",'experLocal',"","试验地点",30);
+
+ //试验设备列表
+ getDevList("devName-1" ,"","试验设备列表",30);
+
+ //设备名称
+ getDevList("experDevName" ,"","设备名称",30);
+
+ //试验依据
+ getDicts("sy_basis",'basisName-1',"","试验依据",30);
+
+ form.on('submit(formData)', function (data) {
+ saveData(data);
+ });
+
+ });
+}
+
+function getDicts(code,id,value,name,maxlength){
+ let url = dataUrl + '/sys/select/getDicts';
+ let obj = {
+ 'code':code
+ }
+ let params = {
+ encryptedData: encryptCBC(JSON.stringify(obj))
+ }
+
+ ajaxRequest(url, "POST", params, false, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ getSelect(result.data, id,value,name,maxlength);
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
+ });
+}
+
+//试验设备列表
+function getDevList(id,value,name,maxlength) {
+ let url = dataUrl + '/sys/select/getDevices';
+ ajaxRequest(url, "POST", null, false, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ let formattedData = result.data.map(({devName, devId}) => ({name: devName, value: devId}));
+ getSelect(formattedData, id,value,name,maxlength);
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
+ });
+}
+
+//新增标题
+function titleAdd() {
+ // 获取当前已有的'dev'类元素
+ var devElems = document.querySelectorAll('.info');
+ var count = devElems.length +1 ;
+
+ // 创建新的div元素
+ var newDiv = document.createElement('div');
+ newDiv.className = 'info';
+ newDiv.style.marginTop = '2%';
+ newDiv.style.display='flex';
+ newDiv.style.flexDirection='column';
+ newDiv.style.border='1px solid #ccc';
+ newDiv.innerHTML = `
+
+
+
+
+
+
+
+
+
+ `;
+ // 将新div插入到现有'dev'元素之后
+ var parent = devElems[count - 2].parentNode;
+ parent.insertBefore(newDiv, parent.querySelector('.btn-box'));
+}
+
+//删除标题
+function titleDel() {
+ // 获取所有的'dev'类元素
+ var devElems = document.querySelectorAll('.info');
+ var count = devElems.length;
+
+ // 检查是否至少保留一个'dev'元素
+ if (count > 1) {
+ // 删除最后一个'dev'元素
+ devElems[count - 1].remove();
+ } else {
+ layer.msg('至少保留一个试验设备信息');
+ }
+}
+
+
+//新增子标题
+function itemNameAdd(num) {
+ // 获取包含 input 元素的 div
+ var divElement = document.querySelector('.subtitle-'+num);
+ // 获取所有 input 元素
+ var inputs = divElement.querySelectorAll('input');
+ // 初始化最大 id 为0
+ var maxId = 0;
+ // 遍历所有 input 元素,找出最大的 id
+ inputs.forEach(function(input) {
+ var idParts = input.id.split('-');
+ if (idParts[0] === 'itemName' && !isNaN(idParts[1])) {
+ var idNum = parseInt(idParts[2], 10);
+ if (idNum > maxId) {
+ maxId = idNum;
+ }
+ }
+ });
+ // 创建一个新的 input 元素,id为下一个数字
+ var newInput = document.createElement('input');
+ newInput.type = 'text';
+ newInput.setAttribute('lay-verify', 'required');
+ newInput.className = 'layui-input-dev';
+ newInput.placeholder = '请输入名称';
+ newInput.id = 'itemName-'+num+'-' + (maxId + 1);
+ newInput.name = 'itemName-'+num+'-' + (maxId + 1);
+
+ // 将新的 input 元素追加到 div 中
+ divElement.appendChild(newInput);
+}
+
+//删除子标题
+function itemNameDel(num) {
+ // 获取包含 input 元素的 div
+ var divElement = document.querySelector('.subtitle-'+num);
+ // 获取所有的 input 元素
+ var inputs = divElement.querySelectorAll('input');
+ // 检查是否有超过一个 input 元素
+ if (inputs.length > 1) {
+ // 获取最后一个 input 元素
+ var lastInput = inputs[inputs.length - 1];
+ // 删除最后一个 input 元素
+ divElement.removeChild(lastInput);
+ }else{
+ layer.msg('至少保留一个子标题');
+ }
+}
+
+//新增试验设备列表
+function devAdd() {
+ // 获取当前已有的'dev'类元素
+ var devElems = document.querySelectorAll('.dev');
+ var count = devElems.length +1 ;
+
+ // 创建新的div元素
+ var newDiv = document.createElement('div');
+ newDiv.className = 'layui-inline dev';
+ newDiv.innerHTML = `
+
+
+
+ `;
+ // 将新div插入到现有'dev'元素之后
+ var parent = devElems[count - 2].parentNode;
+ parent.insertBefore(newDiv, parent.querySelector('.btn-box'));
+
+ getDevList("devName-"+count,"","试验设备列表",30);
+}
+
+//删除试验设备列表
+function devDel() {
+ // 获取所有的'dev'类元素
+ var devElems = document.querySelectorAll('.dev');
+ var count = devElems.length;
+
+ // 检查是否至少保留一个'dev'元素
+ if (count > 1) {
+ // 删除最后一个'dev'元素
+ devElems[count - 1].remove();
+ } else {
+ layer.msg('至少保留一个试验设备信息');
+ }
+}
+
+//新增试验依据
+function basisAdd() {
+ // 获取当前已有的类元素
+ var devElems = document.querySelectorAll('.basis');
+ var count = devElems.length+1;
+
+ // 创建新的div元素
+ var newDiv = document.createElement('div');
+ newDiv.className = 'layui-inline basis';
+ newDiv.innerHTML = `
+
+
+
+ `;
+ // 将新div插入到现有元素之后
+ var parent = devElems[count - 2].parentNode;
+ parent.insertBefore(newDiv, parent.querySelector('.btn-box'));
+ getDicts("sy_basis","basisName-" + count,"","试验依据",30);
+}
+
+//删除试验依据
+function basisDel() {
+ // 获取所有类元素
+ var devElems = document.querySelectorAll('.basis');
+ var count = devElems.length;
+
+ if (count > 1) {
+ // 删除最后一个
+ devElems[count - 1].remove();
+ } else {
+ layer.msg('至少保留一个试验依据');
+ }
+}
+
+function saveData2() {
+ $('#formSubmit').trigger('click')
+}
+
+function saveData(data) {
+ //获取试验设备列表
+ var devList = convertToDevList(data.field);
+
+ //试验依据列表
+ var yjList = convertToYjList(data.field);
+
+ //主要设备
+ var mainDevList = [{
+ "devTypeCode": "",
+ "devTypeName": "",
+ "experDevName": data.field["experDevName"],
+ "experDevModule": data.field["experDevModule"],
+ "experDevCode": data.field["experDevCode"],
+ "devContractDate": data.field["devContractDate"],
+ "experId": null
+ }];
+
+ //获取试验项内容列表
+ var items = convertToItems(data.field);
+
+ var ins = selectInput.getInstance("#devTypeName");
+
+ let paramsData = {
+ 'yjList':yjList,
+ 'devList':devList,
+ 'mainDevList':mainDevList,
+ 'items':items,
+ }
+ let obj = {
+ 'id': data.field["id"],
+ 'devTypeCode': ins.getValue(),
+ 'devTypeName': data.field["devTypeName"],
+ 'devModule': data.field["devModule"],
+ 'experLocalCode':'',
+ 'experLocal': data.field["experLocal"],
+ 'paramsData':paramsData
+ }
+
+
+ let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
+ let url = dataUrl + "/experimentStandard/addData";
+ let params = obj;
+
+ if(params.id !=""){
+ url = dataUrl + "/experimentStandard/editData";
+ }
+ params={
+ encryptedData:encryptCBC(JSON.stringify(params))
+ }
+ ajaxRequest(url, "POST", params, true, function () {
+ $('.save').addClass("layui-btn-disabled").attr("disabled", true);
+ $('.cancel').addClass("layui-btn-disabled").attr("disabled", true);
+ }, function (result) {
+ layer.close(loadingMsg); // 关闭提示层
+ if (result.code === 200) {
+ closePage(1);
+ parent.layer.msg(result.msg, {icon: 1});
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }, function (xhr) {
+ layer.close(loadingMsg); // 关闭提示层
+ $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+ error(xhr)
+ });
+}
+
+function convertToDevList(obj){
+ return Object.entries(obj)
+ .filter(([key, value]) => key.startsWith('devName-'))
+ .map(([key, value]) => ({
+ devTypeCode: "",
+ devTypeName: "", // 如果需要,可以在这里使用 key 或 value
+ devName: value,
+ devId: null
+ }));
+}
+
+function convertToYjList(obj){
+ return Object.entries(obj)
+ .filter(([key, value]) => key.startsWith('basisName-'))
+ .map(([key, value]) => ({
+ basisName: value,
+ }));
+}
+
+function convertToItems(obj){
+ var dataField = obj;
+ var items = [];
+ // 先收集所有的 experTypeName 键名,以便知道有多少个试验项
+ var experTypeNames = Object.keys(dataField).filter(key => key.startsWith('experTypeName-'));
+ var experTypeCount = experTypeNames.length;
+
+ // 预创建试验项对象,先不填充数据
+ for (let i = 0; i < experTypeCount; i++) {
+ items.push({
+ "experTypeCode": "",
+ "experTypeName": "",
+ "experNum": 0, // 将会在后面设置
+ "itemsSort": i + 1,
+ "amount": "",
+ "item": []
+ });
+ }
+
+ // 填充数据
+ experTypeNames.forEach(key => {
+ const experTypeIndex = key.split('-')[1];
+ const item = items[experTypeIndex - 1];
+ item.experTypeName = dataField[key];
+ item.amount = dataField['amount-' + experTypeIndex];
+ });
+
+ // 填充 itemName 数据
+ Object.keys(dataField).forEach(key => {
+ if (key.startsWith('itemName-')) {
+ const parts = key.split('-');
+ const experTypeIndex = parts[1];
+ const itemIndex = parts[2];
+ const itemNum = parseInt(itemIndex);
+ const itemName = dataField[key];
+
+ // 找到对应的试验项并添加试验项内容
+ items[experTypeIndex - 1].item.push({
+ "itemName": itemName,
+ "itemNum": itemNum
+ });
+ }
+ });
+
+ // 设置 experNum 为 item 数组的长度
+ items.forEach(item => {
+ item.experNum = item.item.length;
+ });
+ // 按照 itemsSort 排序
+ items.sort((a, b) => a.itemsSort - b.itemsSort);
+ return items;
+}
+
+function getTestById() {
+ let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+ let url = dataUrl + "/experimental/getTestBasicInfo";
+ let params = {
+ id: idParam,
+ devTypeCode:devTypeCodeParam
+ }
+ params={
+ encryptedData:encryptCBC(JSON.stringify(params))
+ }
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ layer.close(loadingMsg); // 关闭提示层
+ if (result.code === 200) {
+ console.log("试验form=" + result.data)
+ setFormData(result.data);
+ } else if (result.code === 500) {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ layer.close(loadingMsg); // 关闭提示层
+ error(xhr)
+ });
+}
+
+
+function setFormData(data) {
+ if (data) {
+ $('#id').val(data.id);
+ //设备类别
+ getDicts("dev_code",'devTypeName',data.devTypeName,"设备类别",30);
+
+ //设备规格
+ $('#devModule').val(data.devModule)
+
+ //试验地点
+ getDicts("sy_local",'experLocal',data.experLocal,"试验地点",30);
+
+ //试验设备列表
+ for (let i = 0; i < data.deviceVos.length; i++) {
+ var k = i+1;
+ if(k>1){
+ devAdd()
+ }
+ getDevList("devName-"+k ,data.deviceVos[i].devName,"试验设备列表",30);
+ }
+
+ //设备名称
+ getDevList("experDevName" ,data.mainDeviceVos[0].experDevName,"设备名称",30);
+
+ //设备型号
+ $('#experDevModule').val(data.mainDeviceVos[0].experDevModule)
+ //设备编号
+ $('#experDevCode').val(data.mainDeviceVos[0].experDevCode)
+ //合同生效日期
+ $('#devContractDate').val(data.mainDeviceVos[0].devContractDate)
+
+ //试验依据
+ for (let i = 0; i < data.basisVos.length; i++) {
+ var k = i+1;
+ if(k>1){
+ basisAdd()
+ }
+ getDicts("sy_basis",'basisName-'+k,data.basisVos[i].basisName,"试验依据",30);
+ }
+
+ //试验项信息
+ console.log(data);
+ console.log(data.configItemsVos);
+ for (let i = 0; i < data.configItemsVos.length; i++) {
+ var k = i+1;
+ //标题大于1
+ if(k>1){
+ // 新增一个标题
+ titleAdd();
+ }else{
+
+ }
+
+ // 循环判断子标题
+ for (let j = 0; j < data.configItemsVos[i].itemList.length; j++){
+ var kk = j+1;
+ //子标题大于1
+ if(kk>1){
+ //新增一个子标题
+ itemNameAdd(k);
+ }
+ }
+
+ }
+
+ // 赋值
+
+ data.configItemsVos.forEach((item, index) => {
+ const experTypeNameInput = document.getElementById(`experTypeName-${index + 1}`);
+ const amountInput = document.getElementById(`amount-${index + 1}`);
+ const subtitleContainer = document.querySelector(`.subtitle-${index + 1}`);
+
+ // 设置主标题和金额输入框的值
+ experTypeNameInput.value = item.experTypeName;
+ amountInput.value = item.amount;
+
+ // 清空现有的子标题输入框
+ while (subtitleContainer.firstChild) {
+ subtitleContainer.removeChild(subtitleContainer.firstChild);
+ }
+
+ // 添加子标题输入框
+ item.itemList.forEach((subItem, subIndex) => {
+ const inputElement = document.createElement('input');
+ inputElement.type = 'text';
+ inputElement.classList.add('layui-input-dev');
+ inputElement.setAttribute('lay-verify', 'required');
+ inputElement.setAttribute('placeholder', '请输入名称');
+ inputElement.setAttribute('name', `itemName-${index + 1}-${subIndex + 1}`);
+ inputElement.id = `itemName-${index + 1}-${subIndex + 1}`;
+ inputElement.value = subItem.itemName;
+ subtitleContainer.appendChild(inputElement);
+ });
+ });
+
+ // if(data.configItemsVos.length>1){
+ // for (let i = 0; i < data.configItemsVos.length; i++) {
+ //
+ // }
+ // }else{
+ // if(data.configItemsVos[0].itemList.length>2){
+ // for (let i = 0; i < data.configItemsVos[0].itemList.length; i++){
+ // var divElement = document.querySelector('.subtitle-1');
+ // // 创建一个新的 input 元素,id为下一个数字
+ // var newInput = document.createElement('input');
+ // newInput.type = 'text';
+ // newInput.setAttribute('lay-verify', 'required');
+ // newInput.className = 'layui-input-dev';
+ // newInput.placeholder = '请输入名称';
+ // newInput.vlue = data.configItemsVos[0].itemList[i].itemName;
+ // newInput.id = 'itemName-1'+'-' + (3 + i);
+ // newInput.name = 'itemName-1'+'-' + (3 + i);
+ // // 将新的 input 元素追加到 div 中
+ // divElement.appendChild(newInput);
+ // }
+ // }else{
+ // for(let i = 0; i < data.configItemsVos[0].itemList.length; i++){
+ //
+ // }
+ // // $('#itemName-1-1').val(data.items[0].item.)
+ // // $('#itemName-1-2').val(data.items[0].item.devContractDate)
+ // }
+ // }
+
+
+ layui.form.render();
+ }
+}
+
+// 关闭页面
+function closePage(type) {
+ let index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ if (type === 1) {
+ parent.reloadData()
+ }
+}
\ No newline at end of file
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 447ca85..164afc6 100644
--- a/src/main/resources/static/js/basis/standard/child/testList.js
+++ b/src/main/resources/static/js/basis/standard/child/testList.js
@@ -1,13 +1,18 @@
-let form, layer, table, tableIns;
+let form, layer, table, tableIns,idParam;
let pageNum = 1, limitSize = 10; // 默认第一页,分页数量为10
-layui.use(['form', 'layer', 'table', 'laydate'], function () {
- form = layui.form;
- layer = layui.layer;
- table = layui.table;
- layui.form.render();
- getDevSelected();
- pages(1, 10, 1);
-})
+
+function setParams(params) {
+ idParam = JSON.parse(params).id;
+ layui.use(['form', 'layer', 'table', 'laydate'], function () {
+ form = layui.form;
+ layer = layui.layer;
+ table = layui.table;
+ layui.form.render();
+ getDevSelected();
+ pages(1, 10, 1);
+ })
+}
+
function pages(pageNum, pageSize, typeNum) {
let params = getReqParams(pageNum, pageSize, typeNum);
@@ -72,14 +77,14 @@ function initTable(dataList, limit, page) {
{title: "原始记录", unresize: true, width: 300, align: "center",
templet: function (d) {
var html = '';
- if (d.status == "待提交" || d.status == "审阅不通过" || d.status == "审核不通过" || d.status == "审批不通过") {
- let search="查看";
- let edit="编制";
+ let search="查看";
+ if (d.status == "待试验" || d.status == "待提交" || d.status == "审阅不通过" || d.status == "审核不通过" || d.status == "审批不通过") {
+ let edit="编制";
html=search+edit;
- return html;
} else {
-
+ html=search;
}
+ return html;
}
},
],
@@ -96,26 +101,24 @@ function initTable(dataList, limit, page) {
// 获取参数
function getReqParams(page, limit, type) {
+ console.log(idParam)
let obj = {};
if (!type) {
obj = {
page: page + "",
limit: limit + "",
devTypeCode: $('#devId').val(),
- keyWord: $('#keyWord').val(),
- sampleUserName: $('#sampleUserName').val(),
- sampleDate: $('#sampleDate').val(),
+ id: idParam
};
} else {
obj = {
page: '1',
limit: '10',
devTypeCode: '',
- keyWord: '',
- sampleUserName: '',
- sampleDate: '',
+ id: idParam
};
}
+ console.log(obj)
obj={
encryptedData:encryptCBC(JSON.stringify(obj))
}
@@ -132,13 +135,17 @@ function reloadData() {
pages(pageNum, limitSize);
}
-// 试验标准新增、修改
-function testClick(id) {
- let title = '试验'
- let param = {
- 'id': id
+// 试验新增、修改
+function addData(id,devTypeCode) {
+ let title = '新增试验'
+ if (id) {
+ title = '修改试验';
}
- openIframeMax("testList", title, "child/addTestStandards.html", '1000px', '625px', param);
+ let param = {
+ 'id': id,
+ 'devTypeCode':devTypeCode
+ }
+ openIframeMax("testForm", title, "testForm.html", '80%', '100%', param);
}
function getDevSelected() {
diff --git a/src/main/resources/static/js/basis/standard/testManagementList.js b/src/main/resources/static/js/basis/standard/testManagementList.js
index 2aed92a..4093de5 100644
--- a/src/main/resources/static/js/basis/standard/testManagementList.js
+++ b/src/main/resources/static/js/basis/standard/testManagementList.js
@@ -105,7 +105,7 @@ function initTable(dataList, limit, page) {
},
{title: "操作", unresize: true, width: 300, align: "center",
templet: function (d) {
- return '试验';
+ return '试验';
}
},
],
@@ -164,7 +164,7 @@ function testClick(id) {
let param = {
'id': id
}
- openIframeMax("testList", title, "child/testList.html", '1000px', '625px', param);
+ openIframeMax("testList", title, "child/testList.html", '100%', '100%', param);
}
function getDevSelected() {
diff --git a/src/main/resources/static/js/basis/tools/child/addTestStandards.js b/src/main/resources/static/js/basis/tools/child/addTestStandards.js
index 406263c..869b962 100644
--- a/src/main/resources/static/js/basis/tools/child/addTestStandards.js
+++ b/src/main/resources/static/js/basis/tools/child/addTestStandards.js
@@ -193,7 +193,6 @@ function devAdd() {
var newDiv = document.createElement('div');
newDiv.className = 'layui-inline dev';
newDiv.innerHTML = `
-
`;
diff --git a/src/main/resources/static/js/basis/tools/testStandardsList.js b/src/main/resources/static/js/basis/tools/testStandardsList.js
index 2a8b2ba..7396724 100644
--- a/src/main/resources/static/js/basis/tools/testStandardsList.js
+++ b/src/main/resources/static/js/basis/tools/testStandardsList.js
@@ -130,7 +130,7 @@ function addData(id) {
let param = {
'id': id
}
- openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '1000px', '625px', param);
+ openIframeMax("addOrEditTestStandards", title, "child/addTestStandards.html", '80%', '100%', param);
}
// 查看试验标准
@@ -138,7 +138,7 @@ function checkData(id) {
let param = {
'id': id
}
- openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '1000px', '625px', param);
+ openIframeMax("addOrEditTestStandards", "查看试验标准", "child/checkTestStandards.html", '80%', '80%', param);
}
/*删除用户*/
diff --git a/src/main/resources/static/js/openIframe.js b/src/main/resources/static/js/openIframe.js
index f21bc12..9293e22 100644
--- a/src/main/resources/static/js/openIframe.js
+++ b/src/main/resources/static/js/openIframe.js
@@ -155,7 +155,7 @@ function openIframeMax(id, title, content, width, height, params) {
}
}
});
- console.log(layer)
+ // console.log(layer)
// layer.max(layerIndex)
// 弹窗打开后立即调用 layer.full
diff --git a/src/main/resources/static/pages/basic/standard/child/testForm.html b/src/main/resources/static/pages/basic/standard/child/testForm.html
new file mode 100644
index 0000000..c57d190
--- /dev/null
+++ b/src/main/resources/static/pages/basic/standard/child/testForm.html
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 试验新增、修改
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 3d11979..ec4e957 100644
--- a/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
+++ b/src/main/resources/static/pages/basic/tools/child/addTestStandards.html
@@ -31,81 +31,107 @@
padding: 3px 6px;
letter-spacing: 1px;
}
+
+ .layui-form-item .layui-input-inline{
+ width: 340px;
+ }