diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index bb36e76..2851ad2 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -19,7 +19,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
           <download-template :filename="filename"/>
           <el-upload
             v-if="hasPerm('/busConfig/liquidConfig/batchImport')"

diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index bb36e76..2851ad2 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -19,7 +19,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
           <download-template :filename="filename"/>
           <el-upload
             v-if="hasPerm('/busConfig/liquidConfig/batchImport')"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b590338..c1b4bae 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -19,7 +19,7 @@
             </span>
             <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
           </el-form-item>
-          <el-form-item prop="password">
+          <el-form-item prop="password" style="vertical-align: bottom">
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>

diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index bb36e76..2851ad2 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -19,7 +19,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
           <download-template :filename="filename"/>
           <el-upload
             v-if="hasPerm('/busConfig/liquidConfig/batchImport')"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b590338..c1b4bae 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -19,7 +19,7 @@
             </span>
             <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
           </el-form-item>
-          <el-form-item prop="password">
+          <el-form-item prop="password" style="vertical-align: bottom">
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>
diff --git a/src/views/overview/overview_cmap.vue b/src/views/overview/overview_cmap.vue
index 5a8b627..19470ed 100644
--- a/src/views/overview/overview_cmap.vue
+++ b/src/views/overview/overview_cmap.vue
@@ -70,7 +70,7 @@
 <script>
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getWellType } from '@/api/well'
-import { getWellList, getWellInfo, getAlarmsNow, getWellAlarms } from '@/api/overview'
+import { getAlarmsNow } from '@/api/overview'
 import DeptSelect from '../../components/DeptSelect/index'
 import Cmap from '../../components/CMap/components/cmap'
 import CmapMarker from '../../components/CMap/components/cmapMarker'
@@ -340,8 +340,6 @@
                 positionInfo: alarm.position,
                 visible: true
               })
-            } else {
-
             }
           }
           this.alarmWellsOri = alarmWellSets

diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index bb36e76..2851ad2 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -19,7 +19,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
           <download-template :filename="filename"/>
           <el-upload
             v-if="hasPerm('/busConfig/liquidConfig/batchImport')"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b590338..c1b4bae 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -19,7 +19,7 @@
             </span>
             <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
           </el-form-item>
-          <el-form-item prop="password">
+          <el-form-item prop="password" style="vertical-align: bottom">
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>
diff --git a/src/views/overview/overview_cmap.vue b/src/views/overview/overview_cmap.vue
index 5a8b627..19470ed 100644
--- a/src/views/overview/overview_cmap.vue
+++ b/src/views/overview/overview_cmap.vue
@@ -70,7 +70,7 @@
 <script>
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getWellType } from '@/api/well'
-import { getWellList, getWellInfo, getAlarmsNow, getWellAlarms } from '@/api/overview'
+import { getAlarmsNow } from '@/api/overview'
 import DeptSelect from '../../components/DeptSelect/index'
 import Cmap from '../../components/CMap/components/cmap'
 import CmapMarker from '../../components/CMap/components/cmapMarker'
@@ -340,8 +340,6 @@
                 positionInfo: alarm.position,
                 visible: true
               })
-            } else {
-
             }
           }
           this.alarmWellsOri = alarmWellSets
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index bb472fd..bd423d0 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -363,7 +363,6 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)

diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index bb36e76..2851ad2 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -19,7 +19,7 @@
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <!--<el-button v-if="hasPerm('/busConfig/liquidConfig/batchExport')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>-->
           <download-template :filename="filename"/>
           <el-upload
             v-if="hasPerm('/busConfig/liquidConfig/batchImport')"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b590338..c1b4bae 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -19,7 +19,7 @@
             </span>
             <el-input v-model.trim="loginForm.username" name="username" type="text" auto-complete="on" placeholder="用户名" />
           </el-form-item>
-          <el-form-item prop="password">
+          <el-form-item prop="password" style="vertical-align: bottom">
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>
diff --git a/src/views/overview/overview_cmap.vue b/src/views/overview/overview_cmap.vue
index 5a8b627..19470ed 100644
--- a/src/views/overview/overview_cmap.vue
+++ b/src/views/overview/overview_cmap.vue
@@ -70,7 +70,7 @@
 <script>
 import SelectTree from '@/components/SelectTree/singleSelect'
 import { getWellType } from '@/api/well'
-import { getWellList, getWellInfo, getAlarmsNow, getWellAlarms } from '@/api/overview'
+import { getAlarmsNow } from '@/api/overview'
 import DeptSelect from '../../components/DeptSelect/index'
 import Cmap from '../../components/CMap/components/cmap'
 import CmapMarker from '../../components/CMap/components/cmapMarker'
@@ -340,8 +340,6 @@
                 positionInfo: alarm.position,
                 visible: true
               })
-            } else {
-
             }
           }
           this.alarmWellsOri = alarmWellSets
diff --git a/src/views/system/user/listUser.vue b/src/views/system/user/listUser.vue
index bb472fd..bd423d0 100644
--- a/src/views/system/user/listUser.vue
+++ b/src/views/system/user/listUser.vue
@@ -363,7 +363,6 @@
       list.forEach((value, index) => {
         if (value.id === des.id) {
           list.splice(index, 1)
-
         } else {
           if (value.children && value.children.length > 0) {
             this.deleteItem(value.children, des)
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index cab74c7..cf887b7 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -290,7 +290,20 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportWell(this.listQuery).then(res => {
+      const _this = this
+      const config = {
+        // 获取下载进度
+        onDownloadProgress(progressEvent) {
+          console.log(progressEvent)
+          var percent = parseInt(100 * (progressEvent.loaded / progressEvent.total))
+          console.log('percent:' + percent, 'total:' + progressEvent.total)
+          // 渲染dom
+          _this.$nextTick(() => {
+            _this.percent = percent
+          })
+        }
+      }
+      batchExportWell(this.listQuery, config).then(res => {
         loading.close() // 关闭加载动画
         console.log('download===', res)
         const blob = new Blob([res.data])