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,7 +73,8 @@
        ref="upload"
         :on-change="onChange"
        :on-exceed="handleExceed"
        :file-list="fileList">
        :on-success="uploadSuccess"
         >
        <el-button size="small" type="primary">点击上传</el-button>
        <div slot="tip" class="el-upload__tip">不超过50M</div>
      </el-upload>
@@ -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,7 +136,19 @@
         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;
         },
         createTopic() {
@@ -198,9 +213,12 @@
            this.query_();
         },
         query_() {
            this.getData(this.formInline);
            this.getData(this.formInline, true);
         },
         getData(query) {
         getData(query,empty) {
            if(empty) {
               this.dataList = [];
            }
            let me = this;
            this.loading = true
            this.loading_table = true;
@@ -218,7 +236,8 @@
                  console.log(data_);
                  if(data_.data.success) {
                     me.dataList.push.apply(me.dataList, data_.data.data.records)
                     me.total = data_.data.data.total;
                     me.t
                     otal = data_.data.data.total;
                     me.pageno = data_.data.data.pageno;
                     me.maxPage = data_.data.data.maxPage;