ソースを参照

adm:fix> 开发v3.9.1

shaun-sheep 4 年 前
コミット
87235ff6e5

+ 4 - 4
src/components/ledger/lib/excelDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="深化点表导入" :visible.sync="dialogFormVisible" class="dialogFormVisible">
+  <el-dialog title="深化点表导入" :visible.sync="dialogFormVisible" class="dialogFormVisible" @close="messageKey = ''">
     <h5 class="title">深化点表中必须包含四列,表头分别是$唯一识别码$、¥动态信息点名称¥、表号、功能号,每列可以在表中任意位置,不受前后排序的影响。$唯一识别码$使用的设备信息点,由项目的实际需求决定。</h5>
     <p class="time">
       <el-button type="text" :disabled="!messageKey" @click="download">下载导入结果</el-button>
@@ -53,8 +53,8 @@ export default {
       // console.log(event.file, fileList)
     },
     success(event, file, fileList) {
-      if(event.Result == 'success') {
-      this.messageKey = event.Message
+      if (event.Result == 'success') {
+        this.messageKey = event.Message
         this.$message.success('上传成功')
       }
     },
@@ -64,7 +64,7 @@ export default {
       const url = '/api/datacenter/graphic/downloads/point?key=' + this.messageKey
       let a = document.createElement("a");
       a.href = url;
-      a.download =`${this.messageKey}.xlsx`;
+      a.download = `${this.messageKey}.xlsx`;
       a.click();
     }
   }

+ 1 - 3
src/views/ledger/facility/index.vue

@@ -9,9 +9,7 @@
         <my-cascader ref="cascader" @change="changeDevice"></my-cascader>
         <el-button size="small" @click="handleLinkAssets" class="iconfont icon-batchassociation">批量关联资产</el-button>
         <el-tooltip class="item" effect="dark" content="请选择建筑楼层和设备类" placement="top-start">
-          <el-button type="primary" class="deviceList-excel"
-                     :disabled="!((param.buildId != '' || param.buildId != 'all') && param.deviceId !='')"
-          @click="handleSurface">
+          <el-button type="primary" class="deviceList-excel" @click="handleSurface">
             深化点表导入
           </el-button>
         </el-tooltip>