1

haMgr/web-admin/src/views/stats/QualityStats.vue

@@ -419,7 +419,7 @@ const renderProcessTotalCountChart = () => {
     const limit = processLimit.value
     const currentData = processStats.value.slice(0, limit)
     const names = currentData.map(item => item.processName)
-    const totalCounts = currentData.map(item => item.totalCount || 0)
+    const totalCounts = currentData.map(item => item.totalTryNum || 0)
 
     chart.setOption({
        tooltip: { trigger: 'axis' },
@@ -662,7 +662,7 @@ onMounted(() => {
         <el-table v-show="showProcessTable" :data="processStats" border stripe height="250" class="mb-4">
              <el-table-column prop="processName" label="环节名称" />
              <el-table-column prop="averageInspectionTimes" label="平均识别数" sortable />
-             <el-table-column prop="totalCount" label="识别总数" sortable />
+             <el-table-column prop="totalTryNum" label="识别总数" sortable />
              <el-table-column prop="averageDuration" label="平均耗时(s)" sortable />
         </el-table>
 

haMgr/web-admin/src/views/stats/SerialStats.vue

@@ -204,6 +204,7 @@ const initMultiDayCharts = () => {
 
             const dates = datesList.value.map(item => item.date)
             const pass1Data = datesList.value.map(item => item.passRate1 || 0)
+            const pass2Data = datesList.value.map(item => item.passRate2 || 0)
             const pass3Data = datesList.value.map(item => item.passRate3 || 0)
 
             overallPassRateChart.setOption({
@@ -212,12 +213,13 @@ const initMultiDayCharts = () => {
                     trigger: 'axis',
                     valueFormatter: (value: any) => value + '%'
                 },
-                legend: { data: ['1次通过率', '3次通过率'], bottom: 0 },
+                legend: { data: ['1次通过率', '2次通过率', '3次通过率'], bottom: 0 },
                 xAxis: { type: 'category', data: dates },
                 yAxis: { type: 'value', name: '%' },
                 grid: { left: '3%', right: '4%', bottom: '15%', containLabel: true },
                 series: [
                     { name: '1次通过率', type: 'line', data: pass1Data, smooth: true },
+                    { name: '2次通过率', type: 'line', data: pass2Data, smooth: true },
                     { name: '3次通过率', type: 'line', data: pass3Data, smooth: true }
                 ]
             }, true)

huaian/demo.html

@@ -374,7 +374,7 @@
     <script src="js/vue.min.js"></script>
     <script src="js/vant.min.js"></script>
 
-    <script src="js/demo.js?121222"></script>
+    <script src="js/demo.js?333334"></script>
 </body>
 
 </html>
\ No newline at end of file

huaian/js/demo.js

@@ -203,8 +203,9 @@ function getProcess() {
         if (cheatTimeStr) {
           clearTimeout(cheatTimeStr)
         }
-        cheatShowMethod()
+
         $('#warningTsAlert').show()
+        cheatShowMethod()
       }
 
       //主光猫是否在箱子的弹窗显示逻辑
@@ -302,8 +303,9 @@ function getProcess() {
             if (snTimeStr) {
               clearTimeout(snTimeStr)
             }
-            snShowMethod()
+
             $("#snErrorAlert").show()
+            snShowMethod()
           }
         }
       }
@@ -1207,7 +1209,7 @@ async function init() {
     url: '/createRoom',
     data: {
       applyId: applyId,
-      rtcType: isHuaweiPhone() ? '1' : ''
+      rtcType: isHuaweiPhone() ? '1' : '1'
     }
   })