设备信息更新

src/view/gameTarget/target.vue

@@ -16,6 +16,10 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item label="任务名称">
+          <el-input v-model="searchInfo.task_name" placeholder="任务名称" />
+        </el-form-item>
+
         <el-form-item label="状态">
           <el-select v-model="searchInfo.is_complete" placeholder="是否完成">
             <el-option v-for="item in searchStatusOptions" :key="item.value" :label="item.label" :value="item.value"
@@ -44,10 +48,10 @@
         <el-table-column label="负责人" width="75" prop="user" sortable="custom" />
         <el-table-column label="登录方式" width="75" prop="login_method" />
         <el-table-column label="新增目标" width="75" prop="new_target" />
-        <el-table-column label="留存目标" width="75" prop="retained_target" />
+        <el-table-column label="活跃目标" width="75" prop="retained_target" />
         <el-table-column label="付费目标" width="75" prop="pay_target" />
         <el-table-column label="新增完成" width="75" prop="new_complete" />
-        <el-table-column label="留存完成" width="75" prop="retained_complete" />
+        <el-table-column label="活跃完成" width="75" prop="retained_complete" />
         <el-table-column label="付费完成" width="75" prop="pay_complete" />
         <el-table-column label="剩余新增" width="75" prop="new_target1">
           <template #default="scope">
@@ -56,7 +60,7 @@
             <span v-else style="color: #606266">{{ 0 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="剩余留存" width="75" prop="retained_target1">
+        <el-table-column label="剩余活跃" width="75" prop="retained_target1">
           <template #default="scope">
             <span v-if="scope.row.retained_target - scope.row.retained_complete - scope.row.hand_retained_complete > 0"
               style="color: red">{{ scope.row.retained_complete + scope.row.hand_retained_complete -
@@ -74,7 +78,7 @@
         <el-table-column label="付费流水" width="75" prop="amount" />
         <el-table-column label="群控效率" width="75" prop="game_rate" />
         <el-table-column label="手动新增" width="75" prop="hand_new_complete" />
-        <el-table-column label="手动留存" width="75" prop="hand_retained_complete" />
+        <el-table-column label="手动活跃" width="75" prop="hand_retained_complete" />
         <el-table-column label="手动付费" width="75" prop="hand_pay_complete" />
         <el-table-column label="手动付费金额" width="75" prop="hand_amount_total" />
         <el-table-column fixed="right" align="right" label="是否完成" width="75" prop="is_complete">

src/view/levelMonitor/imageRecordList.vue

@@ -28,6 +28,14 @@
                         </div>
                     </template>
                 </el-table-column>
+                <el-table-column align="left" label="上传图片" min-width="100" prop="status">
+                    <template #default="scope">
+                        <div>
+                            <img :src=scope.row.image_base64 alt="Base64 Image">
+                        </div>
+                    </template>
+                </el-table-column>
+                
                 <el-table-column align="left" label="登录次数" min-width="100" prop="use_num" sortable="custom" />
                 <el-table-column align="left" label="等级" min-width="100" prop="identify" sortable="custom" />
                 <el-table-column align="left" label="结果" min-width="100" prop="result" />

src/view/logStatistics/deviceIdErr.vue

@@ -26,13 +26,15 @@
       <div class="gva-table-box">
         <el-table :data="tableData" @sort-change="sortChange">
           <el-table-column align="left" label="游戏ID" min-width="100" prop="game_id" sortable="custom" />
-          <el-table-column align="left" label="账号" min-width="150" prop="account" sortable="custom" />
-          <el-table-column align="left" label="设备id" min-width="150" prop="first_device_id" sortable="custom" />
-          <el-table-column align="left" label="异常游戏ID" min-width="150" prop="current_game_id" sortable="custom" />
-          <el-table-column align="left" label="异常账号" min-width="150" prop="current_account" sortable="custom" />
-          <el-table-column align="left" label="异常设备id" min-width="150" prop="current_device_id" sortable="custom" />
-          <el-table-column align="left" label="上报时间" min-width="150" prop="create_time" sortable="custom" />
-          <el-table-column align="left" label="日期" min-width="150" prop="create_date" sortable="custom" />
+          <el-table-column align="left" label="电脑编号" min-width="80" prop="pc_code"/>
+          <el-table-column align="left" label="负责人" min-width="90" prop="operator"  />
+          <el-table-column align="left" label="账号" min-width="150" prop="account" />
+          <el-table-column align="left" label="设备id" min-width="150" prop="first_device_id" />
+          <el-table-column align="left" label="异常游戏ID" min-width="150" prop="current_game_id" />
+          <el-table-column align="left" label="异常账号" min-width="150" prop="current_account" />
+          <el-table-column align="left" label="异常设备id" min-width="150" prop="current_device_id" />
+          <el-table-column align="left" label="上报时间" min-width="150" prop="create_time" />
+          <el-table-column align="left" label="日期" min-width="150" prop="create_date" />
           <el-table-column align="left" label="备注" min-width="60" prop="status">
           <template #default="scope">
             <div>

src/view/logStatistics/deviceLog.vue

@@ -14,8 +14,14 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="游戏id">
-            <el-input v-model="searchInfo.game_id" placeholder="游戏id" />
-          </el-form-item>
+              <el-input v-model="searchInfo.game_id" placeholder="游戏id" />
+            </el-form-item>
+            <el-form-item label="电脑编号">
+              <el-input v-model="searchInfo.pc_code" placeholder="电脑编号" />
+            </el-form-item>
+            <el-form-item label="机器编号">
+              <el-input v-model="searchInfo.simulator_code" placeholder="机器编号" />
+            </el-form-item>
           <el-form-item label="日期" prop="create_date">
                 <el-date-picker
                     v-model="searchInfo.create_date"
@@ -38,6 +44,7 @@
         <el-table :data="tableData" @sort-change="sortChange">
           <el-table-column align="left" label="游戏ID" min-width="80" prop="game_id" sortable="custom" />
           <el-table-column align="left" label="电脑编号" min-width="80" prop="pc_code"/>
+          <el-table-column align="left" label="机器编号" min-width="50" prop="simulator_code"/>
           <el-table-column align="left" label="设备厂商" min-width="80" prop="device_manufacturer"/>
           <el-table-column align="left" label="设备型号" min-width="80" prop="device_model"/>
           <el-table-column align="left" label="设备Imei" min-width="150" prop="device_imei"/>

src/view/logStatistics/deviceStatistics.vue

@@ -2,9 +2,14 @@
     <div>
       <div class="gva-search-box">
         <el-form ref="searchForm" :inline="true" :model="searchInfo">
-            <el-form-item label="游戏id">
+          <el-form-item label="游戏id">
             <el-input v-model="searchInfo.game_id" placeholder="游戏id" />
           </el-form-item>
+          <el-form-item label="负责人">
+                    <el-select v-model="searchInfo.user" placeholder="负责人">
+                        <el-option v-for="item in ResponsiblePerson" :key="item.id" :label="item.name" :value="item.name" />
+                    </el-select>
+                </el-form-item>
           <el-form-item label="日期" prop="create_date">
                 <el-date-picker
                     v-model="searchInfo.create_date"
@@ -89,6 +94,10 @@
 
   } from '@/api/log'
 
+  import {
+    selectResponsiblePerson,
+} from '@/api/responsiblePerson'
+
   import { toSQLLine } from '@/utils/stringFun'
   import { ref } from 'vue'
 
@@ -118,6 +127,20 @@
     deviceErrRateExcel({ page: page.value, pageSize: pageSize.value, ...searchInfo.value },fileName)
 }
 
+const ResponsiblePerson = ref([{
+    id: 0,
+    name: "",
+}])
+
+//获取负责人
+const getResponsiblePerson = async () => {
+    const table = await selectResponsiblePerson()
+    if (table.code === 0) {
+        ResponsiblePerson.value = table.data
+    }
+}
+getResponsiblePerson()
+
   // 搜索
   
   const onSubmit = () => {