image修改

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

@@ -34,7 +34,7 @@
 <!--            </el-radio-group>-->
             <el-row :gutter="20">
               <el-col span="6">
-                <el-button style="font-size: 12px;padding: 10px 20px;" @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">
                 <!--            看注释，打分按钮和提交按钮是对审核结果提交-->
@@ -65,7 +65,7 @@
       <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: 14px">标注描述</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)">-->
@@ -199,6 +199,8 @@ export default {
       imageNum: -1,
       data: [],
       imageList: [],
+      // 分片描述
+      description: null,
       defaultProps: {
         children: 'children',
         label: 'label'
@@ -214,8 +216,11 @@ export default {
     let routeParams = this.$route.params
     console.log("routeParams")
     console.log(routeParams)
-    let imageName = routeParams.file.url
+    this.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()
@@ -226,7 +231,7 @@ export default {
     // 这个是原来的代码
     // var imgUrl = this.data.length ? this.data[0].imageUrl : 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200627155321.png'
     // 这个是现在使用的代码
-    var imgUrl = 'http://127.0.0.1:9100/api/files/getImage/' + imageName
+    var imgUrl = baseURL + '/files/getImage/' + this.imageName
     // 如果不使用后端可以用这个模拟
     // var imgUrl = 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png'
     this.imageUrl = imgUrl
@@ -801,7 +806,7 @@ export default {
           let newData = {
             relationId: element.relationId,
             imageUrl: element.imageUrl,
-            label: this.getImageName(element.imageUrl),
+            label: element.imageName,
             children: element.labelList
           }
           this.data.push(newData)
@@ -812,7 +817,7 @@ export default {
         let newData = {
           relationId: this.relationId,
           imageUrl: this.imageUrl,
-          label: this.getImageName(this.imageUrl),
+          label: this.imageName,
           children: []
         }
         this.data.push(newData)

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

@@ -62,8 +62,8 @@
 
         <div style="margin-top: 10px"></div>
         <el-button-group  style="margin-right: 5px ; line-height: 30px;vertical-align: middle" id="start">
-          <el-button style="font-size: 12px;padding: 10px 20px;" class="tool-button" type="primary" @click="save()" >保存</el-button>
-          <el-button style="font-size: 12px;padding: 10px 20px;" class="tool-button" type="primary" >退出</el-button>
+          <!-- <el-button style="font-size: 12px;padding: 10px 20px;" class="tool-button" type="primary" @click="save()" >保存</el-button> -->
+          <!-- <el-button style="font-size: 12px;padding: 10px 20px;" class="tool-button" type="primary" >退出</el-button> -->
           <el-button style="font-size: 12px;padding: 10px 20px;" v-if="this.$route.params.operationSign == 1" type="primary" @click="commentScore = true">打分</el-button>
           <el-button style="font-size: 12px;padding: 10px 20px;" v-if="this.$route.params.operationSign == 1" type="primary" @click="submit()">提交</el-button>
         </el-button-group>
@@ -174,6 +174,7 @@
         clickedPosition: null,//保存最新一次点击的结果，没有使用
         map: null,
         mouseTool: null,
+        description: null,// 分片描述
         defaultProps: {
           children: 'children',
           label: 'label'
@@ -193,7 +194,8 @@
       let routeParams = this.$route.params
       console.log("routeParams")
       console.log(routeParams)
-      this.relationId = routeParams.relationId
+      this.relationId = routeParams.relationId      
+      this.description = routeParams.piece.template
 
       let res = await this.getLayerList()
       console.log(res)
@@ -408,7 +410,7 @@
         })
       },
       setCenter () {
-        this.map.setCenter([this.centerX, this.centerY])
+        this.map.setCenter([this.centerY, this.centerX])
       },
       /**
        * 还原数据中的地标、标注区域