src/views/base/deviceInfo-detail.vue

@@ -18,7 +18,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="企业" prop="companyId">
-              <el-select v-model="formModel.companyId" filterable placeholder="请选择">
+              <el-select
+                v-model="formModel.companyId"
+                filterable
+                placeholder="请选择"
+                style="width:280px"
+              >
                 <el-option
                   v-for="company in companyResult"
                   :key="company.id"

src/views/base/deviceInfo-list.vue

@@ -20,7 +20,7 @@
           size="mini"
           filterable
           placeholder="请选择"
-          style="width:300px"
+          style="width:280px"
         >
           <el-option
             v-for="company in companyResult"
@@ -73,7 +73,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="companyName" label="企业" width="250"></el-table-column>
+      <el-table-column prop="companyName" label="企业" width="280"></el-table-column>
       <el-table-column prop="deviceNo" label="设备编号" width="200" fixed="left"></el-table-column>
       <el-table-column prop="aliasName" label="设备别名" width="150"></el-table-column>
       <el-table-column prop="isOnlineN" label="运行状态" width="150"></el-table-column>

src/views/base/personDeviceLog-list.vue

@@ -73,6 +73,7 @@
         size="small"
         plain
         icon="el-icon-circle-plus"
+        :loading="downloadLoading"
         @click="downloadXls"
       >导出数据</el-button>
     </el-row>
@@ -159,7 +160,8 @@ export default {
       multipleSelection: [],
       showModal: false,
       modalTitle: "",
-      businessKey: ""
+      businessKey: "",
+      downloadLoading:false
     };
   },
   created() {
@@ -243,6 +245,7 @@ export default {
     downloadXls() {
       //导出
       var self = this;
+      self.downloadLoading = true;
       var formData = new FormData();
 
       formData.append("faceImage", self.queryModel.faceImage);
@@ -256,6 +259,7 @@ export default {
 
       personDeviceLogApi.exportXls(formData).then(function(response) {
         var jsonData = response.data;
+        self.downloadLoading = false;
         if (jsonData.result) {
           if (jsonData.data != null) {
             //下载有错误信息提示的报表

src/views/base/personInfo-detail.vue

@@ -22,6 +22,7 @@
                 v-model="formModel.companyId"
                 filterable
                 placeholder="请选择"
+                style="width:280px"
               >
                 <el-option
                   v-for="company in companyResult"

src/views/base/personInfo-list.vue

@@ -82,6 +82,7 @@
         size="small"
         plain
         icon="el-icon-circle-plus"
+        :loading="xlsLoading"
         @click="downloadAll"
       >导出数据</el-button>
       <el-button
@@ -119,7 +120,7 @@
     >
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="id" label="序号" width="100"></el-table-column>
-      <el-table-column prop="companyName" label="企业" width="180"></el-table-column>
+      <el-table-column prop="companyName" label="企业" width="280"></el-table-column>
       <el-table-column prop="faceImageUrl" label="人员照片" width="110" fixed="left">
         <template slot-scope="{row}">
           <a :href="row.faceImageUrl" target="_blank">
@@ -275,6 +276,7 @@
             filterable
             placeholder="请选择"
             @change="changeUploadCompayId"
+            style="width:280px"
           >
             <el-option
               v-for="company in companyResult"
@@ -647,9 +649,10 @@ export default {
       formData.append("phone", self.queryModel.phone);
       formData.append("idCard", self.queryModel.idCard);
 
-      this.changePage(1);
+      self.xlsLoading = true;
 
       personInfoApi.exportXls(formData).then(function(response) {
+        self.xlsLoading = false;
         var jsonData = response.data;
         if (jsonData.result) {
           if (jsonData.data != null) {