From 60398050a8e3a8c5269f2d467b650525dfe5fbfd Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Sat, 14 Sep 2024 09:48:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/pages/dataAnalysis/dataAnalysis.js | 12 +++---------
 pages/dataAnalysis/dataAnalysis.html  |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/js/pages/dataAnalysis/dataAnalysis.js b/js/pages/dataAnalysis/dataAnalysis.js
index d59f71b..e47f368 100644
--- a/js/pages/dataAnalysis/dataAnalysis.js
+++ b/js/pages/dataAnalysis/dataAnalysis.js
@@ -64,16 +64,10 @@ function loadDataAnalysis(montageParam,type) {
   function setReportTable(list){
       let html = '';
       $.each(list,function(index,item){
-       let typeName =  item.typeName;
-       let typeNameArr = typeName.split(',');
-       $.each(typeNameArr,function(index2,item2){
         html += '<tr>';
-          if(index2 === 0){
-            html += '<td rowspan="'+typeNameArr.length+'">' + item.name + '</td>';
-          }
-          html += '<td>' + item2 + '</td>';
-          html += '</tr>';
-       })
+        html += '<td>' + item.name + '</td>';
+        html += '<td>' + item.num + '</td>';
+        html += '</tr>';
       })
       $('#report-box table tbody').empty().append(html);
   }
diff --git a/pages/dataAnalysis/dataAnalysis.html b/pages/dataAnalysis/dataAnalysis.html
index aef34f0..5d8abf2 100644
--- a/pages/dataAnalysis/dataAnalysis.html
+++ b/pages/dataAnalysis/dataAnalysis.html
@@ -38,7 +38,7 @@
                 <li class="layout nocheck" onclick="changeData(this,7)">环境监测分析</li>
                 <li class="layout nocheck" onclick="changeData(this,8)">项目管理分析</li>
                 <li class="layout nocheck" onclick="changeData(this,9)">整体效能分析</li>
-                <li class="layout nocheck" onclick="changeData(this,10)">数据分析和报告</li>
+                <li class="layout nocheck" onclick="changeData(this,10)">风险值班分析</li>
                 <li class="layout nocheck" onclick="changeData(this,11)">穿戴设备监测设备指标分析</li>
                 <li class="layout nocheck" onclick="changeData(this,12)">延期原因分析</li>
             </ul>
@@ -55,7 +55,7 @@
                         </tr>
                         <tr></tr>
                             <td>类型</td>
-                            <td>名称</td>
+                            <td>数量</td>
                         </tr>
                     </thead>
                     <tbody>