From a80999e0a233b11f9e5c40d6c797b06c68625213 Mon Sep 17 00:00:00 2001
From: Jere <tsuijy@gmail.com>
Date: Sun, 17 Mar 2019 17:40:51 +0800
Subject: [PATCH] lint

---
 .eslintrc.js                    |  2 ++
 src/directive/waves/waves.js    | 10 +++++-----
 src/views/excel/mergeHeader.vue |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1909c7b5..82ae4a94 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,6 +21,8 @@ module.exports = {
         "allowFirstLine": false
       }
     }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
     "vue/name-property-casing": ["error", "PascalCase"],
     "vue/no-v-html": "off",
     'accessor-pairs': 2,
diff --git a/src/directive/waves/waves.js b/src/directive/waves/waves.js
index 65e1318d..ec2ff439 100644
--- a/src/directive/waves/waves.js
+++ b/src/directive/waves/waves.js
@@ -6,11 +6,11 @@ function handleClick(el, binding) {
   function handle(e) {
     const customOpts = Object.assign({}, binding.value)
     const opts = Object.assign({
-        ele: el, // 波纹作用元素
-        type: 'hit', // hit 点击位置扩散 center中心点扩展
-        color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
-      },
-      customOpts
+      ele: el, // 波纹作用元素
+      type: 'hit', // hit 点击位置扩散 center中心点扩展
+      color: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
+    },
+    customOpts
     )
     const target = opts.ele
     if (target) {
diff --git a/src/views/excel/mergeHeader.vue b/src/views/excel/mergeHeader.vue
index 81d12a89..c145932c 100644
--- a/src/views/excel/mergeHeader.vue
+++ b/src/views/excel/mergeHeader.vue
@@ -4,8 +4,8 @@
     <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">Export</el-button>
 
     <el-table
-      v-loading="listLoading"
       ref="multipleTable"
+      v-loading="listLoading"
       :data="list"
       element-loading-text="Loading"
       border
@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column align="center" label="Date" width="220">
         <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>
         </template>
       </el-table-column>