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

DAPlatform-front/src/components/CheckDetail.vue

@@ -23,7 +23,8 @@ export default {
   },
   data () {
     return {
-      task: null
+      task: null,
+      isCheck: '1'
     }
   },
   beforeMount () {
@@ -31,7 +32,13 @@ export default {
   },
   methods: {
     doOption () {
-      this.$router.push('/selected')
+        console.log(this.isCheck),
+        this.$router.push({
+            path:'/selected',
+            query:{
+                isCheck : this.isCheck,
+            }
+        })
     }
   }
 }

DAPlatform-front/src/components/CompletedTaskDetail.vue

@@ -24,7 +24,8 @@ export default {
   },
   data () {
     return {
-      task: null
+      task: null,
+      isCheck:'0'
     }
   },
   beforeMount () {
@@ -33,7 +34,12 @@ export default {
   methods: {
     doOption (file) {
       console.log(file)
-      this.$router.push('/selected')
+        this.$router.push({
+            path:'/selected',
+            query:{
+                isCheck : this.isCheck
+            }
+        })
     }
   }
 }

DAPlatform-front/src/components/NavHeader.vue

@@ -30,7 +30,7 @@ export default {
   },
   computed: {
     userType () {
-      return this.$store.state.userInfo.identity === '1'
+      return this.$store.state.userInfo.identity === 1
     }
   },
   watch: {

DAPlatform-front/src/components/UserHome.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="user-info-right">
         <div class="user-info-main">
-          <p><span>用户名：</span>{{userInfo.username}}</p>
+          <p><span>用户名：</span>{{userInfo.userName}}</p>
           <p><span>用户ID：</span>{{userInfo.userId}}</p>
           <p><span>邮箱：</span>{{userInfo.email}}</p>
           <p><span>身份：</span>{{userInfo.identity ? '任务发布者' : '任务标注者'}}</p>

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

@@ -11,7 +11,21 @@
               </li>
             </ul>
           </div>
-          <div></div>
+          <div v-if="this.$route.query.isCheck == '1'">
+            <el-button type="primary" @click="commentScore = true">打分</el-button>
+            <el-button type="primary" @click="submit()">提交</el-button>
+            <el-dialog title="请打分" :visible.sync="commentScore" width="400px">
+              <el-form :model="scoreForm">
+                <el-form-item label="标注准确率" :label-width="formLabelWidth" >
+                  <el-input v-model="scoreForm.accuracy" autocomplete="off" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="标注得分" :label-width="formLabelWidth">
+                  <el-input v-model="scoreForm.score" autocomplete="off" clearable></el-input>
+                </el-form-item>
+                <el-button type="primary" @click="addScore()">确认</el-button>
+              </el-form>
+            </el-dialog>
+          </div>
         </div>
       </el-main>
     </el-container>
@@ -45,7 +59,13 @@ export default {
         2019年以来,第二次青藏高原综合科学考察研究队在西藏共采集大气、水文、土壤等环境要素样品1.2万余份,采集动植物、微生物样本4.4万余份,收集经济社会发展资料超2200套,在“亚洲水塔”变化与影响及应对等方面取得突破。<br/> \
         “我们在西藏进行科学考察,必须了解当地群众生产、生活需求和意愿,为保护好这里的一草一木尽一份绵薄之力。肆虐的风雪阻挡不住前进的路,选择了科考,选择了拥抱这片广袤的土地,就是青春的荣耀。”王向涛说。"
       ],
-      
+        commentScore:false,
+        scoreForm:{
+            accuracy:'',
+            score:'',
+        }  ,
+        formLabelWidth:'120px',
+
     };
   },
   methods: {
@@ -54,6 +74,23 @@ export default {
         console.log(response);
       })
     },
+      addScore(){
+          if(this.scoreForm.accuracy == '' || this.scoreForm.score == '')
+              this.$message("请输入内容");
+          else if(!(/^[0-9]+$/.test(this.scoreForm.accuracy))
+              && !(/^[0-9]+$/.test(this.scoreForm.accuracy))
+              && !(/^((([^0][0-9]+|0)\.([0-9]{1,2}))$)|^(([1-9]+)\.([0-9]{1,2})$)/.test(this.scoreForm.score))
+              && !(/^((([^0][0-9]+|0)\.([0-9]{1,2}))$)|^(([1-9]+)\.([0-9]{1,2})$)/.test(this.scoreForm.accuracy))
+          )
+              this.$message("输入非法字符");
+          else if(parseInt(this.scoreForm.accuracy) > 100 || parseInt(this.scoreForm.accuracy) < 0)
+              this.$message("准确度应在0~100范围内");
+          else{
+              this.commentScore = false;
+              this.$message("打分成功") ;
+          }
+      },
+
   }
 };
 </script>

DAPlatform/Dao/Task.py

@@ -13,7 +13,19 @@ mysql = MySQLDatabase(
 mysql.connect()
 
 
+class Result:
+    code: int
+    message: []
+    data: {}
+
+    def __init__(self, code, message, data):
+        self.code = code
+        self.message = message
+        self.data = data
+
+
 class Task(Model):
+    task_id = AutoField(primary_key=True, unique=True)
     publish_id = IntegerField(null=False)
     slice_number = IntegerField(null=False, default=0)
     publish_time = DateTimeField(default=datetime.datetime.now())
@@ -22,69 +34,55 @@ class Task(Model):
 
     # 发布状态：0代表刚发布，1代表已标注待审核，2代表已完成
     class Meta:
-        database = mysql;
+        database = mysql
 
 
 # 新建任务
 def create_task(publish_id, slice_number, task_name):
-    if not Task.table_exists():
-        Task.create_table()
     try:
         if User.find_id(publish_id):
             task = Task(publish_id=publish_id, slice_number=slice_number, task_name=task_name)
             task.save()
         else:
-            print(False)
-            return 0
-    except Exception:
-        print(0)
+            return Result(0, "User not exist", {})
+    except:
+        return Result(0, "create failed", {})
     else:
-        print(task.id)
+        return Result(1, "create success", {})
 
 
-# 根据任务id查找任务
-def find_taskbyid(task_id):
-    if not Task.table_exists():
-        Task.create_table()
+# 根据任务名称查找任务
+def find_task_by_name(task_name):
     try:
-        p = Task.get(Task.id == task_id)
-    except Exception:
-        print(0)
+        query = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time).where(Task.task_name.contains(task_name)).dicts()
+    except:
+        return Result(0, "find failed", {})
     else:
-        print(p.task_name)
+        return Result(1, "find success", query)
 
 
-# 根据任务名称查找任务
-def find_taskbyname(task_name):
-    if not Task.table_exists():
-        Task.create_table()
+# 查找所有任务
+def find_task():
     try:
-        p = Task.get(Task.task_name == task_name)
-    except Exception:
-        print(0)
+        query = Task.select(Task.task_id, Task.task_name, Task.publish_id, Task.publish_time).dicts()
+    except:
+        return Result(0, "find failed", {})
     else:
-        print(p.id)
+        return Result(1, "find success", query)
 
 
 # 删除任务
 def delete_task(task_id):
-    if not Task.table_exists():
-        Task.create_table()
-    try:
-        Task.delete().where(Task.id == task_id);
-    except Exception:
-        print(0)
-    else:
-        print(1)
-
-def find_id(id):
     try:
-        t = Task.get(Task.id == id)
-    except Exception:
-        return False
+        Task.delete().where(Task.id == task_id)
+    except:
+        return Result(0, "delete failed", {})
     else:
-        return True
+        return Result(1, "delete success", {})
 
 
 if __name__ == '__main__':
-    create_task(1,3,'ha')
\ No newline at end of file
+    r = find_task()
+    for row in r.data:
+        print(row)
+    print(len(r.data))

DAPlatform/Dao/User.py

@@ -27,11 +27,11 @@ class User(Model):
     userName = CharField(null=False, max_length=10, unique=True)
     password = CharField(null=False, max_length=20)
     mail = CharField(null=False, max_length=32)
-    type = FixedCharField(max_length=1, choices=['0', '1'], default='0')
+    type = IntegerField(choices=[0, 1], default=0)
     imageScore = IntegerField(null=False, default=0)
-    imageAccuracy = DoubleField(null=True)
+    imageAccuracy = DoubleField(null=True, default=0)
     textScore = IntegerField(null=False, default=0)
-    textAccuracy = DoubleField(null=True)
+    textAccuracy = DoubleField(null=True, default=0)
     postScore = IntegerField(null=False, default=0)
     postNum = IntegerField(null=False, default=0)
 
@@ -157,8 +157,15 @@ def add_post_num(id, num):
         return Result(-1, "DoesNotExit", {})
 
 
+def find_id(id):
+    try:
+        tmp = User.get(User.usrId == id)
+    except:
+        return 0
+    else:
+        return 1
+
+
 if __name__ == '__main__':
-    User.drop_table()
-    User.create_table()
-    register('123','123','123')
+    print(find_id(1))
 

DAPlatform/app.py

@@ -3,23 +3,15 @@ from flask_cors import CORS
 
 # from views.uploadDownload import uploadDownload
 # from views.textAnnotation import textAnnotation
-from .views import user, imageAnnotation
-
-from .Dao.Image import register_extensions
+from views.user import user
+from views.task import task
 
 app = Flask(__name__)
 CORS(app)
-app.register_blueprint(textAnnotation)
-app.register_blueprint(uploadDownload)
+# app.register_blueprint(textAnnotation)
+# app.register_blueprint(uploadDownload)
 app.register_blueprint(user)
-app.register_blueprint(imageAnnotation)
-
-register_extensions(app)
-
-
-@app.route("/")
-def hello_world():
-    return "hello"
+app.register_blueprint(task)
 
 
 if __name__ == '__main__':

DAPlatform/views/task.py

+import json
+from flask import Blueprint
+from flask import request
+from Dao import Task
+import math
+
+task = Blueprint("task", __name__, url_prefix="/api/task")
+
+@task.route("/getTasks", methods=["GET"])
+def get_tasks():
+    pageSize = request.args['pageSize']
+    currentPage = request.args['currentPage']
+    keyword = request.args['keyword']
+    pagesize = int(pageSize)
+    currentpage = int(currentPage)
+    if keyword:
+        ret = Task.find_task_by_name(keyword)
+    else:
+        ret = Task.find_task()
+    num = len(ret.data)
+    Num = math.ceil(num/pagesize)
+    res = {
+        'code': ret.code,
+        'message': ret.message,
+        'tasks': json.dumps(ret.data),
+        'pageNum': Num
+    }
+    return json.dumps(res)
\ No newline at end of file