Skip to content

Commit a80999e

Browse files
jerecuiPanJiaChen
authored andcommitted
lint
1 parent 4b5b0a6 commit a80999e

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ module.exports = {
2121
"allowFirstLine": false
2222
}
2323
}],
24+
"vue/singleline-html-element-content-newline": "off",
25+
"vue/multiline-html-element-content-newline":"off",
2426
"vue/name-property-casing": ["error", "PascalCase"],
2527
"vue/no-v-html": "off",
2628
'accessor-pairs': 2,

src/directive/waves/waves.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ function handleClick(el, binding) {
66
function handle(e) {
77
const customOpts = Object.assign({}, binding.value)
88
const opts = Object.assign({
9-
ele: el, // 波纹作用元素
10-
type: 'hit', // hit 点击位置扩散 center中心点扩展
11-
color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
12-
},
13-
customOpts
9+
ele: el, // 波纹作用元素
10+
type: 'hit', // hit 点击位置扩散 center中心点扩展
11+
color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
12+
},
13+
customOpts
1414
)
1515
const target = opts.ele
1616
if (target) {

src/views/excel/mergeHeader.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">Export</el-button>
55

66
<el-table
7-
v-loading="listLoading"
87
ref="multipleTable"
8+
v-loading="listLoading"
99
:data="list"
1010
element-loading-text="Loading"
1111
border
@@ -36,7 +36,7 @@
3636
</el-table-column>
3737
<el-table-column align="center" label="Date" width="220">
3838
<template slot-scope="scope">
39-
<i class="el-icon-time"/>
39+
<i class="el-icon-time" />
4040
<span>{{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
4141
</template>
4242
</el-table-column>

0 commit comments

Comments
 (0)