图像审核及bug修复

DAPlatform-front/src/assets/js/env.js

-var baseURL = 'http://47.92.1.107/api'
+var baseURL = 'http://localhost:9100/api'
 
 export {
   baseURL

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

@@ -843,8 +843,10 @@ export default {
         labelName = value
         this.makeLabel(labelName)
       }).catch(() => {
-        labelName = 'iss'
-        this.makeLabel(labelName)
+        // labelName = 'iss'
+        // this.makeLabel(labelName)
+        this.canvasAll[0].pop()
+        this.restoreCanvas()
       })
     },
     // 创建储存用的标签数据

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

@@ -852,9 +852,12 @@ export default {
         this.makeLabel(labelName)
         _this.addYes = true
       }).catch(() => {
-        labelName = 'iss'
-        this.makeLabel(labelName)
+        // labelName = 'iss'
+        // this.makeLabel(labelName)
         _this.addYes = false
+        // 还原标注
+        _this.canvasAll[0].pop()
+        _this.restoreCanvas()
       })
 
       return _this.addYes;

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

@@ -587,8 +587,8 @@ export default {
         landmarkName = value
         this.makelandmark(landmarkName, position)
       }).catch(() => {
-        landmarkName = 'iss'
-        this.makelandmark(landmarkName, position)
+        // landmarkName = 'iss'
+        // this.makelandmark(landmarkName, position)
       })
     },
     /**
@@ -644,8 +644,9 @@ export default {
         name = value
         this.makeRectangle(name, northEast, southWest)
       }).catch(() => {
-        name = 'iss'
-        this.makeRectangle(name, northEast, southWest)
+        // name = 'iss'
+        // this.makeRectangle(name, northEast, southWest)
+        this.restore()
       })
     },
     /**
@@ -725,8 +726,9 @@ export default {
         name = value
         this.makePolygon(name, path)
       }).catch(() => {
-        name = 'iss'
-        this.makePolygon(name, path)
+        // name = 'iss'
+        // this.makePolygon(name, path)
+        this.restore()
       })
     },
     /**

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

@@ -665,8 +665,8 @@ export default {
         landmarkName = value
         this.makelandmark(landmarkName, position)
       }).catch(() => {
-        landmarkName = 'iss'
-        this.makelandmark(landmarkName, position)
+        // landmarkName = 'iss'
+        // this.makelandmark(landmarkName, position)
       })
     },
     /**
@@ -724,8 +724,9 @@ export default {
         name = value
         this.makeRectangle(name, northEast, southWest)
       }).catch(() => {
-        name = 'iss'
-        this.makeRectangle(name, northEast, southWest)
+        // name = 'iss'
+        // this.makeRectangle(name, northEast, southWest)
+        this.restore()
       })
     },
     /**
@@ -807,8 +808,9 @@ export default {
         name = value
         this.makePolygon(name, path)
       }).catch(() => {
-        name = 'iss'
-        this.makePolygon(name, path)
+        // name = 'iss'
+        // this.makePolygon(name, path)
+        this.restore()
       })
     },
     /**
@@ -865,7 +867,7 @@ export default {
     isRightLayer2 (index) {
 
       var tmp = this.checkLayer
-      // alert(tmp[id])
+      // alert(tmp)
       tmp[index] = 0
       this.$forceUpdate()
     },
@@ -903,13 +905,30 @@ export default {
     },
     // 保存数据用的接口
     save () {
+      // console.log("layerData")
+      // console.log(this.layerData)
+
+      // 拿出正确的区域标注信息
+      console.log(this.checkLayer)
+      var tmpLabel = []
+      for (var i = 0; i < this.layerData.length; i ++) {
+        if(this.checkLayer[i] == 2 || this.checkLayer[i] == 1)
+          tmpLabel.push(this.layerData[i])
+      }
       let outputLayerInfo = {
         relationId: this.relationId,
-        labelList: this.layerData
+        labelList: tmpLabel
+      }
+
+      // 拿出正确的地标信息
+      var tmpLandmark = []
+      for (var i = 0; i < this.landmarkData.length; i ++) {
+        if(this.checkLand[i] == 2 || this.checkLand[i] == 1)
+          tmpLandmark.push(this.landmarkData[i])
       }
       let outputlandmarkInfo = {
         relationId: this.relationId,
-        landmarkEntityList: this.landmarkData
+        landmarkEntityList: tmpLandmark
       }
       console.log('outputdata')
       console.log(outputlandmarkInfo)