Merge branch 'develop' of https://gitlab.redhtc.com/Berlincen/DA-Platform into develop

DAPlatform-front/src/assets/js/Download.js

+import { baseURL } from './env.js'
+
 export function download (url, relationId) {
-  url = 'http://localhost:9100/api' + url + '/' + relationId
+  url = baseURL + url + '/' + relationId
   var a = document.createElement('a')
   a.href = url
   document.body.appendChild(a)

DAPlatform-front/src/assets/js/env.js

+export default {
+  baseURL: 'http://localhost:9100/api'
+}

DAPlatform-front/src/components/ReleaseTask.vue

@@ -216,7 +216,40 @@
                 </el-form-item>
               </el-row>
             </el-tab-pane>
+
+
+          <el-tab-pane label="数据单列表" name="forth">
+<!--            <el-row :gutter="20" style="margin-bottom: 15px">-->
+<!--              <el-col span="2"><el-button @click="addDomain(3)" type="primary" plain>添加图层分片</el-button></el-col>-->
+<!--            </el-row>-->
+            <el-row :gutter="20">
+              <el-form-item>
+                <!--            采用手风琴实现折叠-->
+                <el-collapse v-model="activeName" accordion>
+                    <div v-if="dynamicValidateForm.dataFormList.length != 0">
+                      <el-form-item v-for="(domain, index) in dynamicValidateForm.dataFormList"
+                                    :key="domain.key"
+                                    :prop="'dataFormList.' + index + '.value'">
+                          <el-collapse-item
+                            :title="'数据单'+(1+index)"
+                            :name="index" style="border-bottom: 1px solid;border-bottom-color:white;font-size: 14px;">
+                            <!--          上传图片-->
+                            <el-row :gutter="20" style="font-size: 18px">
+                              <el-col span="6">数据单ID：{{dynamicValidateForm.dataFormList[index].id}}</el-col>
+                              <el-col span="6">数据单创建时间：{{dynamicValidateForm.dataFormList[index].time}}</el-col>
+                              <el-col span="6">数据单包含信息数：{{dynamicValidateForm.dataFormList[index].obj.length}}</el-col>
+                              <el-col span="2"><el-button @click="createDataToTask" type="primary" plain>将数据单转为任务</el-button></el-col>
+                            </el-row>
+                          </el-collapse-item>
+                      </el-form-item>
+                    </div>
+                    <div v-if="dynamicValidateForm.dataFormList.length == 0" >数据单中无内容</div>
+                </el-collapse>
+              </el-form-item>
+            </el-row>
+          </el-tab-pane>
           </el-tabs>
+
           <el-row :gutter="20">
             <el-col  offset="17" span="7">
               <el-form-item style="margin-top: 20px">
@@ -424,6 +457,13 @@
                 //     description:'',
                 // }
                     layerDomains:[],
+                    dataFormList:[
+                        {
+                            id:1,
+                            time:"2020.8.10",
+                            obj:[1,2,3]
+                        },
+                    ],
             // {
             //     fileList: new Array(),
             //         description:'',
@@ -470,6 +510,17 @@
                         alert("加载错误!!!");
                     }
                 })
+                // this.axios({
+                //     method:"get",
+                //     url:'task/getDataFormList'
+                // }).then(res=>{
+                //     if(res.code == 1){
+                //         this.dynamicValidateForm.dataFormList = res.dataFormList
+                //     }
+                //     else{
+                //         this.dynamicValidateForm.dataFormList = null
+                //     }
+                // })
                 if(this.ins == 2){
                     console.log("修改");
                     this.taskId = this.$route.params.taskId,

DAPlatform-front/src/main.js

@@ -11,10 +11,11 @@ import VueAxios from 'vue-axios'
 import * as math from 'mathjs'
 // cnpm i default-passive-events -S
 import 'default-passive-events'
+import { baseURL } from '@/assets/js/env.js'
 
 Vue.prototype.$math = math
 
-axios.defaults.baseURL = 'http://localhost:9100/api'
+axios.defaults.baseURL = baseURL
 axios.defaults.timeout = 8000
 
 Vue.prototype.baseURL = axios.defaults.baseURL // 图片标注接口使用
@@ -55,8 +56,8 @@ axios.interceptors.request.use(function (config) {
     config.url !== '/user/signin' &&
     config.url !== '/user/signup') {
     ElementUI.Message({
-      type:"warning",
-      message:"您未登录，请前往登录界面进行操作"
+      type: 'warning',
+      message: '您未登录，请前往登录界面进行操作'
     })
     vm.$router.replace('/')
   }