Skip to content

D
DA-Platform

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

Commit 27c68064 by 李景熙
Options

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

parents 2a21b6c8 452c0f0f
Showing with 85 additions and 37 deletions
DAPlatform-front/package-lock.json
......@@ -6699,7 +6699,7 @@
},
"javascript-natural-sort": {
"version": "0.7.1",
"resolved": "https://registry.npm.taobao.org/javascript-natural-sort/download/javascript-natural-sort-0.7.1.tgz",
"resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
"integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
},
"js-base64": {
......@@ -11402,7 +11402,7 @@
},
"seed-random": {
"version": "2.2.0",
"resolved": "https://registry.npm.taobao.org/seed-random/download/seed-random-2.2.0.tgz",
"resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",
"integrity": "sha1-KpsZ4lCoFwmSMaW5mk2vgLf77VQ="
},
"select-hose": {
......
DAPlatform-front/src/assets/js/env.js
var baseURL = 'http://localhost:9100/api'
var baseURL = 'http://47.92.1.107/api'
export {
baseURL
......
DAPlatform-front/src/components/imageAnnotation/imageCheck.vue
......@@ -38,7 +38,7 @@
<el-radio-button label="矩形标注"></el-radio-button>
<el-radio-button label="多边形标注"></el-radio-button>
</el-radio-group>
<el-button @click="save()" style="font-size: 12px;padding: 10px 20px;">保存</el-button>
<el-button @click="save()" style="font-size: 12px;padding: 10px 20px;">提交</el-button>
</div>
</div>
......@@ -1138,7 +1138,7 @@ export default {
else
var score = 0
var tmpScore = score * 100
this.computeScore = tmpScore.toFixed(2)
this.computeScore = tmpScore.toFixed(0)
},
save () {
......@@ -1167,6 +1167,9 @@ export default {
console.log('outputdata')
console.log(outputData)
this.submit()
this.imageNum = this.data.length
this.axios({
method: 'post',
......@@ -1179,7 +1182,7 @@ export default {
if (res.code === 1) {
// 保存标志置为1
this.hasSaved = true
this.$alert('保存成功', '保存成功', {
this.$alert('审核提交成功', '审核提交成功', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
......@@ -1187,9 +1190,12 @@ export default {
// //message: `action: ${action}`
// })
}
})
this.$router.push({ path: "/check" })
} else {
this.$alert('保存失败', '保存失败', {
this.$alert('审核提交失败', '审核提交失败', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
......@@ -1200,7 +1206,7 @@ export default {
})
}
}).catch(err => {
this.$alert('保存失败', '保存失败', {
this.$alert('审核提交失败', '审核提交失败', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
......@@ -1210,7 +1216,34 @@ export default {
}
})
})
}
},
submit() {
// alert("打分成功");
// console.log("route:")
// console.log(this.$route.params.executor.id)
// if(this.scoreForm.score == '' || this.scoreForm.accuracy == ''){
// alert("请打分和填写准确率");
// return;
// }
this.axios({
method: "get",
params: {
userId: this.$route.params.executor.id,
fileId: this.$route.params.file.id,
score: this.computeScore
},
url: "task/gradePieces"
}).then(res => {
// console.log(res);
// console.log("dafennjg");
if (res.code == 0) {
alert("分数提交失败!");
} else if (res.code == 1) {
// alert("打分成功");
// this.$router.push({ path: "/taskhall" });
}
});
},
}
}
</script>
......
DAPlatform-front/src/components/imageAnnotation/layerCheck.vue
......@@ -94,7 +94,7 @@
<el-radio-button label="矩形"></el-radio-button>
<el-radio-button label="多边形"></el-radio-button>
</el-radio-group>
<el-button @click="save()" style="font-size: 12px;padding: 10px 20px;">保存</el-button>
<el-button @click="save()" style="font-size: 12px;padding: 10px 20px;">提交</el-button>
</div>
......@@ -433,6 +433,7 @@ export default {
}
this.restore()
this.isInfo = false
this.computeFn()
// 保存标志置为0
this.hasSaved = false
},
......@@ -904,7 +905,7 @@ export default {
else
var score = 0
var tmpScore = score * 100
this.computeScore = tmpScore.toFixed(2)
this.computeScore = tmpScore.toFixed(0)
},
// 保存数据用的接口
......@@ -938,6 +939,8 @@ export default {
console.log(outputlandmarkInfo)
console.log(outputLayerInfo)
this.submit()
this.axios({
method: 'post',
url: '/layer/saveLayer',
......@@ -950,7 +953,7 @@ export default {
if (res.code === 1) {
// 保存标志置为1
this.hasSaved = true
this.$alert('保存成功', '保存成功', {
this.$alert('审核提交成功', '审核提交成功', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
......@@ -959,8 +962,9 @@ export default {
// });
}
})
this.$router.push({ path: "/check" })
} else {
this.$alert('保存失败', '保存失败', {
this.$alert('审核提交失败', '审核提交失败', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
......@@ -971,7 +975,7 @@ export default {
})
}
}).catch(err => {
this.$alert('保存失败', '保存失败', {
this.$alert('审核提交失败', '审核提交失败', {
confirmButtonText: '确定',
callback: action => {
// this.$message({
......@@ -988,26 +992,33 @@ export default {
changeToolBar (val) {
this.activeIndex1 = val
},
/**
* 这个是不需要的方法，没有问题会删除
*/
deleteAnnotation: function () {
this.$confirm('确定删除此标注', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
}
submit() {
// alert("打分成功");
// console.log("route:")
// console.log(this.$route.params.executor.id)
// if(this.scoreForm.score == '' || this.scoreForm.accuracy == ''){
// alert("请打分和填写准确率");
// return;
// }
this.axios({
method: "get",
params: {
userId: this.$route.params.executor.id,
fileId: this.$route.params.file.id,
score: this.computeScore
},
url: "task/gradePieces"
}).then(res => {
// console.log(res);
// console.log("dafennjg");
if (res.code == 0) {
alert("分数提交失败!");
} else if (res.code == 1) {
// alert("打分成功");
// this.$router.push({ path: "/taskhall" });
}
});
},
}
}
</script>
......
DAPlatform-front/src/components/ongoingtask.vue
......@@ -7,8 +7,8 @@
<div>{{item.name}}</div>
<div>发布者：{{item.creator}}&emsp;&emsp;发布时间：{{item.date|formatDate}}
</div>
<!-- <el-button v-if="item.state == " class="task-enter-btn1" @click="del(item.id)" type="info" plain>删除任务</el-button>-->
<el-button class="task-enter-btn1" @click="detail(item)" type="primary" plain>查看任务详情</el-button>
<el-button v-if="item.state == '5'" class="task-enter-btn1" @click="del(item.id)" type="info" plain>删除任务</el-button>
<el-button v-else class="task-enter-btn1" @click="detail(item)" type="primary" plain>查看任务详情</el-button>
</div>
</div>
<navigator v-model="tasks" :condition="condition"></navigator>
......@@ -43,7 +43,7 @@ export default {
del(id){
this.axios({
method:"post",
url:"task/delTask",
url:"task/giveUpTask",
params:{
userId:this.$store.state.userInfo.userId,
taskId:id
......
DAPlatform/upload/1598777123.txt 0 → 100644
参加过一次软院心理讲座，但是未录入
有博雅记录的一共4次
总共5次博雅
\ No newline at end of file
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