Skip to content

A
admin-base
Commit f50aa9a3 authored by findy's avatar findy
Browse files
Options

a

parent 5edb6392
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 23 deletions
package-lock.json
View file @ f50aa9a3
......@@ -175,8 +175,7 @@
"array-find-index": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
},
"array-flatten": {
"version": "1.1.1",
......@@ -1264,6 +1263,11 @@
}
}
},
"base64-arraybuffer": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
},
"base64-js": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
......@@ -2199,6 +2203,14 @@
"integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
"dev": true
},
"css-line-break": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-1.0.1.tgz",
"integrity": "sha1-GfIGOjPpX7KDG4ZEbAuAwYivRQo=",
"requires": {
"base64-arraybuffer": "0.1.5"
}
},
"css-loader": {
"version": "0.28.11",
"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz",
......@@ -4579,6 +4591,14 @@
}
}
},
"html2canvas": {
"version": "1.0.0-alpha.12",
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.0.0-alpha.12.tgz",
"integrity": "sha1-OxmS48mz9WBjw1/WIElPN+uohRM=",
"requires": {
"css-line-break": "1.0.1"
}
},
"htmlparser2": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
......@@ -5824,6 +5844,16 @@
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
},
"mint-ui": {
"version": "2.2.13",
"resolved": "https://registry.npmjs.org/mint-ui/-/mint-ui-2.2.13.tgz",
"integrity": "sha512-Xz1SFagHSzKOprwQv3fcekXT5RJvhh939zwZHcWeazk1OJrCjsD4I2qm49AEUCfT1AoYzC+rsZIwGP/J6LwVVw==",
"requires": {
"array-find-index": "1.0.2",
"raf.js": "0.0.4",
"vue-lazyload": "1.2.6"
}
},
"mississippi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
......@@ -8741,6 +8771,11 @@
"resolved": "https://registry.npmjs.org/qiniu-js/-/qiniu-js-2.5.1.tgz",
"integrity": "sha512-azOejduzZ9VRqlwwYr2UzfBesQIZHCz4TOyfGcBGMVOTJfznq3feLMCM1h54hDUvlB9ldmbeJ31DJswGNkn6Gg=="
},
"qrcodejs2": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
"integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
},
"qs": {
"version": "6.5.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
......@@ -8774,6 +8809,11 @@
"integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
"dev": true
},
"raf.js": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/raf.js/-/raf.js-0.0.4.tgz",
"integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w="
},
"randomatic": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
......@@ -10004,9 +10044,9 @@
}
},
"tinymce": {
"version": "4.8.0",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.8.0.tgz",
"integrity": "sha512-Rj5MiQxSpwDIaaXo3WsfZqLfLBUi6jLZRrIpg1cbRurhSLwaNcTgAGqxHFjNELlm7zR2xSGzzlq5B/mGlsiJSg=="
"version": "4.9.1",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.1.tgz",
"integrity": "sha512-lGk6QFI2KYWnIkti0TvtN30GIgJAfWWl8LBqUYdnHuywrNvgl92fqrQHhUP7YChHNhiYZj6JAy8M5cwVlbO7iQ=="
},
"to-arraybuffer": {
"version": "1.0.1",
......@@ -10500,6 +10540,11 @@
"integrity": "sha512-2j/t+wIbyVMP5NvctQoSUvLkYKoWAAk2QlQiilrM2a6/ulzFgdcLUJfTvs4XQ/3eZhHiBmmEojbjmM4AzZj8JA==",
"dev": true
},
"vue-lazyload": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.6.tgz",
"integrity": "sha512-6a61+pzwcfowhLRQiPdmRuJ40n/4fL/sEynu8KQZoCf5RVA0NH0X68vplLY0+lUM8mKNScYomaepV+hdjgnZhg=="
},
"vue-loader": {
"version": "13.7.2",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.2.tgz",
......
src/components/achievement/index.vue
View file @ f50aa9a3
......@@ -32,22 +32,22 @@
</el-table-column>
<el-table-column
prop="total_money"
label="销售额"
label="销售额" sortable
>
</el-table-column>
<el-table-column
prop="three_month"
label="季课"
label="季课" sortable
>
</el-table-column>
<el-table-column
prop="one_year"
label="年课"
label="年课" sortable
>
</el-table-column>
<el-table-column
prop="two_year"
label="2年课"
label="2年课" sortable
>
</el-table-column>
</el-table>
......@@ -87,22 +87,22 @@
</el-table-column>
<el-table-column
prop="total_money"
label="销售额"
label="销售额" sortable
>
</el-table-column>
<el-table-column
prop="three_month"
label="季课"
label="季课" sortable
>
</el-table-column>
<el-table-column
prop="one_year"
label="年课"
label="年课" sortable
>
</el-table-column>
<el-table-column
prop="two_year"
label="2年课"
label="2年课" sortable
>
</el-table-column>
</el-table>
......@@ -129,6 +129,7 @@
}
},
mounted(){
this.defaultTime();
this.searchFirstPage();
},
methods: {
......@@ -163,7 +164,21 @@
getTeacherDayRankListApi(json).then(res=>{
this.secondList = res;
})
},
defaultTime(){
let date = new Date();
let year = date.getFullYear();
let Month = date.getMonth()+1;
if(Month < 10){
Month = `0${Month}`
}
let Day = date.getDate();
if(Day<10)Day = `0${Day}`
let star = `${year}-${Month}-01`;
let end = `${year}-${Month}-${Day}`
this.searchFirstFrom.dateValue = [star,end]
this.searchSecondFrom.dateValue = [star,end]
}
}
}
</script>
......
src/components/class/userList.vue
View file @ f50aa9a3
......@@ -123,7 +123,7 @@
type="selection"
width="55">
</el-table-column>
<el-table-column label="用户" className="f-c" width="150">
<el-table-column label="用户" className="f-c" width="150" sortable>
<template slot-scope="scope">
<img :src="scope.row.avatar" style="width: 40px;height: 40px;border-radius: 50px"> {{scope.row.nickname}}(ID:{{scope.row.user_id}})
</template>
......@@ -141,7 +141,7 @@
</template>
</el-table-column>
<el-table-column
label="最后登录时间">
label="最后登录时间" sortable width="140">
<template slot-scope="scope">
{{ scope.row.last_login_at }}
</template>
......@@ -159,25 +159,25 @@
</template>
</el-table-column>
<el-table-column
label="课包查看次数">
label="课包查看次数" sortable width="140">
<template slot-scope="scope">
{{ scope.row.watch_course_num }}
</template>
</el-table-column>
<el-table-column
label="学习时长（分）">
label="学习时长（分）" sortable width="150">
<template slot-scope="scope">
{{ Math.round(scope.row.watch_course_time / 60 * 100) / 100}}
</template>
</el-table-column>
<el-table-column
label="作业率">
label="作业率" sortable>
<template slot-scope="scope">
{{ scope.row.work_rate | percent}}
</template>
</el-table-column>
<el-table-column
label="打卡率">
label="打卡率" sortable>
<template slot-scope="scope">
{{ scope.row.clock_rate | percent}}
</template>
......@@ -189,7 +189,7 @@
</template>
</el-table-column>
<el-table-column
label="是否添加老师">
label="是否添加老师" width="120">
<template slot-scope="scope">
{{ scope.row.is_add_teacher === 0 ? '否' : '是'}}
</template>
......
src/components/teacherDetail/chooseGoodDialog.vue
View file @ f50aa9a3
<template>
<el-dialog title="复制链接" :visible.sync="show" :modal="false">
<el-dialog title="复制链接" :visible.sync="show" :modal="false" width="80%">
<el-form ref="searchFrom" :model="searchFrom" label-width="100px" class="search-form" inline>
<el-form-item label="商品名称">
<el-input v-model="searchFrom.name"></el-input>
......@@ -120,7 +120,7 @@
label="操作">
<template slot-scope="scope">
<el-button size="mini" plain type="success" @click="copyUrl(scope.row.id)">
复制商品
复制链接
</el-button>
</template>
</el-table-column>
......
src/components/teacherDetail/index.vue
View file @ f50aa9a3
......@@ -30,7 +30,7 @@
{{detail.user_info.nickname}}(ID:{{detail.user_info.user_id}})
</el-col>
<el-col v-if="detail.user_info">
<el-col v-if="detail.user_info" :span="6">
<el-button @click="createInviteLink(detail.user_info.user_id)" size="mini" plain type="primary">
复制专属链接
</el-button>
......
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