image&layer审核页面改

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

@@ -736,7 +736,7 @@ export default {
       }
     },
     async getLabelList () {
-      
+
       try {
         this.data = []
         let params = {

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

@@ -34,13 +34,13 @@
 <!--            </el-radio-group>-->
             <el-row :gutter="20">
               <el-col span="6">
-                <!-- <el-button @click="save()">保存</el-button> -->
+                <el-button style="font-size: 12px;padding: 10px 20px;" @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-button style="font-size: 12px;padding: 10px 20px;" type="primary" @click="commentScore = true">打分</el-button>
+                <el-button style="font-size: 12px;padding: 10px 20px;" 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">
@@ -62,15 +62,16 @@
         </div>
       </el-aside>
 
-      <el-aside class="sidebar2" style="position: absolute;margin-top: 60px" :style="{ height : 185 +'px'}">
+      <el-aside class="sidebar2" style="position: absolute;margin-top: 55px" :style="{ height : 185 +'px'}">
         <div class="sidebar-box">
           <div>
-            <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 15px">图片列表</div>
-            <div class="img-title-list-box">
-              <div v-for="(item, index) in data" :key="item.id" style="text-align: left"  class="listLeft" @click="jumpToImage(index)">
-                {{index+1}}. &nbsp; {{item.label}}
-              </div>
-            </div>
+            <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注描述</div>
+            <div style="font-size:14px;margin: 5px;text-align: left">{{this.description}}</div>
+            <!--              <div class="img-title-list-box">-->
+            <!--                <div v-for="(item, index) in data" :key="item.id" style="text-align: left"  class="listLeft" @click="jumpToImage(index)">-->
+            <!--                  {{index+1}}. &nbsp; {{item.label}}-->
+            <!--                </div>-->
+            <!--              </div>-->
           </div>
         </div>
 
@@ -79,7 +80,7 @@
       <el-aside class="sidebar3" style="position: absolute;margin-top: 260px" >
         <div class="sidebar-box">
           <div>
-            <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 15px">标注列表</div>
+            <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注列表</div>
             <div class="img-title-list-box">
               <div id="img-title-list" style="user-select:none">
 
@@ -178,7 +179,6 @@ export default {
       pictureId: 1,
       relationId: null,
       imageUrl: '',
-      imageName: '',
       scaleSize: 1,
       height_res: 0,
       activeIndex1: 1,
@@ -199,8 +199,6 @@ export default {
       imageNum: -1,
       data: [],
       imageList: [],
-      // 分片描述
-      description: null,
       defaultProps: {
         children: 'children',
         label: 'label'
@@ -216,11 +214,9 @@ export default {
     let routeParams = this.$route.params
     console.log("routeParams")
     console.log(routeParams)
-    this.imageName = routeParams.file.url
+    let imageName = routeParams.file.url
     this.relationId = routeParams.relationId
-    this.description = routeParams.piece.template
-    console.log(this.baseURL)
-    let baseURL = this.baseURL
+    // let src = this.getimageUrl(imageName)
     // 获取图片列表并转换格式
     let imageList = await this.getLabelList()
     console.log(imageList)
@@ -230,7 +226,7 @@ export default {
     // 这个是原来的代码
     // var imgUrl = this.data.length ? this.data[0].imageUrl : 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200627155321.png'
     // 这个是现在使用的代码
-    var imgUrl = baseURL + '/files/getImage/' + this.imageName
+    var imgUrl = 'http://127.0.0.1:9100/api/files/getImage/' + imageName
     // 如果不使用后端可以用这个模拟
     // var imgUrl = 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png'
     this.imageUrl = imgUrl
@@ -804,8 +800,8 @@ export default {
         inputData.forEach(element => {
           let newData = {
             relationId: element.relationId,
-            imageName: element.imageName,
-            label: element.imageName,
+            imageUrl: element.imageUrl,
+            label: this.getImageName(element.imageUrl),
             children: element.labelList
           }
           this.data.push(newData)
@@ -815,8 +811,8 @@ export default {
       } else {
         let newData = {
           relationId: this.relationId,
-          imageName: this.imageName,
-          label: this.imageName,
+          imageUrl: this.imageUrl,
+          label: this.getImageName(this.imageUrl),
           children: []
         }
         this.data.push(newData)

DAPlatform-front/src/router/index.js

@@ -128,6 +128,16 @@ export default new Router({
           name: 'layer',
           component: layerAnnotation
         },
+        // {
+        //   path: '/imageshow',
+        //   name: 'imageShow',
+        //   component: imageShow
+        // },
+        // {
+        //   path: '/layershow',
+        //   name: 'layerShow',
+        //   component: layerShow
+        // }
         {
           path: '/imageshow/:file/:task/:relationId/:executor/:piece',
           name: 'imageShow',