Commit 4df00855 authored by 铃兰's avatar 铃兰

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

parent 1d83b510
Pipeline #22654 passed with stages
in 2 minutes and 4 seconds
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
<?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
<?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
<?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
......@@ -85,6 +85,15 @@
"url": "https://opencollective.com/popperjs"
}
},
"node_modules/@trysound/sax": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
"dev": true,
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/@types/http-proxy": {
"version": "1.17.7",
"dev": true,
......@@ -319,7 +328,12 @@
"license": "MIT"
},
"node_modules/async-validator": {
"version": "1.6.9"
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
"integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
"dependencies": {
"babel-runtime": "6.x"
}
},
"node_modules/atob": {
"version": "2.1.2",
......@@ -991,7 +1005,6 @@
},
"node_modules/babel-runtime": {
"version": "6.26.0",
"dev": true,
"license": "MIT",
"dependencies": {
"core-js": "^2.4.0",
......@@ -1148,6 +1161,15 @@
"node": ">=8"
}
},
"node_modules/bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"optional": true,
"dependencies": {
"file-uri-to-path": "1.0.0"
}
},
"node_modules/bluebird": {
"version": "3.7.2",
"dev": true,
......@@ -1451,6 +1473,19 @@
"fsevents": "~2.3.2"
}
},
"node_modules/chokidar/node_modules/fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/chokidar/node_modules/glob-parent": {
"version": "5.1.2",
"license": "ISC",
......@@ -1469,17 +1504,6 @@
"safe-buffer": "^5.0.1"
}
},
"node_modules/clap": {
"version": "1.2.3",
"dev": true,
"license": "MIT",
"dependencies": {
"chalk": "^1.1.3"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/class-utils": {
"version": "0.3.6",
"license": "MIT",
......@@ -1591,16 +1615,6 @@
"node": ">= 0.12.0"
}
},
"node_modules/coa": {
"version": "1.0.4",
"dev": true,
"dependencies": {
"q": "^1.1.2"
},
"engines": {
"node": ">= 0.8.0"
}
},
"node_modules/code-point-at": {
"version": "1.1.0",
"dev": true,
......@@ -1666,14 +1680,6 @@
"has": "^1.0.1"
}
},
"node_modules/colors": {
"version": "1.1.2",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.1.90"
}
},
"node_modules/commander": {
"version": "2.17.1",
"dev": true,
......@@ -1821,7 +1827,6 @@
},
"node_modules/core-js": {
"version": "2.6.12",
"dev": true,
"hasInstallScript": true,
"license": "MIT"
},
......@@ -1980,6 +1985,28 @@
"fastparse": "^1.1.2"
}
},
"node_modules/css-tree": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
"dev": true,
"dependencies": {
"mdn-data": "2.0.14",
"source-map": "^0.6.1"
},
"engines": {
"node": ">=8.0.0"
}
},
"node_modules/css-tree/node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/css-what": {
"version": "5.1.0",
"dev": true,
......@@ -2042,18 +2069,15 @@
}
},
"node_modules/csso": {
"version": "2.3.2",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
"dev": true,
"license": "MIT",
"dependencies": {
"clap": "^1.0.9",
"source-map": "^0.5.3"
},
"bin": {
"csso": "bin/csso"
"css-tree": "^1.1.2"
},
"engines": {
"node": ">=0.10.0"
"node": ">=8.0.0"
}
},
"node_modules/datatables.net": {
......@@ -2730,6 +2754,12 @@
"loader-utils": "~0.2.5"
}
},
"node_modules/file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
"node_modules/filesize": {
"version": "3.6.1",
"dev": true,
......@@ -2872,6 +2902,24 @@
"version": "1.0.0",
"license": "ISC"
},
"node_modules/fsevents": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"dependencies": {
"bindings": "^1.5.0",
"nan": "^2.12.1"
},
"engines": {
"node": ">= 4.0"
}
},
"node_modules/function-bind": {
"version": "1.1.0",
"dev": true
......@@ -3896,6 +3944,12 @@
"safe-buffer": "^5.1.2"
}
},
"node_modules/mdn-data": {
"version": "2.0.14",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
"dev": true
},
"node_modules/media-typer": {
"version": "0.3.0",
"dev": true,
......@@ -4067,6 +4121,12 @@
"version": "2.0.0",
"license": "MIT"
},
"node_modules/nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
"optional": true
},
"node_modules/nanomatch": {
"version": "1.2.13",
"license": "MIT",
......@@ -4537,6 +4597,11 @@
"dev": true,
"license": "MIT"
},
"node_modules/path-dirname": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="
},
"node_modules/path-exists": {
"version": "2.1.0",
"dev": true,
......@@ -4578,6 +4643,12 @@
"node": ">=0.12"
}
},
"node_modules/picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true
},
"node_modules/picomatch": {
"version": "2.3.0",
"license": "MIT",
......@@ -5167,9 +5238,10 @@
}
},
"node_modules/postcss-svgo/node_modules/is-svg": {
"version": "4.3.2",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
"integrity": "sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==",
"dev": true,
"license": "MIT",
"dependencies": {
"html-comment-regex": "^1.1.0"
},
......@@ -5307,15 +5379,6 @@
"dev": true,
"license": "MIT"
},
"node_modules/q": {
"version": "1.5.1",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.6.0",
"teleport": ">=0.2.0"
}
},
"node_modules/qs": {
"version": "6.7.0",
"dev": true,
......@@ -5497,7 +5560,6 @@
},
"node_modules/regenerator-runtime": {
"version": "0.11.1",
"dev": true,
"license": "MIT"
},
"node_modules/regenerator-transform": {
......@@ -5734,11 +5796,6 @@
"version": "2.1.2",
"license": "MIT"
},
"node_modules/sax": {
"version": "1.2.4",
"dev": true,
"license": "ISC"
},
"node_modules/select": {
"version": "1.1.2",
"license": "MIT"
......@@ -6079,6 +6136,13 @@
"version": "4.0.1",
"license": "MIT"
},
"node_modules/stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
"dev": true
},
"node_modules/stackframe": {
"version": "0.3.1",
"dev": true,
......@@ -6175,23 +6239,33 @@
}
},
"node_modules/svgo": {
"version": "0.7.2",
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
"dev": true,
"license": "MIT",
"dependencies": {
"coa": "~1.0.1",
"colors": "~1.1.2",
"csso": "~2.3.1",
"js-yaml": "2.1.3",
"mkdirp": "~0.5.1",
"sax": "~1.2.1",
"whet.extend": "~0.9.9"
"@trysound/sax": "0.2.0",
"commander": "^7.2.0",
"css-select": "^4.1.3",
"css-tree": "^1.1.3",
"csso": "^4.2.0",
"picocolors": "^1.0.0",
"stable": "^0.1.8"
},
"bin": {
"svgo": "bin/svgo"
},
"engines": {
"node": ">=0.10.0"
"node": ">=10.13.0"
}
},
"node_modules/svgo/node_modules/commander": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true,
"engines": {
"node": ">= 10"
}
},
"node_modules/swiper": {
......@@ -6905,6 +6979,26 @@
"node": ">=0.10.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
"dependencies": {
"is-glob": "^3.1.0",
"path-dirname": "^1.0.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/glob-parent/node_modules/is-glob": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
"dependencies": {
"is-extglob": "^2.1.0"
},
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/watchpack-chokidar2/node_modules/is-accessor-descriptor": {
"version": "1.0.0",
"license": "MIT",
......@@ -7269,14 +7363,6 @@
"watchpack-chokidar2": "^2.0.1"
}
},
"node_modules/whet.extend": {
"version": "0.9.9",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.6.0"
}
},
"node_modules/which-module": {
"version": "1.0.0",
"dev": true,
......@@ -7417,6 +7503,12 @@
"version": "2.11.0",
"peer": true
},
"@trysound/sax": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
"dev": true
},
"@types/http-proxy": {
"version": "1.17.7",
"dev": true,
......@@ -7582,7 +7674,12 @@
"version": "1.0.3"
},
"async-validator": {
"version": "1.6.9"
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
"integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
"requires": {
"babel-runtime": "6.x"
}
},
"atob": {
"version": "2.1.2"
......@@ -8178,7 +8275,6 @@
},
"babel-runtime": {
"version": "6.26.0",
"dev": true,
"requires": {
"core-js": "^2.4.0",
"regenerator-runtime": "^0.11.0"
......@@ -8281,6 +8377,15 @@
"binary-extensions": {
"version": "2.2.0"
},
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"optional": true,
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"bluebird": {
"version": "3.7.2",
"dev": true
......@@ -8505,6 +8610,12 @@
"readdirp": "~3.6.0"
},
"dependencies": {
"fsevents": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
"optional": true
},
"glob-parent": {
"version": "5.1.2",
"requires": {
......@@ -8520,13 +8631,6 @@
"safe-buffer": "^5.0.1"
}
},
"clap": {
"version": "1.2.3",
"dev": true,
"requires": {
"chalk": "^1.1.3"
}
},
"class-utils": {
"version": "0.3.6",
"requires": {
......@@ -8603,13 +8707,6 @@
"version": "4.6.0",
"dev": true
},
"coa": {
"version": "1.0.4",
"dev": true,
"requires": {
"q": "^1.1.2"
}
},
"code-point-at": {
"version": "1.1.0",
"dev": true
......@@ -8665,10 +8762,6 @@
"has": "^1.0.1"
}
},
"colors": {
"version": "1.1.2",
"dev": true
},
"commander": {
"version": "2.17.1",
"dev": true
......@@ -8778,8 +8871,7 @@
}
},
"core-js": {
"version": "2.6.12",
"dev": true
"version": "2.6.12"
},
"core-util-is": {
"version": "1.0.3"
......@@ -8911,6 +9003,24 @@
"fastparse": "^1.1.2"
}
},
"css-tree": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
"dev": true,
"requires": {
"mdn-data": "2.0.14",
"source-map": "^0.6.1"
},
"dependencies": {
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true
}
}
},
"css-what": {
"version": "5.1.0",
"dev": true
......@@ -8958,11 +9068,12 @@
}
},
"csso": {
"version": "2.3.2",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
"dev": true,
"requires": {
"clap": "^1.0.9",
"source-map": "^0.5.3"
"css-tree": "^1.1.2"
}
},
"datatables.net": {
......@@ -9439,6 +9550,12 @@
"loader-utils": "~0.2.5"
}
},
"file-uri-to-path": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
"optional": true
},
"filesize": {
"version": "3.6.1",
"dev": true
......@@ -9527,6 +9644,16 @@
"fs.realpath": {
"version": "1.0.0"
},
"fsevents": {
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
"optional": true,
"requires": {
"bindings": "^1.5.0",
"nan": "^2.12.1"
}
},
"function-bind": {
"version": "1.1.0",
"dev": true
......@@ -10187,6 +10314,12 @@
"safe-buffer": "^5.1.2"
}
},
"mdn-data": {
"version": "2.0.14",
"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
"dev": true
},
"media-typer": {
"version": "0.3.0",
"dev": true
......@@ -10296,6 +10429,12 @@
"ms": {
"version": "2.0.0"
},
"nan": {
"version": "2.17.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
"integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
"optional": true
},
"nanomatch": {
"version": "1.2.13",
"requires": {
......@@ -10615,6 +10754,11 @@
"version": "0.0.1",
"dev": true
},
"path-dirname": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
"integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="
},
"path-exists": {
"version": "2.1.0",
"dev": true,
......@@ -10642,6 +10786,12 @@
"sha.js": "^2.4.8"
}
},
"picocolors": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
"dev": true
},
"picomatch": {
"version": "2.3.0"
},
......@@ -11104,7 +11254,9 @@
},
"dependencies": {
"is-svg": {
"version": "4.3.2",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
"integrity": "sha512-Ya1giYJUkcL/94quj0+XGcmts6cETPBW1MiFz1ReJrnDJ680F52qpAEGAEGU0nq96FRGIGPx6Yo1CyPXcOoyGw==",
"dev": true,
"requires": {
"html-comment-regex": "^1.1.0"
......@@ -11198,10 +11350,6 @@
"version": "1.4.1",
"dev": true
},
"q": {
"version": "1.5.1",
"dev": true
},
"qs": {
"version": "6.7.0",
"dev": true
......@@ -11334,8 +11482,7 @@
"dev": true
},
"regenerator-runtime": {
"version": "0.11.1",
"dev": true
"version": "0.11.1"
},
"regenerator-transform": {
"version": "0.10.1",
......@@ -11500,10 +11647,6 @@
"safer-buffer": {
"version": "2.1.2"
},
"sax": {
"version": "1.2.4",
"dev": true
},
"select": {
"version": "1.1.2"
},
......@@ -11748,6 +11891,12 @@
"ssr-window": {
"version": "4.0.1"
},
"stable": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
"integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
"dev": true
},
"stackframe": {
"version": "0.3.1",
"dev": true
......@@ -11816,16 +11965,26 @@
"dev": true
},
"svgo": {
"version": "0.7.2",
"version": "2.8.0",
"resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
"integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
"dev": true,
"requires": {
"coa": "~1.0.1",
"colors": "~1.1.2",
"csso": "~2.3.1",
"js-yaml": "2.1.3",
"mkdirp": "~0.5.1",
"sax": "~1.2.1",
"whet.extend": "~0.9.9"
"@trysound/sax": "0.2.0",
"commander": "^7.2.0",
"css-select": "^4.1.3",
"css-tree": "^1.1.3",
"csso": "^4.2.0",
"picocolors": "^1.0.0",
"stable": "^0.1.8"
},
"dependencies": {
"commander": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true
}
}
},
"swiper": {
......@@ -12316,6 +12475,25 @@
"to-regex-range": "^2.1.0"
}
},
"glob-parent": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
"integrity": "sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==",
"requires": {
"is-glob": "^3.1.0",
"path-dirname": "^1.0.0"
},
"dependencies": {
"is-glob": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
"integrity": "sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==",
"requires": {
"is-extglob": "^2.1.0"
}
}
}
},
"is-accessor-descriptor": {
"version": "1.0.0",
"requires": {
......@@ -12577,10 +12755,6 @@
"source-map": "~0.5.3"
}
},
"whet.extend": {
"version": "0.9.9",
"dev": true
},
"which-module": {
"version": "1.0.0",
"dev": true
......
......@@ -16,13 +16,11 @@ export default class Api {
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 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)
......@@ -41,6 +39,15 @@ export default class Api {
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);
......@@ -49,9 +56,12 @@ export default class Api {
}
static getUserDueHistory(opt) {
return Vue.http.get(`${URL}/history`, { 'params': opt });
return Vue.http.get(`${URL}/history`, {'params': opt});
}
static getDownloadUrls() {
return Vue.http.get('https://api.github.com/repos/mycard/mycard/releases/latest')
}
......@@ -67,72 +77,72 @@ export default class Api {
}
static getDeckInfo(opt) {
return Vue.http.get(`${URL}/deckinfo`, { 'params': opt });
return Vue.http.get(`${URL}/deckinfo`, {'params': opt});
}
static saveDeck(opt) {
const url = `${URL}/deckinfo`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static saveDeckDemo(opt) {
const url = `${URL}/deckdemo`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static getReport(opt) {
return Vue.http.get(`${URL}/report`, { 'params': opt });
return Vue.http.get(`${URL}/report`, {'params': opt});
}
static getVoteList(opt) {
return Vue.http.get(`${URL}/votes`, { 'params': opt });
return Vue.http.get(`${URL}/votes`, {'params': opt});
}
static saveVote(opt) {
const url = `${URL}/votes`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static voteStatus(opt) {
const url = `${URL}/voteStatus`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static getVote(opt) {
return Vue.http.get(`${URL}/vote`, { 'params': opt });
return Vue.http.get(`${URL}/vote`, {'params': opt});
}
static submitVote(opt) {
const url = `${URL}/submitVote`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static saveAds(opt) {
const url = `${URL}/ads`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static getAdsList(opt) {
return Vue.http.get(`${URL}/ads`, { 'params': opt });
return Vue.http.get(`${URL}/ads`, {'params': opt});
}
static adsStatus(opt) {
const url = `${URL}/adsStatus`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static getAd(opt) {
return Vue.http.get(`${URL}/getAd`, { 'params': opt });
return Vue.http.get(`${URL}/getAd`, {'params': opt});
}
static adClick(opt) {
const url = `${URL}/adClick`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static adImpl(opt) {
const url = `${URL}/adImpl`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static getFirstWin(opt) {
......@@ -143,21 +153,21 @@ export default class Api {
static adSwitchChange(opt) {
const url = `${URL}/adSwitchChange`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static saveActivity(opt) {
const url = `${URL}/activity`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static saveLabel(opt) {
const url = `${URL}/label`
return Vue.http.post(url, opt, { 'emulateJSON': true });
return Vue.http.post(url, opt, {'emulateJSON': true});
}
static getLabel(opt) {
return Vue.http.get(`${URL}/label`, { 'params': {} });
return Vue.http.get(`${URL}/label`, {'params': {}});
}
}
......@@ -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
}
......
......@@ -5,26 +5,26 @@
<div>
<h4 class="color-blue">
<i class="glyphicon glyphicon-filter"></i>
{{lang.qc}}
{{ lang.qc }}
</h4>
<div class="well">
<form action="" method="get" role="form" class="form-inline form-filter">
<div class="form-group" style="margin-right: 10px;">
<div class="input-group">
<div class="input-group-addon">{{lang.time}}</div>
<div class="input-group-addon">{{ lang.time }}</div>
<select name="type" class="form-control" id="type" v-on:change="onChange">
<option value="day">{{lang.today}}</option>
<option value="week">{{lang.week}}</option>
<option value="halfmonth">{{lang.half_month}}</option>
<option value="month">{{lang.month}}</option>
<option value="season">{{lang.season}}</option>
<option value="day">{{ lang.today }}</option>
<option value="week">{{ lang.week }}</option>
<option value="halfmonth">{{ lang.half_month }}</option>
<option value="month">{{ lang.month }}</option>
<option value="season">{{ lang.season }}</option>
</select>
</div>
</div>
<div class="form-group" style="margin-right: 10px;">
<div class="input-group">
<div class="input-group-addon">{{lang.source}}</div>
<div class="input-group-addon">{{ lang.source }}</div>
<select name="server" class="form-control" id="server" v-on:change="onChange">
<option value="mycard">MCPro</option>
<option value="233">233</option>
......@@ -36,53 +36,60 @@
<div class="form-group" style="margin-right: 10px;">
<div class="input-group">
<div class="input-group-addon">{{lang.type}}</div>
<div class="input-group-addon">{{ lang.type }}</div>
<select name="source" class="form-control" id="source" v-on:change="onChange">
<option value="athletic">{{lang.athletic}}</option>
<option value="entertain">{{lang.entertain}}</option>
<option value="custom">{{lang.custom}}</option>
<option value="tag">{{lang.tag}}</option>
<option value="athletic">{{ lang.athletic }}</option>
<option value="entertain">{{ lang.entertain }}</option>
<option value="custom">{{ lang.custom }}</option>
<option value="tag">{{ lang.tag }}</option>
</select>
</div>
</div>
<div class="form-group" style="margin-right: 10px;">
<div class="input-group">
<div class="input-group-addon">{{lang.totalDeck}}</div>
<span class="form-control">{{totalDeck}}</span>
<div class="input-group-addon">{{ lang.totalDeck }}</div>
<span class="form-control">{{ totalDeck }}</span>
</div>
</div>
<div class="form-group" style="display:none">
<button type="submit" id="search"
class="form-control btn btn-primary">{{lang.search}}</button>
class="form-control btn btn-primary">{{ lang.search }}
</button>
</div>
</form>
</div>
<h4 class="color-blue"><i class="glyphicon glyphicon-list-alt"></i> {{lang.table_data}} </h4>
<h4 class="color-blue"><i class="glyphicon glyphicon-list-alt"></i> {{ lang.table_data }} </h4>
<div>
<ul class="nav nav-tabs">
<li :class="{ active: isActive }" v-if="isActive">
<a href="#tab-0" role="tab" data-toggle="tab" @click='navClick("Deck")'><img class="tab-img" :src="img0" ></a>
<a href="#tab-0" role="tab" data-toggle="tab" @click='navClick("Deck")'><img class="tab-img"
:src="img0"></a>
</li>
<li :class="{ active: !isActive }">
<a href="#tab-1" role="tab" data-toggle="tab" @click='navClick("Monster")'><img class="tab-img" :src="img1"></a>
<a href="#tab-1" role="tab" data-toggle="tab" @click='navClick("Monster")'><img class="tab-img"
:src="img1"></a>
</li>
<li>
<a href="#tab-2" role="tab" data-toggle="tab" @click='navClick("Spell")'><img class="tab-img" :src="img2"></a>
<a href="#tab-2" role="tab" data-toggle="tab" @click='navClick("Spell")'><img class="tab-img"
:src="img2"></a>
</li>
<li>
<a href="#tab-3" role="tab" data-toggle="tab" @click='navClick("Trap")' ><img class="tab-img" :src="img3"></a>
<a href="#tab-3" role="tab" data-toggle="tab" @click='navClick("Trap")'><img class="tab-img"
:src="img3"></a>
</li>
<li>
<a href="#tab-4" role="tab" data-toggle="tab" @click='navClick("Side")'><img class="tab-img" :src="img4"></a>
<a href="#tab-4" role="tab" data-toggle="tab" @click='navClick("Side")'><img class="tab-img"
:src="img4"></a>
</li>
<li>
<a href="#tab-5" role="tab" data-toggle="tab" @click='navClick("Extra")'><img class="tab-img" :src="img5"></a>
<a href="#tab-5" role="tab" data-toggle="tab" @click='navClick("Extra")'><img class="tab-img"
:src="img5"></a>
</li>
</ul>
......@@ -139,7 +146,8 @@
<div class="form-group" style="display:none">
<button type="submit" id="search"
class="form-control btn btn-primary">{{lang.search}}</button>
class="form-control btn btn-primary">{{ lang.search }}
</button>
</div>
</div>
......@@ -154,44 +162,47 @@
</template>
<script>
import Footads from './Footads'
import tb_language from './tb_lang.js'
import {
import Footads from './Footads'
import tb_language from './tb_lang.js'
import {
mapGetters
} from 'vuex'
import API from '../api';
import img0 from '../assets/img/500x300_deck.png'
import img1 from '../assets/img/500x300_monster.png'
import img2 from '../assets/img/500x300_Spell.png'
import img3 from '../assets/img/500x300_Trap.png'
import img4 from '../assets/img/500x300_side.png'
import img5 from '../assets/img/ExtraWithBorder.png'
var dt = require('datatables.net')
var dt2 = require('datatables.net-bs')
import "../assets/css/dataTables.bootstrap.min.css"
var monsterTable;
var spellTable;
var trapTable;
var exTable;
var sideTable;
var deckTable;
const placeholder={
Deck:'请输入卡组名..',
Monster:'请输入怪兽卡名..',
Spell:'请输入魔法卡名..',
Trap:'请输入陷阱卡名..',
Side:'请输入卡片名..',
Extra:'请输入卡片名..',
}
export default {
} from 'vuex'
import API from '../api';
import img0 from '../assets/img/500x300_deck.png'
import img1 from '../assets/img/500x300_monster.png'
import img2 from '../assets/img/500x300_Spell.png'
import img3 from '../assets/img/500x300_Trap.png'
import img4 from '../assets/img/500x300_side.png'
import img5 from '../assets/img/ExtraWithBorder.png'
var dt = require('datatables.net')
var dt2 = require('datatables.net-bs')
import "../assets/css/dataTables.bootstrap.min.css"
var monsterTable;
var spellTable;
var trapTable;
var exTable;
var sideTable;
var deckTable;
const placeholder = {
Deck: '请输入卡组名..',
Monster: '请输入怪兽卡名..',
Spell: '请输入魔法卡名..',
Trap: '请输入陷阱卡名..',
Side: '请输入卡片名..',
Extra: '请输入卡片名..',
}
export default {
components: {
Footads
},
created: function() {
created: function () {
var regex_match =
/(nokia|iphone|android|motorola|^mot-|softbank|foma|docomo|kddi|up.browser|up.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte-|longcos|pantech|gionee|^sie-|portalmmm|jigs browser|hiptop|^benq|haier|^lct|operas*mobi|opera*mini|320x320|240x320|176x220)/i;
var u = navigator.userAgent;
......@@ -199,20 +210,21 @@
return true;
}
var result = regex_match.exec(u);
if (null == result) {} else {
if (null == result) {
} else {
this.width = "250%"
}
var lang = localStorage.getItem('lang') || 'cn';
this.init(lang)
},
mounted: function() {
mounted: function () {
this.init2();
},
data() {
return {
isActive: true,
totalDeck: 0,
type: "",
isActive: true,
width: "100%",
img0: img0,
img1: img1,
......@@ -228,20 +240,49 @@
}),
},
watch: {
lang: function(val) {
lang: function (val) {
// console.log('lang change1', val)
this.init2()
},
},
methods: {
navClick(data){
console.log('%c ---------------------src'+'\\'+'components'+'\\'+'Cards.vue---------------------%c:238','background:#f034c6','background:#14f1a4',
data)
$(".input-sm").attr("placeholder",placeholder[data])
period(){
// 计算禁卡表发布时间间隔
const today = new Date();
const year = today.getFullYear();
const dates = [
new Date(year, 0, 1),
new Date(year, 3, 1),
new Date(year, 6, 1),
new Date(year, 9, 1),
];
const season = dates.reduce((min, date) => {
const diff = Math.floor((today - date) / (1000 * 60 * 60 * 24));
if (today >= date && diff >= 0 && diff < min) {
return diff;
}
return min;
}, Infinity);
// 根据select设定对应天数
const periodMap = {
day: 1,
week: 7,
halfmonth: 15,
month: 30,
season: season
};
var selectedType = $("#type").val();
return periodMap[selectedType] || 1;
},
navClick(data) {
// console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Cards.vue---------------------%c:238', 'background:#f034c6', 'background:#14f1a4',
// data)
$(".input-sm").attr("placeholder", placeholder[data])
},
init: function(lang) {
init: function (lang) {
if (lang === "cn") {
this.isActive = true;
} else {
......@@ -250,15 +291,20 @@
// this.lang = language[lang]
this.getCount()
},
init2: function() {
init2: function () {
var lang = localStorage.getItem('lang') || 'cn';
if (lang === "cn") {
this.isActive = true;
} else {
this.isActive = false;
}
var self = this;
this.getCount().then(function (count) {
self.totalDeck = count; // 设置totalDeck的值
// 在获取到count后调用init2
function renderPage() {
if (monsterTable) {
monsterTable.clear();
monsterTable.destroy();
......@@ -287,7 +333,7 @@
lang: localStorage.getItem('lang') || 'cn',
extra: 'name',
source: final_source
}, function(data) {
}, function (data) {
var monster = data.monster;
var spell = data.spell;
var trap = data.trap;
......@@ -298,6 +344,7 @@
trapTable = renderTable("#trap", trap)
exTable = renderTable("#ex", ex)
sideTable = renderTable("#side", side)
// console.log(data)
});
//卡组api https://sapi.moecube.com:444/ygopro/analytics/deck/type?type=day&source=mycard-entertain
//只显示中文
......@@ -310,12 +357,12 @@
$.get('https://sapi.moecube.com:444/ygopro/analytics/deck/type', {
type: $("#type").val(),
source: final_source
}, function(data) {
}, function (data) {
var obj = data;
if (typeof obj === 'string')
obj = JSON.parse(data);
var rank = 1;
var processData = obj.map(function(x) {
var processData = obj.map(function (x) {
var tagStr = [];
var deckName = x.name;
for (var i = 0; i < x.tags.length; i++) {
......@@ -323,16 +370,27 @@
var short_tagName = tagName.replace(deckName + "-", "");
tagStr.push(short_tagName)
}
return [rank++, x.name, x.count, tagStr.join(" , ")];
var period = self.period();
var PickRate = (0 < (x.count / (self.totalDeck * period)) && (x.count / (self.totalDeck * period)) < 1)
? ((x.count / (self.totalDeck * period) * 100)).toFixed(2) + "%" : "-";
// 出现-是数据算出来不在0-1之间
return [rank++, x.name, x.count, PickRate, tagStr.join(" , ")];
});
deckTable = $("#deck").DataTable({
data: processData,
pageLength: 25,
order: [
[2, "desc"]
],
"ordering": true,
columns: [{
ordering: true,
columns: [
{
title: tb_language[lang].rank
},
{
......@@ -341,21 +399,24 @@
{
title: tb_language[lang].count
},
{
title: tb_language[lang].PickRate
},
{
title: tb_language[lang].topTags
},
],
"columnDefs": [{
"render": function(data, type, row) {
// return "<span title='" + data + "'>" + data + "</span>";
// return "<img src='imag.png' />";
return "<a href='?name=" + data + "#/deck'>" +
data + "</a>";
columnDefs: [
{
render: function (data, type, row) {
return "<a href='?name=" + data + "#/deck'>" + data + "</a>";
},
"targets": 1
}, ],
"language": tb_language[lang]
targets: 1
}
],
language: tb_language[lang]
});
});
}
}
......@@ -365,9 +426,19 @@
var lang = localStorage.getItem('lang') || 'cn';
var langIndex = (lang === 'en' ? 'en-US' : 'zh-CN');
var rank = 1;
var processData = tableData.map(function(d) {
return [rank++, d.name ? d.name[langIndex] : "未知卡片", d.frequency, d.putone, d
.puttwo, d.putthree, d.id
var processData = tableData.map(function (d) {
var period = self.period();
var PickRate = (parseInt(d.putone) + parseInt(d.puttwo) + parseInt(d.putthree)) / self.totalDeck / period;
PickRate = (0 < PickRate && PickRate < 1) ? (PickRate * 100).toFixed(2) + "%" : "-";
// 使用率出现-是数据算出来不在0-1之间
return [
rank++, d.name ? d.name[langIndex] : "未知卡片",
d.frequency,
PickRate,
d.putone,
d.puttwo,
d.putthree,
d.id
];
});
var table = $(tableID).DataTable({
......@@ -386,6 +457,9 @@
{
title: tb_language[lang].used
},
{
title: tb_language[lang].PickRate
},
{
title: tb_language[lang].put1
},
......@@ -397,57 +471,62 @@
},
],
"columnDefs": [{
"render": function(data, type, row) {
"render": function (data, type, row) {
return "<a href='https://www.ourocg.cn/search/" + row[6] +
"'>" + data + "</a>";
},
"targets": 1
}, ],
},],
"language": tb_language[lang]
});
$(".input-sm").attr("placeholder",placeholder.Deck)
$(".input-sm").attr("placeholder", placeholder.Deck)
return table;
}
renderPage();
$("#search").click(function() {
$("#search").click(function () {
renderPage();
return false;
})
});
},
onChange: function() {
onChange: function () {
$("#search").trigger('click')
this.getCount()
},
getCount: function() {
getCount: function () {
var server = $("#server").val() || "mycard"
var source = $("#source").val() || "athletic"
var opt = {
type: $("#type").val() || "day",
source: server + "-" + source
}
var self = this
API.getCount(opt).then((res) => {
return API.getCount(opt).then((res) => {
if (isNaN(res.data)) {
self.totalDeck = 0
return 0;
} else {
self.totalDeck = res.data
return res.data;
}
});
}
},
events: {
'lang-change': function(lang) {
'lang-change': function (lang) {
this.init(lang)
this.onChange()
}
},
}
}
</script>
<style scoped>
#deck {
margin-top:20px!important;
border:1px solid black;
}
#deck {
margin-top: 20px !important;
border: 1px solid black;
}
</style>
......@@ -6,47 +6,48 @@
<div class="thumbnail">
<img v-bind:src="user.avatar_url" style="height:200px;margin-top:13px;">
<div class="caption">
<h3> <i class="glyphicon glyphicon-user"></i> <strong>{{user.username}}</strong></h3>
<p class="text-muted" style="font-size:20px;">今日首胜: {{activity.today}}/1 </p>
<p class="text-muted" v-if="showActivity" style="font-size:20px;">{{activity.name}}首胜: {{activity.total}}/{{activity.max}} </p>
<h3><i class="glyphicon glyphicon-user"></i> <strong>{{ user.username }}</strong></h3>
<p class="text-muted" style="font-size:20px;">今日首胜: {{ activity.today }}/1 </p>
<p class="text-muted" v-if="showActivity" style="font-size:20px;">{{ activity.name }}首胜:
{{ activity.total }}/{{ activity.max }} </p>
</div>
</div>
</div>
<div class="col-md-9">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.athletic}} </h3>
<h3 class="panel-title">{{ lang.athletic }} </h3>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>D.P </td>
<td>{{user_info.pt}} </td>
<td>D.P</td>
<td>{{ user_info.pt }}</td>
</tr>
<tr>
<td>{{lang.athletic_rank}} </td>
<td>{{user_info.arena_rank}} </td>
<td>{{ lang.athletic_rank }}</td>
<td>{{ user_info.arena_rank }}</td>
</tr>
<tr>
<td>{{lang.win}} </td>
<td>{{user_info.athletic_win}} </td>
<td>{{ lang.win }}</td>
<td>{{ user_info.athletic_win }}</td>
</tr>
<tr>
<td>{{lang.lose}} </td>
<td>{{user_info.athletic_lose}} </td>
<td>{{ lang.lose }}</td>
<td>{{ user_info.athletic_lose }}</td>
</tr>
<tr>
<td>{{lang.draw}} </td>
<td>{{user_info.athletic_draw}} </td>
<td>{{ lang.draw }}</td>
<td>{{ user_info.athletic_draw }}</td>
</tr>
<tr>
<td>{{lang.all}} </td>
<td>{{user_info.athletic_all}} </td>
<td>{{ lang.all }}</td>
<td>{{ user_info.athletic_all }}</td>
</tr>
<tr>
<td>{{lang.ratio}} </td>
<td>{{user_info.athletic_wl_ratio}}% </td>
<td>{{ lang.ratio }}</td>
<td>{{ user_info.athletic_wl_ratio }}%</td>
</tr>
</tbody>
</table>
......@@ -54,34 +55,34 @@
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.entertain}} </h3>
<h3 class="panel-title">{{ lang.entertain }} </h3>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>EXP </td>
<td>{{user_info.exp}} </td>
<td>EXP</td>
<td>{{ user_info.exp }}</td>
</tr>
<tr>
<td>{{lang.exp_rank}} </td>
<td>{{user_info.exp_rank}} </td>
<td>{{ lang.exp_rank }}</td>
<td>{{ user_info.exp_rank }}</td>
</tr>
<tr>
<td>{{lang.win}} </td>
<td>{{user_info.entertain_win}} </td>
<td>{{ lang.win }}</td>
<td>{{ user_info.entertain_win }}</td>
</tr>
<tr>
<td>{{lang.lose}} </td>
<td>{{user_info.entertain_lose}} </td>
<td>{{ lang.lose }}</td>
<td>{{ user_info.entertain_lose }}</td>
</tr>
<tr>
<td>{{lang.draw}} </td>
<td>{{user_info.entertain_draw}} </td>
<td>{{ lang.draw }}</td>
<td>{{ user_info.entertain_draw }}</td>
</tr>
<tr>
<td>{{lang.all}} </td>
<td>{{user_info.entertain_all}} </td>
<td>{{ lang.all }}</td>
<td>{{ user_info.entertain_all }}</td>
</tr>
</tbody>
</table>
......@@ -90,47 +91,63 @@
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> {{lang.tagInfo}}
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
{{ lang.tagInfo }}
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.athleticDueHistory}} </h3>
<h3 class="panel-title">{{ lang.athleticDueHistory }} </h3>
</div>
<!--<div class="panel-body">-->
<!--<div style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" ></table>
</div>-->
<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="athletic_rank" class="table table-striped table-bordered table-hover example" :class="{ scroll: isMobile }"></table>
<table id="athletic_rank" class="table table-striped table-bordered table-hover example"
:class="{ scroll: isMobile }"></table>
</div>
<!--</div>-->
<!--<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" :class="{ scroll: isMobile }" ></table>
</div>-->
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.entertainDueHistory}} </h3>
<h3 class="panel-title">{{ lang.entertainDueHistory }} </h3>
</div>
<!--<div class="panel-body">-->
<!--<div style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" ></table>
</div>-->
<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="entertain_rank" class="table table-striped table-bordered table-hover example" :class="{ scroll: isMobile }"></table>
<table id="entertain_rank" class="table table-striped table-bordered table-hover example"
:class="{ scroll: isMobile }"></table>
</div>
<!--</div>-->
<!--<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" :class="{ scroll: isMobile }" ></table>
</div>-->
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{ lang.monthlyHistory }} </h3>
</div>
<!--<div class="panel-body">-->
<!--<div style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" ></table>
</div>-->
<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="monthly_rank" class="table table-striped table-bordered table-hover example"
:class="{ scroll: isMobile }"></table>
</div>
</div>
</div>
</div>
</div>
</div>
......@@ -138,16 +155,17 @@
</template>
<script>
import querystring from 'querystring';
import API from '../api'
import { mapGetters } from 'vuex'
import querystring from 'querystring';
import API from '../api'
import {mapGetters} from 'vuex'
var rankTable;
var rankTable2;
import moment from 'moment'
import tb_language from './tb_lang.js'
var rankTable;
var rankTable2;
var rankTable3;
import moment from 'moment'
import tb_language from './tb_lang.js'
export default {
export default {
data() {
return {
isMobile: false,
......@@ -183,7 +201,6 @@
},
mounted: function () {
var _this = this
$("#search").click(function () {
......@@ -195,7 +212,6 @@
},
created: function () {
var regex_match = /(nokia|iphone|android|motorola|^mot-|softbank|foma|docomo|kddi|up.browser|up.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte-|longcos|pantech|gionee|^sie-|portalmmm|jigs browser|hiptop|^benq|haier|^lct|operas*mobi|opera*mini|320x320|240x320|176x220)/i;
......@@ -216,21 +232,20 @@
API.getUserInfo(opt).then((res) => {
this.user_info = res.data
console.log('%c ---------------------src'+'\\'+'components'+'\\'+'Profile.vue---------------------%c:219','background:#ed162b','background:#7d382d',
console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Profile.vue---------------------%c:219', 'background:#ed162b', 'background:#7d382d',
res)
});
},
methods: {
exchangeUserInfo(info){
let userName=this.user.username
let exchangeInfo=info
if(info.usernamea!=userName)
{
exchangeInfo={
"type":info.type,
"start_time":info.start_time,
exchangeUserInfo(info) {
let userName = this.user.username
let exchangeInfo = info
if (info.usernamea != userName) {
exchangeInfo = {
"type": info.type,
"start_time": info.start_time,
"isfirstwin": info.isfirstwin,
"end_time": info.end_time,
"usernamea": info.usernameb,
......@@ -251,7 +266,7 @@
}
console.log('%c ---------------------src'+'\\'+'components'+'\\'+'Profile.vue---------------------%c:227','background:#1b5fbd','background:#ce8e6b',
console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Profile.vue---------------------%c:227', 'background:#1b5fbd', 'background:#ce8e6b',
exchangeInfo)
return exchangeInfo
},
......@@ -267,15 +282,20 @@
rankTable2.destroy();
}
if (rankTable3) {
rankTable3.destroy();
}
var username = this.user.username
var type = 1;
rankTable = this.renderRankTable("#athletic_rank", [], "DP");
rankTable2 = this.renderRankTable("#entertain_rank", [], "");
rankTable3 = this.renderRankTable("#monthly_rank", [], "");
if (!username) return;
API.getUserDueHistory({ username: username, type: "1", page_num: 100 }).then((res) => {
API.getUserDueHistory({username: username, type: "1", page_num: 100}).then((res) => {
if (rankTable) {
rankTable.destroy();
......@@ -286,25 +306,38 @@
});
API.getUserDueHistory({ username: username, type: "2", page_num: 100 }).then((res) => {
API.getUserDueHistory({username: username, type: "2", page_num: 100}).then((res) => {
if (rankTable2) {
rankTable2.destroy();
}
rankTable2 = this.renderRankTable("#entertain_rank", res.data.data, "")
}, (res) => {
console.log('%c ---------------------src'+'\\'+'components'+'\\'+'Profile.vue---------------------%c:258','background:#ef98b5','background:#53116e',
console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Profile.vue---------------------%c:258', 'background:#ef98b5', 'background:#53116e',
res)
});
// 每月决斗记录数据获取
var season = new Date().toISOString().slice(0, 7);
API.getMonthlyHistory({username: username, season:season}).then((res) => {
if (rankTable3) {
rankTable3.destroy();
}
rankTable3 = this.renderRankTable("#monthly_rank", res.data.data, "")
}, (res) => {
console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Profile.vue---------------------%c:258', 'background:#ef98b5', 'background:#53116e',
res)
});
var _this = this;
API.getFirstWin({ username: username }).then((res) => {
API.getFirstWin({username: username}).then((res) => {
_this.activity = res.data
if (_this.activity.name && _this.activity.name.trim().length > 0) {
_this.showActivity = true;
}
}, (res) => {
console.log('%c ---------------------src'+'\\'+'components'+'\\'+'Profile.vue---------------------%c:271','background:#c85336','background:#a4c933',
console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Profile.vue---------------------%c:271', 'background:#c85336', 'background:#a4c933',
res)
});
},
......@@ -314,13 +347,13 @@
var lang = localStorage.getItem('lang') || 'cn';
var rank = 1;
console.log('%c ---------------------src'+'\\'+'components'+'\\'+'Profile.vue---------------------%c:284','background:#c896f3','background:#f332b2',
console.log('%c ---------------------src' + '\\' + 'components' + '\\' + 'Profile.vue---------------------%c:284', 'background:#c896f3', 'background:#f332b2',
tableData)
let that=this
let that = this
var processData = tableData.map(function (d) {
d=that.exchangeUserInfo(d)
d = that.exchangeUserInfo(d)
return [d.usernamea, d.usernameb, moment(d.start_time).format('YYYY-MM-DD HH:mm'),
moment(d.end_time).format('YYYY-MM-DD HH:mm'), d.userscorea, d.userscoreb,
d.pta, d.pta_ex, d.ptb, d.ptb_ex];
......@@ -334,10 +367,10 @@
data: processData,
columns: [
{ title: tb_language[lang].playerA },
{ title: tb_language[lang].playerB },
{ title: tb_language[lang].startTime },
{ title: tb_language[lang].endTime },
{title: tb_language[lang].playerA},
{title: tb_language[lang].playerB},
{title: tb_language[lang].startTime},
{title: tb_language[lang].endTime},
],
"columnDefs": [
......@@ -397,6 +430,6 @@
},
},
}
}
</script>
......@@ -5,13 +5,16 @@
<div class="fck">
<form id="search-form" class="search-form" @submit.prevent="onSubmit">
<div class="form-group" v-bind:class="{ 'has-error': hasError}">
<label class="control-label" for="searchText" v-if="hasError">{{lang.battle.notfound}}</label>
<label class="control-label" for="searchText" v-if="hasError">{{ lang.battle.notfound }}</label>
<div class="input-group">
<div class="input-group-addon"><span><i class="glyphicon glyphicon-search"></i></span></div>
<input class="form-control" type="text" id="searchText" v-model="searchText" :placeholder="lang.battle.ph2">
<input class="form-control" type="text" id="searchText" v-model="searchText"
:placeholder="lang.battle.ph2">
<div class="input-group-btn">
<button class="btn btn-default" type="submit">{{lang.battle.search}}</button>
<button class="btn btn-default" style="display:none" type="submit" id="search">{{lang.battle.search}}</button>
<button class="btn btn-default" type="submit">{{ lang.battle.search }}</button>
<button class="btn btn-default" style="display:none" type="submit" id="search">
{{ lang.battle.search }}
</button>
</div>
</div>
</div>
......@@ -23,104 +26,195 @@
<div class="thumbnail">
<img v-bind:src="avatar_url" style="height:200px;margin-top:13px;">
<div class="caption">
<h3> <i class="glyphicon glyphicon-user"></i> <strong>{{username}}</strong></h3>
<h3><i class="glyphicon glyphicon-user"></i> <strong>{{ username }}</strong></h3>
<!--<p class="text-nowrap text-muted" style="font-size:20px;">有妞不泡,大逆不道;遇妞则泡,替天行道。 </p>-->
<p class="text-muted" style="font-size:20px;">今日首胜: {{activity.today}}/1 </p>
<p class="text-muted" v-if="showActivity" style="font-size:20px;">{{activity.name}}首胜: {{activity.total}}/{{activity.max}} </p>
<p class="text-muted" style="font-size:20px;">今日首胜: {{ activity.today }}/1 </p>
<p class="text-muted" v-if="showActivity" style="font-size:20px;">{{ activity.name }}首胜:
{{ activity.total }}/{{ activity.max }} </p>
</div>
</div>
</div>
<div class="col-md-9">
<div class="panel panel-default">
<div class="row">
<div class="col-md-6">
<div class="panel panel-default panel-tietie">
<div class="panel-heading">
<h3 class="panel-title">{{ lang.athletic }}</h3>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover ">
<tbody>
<tr>
<td>D.P</td>
<td>{{ user_info.pt }}</td>
</tr>
<tr>
<td>{{ lang.athletic_rank }}</td>
<td>{{ user_info.arena_rank }}</td>
</tr>
<tr>
<td>{{ lang.win }}</td>
<td>{{ user_info.athletic_win }}</td>
</tr>
<tr>
<td>{{ lang.lose }}</td>
<td>{{ user_info.athletic_lose }}</td>
</tr>
<tr>
<td>{{ lang.draw }}</td>
<td>{{ user_info.athletic_draw }}</td>
</tr>
<tr>
<td>{{ lang.all }}</td>
<td>{{ user_info.athletic_all }}</td>
</tr>
<tr>
<td>{{ lang.ratio }}</td>
<td>{{ user_info.athletic_wl_ratio }}%</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default panel-tietie">
<div class="panel-heading">
<h3 class="panel-title">{{lang.athletic}} </h3>
<h3 class="panel-title">{{ lang.athletic }}</h3>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>D.P </td>
<td>{{user_info.pt}} </td>
<td>D.P</td>
<td>{{ user_info.pt }}</td>
</tr>
<tr>
<td>{{ lang.athletic_rank }}</td>
<td>{{ user_info.arena_rank }}</td>
</tr>
<tr>
<td>{{ lang.win }}</td>
<td>{{ user_info.athletic_win }}</td>
</tr>
<tr>
<td>{{ lang.lose }}</td>
<td>{{ user_info.athletic_lose }}</td>
</tr>
<tr>
<td>{{ lang.draw }}</td>
<td>{{ user_info.athletic_draw }}</td>
</tr>
<tr>
<td>{{ lang.all }}</td>
<td>{{ user_info.athletic_all }}</td>
</tr>
<tr>
<td>{{ lang.ratio }}</td>
<td>{{ user_info.athletic_wl_ratio }}%</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{ lang.entertain }} </h3>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>{{lang.athletic_rank}} </td>
<td>{{user_info.arena_rank}} </td>
<td>EXP</td>
<td>{{ user_info.exp }}</td>
</tr>
<tr>
<td>{{lang.win}} </td>
<td>{{user_info.athletic_win}} </td>
<td>{{ lang.exp_rank }}</td>
<td>{{ user_info.exp_rank }}</td>
</tr>
<tr>
<td>{{lang.lose}} </td>
<td>{{user_info.athletic_lose}} </td>
<td>{{ lang.win }}</td>
<td>{{ user_info.entertain_win }}</td>
</tr>
<tr>
<td>{{lang.draw}} </td>
<td>{{user_info.athletic_draw}} </td>
<td>{{ lang.lose }}</td>
<td>{{ user_info.entertain_lose }}</td>
</tr>
<tr>
<td>{{lang.all}} </td>
<td>{{user_info.athletic_all}} </td>
<td>{{ lang.draw }}</td>
<td>{{ user_info.entertain_draw }}</td>
</tr>
<tr>
<td>{{lang.ratio}} </td>
<td>{{user_info.athletic_wl_ratio}}% </td>
<td>{{ lang.all }}</td>
<td>{{ user_info.entertain_all }}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.entertain}} </h3>
<h3 class="panel-title">{{ lang.entertain }} </h3>
</div>
<div class="table-responsive">
<table class="table table-striped table-bordered table-hover">
<tbody>
<tr>
<td>EXP </td>
<td>{{user_info.exp}} </td>
<td>EXP</td>
<td>{{ user_info.exp }}</td>
</tr>
<tr>
<td>{{lang.exp_rank}} </td>
<td>{{user_info.exp_rank}} </td>
<td>{{ lang.exp_rank }}</td>
<td>{{ user_info.exp_rank }}</td>
</tr>
<tr>
<td>{{lang.win}} </td>
<td>{{user_info.entertain_win}} </td>
<td>{{ lang.win }}</td>
<td>{{ user_info.entertain_win }}</td>
</tr>
<tr>
<td>{{lang.lose}} </td>
<td>{{user_info.entertain_lose}} </td>
<td>{{ lang.lose }}</td>
<td>{{ user_info.entertain_lose }}</td>
</tr>
<tr>
<td>{{lang.draw}} </td>
<td>{{user_info.entertain_draw}} </td>
<td>{{ lang.draw }}</td>
<td>{{ user_info.entertain_draw }}</td>
</tr>
<tr>
<td>{{lang.all}} </td>
<td>{{user_info.entertain_all}} </td>
<td>{{ lang.all }}</td>
<td>{{ user_info.entertain_all }}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button> {{lang.tagInfo}}
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
{{ lang.tagInfo }}
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.athleticDueHistory}} </h3>
<h3 class="panel-title">{{ lang.athleticDueHistory }} </h3>
</div>
<!--<div class="panel-body">-->
<!--<div style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" ></table>
</div>-->
<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="athletic_rank" class="table table-striped table-bordered table-hover example" :class="{ scroll: isMobile }"></table>
<table id="athletic_rank" class="table table-striped table-bordered table-hover example"
:class="{ scroll: isMobile }"></table>
</div>
<!--</div>-->
<!--<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
......@@ -131,14 +225,15 @@
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{{lang.entertainDueHistory}} </h3>
<h3 class="panel-title">{{ lang.entertainDueHistory }} </h3>
</div>
<!--<div class="panel-body">-->
<!--<div style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="rank" class="table table-striped table-bordered table-hover example" ></table>
</div>-->
<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
<table id="entertain_rank" class="table table-striped table-bordered table-hover example" :class="{ scroll: isMobile }"></table>
<table id="entertain_rank" class="table table-striped table-bordered table-hover example"
:class="{ scroll: isMobile }"></table>
</div>
<!--</div>-->
<!--<div class="table-responsive" style="width:100%;overflow-x:auto;overflow-y:hidden;">
......@@ -155,22 +250,22 @@
</template>
<script>
import querystring from 'querystring';
import querystring from 'querystring';
import img1 from '../assets/img/images1.jpeg'
import img2 from '../assets/img/images2.jpeg'
import img3 from '../assets/img/images3.jpeg'
import API from '../api'
import img1 from '../assets/img/images1.jpeg'
import img2 from '../assets/img/images2.jpeg'
import img3 from '../assets/img/images3.jpeg'
import API from '../api'
import tb_language from './tb_lang.js'
import {mapGetters} from 'vuex'
import tb_language from './tb_lang.js'
import { mapGetters } from 'vuex'
import moment from 'moment'
import moment from 'moment'
var rankTable;
var rankTable2;
var rankTable;
var rankTable2;
export default {
export default {
data() {
return {
activity: {
......@@ -199,7 +294,7 @@
athletic_all: 0,
athletic_wl_ratio: 0,
arena_rank: 0
}
},
}
},
created: function () {
......@@ -240,14 +335,13 @@
},
methods: {
exchangeUserInfo(info){
let userName=this.username
let exchangeInfo=info
if(info.usernamea!=userName)
{
exchangeInfo={
"type":info.type,
"start_time":info.start_time,
exchangeUserInfo(info) {
let userName = this.username
let exchangeInfo = info
if (info.usernamea != userName) {
exchangeInfo = {
"type": info.type,
"start_time": info.start_time,
"isfirstwin": info.isfirstwin,
"end_time": info.end_time,
"usernamea": info.usernameb,
......@@ -263,7 +357,6 @@
"pta_ex": info.ptb_ex,
"ptb_ex": info.pta_ex,
"winner": info.winner,
}
}
......@@ -297,32 +390,34 @@
if (!username) return;
API.getUserDueHistory({ username: username, type: "1", page_num: 100 }).then((res) => {
API.getUserDueHistory({username: username, type: "1", page_num: 100}).then((res) => {
if (rankTable) {
rankTable.destroy();
}
rankTable = this.renderRankTable("#athletic_rank", res.data.data, "DP")
}, (res) => {
console.log(res)
// console.log(res)
});
API.getUserDueHistory({ username: username, type: "2", page_num: 100 }).then((res) => {
API.getUserDueHistory({username: username, type: "2", page_num: 100}).then((res) => {
if (rankTable2) {
rankTable2.destroy();
}
rankTable2 = this.renderRankTable("#entertain_rank", res.data.data, "")
}, (res) => {
console.log(res)
// console.log(res)
});
var _this = this;
API.getFirstWin({ username: username }).then((res) => {
API.getFirstWin({username: username}).then((res) => {
_this.activity = res.data
if (_this.activity.name && _this.activity.name.trim().length > 0) {
_this.showActivity = true;
}
}, (res) => {
console.log(res)
// console.log(res)
});
},
......@@ -331,9 +426,9 @@
var lang = localStorage.getItem('lang') || 'cn';
var rank = 1;
let that=this
let that = this
var processData = tableData.map(function (d) {
d=that.exchangeUserInfo(d)
d = that.exchangeUserInfo(d)
return [d.usernamea, d.usernameb, moment(d.start_time).format('YYYY-MM-DD HH:mm'),
moment(d.end_time).format('YYYY-MM-DD HH:mm'), d.userscorea, d.userscoreb,
d.pta, d.pta_ex, d.ptb, d.ptb_ex];
......@@ -348,11 +443,10 @@
data: processData,
columns: [
{ title: tb_language[lang].playerA },
{ title: tb_language[lang].playerB },
{ title: tb_language[lang].startTime },
{ title: tb_language[lang].endTime },
{title: tb_language[lang].playerA},
{title: tb_language[lang].playerB},
{title: tb_language[lang].startTime},
{title: tb_language[lang].endTime},
],
"columnDefs": [
{
......@@ -425,34 +519,42 @@
if (!username) return
var _this = this;
API.getAvatar({ username: username }).then((res) => {
API.getAvatar({username: username}).then((res) => {
_this.avatar_url = res.data
}, (res) => {
_this.avatar_url = "https://cdn02.moecube.com:444/accounts/default_avatar.jpg"
});
API.getUserInfo({ username: username }).then((res) => {
API.getUserInfo({username: username}).then((res) => {
this.hasError = false
this.user_info = res.data
this.username = username
}, (res) => {
this.hasError = true
console.log(res)
// console.log(res)
});
$("#search").trigger('click');
}
},
}
}
</script>
<style scoped>
.fck {
.fck {
margin-bottom: 20px;
margin-top: -30px;
}
}
.scroll {
.scroll {
width: 250%;
}
}
.panel-tietie {
margin-bottom: 0;
border-bottom: 0;
}
</style>
......@@ -41,6 +41,7 @@ module.exports = {
dueHistory: '最近决斗记录',
athleticDueHistory: '竞技场决斗记录',
entertainDueHistory: '娱乐场决斗记录',
monthlyHistory: '每月决斗记录',
tagInfo: '绿色表示获胜方,红色则表示掉线。',
rates: '卡组胜率',
......
......@@ -38,6 +38,7 @@ module.exports = {
deck: "卡组",
count: "使用数",
PickRate : "使用率",
topTags: "热门标签",
playerA: '玩家A',
......@@ -59,6 +60,7 @@ module.exports = {
cardName: "Card Name",
used: "Used",
PickRate:"Pick Rate",
put1: "Put one ",
put2: "Put two ",
put3: "Put three ",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment