Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

kimi

2020-02-11 89ba01e8e0bec7fdadc5278c95850cfe68b9e62a

 src/components/square.vue

@@ -17,7 +17,10 @@
               </el-form-item>
            </el-form>
         </el-col>
        <el-col :span="4" ><el-button type="primary" @click="createNew">创建</el-button></el-col>
        <el-col :span="4" >
           <el-button type="primary" @click="createNew">创建</el-button>
			 
          </el-col>
      </el-row>
      

@@ -26,8 +29,9 @@
      <div class="list" v-infinite-scroll="load" infinite-scroll-disabled="disabled">
         <div v-for="one in dataList" :key="one.id" class="list-item" @click="showItem(one)">
            <el-row >
              <el-col :span="20"><div class="grid-content z_grid-content1 grid-content_text">{{one.title}}</div></el-col>
              <el-col :span="4"><div class="grid-content z_grid-content1 grid-content_time">{{one.time}}</div></el-col>
              <el-col :span="18"><div class="grid-content z_grid-content1 grid-content_text">{{one.title}}</div></el-col>
              <el-col :span="3"><div class="grid-content z_grid-content1 grid-content_exam">{{formatter(one.examine)}}</div></el-col>
              <el-col :span="3"><div class="grid-content z_grid-content1 grid-content_time">{{one.time}}</div></el-col>
            </el-row>
            
            <el-row>
@@ -51,11 +55,13 @@
    </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="canEdit" type="primary" @click="edit">修改</el-button>
         <el-button v-if="!selectOne.examine" type="primary" @click="addProject(selectOne)">生成项目</el-button>
       <el-button v-if="selectOne.attachment && selectOne.attachment != ''" type="primary" @click="download(selectOne)">下 载</el-button>
     </span>
   </el-dialog>
   
   <el-dialog title="创建话题" :visible.sync="dialogFormVisible">
   <el-dialog title="创建话题" :visible.sync="dialogFormVisible"  @close="closeCreate" >
     <el-form :model="form">
       <el-form-item label="话题名称" :label-width="formLabelWidth">
         <el-input v-model="form.title" autocomplete="off"></el-input>
@@ -73,6 +79,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,14 +90,29 @@
       <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>
   <el-dialog @close="Cancel"  width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
     <newProject @closeNewProject="closeNewProject" v-bind:rowData="rowData" ref="newProject_"></newProject>
   </el-dialog>
   
   <el-dialog @close="Cancel1"  width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
     <newProject ref="newProject1_"></newProject>
   </el-dialog>
      </div>
</template>

<script>
   import newProject from '../components/popup/newProject.vue'
   export default {
      components: {
        newProject
      },
      data() {
         return {
            rowData:undefined,
            dialog_1: false,
            uploadUrl:"/api/api/file/topicUpload",
            form:{},
            pageno:1,
@@ -106,6 +128,7 @@
               desp:"miaoshu",
               attachment:"222"
            },
            formLabelWidth:"40%",
            dataList: [
            //    {id:1,attachment:"222",title:"标题", desp:"描述时发生纠纷司符合双方酒叟发动机时代峰峻配电间 刀片机水电费搜豆腐皮搜的看法我都叫打破是觉得批发商附加费第三季度破发接收到发地方就搜到到四点分发偶读囧", time:"12分钟前"},
            //    {id:1,attachment:"222",title:"11", desp:"111", time:"11111"},
@@ -122,6 +145,7 @@
         }
      },
      computed: {
			
         noMore() {
            return this.maxPage == this.pageno 
         },
@@ -133,10 +157,55 @@
         this.getData();
      },
      methods: {
         Cancel() {
            this.$refs.newProject_.Cancel();
            this.dialogFormVisible = false;
         },
         addProject(selected) {
            let url = "/api/topic/exam/" + selected.id;
            this.$axios.get(url)
               .then(data_ => {
                  if(data_.data.success) {
                     this.rowData = {
                        id:selected.id,
                        desp:selected.desp,
                        name:selected.title,
                        //objective:this.selected.reseachType,
                        //items:[this.$moment(this.selected.startTime).format('YYYY-MM-DD'),this.$moment(this.selected.endTime).format('YYYY-MM-DD')]
                     }
                     this.dialogFormVisible = false;
                     this.dialog_1 = true;
                  }else {
                     this.$message({message:'创建项目失败', type: 'warning'});
                  }
               }).catch(error => {
               })
				
				
         },
         closeNewProject() {
            this.dialog_1 = false;
            getData();
         },
         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;
         },
         canExam() {
            return true;
         },
			
         createTopic() {
            let me = this;
            var userId = localStorage.getItem('userId');
@@ -156,21 +225,19 @@
                     if(data_.data.success) {
                        this.$message('创建成功');
                        me.dialogFormVisible = false;
                        me.getData();
                     }else {
                        this.$message({message:'话题创建失败', type: 'warning'});
                     }
                  }).catch(error => {
                     console.log(error);
                  })
            }else {
               this.$refs.upload.submit();
            }
         },
          handleRemove(file, fileList) {
                 console.log(file, fileList);
               },
               handlePreview(file) {
                 console.log(file);
               },
               handleExceed(files, fileList) {
                 this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
@@ -194,14 +261,38 @@
         createNew() {
            this.dialogFormVisible = true;
         },
         formatter(exam){
            if(exam){
               return "已关联项目";
            }
         },
         empty_() {
            this.formInline = {};
            this.query_();
         },
         query_() {
            this.getData(this.formInline);
            this.getData(this.formInline, true);
         },
         getData(query) {
         canEdit() {
            return this.selectOne.userId == this.userId;
         },
         edit(){
            this.form = {
               title: this.selectOne.title,
               desp: this.selectOne.desp,
               id: this.selectOne.id
            };
            this.dialogFormVisible = true;
            this.dialogVisible = false;
         },
         closeCreate() {
            this.dialogFormVisible = false;
            this.getData();
         },
         getData(query,empty) {
            if(empty) {
               this.dataList = [];
            }
            let me = this;
            this.loading = true
            this.loading_table = true;
@@ -216,10 +307,10 @@
                  params
               })
               .then(data_ => {
                  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;
                     
@@ -227,7 +318,6 @@
                  }
                     me.loading = false
               }).catch(error => {
                  console.log(error);
                     me.loading = false
               })
         },
@@ -248,9 +338,12 @@
   }
   .grid-content_time {
      font-weight: bold;
      font-style: italic;
      color: #909399;
   }
   .grid-content_exam {
      color: #00aaff;
      font-size: 14px;
   }
   .z_grid-content1{
     display:table-cell;
     vertical-align:bottom;