Skip to content

Y
Ygopro Arena Web
Commit 5336cb16 authored by ganjingcun's avatar ganjingcun
Browse files
Options

vote

parent d5de2740
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 11 deletions
package.json
View file @ 5336cb16
...@@ -12,14 +12,14 @@ ...@@ -12,14 +12,14 @@
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"datatables.net": "^1.10.13", "datatables.net": "^1.10.13",
"datatables.net-bs": "^1.10.13", "datatables.net-bs": "^1.10.13",
"element-ui": "^1.2.8", "element-ui": "^1.4.4",
"moment": "^2.18.1", "moment": "^2.18.1",
"shelljs": "^0.7.7", "shelljs": "^0.7.7",
"swiper": "^3.4.2", "swiper": "^3.4.2",
"vue": "^2.2.2", "vue": "^2.4.2",
"vue-resource": "^1.3.1", "vue-resource": "^1.3.4",
"vue-router": "^2.2.0", "vue-router": "^2.2.0",
"vuex": "^2.2.1" "vuex": "^2.4.0"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.7.2", "autoprefixer": "^6.7.2",
...@@ -41,17 +41,17 @@ ...@@ -41,17 +41,17 @@
"function-bind": "^1.1.0", "function-bind": "^1.1.0",
"html-webpack-plugin": "^2.28.0", "html-webpack-plugin": "^2.28.0",
"http-proxy-middleware": "^0.17.3", "http-proxy-middleware": "^0.17.3",
"webpack-bundle-analyzer": "^2.2.1",
"semver": "^5.3.0",
"opn": "^4.0.2", "opn": "^4.0.2",
"optimize-css-assets-webpack-plugin": "^1.3.0", "optimize-css-assets-webpack-plugin": "^1.3.0",
"ora": "^1.1.0", "ora": "^1.1.0",
"rimraf": "^2.6.0", "rimraf": "^2.6.0",
"semver": "^5.3.0",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"vue-loader": "^11.1.4", "vue-loader": "^11.3.4",
"vue-style-loader": "^2.0.0", "vue-style-loader": "^2.0.0",
"vue-template-compiler": "^2.2.4", "vue-template-compiler": "^2.4.2",
"webpack": "^2.2.1", "webpack": "^2.2.1",
"webpack-bundle-analyzer": "^2.2.1",
"webpack-dev-middleware": "^1.10.0", "webpack-dev-middleware": "^1.10.0",
"webpack-hot-middleware": "^2.16.1", "webpack-hot-middleware": "^2.16.1",
"webpack-merge": "^2.6.1" "webpack-merge": "^2.6.1"
......
src/api.js
View file @ 5336cb16
...@@ -72,4 +72,13 @@ export default class Api { ...@@ -72,4 +72,13 @@ export default class Api {
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 });
}
static saveVote(opt) {
const url = `${URL}/votes`
return Vue.http.post(url, opt, { 'emulateJSON': true });
}
} }
src/components/Download.vue
View file @ 5336cb16
...@@ -9,18 +9,19 @@ ...@@ -9,18 +9,19 @@
<div @click="gogo('windows')" class="col-md-4 col-sm-6 item1"> <div @click="gogo('windows')" class="col-md-4 col-sm-6 item1">
<div class="box"><i class="fa fa-windows"></i> <div class="box"><i class="fa fa-windows"></i>
<h3 class="name">Windows </h3> <h3 class="name">Windows </h3>
<!--<p class="title">asd</p>--> <!--<p class="title"> &nbsp;</p>-->
</div> </div>
</div> </div>
<div @click="gogo('mac')" class="col-md-4 col-sm-6 item1"> <div @click="gogo('mac')" class="col-md-4 col-sm-6 item1">
<div class="box"><i class="fa fa-apple"></i> <div class="box"><i class="fa fa-apple"></i>
<h3 class="name">Mac </h3> <h3 class="name">Mac </h3>
<!--<p class="title">asd</p>--> <!--<p class="title"> </p>-->
</div> </div>
</div> </div>
<div @click="gogo('android')" class="col-md-4 col-sm-6 item1"> <div @click="gogo('android')" class="col-md-4 col-sm-6 item1">
<div class="box"><i class="fa fa-android"></i> <div class="box"><i class="fa fa-android"></i>
<h3 class="name">Android (YGOMobile) </h3> <h3 class="name">Android </h3>
<!--<p class="title">(YGOMobile)</p>-->
</div> </div>
</div> </div>
......
src/components/Vote.vue 0 → 100644
View file @ 5336cb16
<template>
<div class="container">
<div id="history">
<!--<el-form :inline="true" :model="formInline">
<el-form-item>
<el-select style="width: 100px;" v-model="type" placeholder="类别" @change="selectChange">
<el-option label="所有" value="0"></el-option>
<el-option label="竞技" value="1"></el-option>
<el-option label="娱乐" value="2"></el-option>
</el-select>
</el-form-item>
<el-date-picker v-model="date" type="daterange" align="right" placeholder="选择日期范围" :picker-options="pickerOptions2" style="width: 220px;">
</el-date-picker>
<el-form-item>
<el-input v-model="username" @blur="searchTextChange" icon="search" style="width: 200px;" placeholder="用户名"></el-input>
</el-form-item>
</el-form>-->
<!--<el-table :data="history.data" stripe style="width: 100%">
<el-table-column prop="usernamea" label="玩家A" width="180">
<template scope="scope">
<el-tag :type="scope.row.userscorea > scope.row.userscoreb ? 'success' : 'gray'" close-transition>{{scope.row.usernamea}}</el-tag>
<el-icon v-if="scope.row.userscorea < 0" class="el-icon-warning"></el-icon>
</template>
</el-table-column>
<el-table-column prop="usernameb" label="玩家B" width="180">
<template scope="scope">
<el-tag :type="scope.row.userscoreb > scope.row.userscorea ? 'success' : 'gray'" close-transition>{{scope.row.usernameb}}</el-tag>
<el-icon v-if="scope.row.userscoreb < 0" class="el-icon-warning"></el-icon>
</template>
</el-table-column>
<el-table-column label="类型" :formatter="formatter0" width="80"></el-table-column>
<el-table-column label="开始时间" :formatter="formatter1"></el-table-column>
<el-table-column label="结束时间" :formatter="formatter2"></el-table-column>
</el-table>-->
<el-button type="text" @click="newVote">新建投票</el-button>
<el-dialog title="投票详情" :visible.sync="dialogFormVisible">
<el-form :model="dynamicValidateForm" ref="dynamicValidateForm" label-width="80px" class="demo-dynamic">
<el-form-item prop="title" label="投票标题" :rules="{required: true, message: '投票标题不能为空', trigger: 'blur'}">
<el-input v-model="dynamicValidateForm.title"></el-input>
</el-form-item>
<el-form-item v-for="(domain, index) in dynamicValidateForm.domains" :label="'投票项' + index" :key="domain.key" :prop="'domains.' + index + '.name'"
:rules="{required: true, message: '投票项内容不能为空', trigger: 'blur'}">
<el-input v-model="domain.name"></el-input>
<el-button @click.prevent="removeDomain(domain)">删除</el-button>
</el-form-item>
<el-form-item prop="email" label="投票日期">
<el-date-picker v-model="date" type="daterange" placeholder="选择日期范围" :picker-options="pickerOptions2" style="width: 220px;">
</el-date-picker>
</el-form-item>
<el-form-item label="是否启用" >
<!--<el-tooltip :content="xxx " placement="top">-->
<!--<el-switch v-model="dynamicValidateForm.status" on-color="#13ce66" off-color="#ff4949" on-value="true" off-value="false">
</el-switch>-->
<!--</el-tooltip>-->
<el-checkbox v-model="dynamicValidateForm.status"></el-checkbox>
</el-form-item>
<!--<el-form-item>-->
<!--<el-button type="primary" @click="submitForm('dynamicValidateForm')">提交</el-button>-->
<!--<el-button @click="resetForm('dynamicValidateForm')">重置</el-button>-->
<!--</el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button @click="addDomain">新增投票项</el-button>
<!--<el-button @click="resetForm('dynamicValidateForm')">重置</el-button>-->
<el-button type="primary" @click="submitForm('dynamicValidateForm')">提 交</el-button>
</div>
</el-dialog>
<hr>
<el-table :data="history.data" style="width: 100%">
<el-table-column type="expand">
<template scope="props">
<div v-for=" item in props.row.options">
{{ item.name }}
<el-progress :percentage="50"></el-progress>
</div>
</template>
</el-table-column>
<!--<el-table-column label="ID" prop="id"></el-table-column>-->
<el-table-column label="标题" prop="title"></el-table-column>
<el-table-column label="开始时间" :formatter="formatter1"></el-table-column>
<el-table-column label="结束时间" :formatter="formatter2"></el-table-column>
<el-table-column label="状态" :formatter="formatter3"></el-table-column>
<!--<el-table-column label="状态">
<template scope="props">
<el-tooltip :content="'Switch value: ' + props.row.status" placement="top">
<el-switch v-model="props.row.status" on-color="#13ce66" off-color="#ff4949" on-value="true" off-value="false">
</el-switch>
</el-tooltip>
</template>
</el-table-column>-->
<el-table-column label="操作" width="100">
<template scope="props">
<el-button @click="handleClick(props.row)" type="text" size="small">编辑</el-button>
</template>
</el-table-column>
</el-table>
<div class="text-center">
<el-pagination :page-size="pageSize" layout="total, prev, pager, next" :total="history.total" @current-change="clickpage"></el-pagination>
</div>
</div>
</div>
</template>
<script>
import querystring from 'querystring';
import language from './lang';
import API from '../api'
import tb_language from './tb_lang.js'
import { mapGetters } from 'vuex'
import moment from 'moment'
export default {
created: function () {
var lang = localStorage.getItem('lang') || 'cn';
this.init(lang)
},
watch: {
date: function (val) {
if (val[0] != null) {
this.from_date = moment(val[0]).format('YYYY-MM-DD HH:mm')
this.to_date = moment(val[1]).format('YYYY-MM-DD HH:mm')
} else {
this.from_date = '';
this.to_date = '';
}
if(this.needRender){
this.renderTable()
}
},
},
data: function () {
return {
needRender:true,
page: 1,
from_date: moment().format('YYYY-MM-DD HH:mm'),
to_date: moment().add(7, 'd').format('YYYY-MM-DD HH:mm'),
date: [moment().format('YYYY-MM-DD HH:mm'), moment().add(7, 'd').format('YYYY-MM-DD HH:mm')],
username: '',
type: '0',
formInline: {
},
pickerOptions2: {
shortcuts: [
{
text: '今天',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime());
picker.$emit('pick', [start, end]);
}
},
{
text: '昨天',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
picker.$emit('pick', [start, end]);
}
},
{
text: '最近一周',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近一个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近三个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit('pick', [start, end]);
}
}]
},
pageSize: 15,
history: {
total: 0,
data: []
},
dynamicValidateForm: {
domains: [{
value: ''
}],
id: '',
status: false,
title: ''
},
dialogFormVisible: false,
form: {
name: '',
region: '',
date1: '',
date2: '',
delivery: false,
type: [],
resource: '',
desc: ''
},
formLabelWidth: '120px',
isClick: false,
}
},
methods: {
newVote() {
this.dialogFormVisible = true
this.dynamicValidateForm.id = ""
},
handleClick(row) {
this.dynamicValidateForm.id = row.id
this.dynamicValidateForm.status = row.status
this.dynamicValidateForm.title = row.title
this.dynamicValidateForm.domains = row.options
// this.date = [row.start_time, row.end_time]
this.dialogFormVisible = true;
},
searchTextChange: function () {
var username = this.username
this.renderTable()
},
selectChange: function (val) {
this.type = val
this.renderTable()
},
init: function (lang) {
this.renderTable()
},
clickpage: function (num) {
this.page = num
this.renderTable()
},
formatter0(row, column) {
if ('athletic' === row.type) {
return '竞技'
} else {
return '娱乐'
}
},
formatter1(row, column) {
return moment(row.start_time).format('YYYY-MM-DD HH:mm')
},
formatter2(row, column) {
return moment(row.end_time).format('YYYY-MM-DD HH:mm')
},
formatter3(row, column) {
return row.status ? '启用' : '禁用'
},
renderTable: function () {
var params = {
page: this.page,
username: this.username,
type: this.type,
from_date: this.from_date,
to_date: this.to_date
}
var _this = this;
API.getVoteList(params).then((res) => {
var history = {}
history.total = res.data.total
history.data = res.data.data.map(function (row) {
row.options = JSON.parse(row.options)
return row
})
_this.history = history
}, (res) => {
//
})
},
submitForm(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isClick) {
this.$notify({
title: '警告',
message: '您操作得太快了!',
type: 'error'
})
} else {
this.dialogFormVisible = false
this.isClick = true;
var param = {
id: this.dynamicValidateForm.id,
title: this.dynamicValidateForm.title,
options: JSON.stringify(this.dynamicValidateForm.domains),
start_time: this.from_date,
end_time: this.to_date,
status: this.dynamicValidateForm.status
}
var _this = this;
API.saveVote(param).then((res) => {
this.dialogFormVisible2 = false
this.$notify({
title: '操作成功',
message: '感谢您的提交!',
type: 'success'
})
_this.renderTable()
setTimeout(function () {
_this.isClick = false;
}, 3000)
}, (res) => {
setTimeout(function () {
_this.isClick = false;
}, 3000)
this.hasError = true
});
}
} else {
console.log('error submit!!');
return false;
}
});
},
resetForm(formName) {
this.$refs[formName].resetFields();
},
removeDomain(item) {
var index = this.dynamicValidateForm.domains.indexOf(item)
if (index !== -1) {
this.dynamicValidateForm.domains.splice(index, 1)
}
},
addDomain() {
this.dynamicValidateForm.domains.push({
value: '',
key: Date.now()
});
}
}
}
</script>
<style scoped>
#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
src/router/index.js
View file @ 5336cb16
...@@ -10,6 +10,7 @@ import Cardinfo from '@/components/Cardinfo' ...@@ -10,6 +10,7 @@ import Cardinfo from '@/components/Cardinfo'
import History from '@/components/History' import History from '@/components/History'
import Deck from '@/components/Deck' import Deck from '@/components/Deck'
import Report from '@/components/Report' import Report from '@/components/Report'
import Vote from '@/components/Vote'
Vue.use(Router) Vue.use(Router)
...@@ -65,5 +66,10 @@ export default new Router({ ...@@ -65,5 +66,10 @@ export default new Router({
name: 'Report', name: 'Report',
component: Report component: Report
}, },
{
path: '/vote',
name: 'Vote',
component: Vote
},
] ]
}) })
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