cars页面增加期间使用率统计

.idea/.gitignore

+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/ygopro-arena-web.iml" filepath="$PROJECT_DIR$/.idea/ygopro-arena-web.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

.idea/ygopro-arena-web.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

src/api.js

@@ -10,154 +10,164 @@ const URL = "https://sapi.moecube.com:444/ygopro/arena"
 
 export default class Api {
 
-    static uploadUrl = `${URL}/upload`
-
-    static implUrl = `${URL}/impltrack`
-
-    static clkUrl = `${URL}/clktrack`
-
-    static getMonthlyWinRate() {
-    
-        let monthlyWinRateUrl = 'https://sapi.moecube.com:444/ygopro/analytics/matchup/type?source=mycard-athletic'
-
-        return Vue.http.get(monthlyWinRateUrl)
-    }
-
-    
-    static getDownloadUrl(url) {
-        url = url.slice(7)
-        var downloadUrl = `${URL}/download/${url}`
-        return downloadUrl
-    }
-
-    static getCount(opt) {
-        var request = query.stringify(opt);
-        const url = `${config.COUNTER_URL}?${request}`;
-        return Vue.http.get(url);
-    }
-
-    static getUserInfo(opt) {
-        var request = query.stringify(opt);
-        const url = `${URL}/user?${request}`;
-        return Vue.http.get(url);
-    }
-
-    static getUsers(opt) {
-        var request = query.stringify(opt);
-        const url = `${URL}/users?${request}`;
-        return Vue.http.get(url);
-    }
-
-    static getUserDueHistory(opt) {
-        return Vue.http.get(`${URL}/history`, { 'params': opt });
-    }
-
-    static getDownloadUrls() {
-        return Vue.http.get('https://api.github.com/repos/mycard/mycard/releases/latest')
-    }
-
-    static getAvatar(opt) {
-        return Vue.http.get(`https://sapi.moecube.com:444/accounts/users/${opt.username}.avatar`)
-    }
-
-    static getCardInfo(opt) {
-        var request = query.stringify(opt);
-        const url = `${URL}/cardinfo?${request}`;
-        return Vue.http.get(url);
-    }
-
-    static getDeckInfo(opt) {
-        return Vue.http.get(`${URL}/deckinfo`, { 'params': opt });
-    }
-
-    static saveDeck(opt) {
-        const url = `${URL}/deckinfo`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static saveDeckDemo(opt) {
-        const url = `${URL}/deckdemo`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static getReport(opt) {
-        return Vue.http.get(`${URL}/report`, { 'params': opt });
-    }
-
-    static getVoteList(opt) {
-        return Vue.http.get(`${URL}/votes`, { 'params': opt });
-    }
-
-    static saveVote(opt) {
-        const url = `${URL}/votes`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static voteStatus(opt) {
-        const url = `${URL}/voteStatus`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static getVote(opt) {
-        return Vue.http.get(`${URL}/vote`, { 'params': opt });
-    }
-
-    static submitVote(opt) {
-        const url = `${URL}/submitVote`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static saveAds(opt) {
-        const url = `${URL}/ads`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static getAdsList(opt) {
-        return Vue.http.get(`${URL}/ads`, { 'params': opt });
-    }
-
-    static adsStatus(opt) {
-        const url = `${URL}/adsStatus`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static getAd(opt) {
-        return Vue.http.get(`${URL}/getAd`, { 'params': opt });
-    }
-
-    static adClick(opt) {
-        const url = `${URL}/adClick`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static adImpl(opt) {
-        const url = `${URL}/adImpl`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static getFirstWin(opt) {
-        var request = query.stringify(opt);
-        const url = `${URL}/firstwin?${request}`;
-        return Vue.http.get(url);
-    }
-
-    static adSwitchChange(opt) {
-        const url = `${URL}/adSwitchChange`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static saveActivity(opt) {
-        const url = `${URL}/activity`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static saveLabel(opt) {
-        const url = `${URL}/label`
-        return Vue.http.post(url, opt, { 'emulateJSON': true });
-    }
-
-    static getLabel(opt) {
-        return Vue.http.get(`${URL}/label`, { 'params': {} });
-    }
+  static uploadUrl = `${URL}/upload`
+
+  static implUrl = `${URL}/impltrack`
+
+  static clkUrl = `${URL}/clktrack`
+
+  static getMonthlyHistory(opt) {
+    const url = `https://sapi.moecube.com:444/ygopro/arena/historyScore`;
+    return Vue.http.get(url, { params: opt });
+  }
+  // https://sapi.moecube.com:444/ygopro/arena/historyScore?username=id&season=yyyy-mm
+
+  static getDownloadUrl(url) {
+    url = url.slice(7)
+    var downloadUrl = `${URL}/download/${url}`
+    return downloadUrl
+  }
+
+  static getCount(opt) {
+    var request = query.stringify(opt);
+    const url = `${config.COUNTER_URL}?${request}`;
+    return Vue.http.get(url);
+  }
+
+  static getUserInfo(opt) {
+    var request = query.stringify(opt);
+    const url = `${URL}/user?${request}`;
+    return Vue.http.get(url);
+  }
+  static getUserInfoMonth(opt) {
+    var request = query.stringify(opt);
+    const url = `${URL}/user?${request}`;
+    return Vue.http.get(url);
+  }
+  // https://sapi.moecube.com:444/ygopro/arena/historyScore?username=id&season=yyyy-mm
+
+
+
+
+  static getUsers(opt) {
+    var request = query.stringify(opt);
+    const url = `${URL}/users?${request}`;
+    return Vue.http.get(url);
+  }
+
+  static getUserDueHistory(opt) {
+    return Vue.http.get(`${URL}/history`, {'params': opt});
+  }
+
+
+
+
+  static getDownloadUrls() {
+    return Vue.http.get('https://api.github.com/repos/mycard/mycard/releases/latest')
+  }
+
+  static getAvatar(opt) {
+    return Vue.http.get(`https://sapi.moecube.com:444/accounts/users/${opt.username}.avatar`)
+  }
+
+  static getCardInfo(opt) {
+    var request = query.stringify(opt);
+    const url = `${URL}/cardinfo?${request}`;
+    return Vue.http.get(url);
+  }
+
+  static getDeckInfo(opt) {
+    return Vue.http.get(`${URL}/deckinfo`, {'params': opt});
+  }
+
+  static saveDeck(opt) {
+    const url = `${URL}/deckinfo`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static saveDeckDemo(opt) {
+    const url = `${URL}/deckdemo`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static getReport(opt) {
+    return Vue.http.get(`${URL}/report`, {'params': opt});
+  }
+
+  static getVoteList(opt) {
+    return Vue.http.get(`${URL}/votes`, {'params': opt});
+  }
+
+  static saveVote(opt) {
+    const url = `${URL}/votes`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static voteStatus(opt) {
+    const url = `${URL}/voteStatus`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static getVote(opt) {
+    return Vue.http.get(`${URL}/vote`, {'params': opt});
+  }
+
+  static submitVote(opt) {
+    const url = `${URL}/submitVote`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static saveAds(opt) {
+    const url = `${URL}/ads`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static getAdsList(opt) {
+    return Vue.http.get(`${URL}/ads`, {'params': opt});
+  }
+
+  static adsStatus(opt) {
+    const url = `${URL}/adsStatus`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static getAd(opt) {
+    return Vue.http.get(`${URL}/getAd`, {'params': opt});
+  }
+
+  static adClick(opt) {
+    const url = `${URL}/adClick`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static adImpl(opt) {
+    const url = `${URL}/adImpl`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static getFirstWin(opt) {
+    var request = query.stringify(opt);
+    const url = `${URL}/firstwin?${request}`;
+    return Vue.http.get(url);
+  }
+
+  static adSwitchChange(opt) {
+    const url = `${URL}/adSwitchChange`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static saveActivity(opt) {
+    const url = `${URL}/activity`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static saveLabel(opt) {
+    const url = `${URL}/label`
+    return Vue.http.post(url, opt, {'emulateJSON': true});
+  }
+
+  static getLabel(opt) {
+    return Vue.http.get(`${URL}/label`, {'params': {}});
+  }
 
 }

src/components/Ads.vue

@@ -491,7 +491,6 @@
 					type: this.type,
 					page: this.page,
 					username: this.username,
-					type: this.type,
 					from_date: this.from_date,
 					to_date: this.to_date
 				}
@@ -641,19 +640,19 @@
 	#history {
 		margin-top: 100px;
 	}
-	
+
 	.demo-table-expand {
 		font-size: 0;
 	}
-	
+
 	.demo-table-expand label {
 		width: 90px;
 		color: #99a9bf;
 	}
-	
+
 	.demo-table-expand .el-form-item {
 		margin-right: 0;
 		margin-bottom: 0;
 		width: 100%;
 	}
-</style>
\ No newline at end of file
+</style>

src/components/lang.js

@@ -41,6 +41,7 @@ module.exports = {
     dueHistory: '最近决斗记录',
     athleticDueHistory: '竞技场决斗记录',
     entertainDueHistory: '娱乐场决斗记录',
+    monthlyHistory: '每月决斗记录',
     tagInfo: '绿色表示获胜方，红色则表示掉线。',
     rates: '卡组胜率',
 

src/components/tb_lang.js

 module.exports = {
-    cn: {
-        "sProcessing": "处理中...",
-        "sLengthMenu": "显示 _MENU_ 项结果",
-        "sZeroRecords": "没有匹配结果",
-        "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
-        "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
-        "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
-        "sInfoPostFix": "",
-        "sSearch": "搜索:",
-        "sUrl": "",
-        "sEmptyTable": "表中数据为空",
-        "sLoadingRecords": "载入中...",
-        "sInfoThousands": ",",
-        "oPaginate": {
-            "sFirst": "首页",
-            "sPrevious": "上页",
-            "sNext": "下页",
-            "sLast": "末页"
-        },
-        "oAria": {
-            "sSortAscending": ": 以升序排列此列",
-            "sSortDescending": ": 以降序排列此列"
-        },
-        rank: "排名",
-        name: "用户名",
-        exp: "EXP",
-        pt: "D.P",
-        win: "胜局",
-        lose: "负局",
-        wl: "胜率",
+  cn: {
+    "sProcessing": "处理中...",
+    "sLengthMenu": "显示 _MENU_ 项结果",
+    "sZeroRecords": "没有匹配结果",
+    "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
+    "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
+    "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
+    "sInfoPostFix": "",
+    "sSearch": "搜索:",
+    "sUrl": "",
+    "sEmptyTable": "表中数据为空",
+    "sLoadingRecords": "载入中...",
+    "sInfoThousands": ",",
+    "oPaginate": {
+      "sFirst": "首页",
+      "sPrevious": "上页",
+      "sNext": "下页",
+      "sLast": "末页"
+    },
+    "oAria": {
+      "sSortAscending": ": 以升序排列此列",
+      "sSortDescending": ": 以降序排列此列"
+    },
+    rank: "排名",
+    name: "用户名",
+    exp: "EXP",
+    pt: "D.P",
+    win: "胜局",
+    lose: "负局",
+    wl: "胜率",
 
-        cardName: "卡名",
-        used: "使用量",
-        put1: "投入1",
-        put2: "投入2",
-        put3: "投入3",
+    cardName: "卡名",
+    used: "使用量",
+    put1: "投入1",
+    put2: "投入2",
+    put3: "投入3",
 
-        deck: "卡组",
-        count: "使用数",
-        topTags: "热门标签",
+    deck: "卡组",
+    count: "使用数",
+    PickRate : "使用率",
+    topTags: "热门标签",
 
-        playerA: '玩家A',
-        playerB: '玩家B',
-        startTime: '开始时间',
-        endTime: '结束时间',
+    playerA: '玩家A',
+    playerB: '玩家B',
+    startTime: '开始时间',
+    endTime: '结束时间',
+  },
+  en: {
+    "oPaginate": {
+      "sPrevious": "Pre",
     },
-    en: {
-        "oPaginate": {
-            "sPrevious": "Pre",
-        },
-        rank: "Rank",
-        name: "Name",
-        exp: "EXP",
-        pt: "D.P",
-        win: "Win",
-        lose: "Lose",
-        wl: "W/L",
+    rank: "Rank",
+    name: "Name",
+    exp: "EXP",
+    pt: "D.P",
+    win: "Win",
+    lose: "Lose",
+    wl: "W/L",
 
-        cardName: "Card Name",
-        used: "Used",
-        put1: "Put one ",
-        put2: "Put two ",
-        put3: "Put three ",
+    cardName: "Card Name",
+    used: "Used",
+    PickRate:"Pick Rate",
+    put1: "Put one ",
+    put2: "Put two ",
+    put3: "Put three ",
 
-        deck: "Deck",
-        count: "Count",
-        topTags: "Top Tags",
+    deck: "Deck",
+    count: "Count",
+    topTags: "Top Tags",
 
-        playerA: 'PlayerA',
-        playerB: 'PlayerA',
-        startTime: 'Start Time',
-        endTime: 'End Time',
-    }
+    playerA: 'PlayerA',
+    playerB: 'PlayerA',
+    startTime: 'Start Time',
+    endTime: 'End Time',
+  }
 }