merge

kimi

2020-01-23 11317bf89e4d4194f84229c3d89a786b323c6be4

 src/components/square.vue

@@ -51,7 +51,7 @@
    </div>
    
     <span slot="footer" class="dialog-footer">
       <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download">下 载</el-button>
       <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download(selectOne)">下 载</el-button>
     </span>
   </el-dialog>
   
@@ -73,6 +73,7 @@
        ref="upload"
         :on-change="onChange"
        :on-exceed="handleExceed"
        :on-success="uploadSuccess"
         >
        <el-button size="small" type="primary">点击上传</el-button>
        <div slot="tip" class="el-upload__tip">不超过50M</div>
@@ -83,7 +84,9 @@
       <el-button type="primary" @click="createTopic">确 定</el-button>
     </div>
   </el-dialog>
	
   <div style="width: 0px; height: 0px;">
     <iframe ref="frame_export" style="width: 0px; height: 0px;"></iframe>
   </div>
      </div>
</template>

@@ -133,6 +136,17 @@
         this.getData();
      },
      methods: {
         download(val) {
            if(val) {
               this.$refs.frame_export.src = "/api/api/file/download/" + val.id;
            }else {
                  this.$message({message:'获取地址失败', type: 'warning'});
            }
				
         },
         uploadSuccess() {
            this.dialogFormVisible = false;
         },
         onChange(file, fileList) {
            this.fileList = [];
            this.fileList = fileList;