Skip to content

D
DA-Platform

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

Commit 200fe3c3 by 张欣玥
Options

image&layer审核页面改

parent f14e2c11
Showing with 151 additions and 66 deletions
DAPlatform-front/src/components/imageAnnotation/imageAnnotiation.vue
......@@ -736,7 +736,7 @@ export default {
}
},
async getLabelList () {
try {
this.data = []
let params = {
......
DAPlatform-front/src/components/imageAnnotation/imageShow.vue
......@@ -34,13 +34,13 @@
<!-- </el-radio-group>-->
<el-row :gutter="20">
<el-col span="6">
<!-- <el-button @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">
<!-- 看注释，打分按钮和提交按钮是对审核结果提交-->
<el-button type="primary" @click="commentScore = true">打分</el-button>
<el-button type="primary" @click="submit()">提交</el-button>
<el-button style="font-size: 12px;padding: 10px 20px;" type="primary" @click="commentScore = true">打分</el-button>
<el-button style="font-size: 12px;padding: 10px 20px;" type="primary" @click="submit()">提交</el-button>
<el-dialog title="请打分" :visible.sync="commentScore" width="400px">
<el-form :model="scoreForm">
<el-form-item label="标注准确率" :label-width="formLabelWidth">
......@@ -62,15 +62,16 @@
</div>
</el-aside>
<el-aside class="sidebar2" style="position: absolute;margin-top: 60px" :style="{ height : 185 +'px'}">
<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: 15px">图片列表</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)">
{{index+1}}. &nbsp; {{item.label}}
</div>
</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)">-->
<!-- {{index+1}}. &nbsp; {{item.label}}-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
......@@ -79,7 +80,7 @@
<el-aside class="sidebar3" style="position: absolute;margin-top: 260px" >
<div class="sidebar-box">
<div>
<div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 15px">标注列表</div>
<div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注列表</div>
<div class="img-title-list-box">
<div id="img-title-list" style="user-select:none">
......@@ -178,7 +179,6 @@ export default {
pictureId: 1,
relationId: null,
imageUrl: '',
imageName: '',
scaleSize: 1,
height_res: 0,
activeIndex1: 1,
......@@ -199,8 +199,6 @@ export default {
imageNum: -1,
data: [],
imageList: [],
// 分片描述
description: null,
defaultProps: {
children: 'children',
label: 'label'
......@@ -216,11 +214,9 @@ export default {
let routeParams = this.$route.params
console.log("routeParams")
console.log(routeParams)
this.imageName = routeParams.file.url
let 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()
console.log(imageList)
......@@ -230,7 +226,7 @@ export default {
// 这个是原来的代码
// var imgUrl = this.data.length ? this.data[0].imageUrl : 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200627155321.png'
// 这个是现在使用的代码
var imgUrl = baseURL + '/files/getImage/' + this.imageName
var imgUrl = 'http://127.0.0.1:9100/api/files/getImage/' + imageName
// 如果不使用后端可以用这个模拟
// var imgUrl = 'https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png'
this.imageUrl = imgUrl
......@@ -804,8 +800,8 @@ export default {
inputData.forEach(element => {
let newData = {
relationId: element.relationId,
imageName: element.imageName,
label: element.imageName,
imageUrl: element.imageUrl,
label: this.getImageName(element.imageUrl),
children: element.labelList
}
this.data.push(newData)
......@@ -815,8 +811,8 @@ export default {
} else {
let newData = {
relationId: this.relationId,
imageName: this.imageName,
label: this.imageName,
imageUrl: this.imageUrl,
label: this.getImageName(this.imageUrl),
children: []
}
this.data.push(newData)
......
DAPlatform-front/src/components/imageAnnotation/layerShow.vue
......@@ -2,28 +2,28 @@
<!-- <div class="layout" :style="{ height : height_res+'px'}">-->
<div class="layout">
<!-- 工具栏-->
<div class="toolBar">
<el-button-group id="start">
<!-- <el-button class="tool-button" type="primary" @click="save()" >保存</el-button> -->
<el-button class="tool-button" type="primary" >退出</el-button>
<el-button v-if="this.$route.params.operationSign == 1" type="primary" @click="commentScore = true">打分</el-button>
<el-button v-if="this.$route.params.operationSign == 1" type="primary" @click="submit()">提交</el-button>
</el-button-group>
<el-button-group style="margin-right: 10px ; line-height: 40px;vertical-align: middle">
<el-button class="tool-button" type="primary" style="margin-right: 10px" @click="setCenter()">改变中心点</el-button>
<a>X:</a>
<input type="text" style="width: 30px" v-model="centerX">
<a>Y:</a>
<input type="text" style="width: 30px" v-model="centerY">
</el-button-group>
<!-- <el-radio-group v-model="radio1">-->
<!-- <el-radio-button label="建立地标"></el-radio-button>-->
<!-- <el-radio-button label="矩形标注"></el-radio-button>-->
<!-- <el-radio-button label="多边形标注"></el-radio-button>-->
<!-- </el-radio-group>-->
</div>
<el-container style="height:50vh">
<!-- <div class="toolBar">-->
<!-- <el-button-group id="start">-->
<!-- <el-button class="tool-button" type="primary" @click="save()" >保存</el-button>-->
<!-- <el-button class="tool-button" type="primary" >退出</el-button>-->
<!-- <el-button v-if="this.$route.params.operationSign == 1" type="primary" @click="commentScore = true">打分</el-button>-->
<!-- <el-button v-if="this.$route.params.operationSign == 1" type="primary" @click="submit()">提交</el-button>-->
<!-- </el-button-group>-->
<!-- <el-button-group style="margin-right: 10px ; line-height: 40px;vertical-align: middle">-->
<!-- <el-button class="tool-button" type="primary" style="margin-right: 10px" @click="setCenter()">改变中心点</el-button>-->
<!-- <a>X:</a>-->
<!-- <input type="text" style="width: 30px" v-model="centerX">-->
<!-- <a>Y:</a>-->
<!-- <input type="text" style="width: 30px" v-model="centerY">-->
<!-- </el-button-group>-->
<!--&lt;!&ndash; <el-radio-group v-model="radio1">&ndash;&gt;-->
<!--&lt;!&ndash; <el-radio-button label="建立地标"></el-radio-button>&ndash;&gt;-->
<!--&lt;!&ndash; <el-radio-button label="矩形标注"></el-radio-button>&ndash;&gt;-->
<!--&lt;!&ndash; <el-radio-button label="多边形标注"></el-radio-button>&ndash;&gt;-->
<!--&lt;!&ndash; </el-radio-group>&ndash;&gt;-->
<!-- </div>-->
<el-container style="margin-top: 20px;height: 100%">
<transition name="fade">
<div class = "alert1" v-show="isInfo">
<div style="flex: 1;display: flex;align-items:center;font-size: 25px">标注</div>
......@@ -50,35 +50,71 @@
<div v-show="isInfo" style="z-index:4000;position: fixed;background-color: rgba(0,0,0,0.42);width: 100%;height: 100%;top: 0;left: 0"></div>
</transition>
<!-- 侧边栏-->
<el-aside class="sidebar" style="">
<el-aside class="sidebar" style="text-align:left;height: 130px;background-color: rgba(255,255,255,0);box-shadow: 0px 0px 0px rgba(255,255,255,0);padding: 0px">
<div style="margin-top: 5px"></div>
<el-button-group style="margin-right: 10px ; line-height: 30px;vertical-align: middle">
<el-button class="tool-button" type="primary" style="margin-right: 10px;font-size: 12px;padding: 10px 20px;" @click="setCenter()">改变中心点</el-button>
<a>X:</a>
<el-input type="text" style="width: 50px;" v-model="centerX"></el-input>
<a>Y:</a>
<el-input type="text" style="width: 50px" v-model="centerY"></el-input>
</el-button-group>
<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;" 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>
</el-aside>
<el-aside class="sidebar" style="position: absolute;height: 32vh">
<div class="sidebar-box" style="height: 32vh">
<el-aside class="sidebar" style="position: absolute;margin-top: 100px;height: 235px">
<div class="sidebar-box" style="height: 235px">
<div>
<div class="img-list-title">点标注</div>
<div class="img-title-list-box" style="height: calc(32vh - 40px)">
<div v-for="(item, index) in landmarkData" :key="item.id" class="listLeft" style="text-align: left" @dblclick="markInfo(index)" @mouseenter="markEnter(index)" @mouseleave="restore()">
{{index+1}}. &nbsp; {{item.landmarkName}}
</div>
</div>
<div class="img-list-title" style="font-size: 14px;height: 30px;line-height: 30px">标注描述</div>
<div style="font-size:14px;margin: 5px;text-align: left">{{this.description}}</div>
</div>
</div>
</el-aside>
<el-aside class="sidebar" style="position: absolute;margin-top: calc(32vh + 30px);height: calc(82% - 32vh - 30px)">
<el-aside class="sidebar" style="position: absolute;margin-top: 350px;height: calc(100vh - 71px - 400px);">
<div class="sidebar-box">
<div>
<div class="img-list-title">区域标注</div>
<div class="img-title-list-box">
<div v-for="(item, index) in layerData" :key="item.id" class="listLeft" style="text-align: left" @dblclick="areaInfo(index)" @mouseenter="areaEnter(index)" @mouseleave="restore()">
{{index+1}}. &nbsp; {{item.labelName}}
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="地标列表" name="first">
<div class="img-title-list-box" style="height: 205px">
<div v-for="(item, index) in landmarkData" :key="item.id" class="listLeft" style="text-align: left" @dblclick="markInfo(index)" @mouseenter="markEnter(index)" @mouseleave="restore()">
{{index+1}}. &nbsp; {{item.landmarkName}}
</div>
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="区域标注列表" name="second">
<div class="img-title-list-box">
<div v-for="(item, index) in layerData" :key="item.id" class="listLeft" style="text-align: left" @dblclick="areaInfo(index)" @mouseenter="areaEnter(index)" @mouseleave="restore()">
{{index+1}}. &nbsp; {{item.labelName}}
</div>
</div>
</el-tab-pane>
</el-tabs>
<!-- <div>-->
<!-- <div class="img-list-title" style="display:inline-block;font-size: 14px;height: 30px;line-height: 30px;width: 100px">点标注</div>-->
<!-- <div class="img-list-title">区域标注</div>-->
<!-- <div v-show="isPoint" class="img-title-list-box" style="height: 205px">-->
<!-- <div v-for="(item, index) in landmarkData" :key="item.id" class="listLeft" style="text-align: left" @dblclick="markInfo(index)" @mouseenter="markEnter(index)" @mouseleave="restore()">-->
<!-- {{index+1}}. &nbsp; {{item.landmarkName}}-->
<!-- </div>-->
<!-- </div>-->
<!-- <div v-show="!isPoint" class="img-title-list-box">-->
<!-- <div v-for="(item, index) in layerData" :key="item.id" class="listLeft" style="text-align: left" @dblclick="areaInfo(index)" @mouseenter="areaEnter(index)" @mouseleave="restore()">-->
<!-- {{index+1}}. &nbsp; {{item.labelName}}-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
</el-aside>
<!-- 工作台-->
<el-main class="workbench" style="width: 60%;padding: 0">
<!-- <img src="../../assets/logo.png">-->
......@@ -118,6 +154,8 @@
name: 'layerAnnotation',
data(){
return{
activeName: 'first',
isPoint: true,
centerX: 0,
centerY: 0,
labelNow: 0,
......@@ -136,7 +174,6 @@
clickedPosition: null,//保存最新一次点击的结果，没有使用
map: null,
mouseTool: null,
description: null,// 分片描述
defaultProps: {
children: 'children',
label: 'label'
......@@ -157,7 +194,6 @@
console.log("routeParams")
console.log(routeParams)
this.relationId = routeParams.relationId
this.description = routeParams.piece.template
let res = await this.getLayerList()
console.log(res)
......@@ -261,6 +297,10 @@
// }
// })
},
// 点标注&区域标注跳转
handleClick(tab, event) {
console.log(tab, event);
},
// 删除标注
deleteLabelInList () {
if(this.isMark) {
......@@ -820,7 +860,7 @@
border-radius: 5px;
box-shadow: 0px 0px 10px #dbdbdb;
background-color: white;
height: 96.5%;
height: calc(100vh - 81px - 40px);
}
#buttonBar {
......@@ -864,4 +904,43 @@
.listLeft:hover{
background-color: #cbd8ea;
}
/deep/ .el-radio-button__inner{
font-size: 12px;
padding: 10px 20px;
}
/deep/ .el-input__inner{
font-size: 12px;
height: 34px;
line-height: 34px;
padding: 0px 3px;
}
/deep/ .el-tabs__header{
margin: 0px 0px 5px;
}
/deep/ .el-tabs__item{
height: 35px;
line-height: 35px;
font-size: 14px;
}
/deep/ .el-tabs__nav-scroll{
background-color: #409EFF;
}
/deep/ .el-tabs__item.is-active{
background-color: white;
color: black;
}
/deep/ .el-tabs__item{
background-color: #409EFF;
color: white;
width: 150px;
/*border-right: 1px solid white;*/
}
/deep/ .el-tabs--card>.el-tabs__header .el-tabs__item{
transition: color 0s ease;
-webkit-transition: color 0s ease;
}
/deep/ .el-tabs--card>.el-tabs__header .el-tabs__nav{
border: 0;
}
</style>
DAPlatform-front/src/router/index.js
......@@ -128,6 +128,16 @@ export default new Router({
name: 'layer',
component: layerAnnotation
},
// {
// path: '/imageshow',
// name: 'imageShow',
// component: imageShow
// },
// {
// path: '/layershow',
// name: 'layerShow',
// component: layerShow
// }
{
path: '/imageshow/:file/:task/:relationId/:executor/:piece',
name: 'imageShow',
......
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