zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lint

This commit is contained in:
Jere 2019-03-17 17:40:51 +08:00 committed by Pan
parent 4b5b0a6e6b
commit a80999e0a2
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.js
View File

@ -21,6 +21,8 @@ module.exports = {
"allowFirstLine": false "allowFirstLine": false
} }
}], }],
"vue/singleline-html-element-content-newline": "off",
"vue/multiline-html-element-content-newline":"off",
"vue/name-property-casing": ["error", "PascalCase"], "vue/name-property-casing": ["error", "PascalCase"],
"vue/no-v-html": "off", "vue/no-v-html": "off",
'accessor-pairs': 2, 'accessor-pairs': 2,

10
src/directive/waves/waves.js
View File

@ -6,11 +6,11 @@ function handleClick(el, binding) {
function handle(e) { function handle(e) {
const customOpts = Object.assign({}, binding.value) const customOpts = Object.assign({}, binding.value)
const opts = Object.assign({ const opts = Object.assign({
ele: el, // 波纹作用元素 ele: el, // 波纹作用元素
type: 'hit', // hit 点击位置扩散 center中心点扩展 type: 'hit', // hit 点击位置扩散 center中心点扩展
color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色 color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
}, },
customOpts customOpts
) )
const target = opts.ele const target = opts.ele
if (target) { if (target) {

4
src/views/excel/mergeHeader.vue
View File

@ -4,8 +4,8 @@
<el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">Export</el-button> <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">Export</el-button>
<el-table <el-table
v-loading="listLoading"
ref="multipleTable" ref="multipleTable"
v-loading="listLoading"
:data="list" :data="list"
element-loading-text="Loading" element-loading-text="Loading"
border border
@ -36,7 +36,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="Date" width="220"> <el-table-column align="center" label="Date" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<i class="el-icon-time"/> <i class="el-icon-time" />
<span>{{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span> <span>{{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
</template> </template>
</el-table-column> </el-table-column>