Merge branch 'dwl0112' of wangbin/log-server-web into master

src/view/gameTask/list.vue

@@ -155,9 +155,9 @@
                 <el-select v-model="form.game_port_id" placeholder="请选择" style="width:100%">
                   <el-option
                     v-for="item in GamePortOptions"
-                    :key="item.id"
-                    :label="`${item.name}`"
-                    :value="item.id"
+                    :key="item.Id"
+                    :label="`${item.ChannelName}`"
+                    :value="item.Id"
                   />
                 </el-select>
               </el-form-item>
@@ -165,9 +165,9 @@
                 <el-select v-model="form.account_type" placeholder="请选择" style="width:100%">
                   <el-option
                     v-for="item in accountTypeOptions"
-                    :key="item.id"
-                    :label="`${item.name}`"
-                    :value="item.id"
+                    :key="item.Id"
+                    :label="`${item.TypeName}`"
+                    :value="item.Id"
                   />
                 </el-select>
               </el-form-item>
@@ -175,9 +175,9 @@
                 <el-select v-model="form.login_method" placeholder="请选择" style="width:100%">
                   <el-option
                     v-for="item in loginMethodOptions"
-                    :key="item.id"
-                    :label="`${item.name}`"
-                    :value="item.id"
+                    :key="item.Id"
+                    :label="`${item.LoginName}`"
+                    :value="item.Id"
                   />
                 </el-select>
               </el-form-item>
@@ -377,84 +377,84 @@
   ])
 
   const GamePortOptions = ref([
-    {
-      id: 1,
-      name: '腾讯游戏',
-    },
-    {
-      id: 2,
-      name: '360游戏',
-    },
-    {
-      id: 3,
-      name: '网易游戏',
-    },
-    {
-      id: 4,
-      name: '酷派游戏',
-    },
-    {
-      id: 5,
-      name: '魅族游戏',
-    },
+    // {
+    //   id: 1,
+    //   name: '腾讯游戏',
+    // },
+    // {
+    //   id: 2,
+    //   name: '360游戏',
+    // },
+    // {
+    //   id: 3,
+    //   name: '网易游戏',
+    // },
+    // {
+    //   id: 4,
+    //   name: '酷派游戏',
+    // },
+    // {
+    //   id: 5,
+    //   name: '魅族游戏',
+    // },
   ])
 
   const accountTypeOptions = ref([
-    {
-      id: 1,
-      name: '小绵羊账号',
-    },
-    {
-      id: 2,
-      name: 'QQ账号',
-    },
-    {
-      id: 3,
-      name: '魅族账号',
-    },
-    {
-      id: 4,
-      name: '华为账号',
-    },
-    {
-      id: 5,
-      name: '测试类型',
-    },
-    {
-      id: 6,
-      name: '微信',
-    },
-    {
-      id: 7,
-      name: '微信+QQ',
-    },
+    // {
+    //   id: 1,
+    //   name: '小绵羊账号',
+    // },
+    // {
+    //   id: 2,
+    //   name: 'QQ账号',
+    // },
+    // {
+    //   id: 3,
+    //   name: '魅族账号',
+    // },
+    // {
+    //   id: 4,
+    //   name: '华为账号',
+    // },
+    // {
+    //   id: 5,
+    //   name: '测试类型',
+    // },
+    // {
+    //   id: 6,
+    //   name: '微信',
+    // },
+    // {
+    //   id: 7,
+    //   name: '微信+QQ',
+    // },
   ])
 
   const loginMethodOptions = ref([
-    {
-      id: 1,
-      name: '小绵羊登录',
-    },
-    {
-      id: 2,
-      name: '魅族账号登录',
-    },
-    {
-      id: 3,
-      name: 'QQ账号登录',
-    },
-    {
-      id: 4,
-      name: '网易账号登录',
-    },
-    {
-      id: 5,
-      name: '微信授权登录',
-    },
-    {
-      id: 6,
-      name: '微信+QQ授权登录',
-    },
+    // {
+    //   id: 1,
+    //   name: '小绵羊登录',
+    // },
+    // {
+    //   id: 2,
+    //   name: '魅族账号登录',
+    // },
+    // {
+    //   id: 3,
+    //   name: 'QQ账号登录',
+    // },
+    // {
+    //   id: 4,
+    //   name: '网易账号登录',
+    // },
+    // {
+    //   id: 5,
+    //   name: '微信授权登录',
+    // },
+    // {
+    //   id: 6,
+    //   name: '微信+QQ授权登录',
+    // },
   ])
   
   
@@ -507,6 +507,10 @@
     if (table.code === 0) {
       tableData.value = table.data.list
       total.value = table.data.total
+      GamePortOptions.value = table.data.option.game_port
+      loginMethodOptions.value = table.data.option.login_type
+      accountTypeOptions.value = table.data.option.account_type
+      links.value = table.data.option.game_list
       page.value = table.data.page
       pageSize.value = table.data.pageSize
     }
@@ -725,17 +729,17 @@ const createFilter = (queryString) => {
     )
   }
 }
-const loadAll = () => {
-  return [
-    { game_id: 1, game_name: '龙腾传世' },
-    { game_id: 2, game_name: '龙皇传说' },
-    { game_id: 3, game_name: '龙之国物语' },
-    { game_id: 4, game_name: '黑月' },
-    { game_id: 5, game_name: '麻将来了' },
-    { game_id: 6, game_name: '鸿途归来' },
-    { game_id: 7, game_name: '魔力宝贝归来' },
-  ]
-}
+// const loadAll = () => {
+//   return [
+//     { game_id: 1, game_name: '龙腾传世' },
+//     { game_id: 2, game_name: '龙皇传说' },
+//     { game_id: 3, game_name: '龙之国物语' },
+//     { game_id: 4, game_name: '黑月' },
+//     { game_id: 5, game_name: '麻将来了' },
+//     { game_id: 6, game_name: '鸿途归来' },
+//     { game_id: 7, game_name: '魔力宝贝归来' },
+//   ]
+// }
 const handleSelect = (item) => {
   form.value.game_id = item.game_id
   console.log(item)
@@ -745,7 +749,7 @@ const handleIconClick = (ev) => {
   console.log(ev)
 }
 
-links.value = loadAll()
+// links.value = loadAll()
   
   </script>