From af6281c665d225a428ac1e5a4535eddd3b26d7d7 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Fri, 26 Jul 2024 09:35:59 +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

---
 .../resources/static/js/basis/standard/child/testForm.js    | 2 +-
 .../resources/static/js/basis/standard/child/testList.js    | 6 +++---
 .../static/js/basis/standard/testManagementList.js          | 5 ++---
 .../resources/static/js/basis/tools/testStandardsList.js    | 6 +++---
 .../static/pages/basic/standard/child/testForm.html         | 4 ++--
 .../static/pages/basic/tools/child/addTestStandards.html    | 2 ++
 6 files changed, 13 insertions(+), 12 deletions(-)

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){
                 <td class="table-cell-wide"><input id="manufactureDate-${idCounter}" lay-verify="required" class="layui-input" name="manufactureDate-${idCounter}" readonly /></td>
                 <td class="table-cell-wide"><input maxlength="30" id="devModule-${idCounter}" lay-verify="required" class="layui-input" name="devModule-${idCounter}" /></td>
                 <td class="table-cell-wide"><input maxlength="30" id="devStatus-${idCounter}" lay-verify="required" class="layui-input" name="devStatus-${idCounter}" /></td>
-                <td class="table-cell-wide"><input maxlength="6" id="amounts-${idCounter}" type="text" lay-affix="number" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\\..*)\\./g, '$1')" min="0" lay-verify="required" class="layui-input" name="amounts-${idCounter}" /></td>
+                <td class="table-cell-wide"><input maxlength="6" id="amounts-${idCounter}" type="text" lay-affix="number" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\\..*)\\./g, '$1')" min="0" value="0.00" lay-verify="required" class="layui-input" name="amounts-${idCounter}" /></td>
                 <td class="table-cell-wide"><input maxlength="60" id="remarks-${idCounter}" lay-verify="required" class="layui-input" name="remarks-${idCounter}" /></td>
             `;
         // 遍历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 = '<table class="layui-table" lay-skin="line" lay-size="sm" style="width: 100%;">' +
+    var html = '<table class="classTable" lay-skin="line" lay-size="sm" style="width: 100%;">' +
         '<thead>' +
         '<tr>' +
         '<th>序号</th>' +
@@ -195,7 +195,7 @@ function getMouseover(data){
             html += '<tr>' +
                 '<td>' + (i+1) + '</td>' +
                 '<td title="'+ data[i].devCode +'" style="cursor: pointer;" >' + data[i].devCode + '</td>' +
-                '<td title="'+ data[i].testResult +'" style="cursor: pointer;">' + data[i].testResult + '</td>' +
+                '<td title="' + data[i].testResult + '" style="cursor: pointer;color:'+(data[i].testResult.indexOf('不合格')>-1 ? '#F39268' : '#2A6EDF')+'">' + data[i].testResult + '</td>' +
                 '</tr>';
         }
     }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 '<a href="#" class="layui-icon layui-icon-set-sm" style="color: blue;cursor:pointer;" title="试验" onclick="testClick(\'' + d.id + '\',\''+d.customNum+'\')"></a>';
+
                     }
                 },
             ],
@@ -260,8 +260,7 @@ function buttonTest(id,customNum, permission, pers){
             return "";
         }
     }
-    //return '<a href="#" class="layui-icon layui-icon-set-sm" style="color: blue;cursor:pointer;" title="试验" onclick="testClick(\'' + d.id + '\',\''+d.customNum+'\')"></a>';
-    var btn = $("<button class='layui-btn layui-btn-xs' title='试验' onclick='testClick(\"" + id +"\",\"" + customNum +"\")'><i class='layui-icon layui-icon-set-sm'></i></button>");
+    var btn = $("<a class='layui-icon layui-icon-set-sm' title='试验' onclick='testClick(\"" + id +"\",\"" + customNum +"\")'></a>");
     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 = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='addData(\"" + id +"\")'><i class='layui-icon layui-icon-edit'></i></button>");
+    var btn = $("<a class='layui-icon layui-icon-edit' title='编辑' onclick='addData(\"" + id +"\")'></a>");
     return btn.prop("outerHTML");
 }
 function addData(id) {
@@ -158,7 +158,7 @@ function buttonSearch(id, permission, pers){
         }
     }
 
-    var btn = $("<button class='layui-btn layui-btn-xs' title='查看' onclick='checkData(\"" + id +"\")'><i class='layui-icon layui-icon-search'></i></button>");
+    var btn = $("<a class='layui-icon layui-icon-search' title='查看' onclick='checkData(\"" + id +"\")'></a>");
     return btn.prop("outerHTML");
 }
 function checkData(id) {
@@ -176,7 +176,7 @@ function buttonDel(id, permission, pers){
             return "";
         }
     }
-    var btn = $("<button class='layui-btn layui-btn-xs' title='编辑' onclick='delData(\""+id+"\")'><i class='layui-icon layui-icon-delete'></i></button>");
+    var btn = $("<a class='layui-icon layui-icon-delete' title='编辑' onclick='delData(\""+id+"\")'></a>");
     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 @@
                 </div>
             </div>
             <div class="btn-box">
-                <button class="layui-btn layui-btn-norma save" onclick="basisAdd()">新增试验依据</button>
-                <button class="layui-btn layui-btn-primary cancel" onclick="basisDel()">删除试验依据</button>
+                <button class="layui-btn layui-btn-norma save" onclick="basisAdd()">+</button>
+                <button class="layui-btn layui-btn-primary cancel" onclick="basisDel()">-</button>
             </div>
         </div>
 
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 @@
     <link rel="stylesheet" href="../../../../js/layui-v2.6.8/dtree/dtree.css">
     <link rel="stylesheet" href="../../../../js/layui-v2.6.8/dtree/font/dtreefont.css">
     <link rel="stylesheet" href="../../../../css/dataForm.css">
+    <link rel="stylesheet" href="../../../../css/font.css">
+    <link rel="stylesheet" href="../../../../css/basis/originalRecord.css">
     <script src="../../../../js/libs/jquery-2.1.1.min.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../../../js/layui-v2.6.8/layui.js" charset="UTF-8" type="text/javascript"></script>
     <script src="../../../../js/publicJs.js"></script>