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

the commit.

DAPlatform-front/package-lock.json

@@ -6694,7 +6694,7 @@
     },
     "javascript-natural-sort": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/javascript-natural-sort/download/javascript-natural-sort-0.7.1.tgz",
       "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
     },
     "js-base64": {
@@ -11379,7 +11379,7 @@
     },
     "seed-random": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/seed-random/download/seed-random-2.2.0.tgz",
       "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ="
     },
     "select-hose": {

DAPlatform-front/src/components/imageAnnotation/imageAnnotiation.vue

@@ -172,6 +172,8 @@ export default {
       createPTmp: [],
       imageNum: -1,
       data: [],
+      // 分片描述
+      description: null,
       imageList: [],
       defaultProps: {
         children: 'children',
@@ -185,7 +187,8 @@ export default {
     console.log(routeParams)
     let imageName = routeParams.file.url
     this.relationId = routeParams.relationId
-    // let src = this.getimageUrl(imageName)
+    this.description = routeParams.piece.template
+    
     // 获取图片列表并转换格式
     let imageList = await this.getLabelList()
     console.log(imageList)

DAPlatform-front/src/components/imageAnnotation/layerAnnotation.vue

@@ -120,6 +120,7 @@
         clickedPosition: null,//保存最新一次点击的结果，没有使用
         map: null,
         mouseTool: null,
+        description: null,// 分片描述
         defaultProps: {
           children: 'children',
           label: 'label'
@@ -135,6 +136,7 @@
       console.log("routeParams")
       console.log(routeParams)
       this.relationId = routeParams.relationId
+      this.description = routeParams.piece.template
 
       let res = await this.getLayerList()
       console.log(res)

DAPlatform-front/src/components/imageAnnotation/layerShow.vue

@@ -42,8 +42,8 @@
           </div>
 <!--          <div style="overflow: auto" v-if="this.$route.params.operationSign == 1">-->
 
-<!--
-<!--          </div>-->
+
+         <!-- </div> -->
         </div>
       </transition>
       <transition name="fade">

DAPlatform-front/src/components/textAnnotation/SelectText.vue

@@ -40,8 +40,6 @@
           <br />
           <div>
             <el-button class="button1" type="primary" @click="submit()">提交</el-button>
-            <el-button class="button2" type="primary" @click="exportContent()">导出文本</el-button>
-            <el-button class="button3" type="primary" @click="exportTokenList()">导出标注</el-button>
           </div>
 
           <!-- 弹窗-->
@@ -474,25 +472,6 @@ export default {
         params: { task: encodeURIComponent(JSON.stringify(this.task)) }
       });
     },
-    exportContent() {
-      this.axios({
-        method: "post",
-        url: "/files/downloadContent",
-        data: {
-          // documentId: "9aa2d69cc66411ea879e54e1ad87433a"
-          documentId:this.documentId
-        }
-      }).then(res => {
-        console.log(res)
-        // let blob = new Blob([res], {type : 'application/octet-stream'});
-        let blob = new Blob([res], {type : 'text/plain'});
-        FileSaver.saveAs(blob);
-      });
-    },
-    exportTokenList() {
-      let blob = new Blob([JSON.stringify(this.tokenList)], {type : 'application/json'});
-      FileSaver.saveAs(blob);
-    },
   },
   mounted: function() {
     this.insertDocument();

DAPlatform-front/src/components/textAnnotation/SelectedCheck.vue

@@ -34,8 +34,6 @@
           <div class="button1">
             <el-button type="primary" @click="commentScore = true">打分</el-button>
             <el-button type="primary" @click="submit()">提交</el-button>
-            <el-button class="button2" type="primary" @click="exportContent()">导出文本</el-button>
-            <el-button class="button3" type="primary" @click="exportTokenList()">导出标注</el-button>
             <el-dialog title="请打分" :visible.sync="commentScore" width="400px">
               <el-form :model="scoreForm">
                 <el-form-item label="标注准确率" :label-width="formLabelWidth">
@@ -239,24 +237,6 @@ export default {
         this.$message("打分成功");
       }
     },
-    exportContent() {
-      this.axios({
-        method: "post",
-        url: "/files/downloadContent",
-        data: {
-          documentId:this.documentId
-        }
-      }).then(res => {
-        console.log(res)
-        // let blob = new Blob([res], {type : 'application/octet-stream'});
-        let blob = new Blob([res], {type : 'text/plain'});
-        FileSaver.saveAs(blob);
-      });
-    },
-    exportTokenList() {
-      let blob = new Blob([JSON.stringify(this.tokenList)], {type : 'application/json'});
-      FileSaver.saveAs(blob);
-    },
     submit() {
       alert("打分成功");
       // this.$router.push({ path: "/taskhall" });

DAPlatform-front/src/components/textAnnotation/SelectedText.vue

@@ -31,8 +31,6 @@
           <br />
           <div>
             <el-button class="button1" type="primary" @click="submit()">提交</el-button>
-            <el-button class="button2" type="primary" @click="exportContent()">导出文本</el-button>
-            <el-button class="button3" type="primary" @click="exportTokenList()">导出标注</el-button>
           </div>
         </div>
       </el-main>
@@ -194,24 +192,6 @@ export default {
         }
       });
     },
-    exportContent() {
-      this.axios({
-        method: "post",
-        url: "/files/downloadContent",
-        data: {
-          documentId:this.documentId
-        }
-      }).then(res => {
-        console.log(res)
-        // let blob = new Blob([res], {type : 'application/octet-stream'});
-        let blob = new Blob([res], {type : 'text/plain'});
-        FileSaver.saveAs(blob);
-      });
-    },
-    exportTokenList() {
-      let blob = new Blob([JSON.stringify(this.tokenList)], {type : 'application/json'});
-      FileSaver.saveAs(blob);
-    },
     submit() {
       this.$router.push({ path: "/taskhall" });
     }

DAPlatform-front/src/components/textAnnotation/Table.vue

@@ -75,8 +75,6 @@
           <br />
           <div>
             <el-button type="primary" @click="submit()">提交</el-button>
-            <el-button class="button2" type="primary" @click="exportContent()">导出文本</el-button>
-            <el-button class="button3" type="primary" @click="exportTokenList()">导出标注</el-button>
           </div>
 
           <!-- 弹窗-->
@@ -519,24 +517,7 @@ export default {
         name: "ongoingtaskdetail",
         params: { task: encodeURIComponent(JSON.stringify(this.task)) }
       });
-    },
-    exportContent() {
-      this.axios({
-        method: "post",
-        url: "/files/downloadContent",
-        data: {
-          documentId:this.documentId
-        },
-        responseType: "blob"
-      }).then(res => {
-        let blob = new Blob([res], {type : 'application/vnd.ms-excel;charset=utf-8',});
-        FileSaver.saveAs(blob,"download.xlsx");
-      });
-    },
-    exportTokenList() {
-      let blob = new Blob([JSON.stringify(this.tokenList)], {type : 'application/json'});
-      FileSaver.saveAs(blob);
-    },
+    }
   },
   mounted: function() {
     this.insertDocument();

DAPlatform-front/src/components/textAnnotation/Tabled.vue

@@ -77,8 +77,6 @@
           <!--div v-if="this.$route.query.isCheck == '1'"-->
           <div>
             <el-button type="primary" @click="submit()">提交</el-button>
-            <el-button class="button2" type="primary" @click="exportContent()">导出文本</el-button>
-            <el-button class="button3" type="primary" @click="exportTokenList()">导出标注</el-button>
           </div>
         </div>
       </el-main>
@@ -245,23 +243,6 @@ export default {
         }
       });
     },
-    exportContent() {
-      this.axios({
-        method: "post",
-        url: "/files/downloadContent",
-        data: {
-          documentId:this.documentId
-        },
-        responseType: "blob"
-      }).then(res => {
-        let blob = new Blob([res], {type : 'application/vnd.ms-excel;charset=utf-8',});
-        FileSaver.saveAs(blob,"download.xlsx");
-      });
-    },
-    exportTokenList() {
-      let blob = new Blob([JSON.stringify(this.tokenList)], {type : 'application/json'});
-      FileSaver.saveAs(blob);
-    },
     submit() {
       this.$router.push({ path: "/taskhall" });
       

DAPlatform-front/src/components/textAnnotation/TabledCheck.vue

@@ -78,8 +78,6 @@
           <div>
             <el-button type="primary" @click="commentScore = true">打分</el-button>
             <el-button type="primary" @click="submit()">提交</el-button>
-            <el-button class="button2" type="primary" @click="exportContent()">导出文本</el-button>
-            <el-button class="button3" type="primary" @click="exportTokenList()">导出标注</el-button>
             <el-dialog title="请打分" :visible.sync="commentScore" width="400px">
               <el-form :model="scoreForm">
                 <el-form-item label="标注准确率" :label-width="formLabelWidth">
@@ -310,24 +308,7 @@ export default {
                   this.$router.push({path: '/taskhall'});
               }
           })
-      },
-    exportContent() {
-      this.axios({
-        method: "post",
-        url: "/files/downloadContent",
-        data: {
-          documentId:this.documentId
-        },
-        responseType: "blob"
-      }).then(res => {
-        let blob = new Blob([res], {type : 'application/vnd.ms-excel;charset=utf-8',});
-        FileSaver.saveAs(blob,"download.xlsx");
-      });
-    },
-    exportTokenList() {
-      let blob = new Blob([JSON.stringify(this.tokenList)], {type : 'application/json'});
-      FileSaver.saveAs(blob);
-    }
+      }
   },
   mounted: function() {
     this.insertDocument();