排序

src/api/log.js

@@ -19,6 +19,14 @@ export const logStatistics = (data) => {
   })
 }
 
+export const logNodeStatistics = (data) => {
+  return service({
+    url: '/loging/getNodeStatisticsLogList',
+    method: 'post',
+    data
+  })
+}
+
 export const logComputerList = (data) => {
   return service({
     url: '/loging/getComputerStatistics',
@@ -35,6 +43,7 @@ export const logGameIdList = (data) => {
   })
 }
 
+
 export const logComputerNum = (data) => {
   return service({
     url: '/loging/getComputerNum',

src/view/logComputer/list.vue

@@ -46,8 +46,8 @@
             type="selection"
             width="55"
           />
-          <el-table-column align="left" label="电脑编号" min-width="100" prop="pc_code" />
-          <el-table-column align="left" label="脚本负责人" min-width="150" prop="operator" />
+          <el-table-column align="left" label="电脑编号" min-width="100" prop="pc_code" sortable="custom"/>
+          <el-table-column align="left" label="脚本负责人" min-width="150" prop="operator" sortable="custom"/>
           <el-table-column align="left" label="日期" min-width="150" prop="create_date" />
           <el-table-column align="left" label="游戏id" min-width="150" prop="game_id" sortable="custom" />
           <el-table-column align="left" label="总任务" min-width="150" prop="target_num" />
@@ -286,7 +286,7 @@
   const computerNum = ref('')
     // 查询
     const getComputerNum = async() => {
-    const table = await logComputerNum({})
+    const table = await logComputerNum({ ...searchInfo.value })
     if (table.code === 0) {
       console.log(table.data)
       computerNum.value = table.data

src/view/logStatistics/codeList.vue

@@ -127,13 +127,13 @@
   
   <script>
   export default {
-    name: 'LogStatisticsList',
+    name: 'LogNodeStatisticsList',
   }
   </script>
   
   <script setup>
   import {
-    logStatistics,
+    logNodeStatistics,
   } from '@/api/log'
   import { toSQLLine } from '@/utils/stringFun'
   import { ref } from 'vue'
@@ -183,7 +183,7 @@
 
   // 查询
   const getTableFailData = async() => {
-    const table = await logStatistics({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
+    const table = await logNodeStatistics({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
     if (table.code === 0) {
       tableData.value = table.data
     }
@@ -232,7 +232,7 @@
   
   // 查询
   const getTableData = async() => {
-    const table = await logStatistics({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
+    const table = await logNodeStatistics({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
     if (table.code === 0) {
       tableData.value = table.data.list
       total.value = table.data.total

src/view/logStatistics/list.vue

@@ -56,7 +56,7 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="下拉成功率" align="center"  min-width="100">
+      <el-table-column label="下拉成功率" align="center"  min-width="100" prop="pull_success_rate" sortable="custom">
         <el-table-column label="拉取账号" align="center" >
             <el-table-column prop="pull_account_ok,pull_account_fail" label="下发账号" align="center" min-width="100">
             <template #default="scope">
@@ -64,38 +64,38 @@
 							<el-divider style="margin:0 5px" direction="vertical" />
               {{ scope.row.issued_account}}
 							<el-divider style="margin:0" />
-							{{ scope.row.pull_account_ok == 0  || scope.row.issued_account == 0 ? 0 + '%' : Math.round(scope.row.pull_account_ok/scope.row.issued_account * 10000) / 100 + '%'}}
+							{{ scope.row.pull_success_rate + '%'}}
 						</template>
           </el-table-column>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="启动成功率" align="center" min-width="100">
-        <el-table-column label="启动成功" align="center">
+      <el-table-column label="启动成功率" align="center" min-width="100" prop="start_success_rate" sortable="custom">
+        <el-table-column label="模拟器启动成功" align="center">
             <el-table-column prop="game_start_ok,pull_account_ok" label="拉取成功" align="center" min-width="100">
             <template #default="scope">
 							{{ scope.row.simulator_start_ok }}
 							<el-divider style="margin:0 5px" direction="vertical" />
               {{ scope.row.pull_account_ok}}
 							<el-divider style="margin:0" />
-							{{ scope.row.pull_account_ok == 0 ? 0 + '%' : Math.round(scope.row.simulator_start_ok/scope.row.pull_account_ok * 10000) / 100 + '%'}}
+							{{ scope.row.start_success_rate + '%'}}
 						</template>
           </el-table-column>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="主线成功率" align="center"  min-width="100">
+      <el-table-column label="主线成功率" align="center"  min-width="100" prop="main_success_rate" sortable="custom">
         <el-table-column label="进入主线" align="center">
-            <el-table-column prop="enter_main,game_start_ok" label="启动成功" align="center" min-width="100">
+            <el-table-column prop="enter_main,game_start_ok" label="游戏启动成功" align="center" min-width="100">
             <template #default="scope">
 							{{ scope.row.enter_main }}
 							<el-divider style="margin:0 5px" direction="vertical" />
               {{ scope.row.game_start_ok}}
 							<el-divider style="margin:0" />
-							{{ scope.row.enter_game == 0 || scope.row.game_start_ok == 0 ? 0 + '%' : Math.round(scope.row.enter_game/scope.row.game_start_ok * 10000) / 100 + '%'}}
+							{{ scope.row.main_success_rate + '%'}}
 						</template>
           </el-table-column>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="任务成功率" align="center"  min-width="100">
+      <el-table-column label="任务成功率" align="center"  min-width="100" prop="task_success_rate" sortable="custom">
         <el-table-column label="进入主线" align="center">
           <el-table-column prop="enter_main,pull_account_fail" label="总任务数" align="center" min-width="100">
             <template #default="scope">
@@ -103,12 +103,12 @@
 							<el-divider style="margin:0 5px" direction="vertical" />
               {{ scope.row.target_num}}
 							<el-divider style="margin:0" />
-							{{ scope.row.enter_game == 0 || scope.row.target_num == 0 ? 0 + '%' : Math.round(scope.row.enter_main/scope.row.target_num * 10000) / 100 + '%'}}
+							{{ scope.row.task_success_rate + '%'}}
 						</template>
           </el-table-column>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="微信扫码率" align="center"  min-width="100">
+      <el-table-column label="微信扫码率" align="center"  min-width="100" prop="scanning_success_rate" sortable="custom">
         <el-table-column label="任务总数" align="center">
           <el-table-column prop="pull_account_fail,pull_account_fail" label="扫码总数" align="center" min-width="100">
             <template #default="scope">
@@ -116,12 +116,12 @@
 							<el-divider style="margin:0 5px" direction="vertical" />
               {{ scope.row.new_scanning_code}}
 							<el-divider style="margin:0" />
-							{{ scope.row.target_num == 0 || scope.row.new_scanning_code == 0 ? 0 + '%' : Math.round(scope.row.target_num/scope.row.new_scanning_code * 10000) / 100 + '%'}}
+							{{ scope.row.scanning_success_rate + '%'}}
 						</template>
           </el-table-column>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="订单完成率" align="center"  min-width="100">
+      <el-table-column label="订单完成率" align="center"  min-width="100" prop="local_order_success_rate" sortable="custom">
         <el-table-column label="付费成功" align="center">
           <el-table-column prop="fee_ok,pull_account_fail" label="下发付费" align="center" min-width="100">
             <template #default="scope">