Skip to content

Commit 2aa4f4b

Browse files
committed
fix(view): 上传七牛
1 parent 763a059 commit 2aa4f4b

File tree

2 files changed

+47
-17
lines changed

2 files changed

+47
-17
lines changed

admin/src/components/common/navBar.vue

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,49 @@
11
<template>
2-
<div>
2+
<div class="nav">
33
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal">
44
<el-row :gutter="1">
55
<el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
66
<div class="grid-content">
77
<el-menu-item index="1">
8-
<router-link :to="{name: 'index'}">首页</router-link>
8+
<router-link :to="{name: 'index'}">公交-首页</router-link>
99
</el-menu-item>
1010
</div>
1111
</el-col>
1212
<el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
1313
<div class="grid-content">
1414
<el-menu-item index="3">
15-
<router-link :to="{name: 'echarts'}">图表</router-link>
15+
<router-link :to="{name: 'out'}" class="login">中文排版</router-link>
1616
</el-menu-item>
1717
</div>
1818
</el-col>
1919
<el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
2020
<div class="grid-content">
2121
<el-menu-item index="4">
22-
<router-link :to="{path: '/login'}">用户中心</router-link>
22+
<router-link :to="{name: 'excel'}" class="login">在线表格 Excel</router-link>
23+
</el-menu-item>
24+
</div>
25+
</el-col>
26+
<el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
27+
<div class="grid-content">
28+
<el-menu-item index="4">
29+
<router-link :to="{name: 'upload'}" class="login">图片转文字</router-link>
2330
</el-menu-item>
2431
</div>
2532
</el-col>
2633
<el-col :xs="6" :sm="6" :md="4" :lg="4" :xl="4">
2734
<div class="grid-content">
2835
<el-submenu index="2">
29-
<template slot="title">常用工具</template>
30-
<el-menu-item index="2-1" class="sub">
31-
<router-link :to="{name: 'out'}" class="login">中文排版</router-link>
32-
</el-menu-item>
33-
<el-menu-item index="2-2">
34-
<router-link :to="{name: 'md'}" class="login">markdown</router-link>
35-
</el-menu-item>
36+
<template slot="title">其它工具</template>
3637
<el-menu-item index="2-2">
37-
<router-link :to="{name: 'excel'}" class="login">在线表格</router-link>
38+
<router-link :to="{name: 'md'}" class="login">Markdown</router-link>
3839
</el-menu-item>
3940
<el-menu-item index="2-2">
40-
<router-link :to="{name: 'upload'}" class="login">图片转文字</router-link>
41+
<router-link :to="{name: 'echarts'}">图表</router-link>
4142
</el-menu-item>
4243
</el-submenu>
4344
</div>
4445
</el-col>
45-
<el-col :xs="6" :sm="6" :md="0" :lg="0" :xl="0"/>
46+
<!--<el-col :xs="6" :sm="6" :md="0" :lg="0" :xl="0"/>-->
4647
</el-row>
4748
</el-menu>
4849
</div>
@@ -60,6 +61,18 @@ export default {
6061
</script>
6162

6263
<style scoped>
64+
.nav {
65+
padding-left: 0;
66+
margin-bottom: 20px;
67+
list-style: none
68+
}
69+
.nav:after, .nav:before {
70+
display:table;
71+
content:" "
72+
}
73+
.nav:after {
74+
clear:both
75+
}
6376
.el-row {
6477
/*margin-bottom: 20px;*/
6578
height: 50px;

admin/src/views/home/excel.vue

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
<nav-bar/>
44
<el-upload
55
ref="upload"
6+
:data="dataObj"
7+
:action="uploadUrl"
68
:on-preview="handlePreview"
79
:on-remove="handleRemove"
810
:before-upload="beforeUpload"
911
:file-list="fileList"
10-
class="upload-demo"
11-
action="">
12+
class="upload-demo">
1213
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
1314
<div slot="tip" class="el-upload__tip">只能上传 Excel 文件,且不超过 500kb</div>
1415
</el-upload>
@@ -30,16 +31,32 @@
3031

3132
<script>
3233
import XLSX from 'xlsx'
34+
import request from '../../utils/request'
35+
3336
export default {
3437
data() {
3538
return {
3639
fileList: [],
3740
upLoadNumber: 100000,
3841
tableTitle: '',
3942
tableData: [],
40-
tableHeader: ''
43+
tableHeader: '',
44+
uploadUrl: 'http://up.qiniu.com',
45+
dialogImageUrl: '',
46+
dialogVisible: false,
47+
desc: '',
48+
dataObj: {}
4149
}
4250
},
51+
created() {
52+
// 加载页面时候需要获取本次上传七牛的 Token ,并且赋值
53+
const that = this
54+
request.get('/api/getToken').then(res => {
55+
// console.log(that.dataObj)
56+
that.dataObj = { 'token': res.data.token }
57+
console.log(that.dataObj)
58+
})
59+
},
4360
methods: {
4461
submitUpload() {
4562
this.$refs.upload.submit()

0 commit comments

Comments
 (0)