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>
   
@@ -68,10 +68,13 @@
        :action="uploadUrl"
        :on-preview="handlePreview"
        :data="form"
        :limit="1"
        :limit="3"
        :auto-upload='false'
        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>
@@ -81,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>

@@ -91,6 +96,9 @@
         return {
            uploadUrl:"/api/api/file/topicUpload",
            form:{},
            pageno:1,
            total:0,
            maxPage:0,
            fileList: [],
            dialogVisible: false,
            dialogFormVisible: false,
@@ -102,50 +110,74 @@
               attachment:"222"
            },
            dataList: [
               {id:1,attachment:"222",title:"标题", desp:"描述时发生纠纷司符合双方酒叟发动机时代峰峻配电间 刀片机水电费搜豆腐皮搜的看法我都叫打破是觉得批发商附加费第三季度破发接收到发地方就搜到到四点分发偶读囧", time:"12分钟前"},
               {id:1,attachment:"222",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
               {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            ],
            loading: false
            //    {id:1,attachment:"222",title:"标题", desp:"描述时发生纠纷司符合双方酒叟发动机时代峰峻配电间 刀片机水电费搜豆腐皮搜的看法我都叫打破是觉得批发商附加费第三季度破发接收到发地方就搜到到四点分发偶读囧", time:"12分钟前"},
            //    {id:1,attachment:"222",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
            //    {id:1,attachment:"",title:"11", desp:"111", time:"11111"},
             ],
            loading: false,
				
         }
      },
      computed: {
         noMore() {
            return this.count >= 20
            return this.maxPage == this.pageno 
         },
         disabled() {
            return this.loading || this.noMore
         }
      },
      mounted() {
         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() {
            let me = this;
            var userId = localStorage.getItem('userId');
            if(!userId) {
               this.$router.push('/login');
            }
            this.from.userId = userId;
            if(fileList.length == 0) {
            this.form.userId = userId;
            let params = this.form;
				
            if(this.fileList.length == 0) {
               //不带附件
               url = "/api/topic/add";
               let url = "/api/topic/add";
               this.$axios.get(url, {
                     params
                  })
                  .then(data_ => {
                     console.log(data_);
                     this.tableData = data_.data.data.records; //给tableData赋值
                     this.total = data_.data.data.total;
                     this.loading_table = false;
                     if(data_.data.success) {
                        this.$message('创建成功');
                        me.dialogFormVisible = false;
                     }else {
                        this.$message({message:'话题创建失败', type: 'warning'});
                     }
                  }).catch(error => {
                     console.log(error);
                  })
            }else {
					
               this.$refs.upload.submit();
            }
         },
          handleRemove(file, fileList) {
@@ -161,11 +193,13 @@
                 return this.$confirm(`确定移除 ${ file.name }？`);
               },
         load() {
            // this.loading = true
            // setTimeout(() => {
            //    this.count += 2
            //    this.loading = false
            // }, 2000)
				
            if(me.pageno < me.maxPage) {
               me.pageno++;
            }
            query_();
				
			
         },
         showItem(one) {
            this.dialogVisible = true;
@@ -179,31 +213,40 @@
            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;
            let pageno = this.pagenum;
            let url = "/api/scheme/page/" + pageno;
            let params =  {
               pageSize: this.pagesize
            };
            let url = "/api/topic/page/" + this.pageno;
            let params =  {};
            if(query){
               params.name = query.name;
               params.delay = query.delay;
               params.finish = query.fiish;
               params.type = query.type;
               params.title = query.title;
               params.desp = query.desp;
            }
            this.$axios.get(url, {
                  params
               })
               .then(data_ => {
                  console.log(data_);
                  this.tableData = data_.data.data.records; //给tableData赋值
                  this.total = data_.data.data.total;
                  this.loading_table = false;
                  if(data_.data.success) {
                     me.dataList.push.apply(me.dataList, data_.data.data.records)
                     me.t
                     otal = data_.data.data.total;
                     me.pageno = data_.data.data.pageno;
                     me.maxPage = data_.data.data.maxPage;
							
							
                  }
                     me.loading = false
               }).catch(error => {
                  console.log(error);
                     me.loading = false
               })
         },
      }