Skip to content

D
DA-Platform

文档服务地址：http://47.92.0.57:3000/ 周报索引地址：http://47.92.0.57:3000/s/NruNXRYmV

Commit 67617317 by 李景熙
Options

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

parents ffe4e5d4 ad3029de
Showing with 99 additions and 52 deletions
DAPlatform-front/package-lock.json
...@@ -1567,6 +1567,14 @@ ...@@ -1567,6 +1567,14 @@
"qs": "6.7.0", "qs": "6.7.0",
"raw-body": "2.4.0", "raw-body": "2.4.0",
"type-is": "~1.6.17" "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": { "bonjour": {
...@@ -4555,6 +4563,14 @@ ...@@ -4555,6 +4563,14 @@
"type-is": "~1.6.18", "type-is": "~1.6.18",
"utils-merge": "1.0.1", "utils-merge": "1.0.1",
"vary": "~1.1.2" "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": { "ext": {
...@@ -10591,10 +10607,9 @@ ...@@ -10591,10 +10607,9 @@
"dev": true "dev": true
}, },
"qs": { "qs": {
"version": "6.7.0", "version": "6.9.4",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
"integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
"dev": true
}, },
"query-string": { "query-string": {
"version": "4.3.4", "version": "4.3.4",
......
DAPlatform-front/package.json
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
"axios": "^0.19.2", "axios": "^0.19.2",
"element-ui": "^2.13.1", "element-ui": "^2.13.1",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"qs": "^6.9.4",
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^3.4.0", "vuex": "^3.4.0",
......
DAPlatform-front/src/mock/api.js
...@@ -9,54 +9,82 @@ import Mock from 'mockjs' ...@@ -9,54 +9,82 @@ import Mock from 'mockjs'
// }] // }]
// }) // })
Mock.mock('http://localhost:9100/api/image', { // Mock.mock('http://localhost:9100/api/image', {
code: 1, // code: 1,
data: [{ // data: [{
relationId: 123, // relationId: 123,
imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png', // imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png',
labelList: [{ // labelList: [{
labelId: 0, // labelId: 0,
label: 'label1', // labelName: 'label24',
pointList: [{ // pointList: [{
pointId: '1-1', // pointId: '1-1',
X: 500, // X: 500,
Y: 300 // Y: 300
}, { // }, {
pointId: '1-2', // pointId: '1-2',
X: 600, // X: 600,
Y: 400 // Y: 300
}] // }, {
}, { // pointId: '1-3',
labelId: 1, // X: 700,
label: 'label2', // Y: 350
pointList: [{ // }, {
pointId: '2-1', // pointId: '1-4',
X: 100, // X: 600,
Y: 100 // Y: 400
}, { // }, {
pointId: '2-2', // pointId: '1-5',
X: 200, // X: 450,
Y: 200 // Y: 350
}] // }]
}] // }, {
}, { // labelId: 1,
relationId: 233, // labelName: 'label2',
imageUrl: 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200526170357.jpg', // pointList: [{
labelList: [{ // pointId: '2-1',
labelId: 0, // X: 100,
label: 'label1', // Y: 100
pointList: [{ // }, {
pointId: '1-1', // pointId: '2-2',
X: 100, // X: 200,
Y: 100 // Y: 100
}, { // }, {
pointId: '1-2', // pointId: '2-2',
X: 300, // X: 200,
Y: 300 // 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]+/, { // Mock.mock(/http:\/\/localhost:9100\/api\/getPieces\?id=[0-9]+/, {
// 'status': 0, // 'status': 0,
......
DAPlatform-front/src/store/index.js
...@@ -16,6 +16,9 @@ export default new Vuex.Store({ ...@@ -16,6 +16,9 @@ export default new Vuex.Store({
}, },
setImageData (state, imageData) { setImageData (state, imageData) {
state.imageData = imageData state.imageData = imageData
},
clearImageData (state) {
state.imageData = null
} }
}, },
actions: { actions: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment