任务更新

src/api/log.js

@@ -68,6 +68,14 @@ export const updateComputerUseRemarks = (data) => {
   })
 }
 
+export const getLogScanningList = (data) => {
+  return service({
+    url: '/loging/getLogScanningList',
+    method: 'post',
+    data
+  })
+}
+
 
 const handleFileError = (res, fileName) => {
   if (typeof (res.data) !== 'undefined') {

src/api/task.js

@@ -70,4 +70,44 @@ export const createGameTask = (data) => {
       method: 'post',
       data
     })
+  }
+
+  export const everyDayStatistics = (data) => {
+    return service({
+      url: '/gameTask/everyDayStatistics',
+      method: 'post',
+      data
+    })
+  }
+
+  export const monthStatistics = (data) => {
+    return service({
+      url: '/gameTask/monthStatistics',
+      method: 'post',
+      data
+    })
+  }
+  
+  export const gameStatistics = (data) => {
+    return service({
+      url: '/gameTask/gameStatistics',
+      method: 'post',
+      data
+    })
+  }
+
+  export const gameList = (data) => {
+    return service({
+      url: '/gameTask/gameList',
+      method: 'post',
+      data
+    })
+  }
+
+  export const getGameTxTaskList = (data) => {
+    return service({
+      url: '/gameTask/getGameTxTaskList',
+      method: 'post',
+      data
+    })
   }

src/view/about/index.vue

@@ -49,7 +49,7 @@
             </el-row>
           </div>
         </el-card>
-        <el-card style="margin-top: 20px">
+        <!-- <el-card style="margin-top: 20px">
           <template #header>
             <div>flipped-aurora团队</div>
           </template>
@@ -74,7 +74,7 @@
               </el-col>
             </el-row>
           </div>
-        </el-card>
+        </el-card> -->
       </el-col>
       <el-col :span="12">
         <el-card>

src/view/layout/bottomInfo/bottomInfo.vue

@@ -1,16 +1,6 @@
 <template>
   <div class="bottom-info">
-    <div>
-      <span>Powered by</span>
-      <span>
-        <a href="https://github.com/flipped-aurora/gin-vue-admin">{{ $GIN_VUE_ADMIN.appName }}</a>
-      </span>
-      <el-divider direction="vertical" />
-      <span>Copyright</span>
-      <span>
-        <a href="https://github.com/flipped-aurora">flipped-aurora团队</a>
-      </span>
-    </div>
+    
   </div>
 </template>
 

src/view/logStatistics/codeList.vue

@@ -23,12 +23,9 @@
         </el-form>
       </div>
       <div class="gva-table-box">
-        <el-table :data="tableData" @sort-change="sortChange" @selection-change="handleSelectionChange" height="500" style="width: 100%">
-          <el-table-column
-            type="selection"
-            width="55"
-          />
+        <el-table :data="tableData" :span-method="objectSpanMethod" @sort-change="sortChange" @selection-change="handleSelectionChange" height="500" style="width: 100%">
           <el-table-column fixed="left" align="left" label="游戏id" min-width="90" prop="game_id" sortable="custom" />
+          <el-table-column fixed="left" align="left" label="任务名称" min-width="90" prop="game_name" sortable="custom" />
           <el-table-column fixed="left" align="left" label="日期" min-width="90" prop="create_date" />
           <el-table-column fixed="left" align="left" label="脚本负责人" min-width="90" prop="operator" />
           <el-table-column fixed="left" align="left" label="类型" min-width="60" prop="type" sortable="custom">
@@ -65,6 +62,12 @@
         <el-table-column prop="login_ok" label="成功" width="60" />
         <el-table-column prop="login_fail" label="失败" width="60" />
       </el-table-column>
+      <el-table-column label="微信授权">
+        <el-table-column prop="enter_scanning_code" label="进入" width="60" />
+        <el-table-column prop="scanning_code_success" label="成功" width="60" />
+        <el-table-column prop="transcoding_fail" label="转码失败" width="60" />
+        <el-table-column prop="third_party_fail" label="三方失败" width="60" />
+      </el-table-column>
       <el-table-column label="实名认证">
         <el-table-column prop="enter_authentication" label="进入" width="60" />
         <el-table-column prop="authentication_ok" label="成功" width="60" />
@@ -238,6 +241,7 @@
       total.value = table.data.total
       page.value = table.data.page
       pageSize.value = table.data.pageSize
+      getSpanArr(table.data.list)
     }
   }
   
@@ -334,6 +338,38 @@
       }
     })
   }
+
+  let spanArr = []
+  const getSpanArr = (data) => {
+    spanArr = []
+    var pos = 0
+    for (var i = 0; i < data.length; i++) {
+          if (i === 0) {
+            spanArr.push(1);
+            pos = 0
+          } else {
+            if (data[i].game_id === data[i - 1].game_id) {
+              spanArr[pos] += 1;
+              spanArr.push(0);
+            } else {
+              spanArr.push(1);
+              pos = i;
+            }
+          }
+        }
+        console.log(spanArr)  
+  }
+
+  const objectSpanMethod = (row) => {
+    if (row.columnIndex === 0 || row.columnIndex === 3 ||  row.columnIndex === 2 ||  row.columnIndex === 1) {
+          const rowspan = spanArr[row.rowIndex];
+          const colspan = rowspan > 0 ? 1 : 0;
+          return {
+            rowspan: rowspan,
+            colspan: colspan
+          }
+        }
+  }
   
   
   </script>

src/view/logStatistics/list.vue

@@ -28,7 +28,6 @@
         :span-method="objectSpanMethod"
         @sort-change="sortChange" 
         @selection-change="handleSelectionChange" 
-        height="500" 
         header-align="center"
         >
           <el-table-column
@@ -109,12 +108,12 @@
         </el-table-column>
       </el-table-column>
       <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">
+        <el-table-column label="扫码成功" align="center">
+          <el-table-column prop="scanning_code_success,enter_scanning_code" label="扫码总数" align="center" min-width="100">
             <template #default="scope">
-							{{ scope.row.target_num }}
+							{{ scope.row.scanning_code_success }}
 							<el-divider style="margin:0 5px" direction="vertical" />
-              {{ scope.row.new_scanning_code}}
+              {{ scope.row.enter_scanning_code}}
 							<el-divider style="margin:0" />
 							{{ scope.row.scanning_success_rate + '%'}}
 						</template>
@@ -311,7 +310,7 @@ const renderheader = ({ column, $index  }) => {
   }
 
   const objectSpanMethod = (row) => {
-    if (row.columnIndex === 1 || row.columnIndex === 3 || row.columnIndex === 7 || row.columnIndex === 0 || row.columnIndex === 2 || row.columnIndex === 12|| row.columnIndex === 14|| row.columnIndex === 15|| row.columnIndex === 16|| row.columnIndex === 17) {
+    if (row.columnIndex === 1 || row.columnIndex === 3 || row.columnIndex === 7 || row.columnIndex === 0 || row.columnIndex === 2 || row.columnIndex === 14|| row.columnIndex === 15|| row.columnIndex === 16|| row.columnIndex === 17) {
           const rowspan = spanArr[row.rowIndex];
           const colspan = rowspan > 0 ? 1 : 0;
           return {