Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
VueElementTemplate
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄瑜
VueElementTemplate
Commits
98d5f9a2
Commit
98d5f9a2
authored
Oct 31, 2017
by
Pan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint:format code style
parent
3666148d
Changes
14
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
341 additions
and
342 deletions
+341
-342
.eslintrc.js
.eslintrc.js
+1
-1
index.vue
src/components/Dropzone/index.vue
+10
-10
index.vue
src/components/Tinymce/index.vue
+33
-33
index.js
src/filters/index.js
+6
-6
main.js
src/main.js
+1
-1
_import_development.js
src/router/_import_development.js
+1
-1
fetch.js
src/utils/fetch.js
+25
-26
index.js
src/utils/index.js
+230
-230
openWindow.js
src/utils/openWindow.js
+1
-1
index.vue
src/views/clipboard/index.vue
+1
-1
sticky.vue
src/views/components/sticky.vue
+3
-3
pieChart.vue
src/views/dashboard/admin/pieChart.vue
+6
-6
complexTable.vue
src/views/example/table/complexTable.vue
+4
-4
index.vue
src/views/login/index.vue
+19
-19
No files found.
.eslintrc.js
View file @
98d5f9a2
...
@@ -52,7 +52,7 @@ module.exports = {
...
@@ -52,7 +52,7 @@ module.exports = {
'no-class-assign'
:
2
,
'no-class-assign'
:
2
,
'no-cond-assign'
:
2
,
'no-cond-assign'
:
2
,
'no-const-assign'
:
2
,
'no-const-assign'
:
2
,
'no-control-regex'
:
2
,
'no-control-regex'
:
0
,
'no-delete-var'
:
2
,
'no-delete-var'
:
2
,
'no-dupe-args'
:
2
,
'no-dupe-args'
:
2
,
'no-dupe-class-members'
:
2
,
'no-dupe-class-members'
:
2
,
...
...
src/components/Dropzone/index.vue
View file @
98d5f9a2
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<
script
>
<
script
>
import
Dropzone
from
'dropzone'
import
Dropzone
from
'dropzone'
import
'dropzone/dist/dropzone.css'
import
'dropzone/dist/dropzone.css'
// import { getToken } from 'api/qiniu';
// import { getToken } from 'api/qiniu';
Dropzone
.
autoDiscover
=
false
Dropzone
.
autoDiscover
=
false
...
@@ -59,18 +59,18 @@ export default {
...
@@ -59,18 +59,18 @@ export default {
},
},
accept
:
(
file
,
done
)
=>
{
accept
:
(
file
,
done
)
=>
{
/* 七牛*/
/* 七牛*/
// const token = this.$store.getters.token;
// const token = this.$store.getters.token;
// getToken(token).then(response => {
// getToken(token).then(response => {
// file.token = response.data.qiniu_token;
// file.token = response.data.qiniu_token;
// file.key = response.data.qiniu_key;
// file.key = response.data.qiniu_key;
// file.url = response.data.qiniu_url;
// file.url = response.data.qiniu_url;
// done();
// done();
// })
// })
done
()
done
()
},
},
sending
:
(
file
,
xhr
,
formData
)
=>
{
sending
:
(
file
,
xhr
,
formData
)
=>
{
// formData.append('token', file.token);
// formData.append('token', file.token);
// formData.append('key', file.key);
// formData.append('key', file.key);
vm
.
initOnce
=
false
vm
.
initOnce
=
false
}
}
})
})
...
...
src/components/Tinymce/index.vue
View file @
98d5f9a2
...
@@ -91,39 +91,39 @@ export default {
...
@@ -91,39 +91,39 @@ export default {
this
.
$emit
(
'input'
,
editor
.
getContent
({
format
:
'raw'
}))
this
.
$emit
(
'input'
,
editor
.
getContent
({
format
:
'raw'
}))
})
})
}
}
// 整合七牛上传
// 整合七牛上传
// images_dataimg_filter(img) {
// images_dataimg_filter(img) {
// setTimeout(() => {
// setTimeout(() => {
// const $image = $(img);
// const $image = $(img);
// $image.removeAttr('width');
// $image.removeAttr('width');
// $image.removeAttr('height');
// $image.removeAttr('height');
// if ($image[0].height && $image[0].width) {
// if ($image[0].height && $image[0].width) {
// $image.attr('data-wscntype', 'image');
// $image.attr('data-wscntype', 'image');
// $image.attr('data-wscnh', $image[0].height);
// $image.attr('data-wscnh', $image[0].height);
// $image.attr('data-wscnw', $image[0].width);
// $image.attr('data-wscnw', $image[0].width);
// $image.addClass('wscnph');
// $image.addClass('wscnph');
// }
// }
// }, 0);
// }, 0);
// return img
// return img
// },
// },
// images_upload_handler(blobInfo, success, failure, progress) {
// images_upload_handler(blobInfo, success, failure, progress) {
// progress(0);
// progress(0);
// const token = _this.$store.getters.token;
// const token = _this.$store.getters.token;
// getToken(token).then(response => {
// getToken(token).then(response => {
// const url = response.data.qiniu_url;
// const url = response.data.qiniu_url;
// const formData = new FormData();
// const formData = new FormData();
// formData.append('token', response.data.qiniu_token);
// formData.append('token', response.data.qiniu_token);
// formData.append('key', response.data.qiniu_key);
// formData.append('key', response.data.qiniu_key);
// formData.append('file', blobInfo.blob(), url);
// formData.append('file', blobInfo.blob(), url);
// upload(formData).then(() => {
// upload(formData).then(() => {
// success(url);
// success(url);
// progress(100);
// progress(100);
// })
// })
// }).catch(err => {
// }).catch(err => {
// failure('出现未知问题,刷新页面,或者联系程序员')
// failure('出现未知问题,刷新页面,或者联系程序员')
// console.log(err);
// console.log(err);
// });
// });
// },
// },
})
})
},
},
destroyTinymce
()
{
destroyTinymce
()
{
...
...
src/filters/index.js
View file @
98d5f9a2
...
@@ -77,12 +77,12 @@ export function formatTime(time, option) {
...
@@ -77,12 +77,12 @@ export function formatTime(time, option) {
/* 数字 格式化*/
/* 数字 格式化*/
export
function
nFormatter
(
num
,
digits
)
{
export
function
nFormatter
(
num
,
digits
)
{
const
si
=
[
const
si
=
[
{
value
:
1
E18
,
symbol
:
'E'
},
{
value
:
1
E18
,
symbol
:
'E'
},
{
value
:
1
E15
,
symbol
:
'P'
},
{
value
:
1
E15
,
symbol
:
'P'
},
{
value
:
1
E12
,
symbol
:
'T'
},
{
value
:
1
E12
,
symbol
:
'T'
},
{
value
:
1
E9
,
symbol
:
'G'
},
{
value
:
1
E9
,
symbol
:
'G'
},
{
value
:
1
E6
,
symbol
:
'M'
},
{
value
:
1
E6
,
symbol
:
'M'
},
{
value
:
1
E3
,
symbol
:
'k'
}
{
value
:
1
E3
,
symbol
:
'k'
}
]
]
for
(
let
i
=
0
;
i
<
si
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
si
.
length
;
i
++
)
{
if
(
num
>=
si
[
i
].
value
)
{
if
(
num
>=
si
[
i
].
value
)
{
...
...
src/main.js
View file @
98d5f9a2
...
@@ -8,7 +8,7 @@ import * as filters from './filters' // 全局filter
...
@@ -8,7 +8,7 @@ import * as filters from './filters' // 全局filter
import
'./icons'
// icon
import
'./icons'
// icon
import
'./errorLog'
// error log
import
'./errorLog'
// error log
import
'./permission'
// 权限
import
'./permission'
// 权限
import
'./mock'
// 该项目所有请求使用mockjs模拟
import
'./mock'
// 该项目所有请求使用mockjs模拟
Vue
.
use
(
ElementUI
)
Vue
.
use
(
ElementUI
)
...
...
src/router/_import_development.js
View file @
98d5f9a2
module
.
exports
=
file
=>
require
(
'@/views/'
+
file
+
'.vue'
).
default
// vue-loader at least v13.0.0+
module
.
exports
=
file
=>
require
(
'@/views/'
+
file
+
'.vue'
).
default
// vue-loader at least v13.0.0+
src/utils/fetch.js
View file @
98d5f9a2
...
@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
...
@@ -6,7 +6,7 @@ import { getToken } from '@/utils/auth'
// 创建axios实例
// 创建axios实例
const
service
=
axios
.
create
({
const
service
=
axios
.
create
({
baseURL
:
process
.
env
.
BASE_API
,
// api的base_url
baseURL
:
process
.
env
.
BASE_API
,
// api的base_url
timeout
:
5000
// 请求超时时间
timeout
:
5000
// 请求超时时间
})
})
// request拦截器
// request拦截器
...
@@ -29,29 +29,29 @@ service.interceptors.response.use(
...
@@ -29,29 +29,29 @@ service.interceptors.response.use(
* 下面的注释为通过response自定义code来标示请求状态,当code返回如下情况为权限有问题,登出并返回到登录页
* 下面的注释为通过response自定义code来标示请求状态,当code返回如下情况为权限有问题,登出并返回到登录页
* 如通过xmlhttprequest 状态码标识 逻辑可写在下面error中
* 如通过xmlhttprequest 状态码标识 逻辑可写在下面error中
*/
*/
// const res = response.data;
// const res = response.data;
// if (res.code !== 20000) {
// if (res.code !== 20000) {
// Message({
// Message({
// message: res.message,
// message: res.message,
// type: 'error',
// type: 'error',
// duration: 5 * 1000
// duration: 5 * 1000
// });
// });
// // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
// // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了;
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
// if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
// MessageBox.confirm('你已被登出,可以取消继续留在该页面,或者重新登录', '确定登出', {
// MessageBox.confirm('你已被登出,可以取消继续留在该页面,或者重新登录', '确定登出', {
// confirmButtonText: '重新登录',
// confirmButtonText: '重新登录',
// cancelButtonText: '取消',
// cancelButtonText: '取消',
// type: 'warning'
// type: 'warning'
// }).then(() => {
// }).then(() => {
// store.dispatch('FedLogOut').then(() => {
// store.dispatch('FedLogOut').then(() => {
// location.reload();// 为了重新实例化vue-router对象 避免bug
// location.reload();// 为了重新实例化vue-router对象 避免bug
// });
// });
// })
// })
// }
// }
// return Promise.reject('error');
// return Promise.reject('error');
// } else {
// } else {
// return response.data;
// return response.data;
// }
// }
error
=>
{
error
=>
{
console
.
log
(
'err'
+
error
)
// for debug
console
.
log
(
'err'
+
error
)
// for debug
Message
({
Message
({
...
@@ -60,7 +60,6 @@ service.interceptors.response.use(
...
@@ -60,7 +60,6 @@ service.interceptors.response.use(
duration
:
5
*
1000
duration
:
5
*
1000
})
})
return
Promise
.
reject
(
error
)
return
Promise
.
reject
(
error
)
}
})
)
export
default
service
export
default
service
src/utils/index.js
View file @
98d5f9a2
This diff is collapsed.
Click to expand it.
src/utils/openWindow.js
View file @
98d5f9a2
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
*/
*/
export
default
function
openWindow
(
url
,
title
,
w
,
h
)
{
export
default
function
openWindow
(
url
,
title
,
w
,
h
)
{
// Fixes dual-screen position Most browsers
Firefox
// Fixes dual-screen position Most browsers
Firefox
const
dualScreenLeft
=
window
.
screenLeft
!==
undefined
?
window
.
screenLeft
:
screen
.
left
const
dualScreenLeft
=
window
.
screenLeft
!==
undefined
?
window
.
screenLeft
:
screen
.
left
const
dualScreenTop
=
window
.
screenTop
!==
undefined
?
window
.
screenTop
:
screen
.
top
const
dualScreenTop
=
window
.
screenTop
!==
undefined
?
window
.
screenTop
:
screen
.
top
...
...
src/views/clipboard/index.vue
View file @
98d5f9a2
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<
script
>
<
script
>
import
clip
from
'@/utils/clipboard'
// use clipboard directly
import
clip
from
'@/utils/clipboard'
// use clipboard directly
import
clipboard
from
'@/directive/clipboard/index.js'
// use clipboard by v-directive
import
clipboard
from
'@/directive/clipboard/index.js'
// use clipboard by v-directive
export
default
{
export
default
{
name
:
'clipboardDemo'
,
name
:
'clipboardDemo'
,
...
...
src/views/components/sticky.vue
View file @
98d5f9a2
...
@@ -104,9 +104,9 @@ export default {
...
@@ -104,9 +104,9 @@ export default {
url
:
''
,
url
:
''
,
platforms
:
[
'a-platform'
],
platforms
:
[
'a-platform'
],
platformsOptions
:
[
platformsOptions
:
[
{
key
:
'a-platform'
,
name
:
'平台A'
},
{
key
:
'a-platform'
,
name
:
'平台A'
},
{
key
:
'b-platform'
,
name
:
'平台B'
},
{
key
:
'b-platform'
,
name
:
'平台B'
},
{
key
:
'c-platform'
,
name
:
'平台C'
}
{
key
:
'c-platform'
,
name
:
'平台C'
}
],
],
pickerOptions
:
{
pickerOptions
:
{
disabledDate
(
time
)
{
disabledDate
(
time
)
{
...
...
src/views/dashboard/admin/pieChart.vue
View file @
98d5f9a2
...
@@ -61,12 +61,12 @@ export default {
...
@@ -61,12 +61,12 @@ export default {
type
:
'pie'
,
type
:
'pie'
,
roseType
:
'radius'
,
roseType
:
'radius'
,
data
:
[
data
:
[
{
value
:
320
,
name
:
'industries'
},
{
value
:
320
,
name
:
'industries'
},
{
value
:
240
,
name
:
'technology'
},
{
value
:
240
,
name
:
'technology'
},
{
value
:
149
,
name
:
'forex'
},
{
value
:
149
,
name
:
'forex'
},
{
value
:
100
,
name
:
'gold'
},
{
value
:
100
,
name
:
'gold'
},
{
value
:
59
,
name
:
'forecasts'
},
{
value
:
59
,
name
:
'forecasts'
},
{
value
:
49
,
name
:
'markets'
}
{
value
:
49
,
name
:
'markets'
}
],
],
animationEasing
:
'cubicInOut'
,
animationEasing
:
'cubicInOut'
,
animationDuration
:
2600
animationDuration
:
2600
...
...
src/views/example/table/complexTable.vue
View file @
98d5f9a2
...
@@ -155,10 +155,10 @@ import waves from '@/directive/waves/index.js' // 水波纹指令
...
@@ -155,10 +155,10 @@ import waves from '@/directive/waves/index.js' // 水波纹指令
import
{
parseTime
}
from
'@/utils'
import
{
parseTime
}
from
'@/utils'
const
calendarTypeOptions
=
[
const
calendarTypeOptions
=
[
{
key
:
'CN'
,
display_name
:
'中国'
}
,
{
key
:
'CN'
,
display_name
:
'中国'
}
,
{
key
:
'US'
,
display_name
:
'美国'
}
,
{
key
:
'US'
,
display_name
:
'美国'
}
,
{
key
:
'JP'
,
display_name
:
'日本'
}
,
{
key
:
'JP'
,
display_name
:
'日本'
}
,
{
key
:
'EU'
,
display_name
:
'欧元区'
}
{
key
:
'EU'
,
display_name
:
'欧元区'
}
]
]
// arr to obj
// arr to obj
...
...
src/views/login/index.vue
View file @
98d5f9a2
...
@@ -87,7 +87,7 @@ export default {
...
@@ -87,7 +87,7 @@ export default {
this
.
$store
.
dispatch
(
'LoginByUsername'
,
this
.
loginForm
).
then
(()
=>
{
this
.
$store
.
dispatch
(
'LoginByUsername'
,
this
.
loginForm
).
then
(()
=>
{
this
.
loading
=
false
this
.
loading
=
false
this
.
$router
.
push
({
path
:
'/'
})
this
.
$router
.
push
({
path
:
'/'
})
// this.showDialog = true
// this.showDialog = true
}).
catch
(()
=>
{
}).
catch
(()
=>
{
this
.
loading
=
false
this
.
loading
=
false
})
})
...
@@ -98,29 +98,29 @@ export default {
...
@@ -98,29 +98,29 @@ export default {
})
})
},
},
afterQRScan
()
{
afterQRScan
()
{
// const hash = window.location.hash.slice(1)
// const hash = window.location.hash.slice(1)
// const hashObj = getQueryObject(hash)
// const hashObj = getQueryObject(hash)
// const originUrl = window.location.origin
// const originUrl = window.location.origin
// history.replaceState({}, '', originUrl)
// history.replaceState({}, '', originUrl)
// const codeMap = {
// const codeMap = {
// wechat: 'code',
// wechat: 'code',
// tencent: 'code'
// tencent: 'code'
// }
// }
// const codeName = hashObj[codeMap[this.auth_type]]
// const codeName = hashObj[codeMap[this.auth_type]]
// if (!codeName) {
// if (!codeName) {
// alert('第三方登录失败')
// alert('第三方登录失败')
// } else {
// } else {
// this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
// this.$store.dispatch('LoginByThirdparty', codeName).then(() => {
// this.$router.push({ path: '/' })
// this.$router.push({ path: '/' })
// })
// })
// }
// }
}
}
},
},
created
()
{
created
()
{
// window.addEventListener('hashchange', this.afterQRScan)
// window.addEventListener('hashchange', this.afterQRScan)
},
},
destroyed
()
{
destroyed
()
{
// window.removeEventListener('hashchange', this.afterQRScan)
// window.removeEventListener('hashchange', this.afterQRScan)
}
}
}
}
</
script
>
</
script
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment