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

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

@@ -5,7 +5,7 @@
         <!-- 实体/属性模板 -->
         <div class="sidebar-box1">
           <div>
-            <div class="img-list-title1">实体/属性模板</div>
+            <div class="img-list-title1">标注：{{this.token.word}}</div>
             <div class="img-title-list-box1">
               <div style="overflow: auto; height: calc(100vh - 61px - 100px - 40px - 60px);">
                 <p v-html="'实体：'+ token.entityId" />
@@ -39,16 +39,9 @@
         </div>
       </el-aside>
       <!-- 文本界面 -->
-      <el-main
-        class="filter-container1"
-        style="background-color: #FFFFFF"
-      >
+      <el-main class="filter-container1" style="background-color: #FFFFFF">
         <div style="overflow-y:auto;height:100%;">
-          <div
-            class="content1"
-            @mouseup="select()"
-            v-html="content"
-          ></div>
+          <div class="content1" @mouseup="select()" v-html="content"></div>
           <div class="content_left">
             <div
               class="tokenList1"
@@ -63,10 +56,7 @@
                 :disable-transitions="false"
                 @close="deleteToken(it)"
               >
-                <a
-                  class="token1"
-                  v-html="it.word"
-                ></a>
+                <a class="token1" v-html="it.word"></a>
               </el-tag>
             </div>
           </div>
@@ -101,7 +91,7 @@ export default {
       },
       token: {
         tokenId: "",
-        word: "",
+        word: "未选择",
         begin: 0,
         end: 0,
         entityId: "",
@@ -117,7 +107,7 @@ export default {
         children: "children",
         label: "label",
       },
-      treeToArray : [],
+      treeToArray: [],
     };
   },
   beforeMount() {
@@ -250,7 +240,10 @@ export default {
           // 属性
           this.treeData = res.result.entityList;
           for (var i = 0; i < this.treeData.length; i++) {
-            this.treeToArray.push({ "id": this.treeData[i].id, "label": this.treeData[i].label }); // 属性
+            this.treeToArray.push({
+              id: this.treeData[i].id,
+              label: this.treeData[i].label,
+            }); // 属性
             if (this.treeData[i].children != []) {
               this.transfer(this.treeData[i].children);
             }
@@ -266,6 +259,15 @@ export default {
     // 定位原文token
     select() {
       if (window.getSelection().toString() != "") {
+        for (var i = 0; i < this.tokenList.length; i++) {
+          if (window.getSelection().toString() == this.tokenList[i].word) {
+            this.$message({
+              message: "“" + window.getSelection().toString() + "”已标注",
+              type: "info",
+            });
+            return;
+          }
+        }
         //console.log("  token select" + JSON.stringify(this.token));
         this.token.tokenId = "0";
         this.token.word = window.getSelection().toString();
@@ -410,10 +412,9 @@ export default {
       this.$refs.tree.setCheckedNodes(res);
     },
     transfer(children) {
-      if (children == [])
-        return;
+      if (children == []) return;
       for (var i = 0; i < children.length; i++) {
-        this.treeToArray.push({ "id": children[i].id, "label": children[i].label });
+        this.treeToArray.push({ id: children[i].id, label: children[i].label });
         if (children[i] != []) {
           this.transfer(children[i].children);
         }

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

@@ -5,7 +5,7 @@
         <!-- 实体/属性模板 -->
         <div class="sidebar-box1">
           <div>
-            <div class="img-list-title1">实体/属性模板</div>
+            <div class="img-list-title1">标注：{{this.token.word}}</div>
             <div class="img-title-list-box1">
               <div style="overflow: auto; height: calc(100vh - 61px - 100px - 40px - 60px);">
                 <p v-html="'实体：'+ token.entityId" />
@@ -39,16 +39,9 @@
         </div>
       </el-aside>
       <!-- 文本界面 -->
-      <el-main
-        class="filter-container3"
-        style="background-color: #FFFFFF"
-      >
+      <el-main class="filter-container3" style="background-color: #FFFFFF">
         <div style="overflow-y:auto;height:100%;">
-          <div
-            class="content3"
-            @mouseup="select()"
-            v-html="content"
-          ></div>
+          <div class="content3" @mouseup="select()" v-html="content"></div>
 
           <div class="content_left1">
             <div
@@ -56,35 +49,22 @@
               v-for="it in tokenList"
               :key="it"
               style="user-select:none; float: left;"
+              @click="changeToken(it)"
+              :disable-transitions="false"
             >
-              <el-tag
-                size="small"
-                @click="changeToken(it)"
-                closable
-                :disable-transitions="false"
-                @close="deleteToken(it)"
-              >
-                <a
-                  style="font-size: 18px;"
-                  v-html="it.word"
-                ></a>
+              <el-checkbox>
+                <a style="font-size: 18px;" v-html="it.word"></a>
                 <a style="font-size: 14px;">: 实体</a>
-                <a
-                  style="font-size: 14px;"
-                  v-html="it.entityId"
-                ></a>
+                <a style="font-size: 14px;" v-html="it.entityId"></a>
                 <a style="font-size: 14px;">属性</a>
-                <a
-                  style="font-size: 14px;"
-                  v-html="it.attribute"
-                ></a>
-                <el-button
+                <a style="font-size: 14px;" v-html="it.attribute"></a>
+                <!--el-button
                   style="margin-left: auto;font-size: 12px"
                   @click="countScore()"
                   size="mini"
                   type="text"
-                >标注正确</el-button>
-              </el-tag>
+                >O</el-button-->
+              </el-checkbox>
             </div>
           </div>
           <div style="overflow:auto;font-size: 15px;float: right;">
@@ -121,7 +101,7 @@ export default {
       },
       token: {
         tokenId: "",
-        word: "",
+        word: "未选择",
         begin: 0,
         end: 0,
         entityId: "",
@@ -289,7 +269,10 @@ export default {
           // 属性
           this.treeData = res.result.entityList;
           for (var i = 0; i < this.treeData.length; i++) {
-            this.treeToArray.push({ "id": this.treeData[i].id, "label": this.treeData[i].label }); // 属性
+            this.treeToArray.push({
+              id: this.treeData[i].id,
+              label: this.treeData[i].label,
+            }); // 属性
             if (this.treeData[i].children != []) {
               this.transfer(this.treeData[i].children);
             }
@@ -449,17 +432,44 @@ export default {
       this.$refs.tree.setCheckedNodes(res);
     },
     transfer(children) {
-      if (children == [])
-        return;
+      if (children == []) return;
       for (var i = 0; i < children.length; i++) {
-        this.treeToArray.push({ "id": children[i].id, "label": children[i].label });
+        this.treeToArray.push({ id: children[i].id, label: children[i].label });
         if (children[i] != []) {
           this.transfer(children[i].children);
         }
       }
     },
     save() {
-      alert("打分成功");
+      this.submit();
+      this.$router.push({ path: "/check" });
+    },
+    submit() {
+      // alert("打分成功");
+      // console.log("route:")
+      // console.log(this.$route.params.executor.id)
+      // if(this.scoreForm.score == '' || this.scoreForm.accuracy == ''){
+      //     alert("请打分和填写准确率");
+      //     return;
+      // }
+      this.axios({
+        method: "get",
+        params: {
+          userId: this.$route.params.executor.id,
+          fileId: this.$route.params.file.id,
+          score: this.computeScore,
+        },
+        url: "task/gradePieces",
+      }).then((res) => {
+        // console.log(res);
+        // console.log("dafennjg");
+        if (res.code == 0) {
+          alert("分数提交失败!");
+        } else if (res.code == 1) {
+          // alert("打分成功");
+          // this.$router.push({ path: "/taskhall" });
+        }
+      });
     },
     // 打分
     addScore() {

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

@@ -60,7 +60,7 @@
       <el-main class="filter-container2" style="background-color: #FFFFFF">
         <div style="overflow-y:auto;height:100%;">
           <!-- 表格界面 -->
-          <div class="content2">
+          <div class="content2" @mouseup="select2()">
             <el-table
               :data="nowContent.tableData"
               :cell-style="cellStyle"
@@ -290,7 +290,49 @@ export default {
       }
     },
     // 定位原文token
+    select2() {
+      if (window.getSelection().toString() != "") {
+        for (var i = 0; i < this.tokenList.length; i++) {
+          if (window.getSelection().toString() == this.tokenList[i].word) {
+            this.$message({
+              message: "“" + window.getSelection().toString() + "”已标注",
+              type: "info",
+            });
+            return;
+          }
+        }
+        //console.log("  token select" + JSON.stringify(this.token));
+        this.token.tokenId = "0";
+        this.token.word = window.getSelection().toString();
+        this.token.begin = window.getSelection().anchorOffset; //开始位置
+        this.token.end = window.getSelection().focusOffset; //结束位置
+        this.$refs.tree.setCheckedNodes([]);
+        //console.log("  token select" + JSON.stringify(this.token));
+        //console.log("  tokenList select" + JSON.stringify(this.tokenList));
+      }
+    },
+    // 定位原文token
     select: function (row, column) {
+      if (window.getSelection().toString() != "") {
+        for (var i = 0; i < this.tokenList.length; i++) {
+          if (window.getSelection().toString() == this.tokenList[i].word) {
+            this.$message({
+              message: "“" + window.getSelection().toString() + "”已标注",
+              type: "info",
+            });
+            return;
+          }
+        }
+        //console.log("  token select" + JSON.stringify(this.token));
+        this.token.tokenId = "0";
+        this.token.word = window.getSelection().toString();
+        this.token.begin = window.getSelection().anchorOffset; //开始位置
+        this.token.end = window.getSelection().focusOffset; //结束位置
+        this.$refs.tree.setCheckedNodes([]);
+        //console.log("  token select" + JSON.stringify(this.token));
+        //console.log("  tokenList select" + JSON.stringify(this.tokenList));
+        return;
+      }
       this.row = row;
       this.column = column;
       this.token.tokenId = "0";