Merge remote-tracking branch 'origin/develop' into develop

DAPlatform-front/package-lock.json

@@ -1567,6 +1567,14 @@
         "qs": "6.7.0",
         "raw-body": "2.4.0",
         "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
       }
     },
     "bonjour": {
@@ -4555,6 +4563,14 @@
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        }
       }
     },
     "ext": {
@@ -10591,10 +10607,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-      "dev": true
+      "version": "6.9.4",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+      "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
     },
     "query-string": {
       "version": "4.3.4",

DAPlatform-front/package.json

@@ -14,6 +14,7 @@
     "axios": "^0.19.2",
     "element-ui": "^2.13.1",
     "node-sass": "^4.14.1",
+    "qs": "^6.9.4",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
     "vuex": "^3.4.0",

DAPlatform-front/src/mock/api.js

@@ -9,54 +9,82 @@ import Mock from 'mockjs'
 //   }]
 // })
 
-Mock.mock('http://localhost:9100/api/image', {
-  code: 1,
-  data: [{
-    relationId: 123,
-    imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png',
-    labelList: [{
-      labelId: 0,
-      label: 'label1',
-      pointList: [{
-        pointId: '1-1',
-        X: 500,
-        Y: 300
-      }, {
-        pointId: '1-2',
-        X: 600,
-        Y: 400
-      }]
-    }, {
-      labelId: 1,
-      label: 'label2',
-      pointList: [{
-        pointId: '2-1',
-        X: 100,
-        Y: 100
-      }, {
-        pointId: '2-2',
-        X: 200,
-        Y: 200
-      }]
-    }]
-  }, {
-    relationId: 233,
-    imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200526170357.jpg',
-    labelList: [{
-      labelId: 0,
-      label: 'label1',
-      pointList: [{
-        pointId: '1-1',
-        X: 100,
-        Y: 100
-      }, {
-        pointId: '1-2',
-        X: 300,
-        Y: 300
-      }]
-    }]
-  }]
-})
+// Mock.mock('http://localhost:9100/api/image', {
+//   code: 1,
+//   data: [{
+//     relationId: 123,
+//     imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png',
+//     labelList: [{
+//       labelId: 0,
+//       labelName: 'label24',
+//       pointList: [{
+//         pointId: '1-1',
+//         X: 500,
+//         Y: 300
+//       }, {
+//         pointId: '1-2',
+//         X: 600,
+//         Y: 300
+//       }, {
+//         pointId: '1-3',
+//         X: 700,
+//         Y: 350
+//       }, {
+//         pointId: '1-4',
+//         X: 600,
+//         Y: 400
+//       }, {
+//         pointId: '1-5',
+//         X: 450,
+//         Y: 350
+//       }]
+//     }, {
+//       labelId: 1,
+//       labelName: 'label2',
+//       pointList: [{
+//         pointId: '2-1',
+//         X: 100,
+//         Y: 100
+//       }, {
+//         pointId: '2-2',
+//         X: 200,
+//         Y: 100
+//       }, {
+//         pointId: '2-2',
+//         X: 200,
+//         Y: 200
+//       }, {
+//         pointId: '2-2',
+//         X: 100,
+//         Y: 200
+//       }]
+//     }]
+//   }, {
+//     relationId: 233,
+//     imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200526170357.jpg',
+//     labelList: [{
+//       labelId: 0,
+//       labelName: 'label1',
+//       pointList: [{
+//         pointId: '1-1',
+//         X: 100,
+//         Y: 100
+//       }, {
+//         pointId: '1-2',
+//         X: 300,
+//         Y: 100
+//       }, {
+//         pointId: '1-2',
+//         X: 300,
+//         Y: 300
+//       }, {
+//         pointId: '1-2',
+//         X: 100,
+//         Y: 300
+//       }]
+//     }]
+//   }]
+// })
 
 // Mock.mock(/http:\/\/localhost:9100\/api\/getPieces\?id=[0-9]+/, {
 //   'status': 0,

DAPlatform-front/src/store/index.js

@@ -16,6 +16,9 @@ export default new Vuex.Store({
     },
     setImageData (state, imageData) {
       state.imageData = imageData
+    },
+    clearImageData (state) {
+      state.imageData = null
     }
   },
   actions: {