数据分析应用修改

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);
   }

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>