修改标注完成state

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

@@ -78,7 +78,7 @@
               </el-select>
               <!--el-button type="primary" @click="handleOption">新建</el-button-->
               <el-tree
-                :data="treedata"
+                :data="treeData"
                 show-checkbox
                 default-expand-all
                 node-key="id"
@@ -119,39 +119,8 @@ export default {
       tokenList: [],
       // 文章列表
       textData: [],
-      treedata: [
-        {
-          label: "坐标",
-          children: [
-            {
-              label: "经度"
-            },
-            {
-              label: "维度"
-            }
-          ]
-        },
-        {
-          label: "规模等级",
-          children: [
-            {
-              label: "巨型"
-            },
-            {
-              label: "特大型"
-            },
-            {
-              label: "大型"
-            },
-            {
-              label: "中型"
-            },
-            {
-              label: "小型"
-            }
-          ]
-        }
-      ],
+      // templete
+      treeData: [],
       defaultProps: {
         children: "children",
         label: "label"
@@ -177,7 +146,9 @@ export default {
           value: "选项4",
           label: "时间"
         }
-      ]
+      ],
+      // table
+      tableData:[],
     };
   },
   beforeMount() {
@@ -200,10 +171,12 @@ export default {
       }).then(res => {
         if (res.return_code == 200) {
           this.documentId = res.result;
-          console.log(this.documentId);
+          //console.log("this.documentId: " + this.documentId);
           this.getContent();
           // 获得实体属性
           this.getTokenList();
+          // 获得标注模板
+          this.getTemplate();
         } else {
           this.$message({
             message: res.return_info,
@@ -214,19 +187,20 @@ export default {
     },
     //获取内容
     getContent() {
-      console.log("this.file: " + JSON.stringify(this.file));
-
-      console.log("this.documentId: " + JSON.stringify(this.documentId));
+      //console.log("getContent");
+      //console.log("this.file: " + JSON.stringify(this.file));
+      //console.log("this.documentId: " + this.documentId);
       this.axios({
         method: "post",
         url: "/files/getFileContent",
         data: {
-          documentId: this.documentId // TODO documentId 和 fileId 还没对应 JSON.stringify(this.file.id) // this.file.url
+          documentId: this.documentId
         }
       }).then(res => {
         if (res.return_code == 200) {          
+          //console.log("getContent: " + res.result);
           this.content = res.result;
-          console.log("this.content: " + this.content);
+          //console.log("this.content: " + this.content);
         } else {
           this.$message({
             message: res.return_info,
@@ -237,17 +211,18 @@ export default {
     },
     // 获得实体属性列表
     getTokenList() {
+      //console.log("getTokenList");
       this.axios({
         method: "post",
         url: "/textAnnotation/getTokenList",
         data: {
-          documentId: this.documentId // TODO documentId & fileId 还没对应
+          documentId: this.documentId
         }
       }).then(res => {
         if (res.return_code == 200) {
           res.result.forEach(element => {
-            this.tokenList.push(element);
             console.log("this.token: " + element);
+            this.tokenList.push(element);
           });
         } else {
           this.$message({
@@ -259,15 +234,21 @@ export default {
     },
     //获取模板 // TODO 模板渲染
     getTemplate() {
+      //console.log("getTemplate");
       this.axios({
         method: "post",
-        url: "/textAnnotation/getOneTemplated",
+        url: "/textAnnotation/getOneTemplate",
         data: {
-          templateId: this.file.id
+          templateId: 1 // TODO 待沟通，通用那边没给这个接口，还有这个在后端用str包了，这里用int就行
         }
       }).then(res => {
         if (res.return_code == 200) {
           console.log(res.result);
+          res.result.forEach(element => {
+            console.log("this.token: " + element);
+            this.treeData.push(element);
+          });
+          console.log("this.treeData: " + JSON.stringify(this.treeData));  
         } else {
           this.$message({
             message: res.return_info,

DAPlatform/dao/mongodbApi.py

@@ -57,12 +57,11 @@ def findOne(collection, condition):
 # 修改单个文档
 def revOne(collection, condition, reset):
     try:
-        collection.update_one(condition, reset)
-        # print(result)
-        # < pymongo.results.UpdateResult object at 0x0000022485BE3FC8 >
+        result = collection.update_one(condition, reset)
+        return result
     except Exception as e:
         print(e)
-    print("success")
+        return None
 
 
 # 向tokenList中添加一个token

DAPlatform/upload/1594521435.txt

+1.做笔记
+
+在任务1中做好笔记非常重要，尤其是在听力段落中。有两个原因：
+
+阅读文章将在演讲后重新出现，并且在你写作时可见。因此，尽管注意作者的立场和要点很重要，但你无需在阅读文章中做大量注释。
+
+与阅读相比，你应该写更多有关听力的文章。那就对了！在你的回答中，关于教授的观点和反驳的文章应多于作者两倍。因此，在演讲过程中做好笔记至关重要。
+
+这一点必须要强调：在听力文章中记下好的笔记！
+
+关于听力段落的内容，你所写的内容将比阅读内容多两倍。
+
+聆听并将你的笔记与聆听中的笔记进行比较。
+
+2.不要引用
+
+对于TOEFL综合写作任务，要求你用自己的话来解释作者和教授的观点！因此，把一切都解释一下是非常重要的。
+
+阅读文章尤其如此。请记住，在撰写论文时，阅读部分就在你眼前。如果你直接引用作者的阅读段落，那么TOEFL电子评分系统把这部分内容辨认出来，并直接导致你的分数降低。
+
+例如，假设阅读段落指出：
+
+“ there are many who argue that corn ethanol should replace fossil fuel gas as the primary source for running cars.”
+
+不要在你的作文中写： “The author discusses howthere are many who argue that corn ethanol should replace fossil fuel gas as the primary source for running cars.”
+
+加粗的部分是完全一样的，这是许多同学会犯的错误！
+
+那么怎么写呢？我们可以对作者的观点进行阐述，进行paraphrase，例如可以这么写：“The author discusses the advantages of switching from fossil fuels to the alternative energy source: corn-based ethanol”
+
+3.要使用过渡词和短语
+
+过渡性单词和短语是写作的关键组成部分，尤其是在托福写作任务一中。在阅读和听力文章中，你需要在形成鲜明对比的观点之间转换。保持文章连贯性的最佳方法是在不同观点之间使用过渡词。
+
+对过渡词的良好使用，能够向TOEFL评分者和电子评分者证明，你对英语和北美学术论文结构掌握良好。以下是一些常见的过渡性单词和短语：
+
+给各个要点和理由进行排序
+
+位置：
+
+整理各段落中的要点/每个正文段落的第一句
+
+and then, first of all, firstly, in the first place, first and foremost,firstly, secondly, thirdly, next, after that, meanwhile, lastly, later, finally, while
+
+阐述、添加想法
+
+位置：
+
+在正文中论述听力的要点
+
+在解释你的理由时，通常是正文的第二句话
+
+在阐述例子时
+
+above all, actually, additionally, as well as, as a matter of fact, in addition, believe it or not, furthermore, indeed, in fact, just as, moreover
+
+举例说明
+
+位置：
+
+介绍你的个人例子或轶事时
+
+as an illustration, for example, for instance, I remember when, such as
+
+显示因果关系
+
+位置：
+
+在正文结尾处和/或将您的故事与主题相关时，在每个正文段落的末尾
+
+as a result, because, consequently, due to, hence, so, therefore, thus, for this reason
+
+对比
+
+位置：
+
+在每个段落中介绍听力段落的观点时
+
+在介绍和结论中认识相反的论点
+
+although, at the same time, but, contrary to, even though, however, nevertheless, nonetheless, on the other hand, still, when in fact, yet, whereas, besides, despite the fact that, conversely
+
+总结
+
+位置：
+
+结论段落/每个正文段落的最后一句
+
+all in all, as noted above, finally, in conclusion, in short, in the end, on the whole, to conclude, to sum up
\ No newline at end of file

DAPlatform/views/textAnnotation.py

@@ -198,7 +198,7 @@ def insertDocument():
     documentId = str(uuid.uuid1()).replace('-', '')
 
     result = mongodbApi.insert(collectionTest, {"documentId": documentId, "templateId": templateId,
-                                       "annotatorId": annotatorId, "textUrl": textUrl,
+                                       "annotatorId": annotatorId, "textUrl": textUrl, "state": "0",
                                        "type": type, "tokenList": []})
 
     if result is None:
@@ -210,6 +210,45 @@ def insertDocument():
     return json.dumps(return_dict, ensure_ascii=False)
 
 
+# 修改标注状态
+# 插入document
+@textAnnotation.route("/revDocumentState", methods=["POST"])
+def revDocumentState():
+    # 默认返回内容
+    return_dict = {'return_code': '200', 'return_info': '处理成功', 'result': False}
+    # 判断传入的json数据是否为空
+    try:
+        get_Data = request.get_data()
+        get_Data = json.loads(get_Data)
+    except Exception as e:
+        return_dict['return_code'] = '201'
+        return_dict['return_info'] = '请求参数有误'
+        return json.dumps(return_dict, ensure_ascii=False)
+
+    documentId = get_Data.get('documentId', None)
+
+    if documentId is None:
+        return_dict['return_code'] = '201'
+        return_dict['return_info'] = '请求参数有误'
+        return json.dumps(return_dict, ensure_ascii=False)
+
+    result = mongodbApi.findOne(collectionTest, {"documentId": documentId})
+
+    if result is None:
+        return_dict['return_code'] = '201'
+        return_dict['return_info'] = '请求参数有误'
+        return json.dumps(return_dict, ensure_ascii=False)
+
+    result = mongodbApi.revOne(collectionTest, {"documentId": documentId}, {"$set": {"state": "1"}})
+
+    if result is None:
+        return_dict['return_code'] = '209'
+        return_dict['return_info'] = '修改失败'
+        return json.dumps(return_dict, ensure_ascii=False)
+
+    return json.dumps(return_dict, ensure_ascii=False)
+
+
 # 插入模板
 @textAnnotation.route("/createTemplated", methods=["POST"])
 def createTemplated():