Merge branch 'bug_mk' into dev

src/views/modules/base/community/communityTable.vue

@@ -863,7 +863,7 @@ export default {
             title = title + "电子门牌信息";
             let url = "/actual/base/communityHouse/downloadZip";
             console.log(this.agencyObj)
-            this.startLoading('正在生成，请稍候...')
+            this.startLoading('正在生成，需要几分钟时间，请耐心等待...')
             let params = {
                 pageSize:this.pageSize,
                 pageNo:this.pageNo,

src/views/modules/base/community/roomForm.vue

@@ -77,7 +77,7 @@
             <a style="margin-left: 10px;"
                class="div-table-button--blue"     
                :href="dataForm.houseQrcodeUrl"
-               target="_blank"  @click="downloadQR"><i class="el-icon-download"></i>下载电子门牌二维码</a>
+               target="_blank"  @click="downloadQR"><i class="el-icon-download"></i>下载电子门牌</a>
           </div>
         </el-form-item>
 
@@ -289,6 +289,7 @@ export default {
        console.log(this.houseId)
        let  url = "/actual/base/communityHouse/createHouseQrcode/";
        console.log(url)
+       this.startLoading('正在生成，需要几分钟时间，请耐心等待...')
        let params={
           id:this.houseId
        }
@@ -316,6 +317,7 @@ export default {
 
             if (window.navigator && window.navigator.msSaveOrOpenBlob) {
                 window.navigator.msSaveOrOpenBlob(csvData, downFileName);
+                this.endLoading()
             }
             // for Non-IE (chrome, firefox etc.)
             else {
@@ -328,6 +330,7 @@ export default {
                 a.click();
                 a.remove();
                 window.URL.revokeObjectURL(url);
+                this.endLoading()
             }
         },