iamgeShow打分按钮添加

DAPlatform-front/package-lock.json

@@ -6694,7 +6694,7 @@
     },
     "javascript-natural-sort": {
       "version": "0.7.1",
-      "resolved": "https://registry.npm.taobao.org/javascript-natural-sort/download/javascript-natural-sort-0.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
       "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
     },
     "js-base64": {
@@ -6710,7 +6710,8 @@
     },
     "js-yaml": {
       "version": "3.7.0",
-      "resolved": "",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
+      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -11378,7 +11379,7 @@
     },
     "seed-random": {
       "version": "2.2.0",
-      "resolved": "https://registry.npm.taobao.org/seed-random/download/seed-random-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
       "integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ="
     },
     "select-hose": {

DAPlatform-front/src/components/CheckDetail.vue

@@ -41,7 +41,8 @@ export default {
       executors: [],
       file: undefined,
       piece: undefined,
-      loading: false
+      loading: false,
+      operationSign:1,
     }
   },
   beforeMount () {
@@ -66,15 +67,16 @@ export default {
       })
     },
     goto (executor) {
-      var self = this, {file, piece} = this
+      var self = this, {file, piece , operationSign} = this
       var params = {
         file,
         task: self.task,
         relationId: executor.relation_id,
         executor,
         piece,
-        operationSign: 1 // 作为审核任务标识
+        operationSign
       }
+      // console.log(params)
       function goto (path) {
         self.$router.push({ name: path, params })
       }

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

@@ -32,24 +32,30 @@
 <!--              <el-radio-button label="矩形标注"></el-radio-button>-->
 <!--              <el-radio-button label="多边形标注"></el-radio-button>-->
 <!--            </el-radio-group>-->
-            <el-button @click="save()">保存</el-button>
-
-<!--            看注释，打分按钮和提交按钮是对审核结果提交-->
-<!--            <div style="overflow: auto" v-if="this.routeParams.operationSign == 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>-->
+            <el-row :gutter="20">
+              <el-col span="6">
+                <el-button @click="save()">保存</el-button>
+              </el-col>
+              <el-col span="14" v-if="this.$route.params.operationSign == 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>
+              </el-col>
+            </el-row>
+
+
 <!--            -->
 
           </div>
@@ -917,9 +923,11 @@ export default {
           }
       },
       submit() {
-          alert("打分成功");
-          this.$router.push({ path: "/taskhall" });
-          // alert("inin");
+          // alert("打分成功");
+          if(this.scoreForm.score == '' || this.scoreForm.accuracy == ''){
+              alert("请打分和填写准确率");
+              return;
+          }
           this.axios({
               method: "get",
               params: {
@@ -929,6 +937,8 @@ export default {
               },
               url: "task/gradePieces"
           }).then(res => {
+              // console.log(res);
+              // console.log("dafennjg");
               if (res.code == 0) {
                   alert("分数提交失败!");
               } else if (res.code == 1) {

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

@@ -155,7 +155,7 @@
       console.log(res)
      if (res.layerInfo != null)
         this.layerData = res.layerInfo.labelList
-      else 
+      else
         this.layerData = []
       console.log(this.layerData)
 

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

@@ -259,7 +259,7 @@ export default {
     },
     submit() {
       alert("打分成功");
-      this.$router.push({ path: "/taskhall" });
+      // this.$router.push({ path: "/taskhall" });
       // alert("inin");
       this.axios({
         method: "get",

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

@@ -290,7 +290,7 @@ export default {
       submit(){
 
                   alert("打分成功");
-                  this.$router.push({path: '/taskhall'});
+                  // this.$router.push({path: '/taskhall'});
           // alert("inin");
           this.axios({