Skip to content

D
DA-Platform

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

Commit 4e4f76dd by 张欣玥
Options

layer&image布局修改

parent 8b50febc
Showing with 167 additions and 97 deletions
DAPlatform-front/src/components/imageAnnotation/imageAnnotiation.vue
...@@ -25,19 +25,27 @@ ...@@ -25,19 +25,27 @@
<!-- 侧边栏--> <!-- 侧边栏-->
<el-aside class="sidebar" style="height: 130px;background-color: rgba(255,255,255,0);box-shadow: 0px 0px 0px rgba(255,255,255,0);padding: 0px"> <el-aside class="sidebar" style="height: 130px;background-color: rgba(255,255,255,0);box-shadow: 0px 0px 0px rgba(255,255,255,0);padding: 0px">
</el-aside>
<div class="sidebar2" style="position: absolute;margin-top: 0px;width: 300px" :style="{ height : 185 +'px'}">
<div class="sidebar-box"> <div class="sidebar-box">
<div class="tool-button-left"> <div>
<div style="margin-top: 5px"></div> <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">工具栏</div>
<el-radio-group v-model="radio1"> <div class="tool-button-left" style="margin-left: 10px;margin-top: 10px">
<el-radio-button label="矩形标注"></el-radio-button> <div style="margin-top: 5px"></div>
<el-radio-button label="多边形标注"></el-radio-button> <el-radio-group v-model="radio1">
</el-radio-group> <el-radio-button label="矩形标注"></el-radio-button>
<el-button @click="save()" style="font-size: 12px;padding: 10px 20px;">保存</el-button> <el-radio-button label="多边形标注"></el-radio-button>
</el-radio-group>
<el-button @click="save()" style="font-size: 12px;padding: 10px 20px;">保存</el-button>
</div>
</div> </div>
</div> </div>
</el-aside> </div>
<el-aside class="sidebar2" style="position: absolute;margin-top: 55px" :style="{ height : 185 +'px'}"> <div class="sidebar2" style="position: absolute;margin-top: 85px;width: 300px" :style="{ height : 180 +'px'}">
<div class="sidebar-box"> <div class="sidebar-box">
<div> <div>
<div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注描述</div> <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注描述</div>
...@@ -49,10 +57,9 @@ ...@@ -49,10 +57,9 @@
<!-- </div>--> <!-- </div>-->
</div> </div>
</div> </div>
</div>
</el-aside> <div class="sidebar3" style="position: absolute;margin-top: 265px;width: 300px" >
<el-aside class="sidebar3" style="position: absolute;margin-top: 240px" >
<div class="sidebar-box"> <div class="sidebar-box">
<div> <div>
<div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注列表</div> <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注列表</div>
...@@ -73,7 +80,7 @@ ...@@ -73,7 +80,7 @@
</div> </div>
</div> </div>
</el-aside> </div>
<!-- <el-aside class="sidebar2" style="position: absolute;width: 3vh;margin-left: 390px;margin-top:10px;margin-right: 0px">--> <!-- <el-aside class="sidebar2" style="position: absolute;width: 3vh;margin-left: 390px;margin-top:10px;margin-right: 0px">-->
<!-- <div class="tool-button-left">--> <!-- <div class="tool-button-left">-->
...@@ -322,9 +329,10 @@ export default { ...@@ -322,9 +329,10 @@ export default {
i = 1 i = 1
}) })
var _this = this;
setTimeout(function () { setTimeout(function () {
if (i == 0) { if (i == 0) {
this.$destroy() _this.$destroy()
next() next()
} }
},500) },500)
...@@ -1252,7 +1260,7 @@ export default { ...@@ -1252,7 +1260,7 @@ export default {
.sidebar3 { .sidebar3 {
/*height: calc(97% - 337px);*/ /*height: calc(97% - 337px);*/
/*height: calc(100vh - 81px - 300px);*/ /*height: calc(100vh - 81px - 300px);*/
height: calc(100vh - 81px - 280px); height: calc(100vh - 81px - 305px);
margin-left: 50px; margin-left: 50px;
/*border: 2px solid #409eff;*/ /*border: 2px solid #409eff;*/
border-radius: 5px; border-radius: 5px;
...@@ -1280,4 +1288,10 @@ export default { ...@@ -1280,4 +1288,10 @@ export default {
font-size: 12px; font-size: 12px;
padding: 10px 20px; padding: 10px 20px;
} }
/deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner {
background-color:#ecf5ff;
color: rgba(51, 135, 255, 0.76);
border: 1px solid #cadcee;
}
</style> </style>
DAPlatform-front/src/components/imageAnnotation/imageShow.vue
...@@ -25,44 +25,64 @@ ...@@ -25,44 +25,64 @@
<!-- 侧边栏--> <!-- 侧边栏-->
<el-aside class="sidebar" style="height: 130px;background-color: rgba(255,255,255,0);box-shadow: 0px 0px 0px rgba(255,255,255,0);padding: 0px"> <el-aside class="sidebar" style="height: 130px;background-color: rgba(255,255,255,0);box-shadow: 0px 0px 0px rgba(255,255,255,0);padding: 0px">
</el-aside>
<div class="sidebar2" v-if="this.$route.params.operationSign == 1" style="width:300px;position: absolute;margin-top: 0px" :style="{ height : 90 +'px'}">
<div class="sidebar-box"> <div class="sidebar-box">
<div class="tool-button-left"> <div>
<div style="margin-top: 5px"></div> <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">工具栏</div>
<!-- <el-radio-group v-model="radio1">--> <div class="tool-button-left" style="margin-left: 10px">
<!-- <el-radio-button label="矩形标注"></el-radio-button>--> <div style="margin-top: 10px"></div>
<!-- <el-radio-button label="多边形标注"></el-radio-button>--> <!-- <el-radio-group v-model="radio1">-->
<!-- </el-radio-group>--> <!-- <el-radio-button label="矩形标注"></el-radio-button>-->
<el-row :gutter="20"> <!-- <el-radio-button label="多边形标注"></el-radio-button>-->
<el-col span="6"> <!-- </el-radio-group>-->
<!-- <el-button style="font-size: 12px;padding: 10px 20px;" @click="save()">保存</el-button> --> <el-row :gutter="20">
</el-col> <el-col span="6">
<el-col span="14" v-if="this.$route.params.operationSign == 1"> <!-- <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 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-button style="font-size: 12px;padding: 10px 20px;" @click="commentScore = true">打分</el-button>
<el-form :model="scoreForm"> <el-button style="font-size: 12px;padding: 10px 20px;" @click="submit()">提交</el-button>
<el-form-item label="标注准确率" :label-width="formLabelWidth"> <el-dialog title="请打分" :visible.sync="commentScore" width="400px">
<el-input v-model="scoreForm.accuracy" autocomplete="off" clearable></el-input> <el-form :model="scoreForm">
</el-form-item> <el-form-item label="标注准确率" :label-width="formLabelWidth">
<el-form-item label="标注得分" :label-width="formLabelWidth"> <el-input v-model="scoreForm.accuracy" autocomplete="off" clearable></el-input>
<el-input v-model="scoreForm.score" autocomplete="off" clearable></el-input> </el-form-item>
</el-form-item> <el-form-item label="标注得分" :label-width="formLabelWidth">
<el-button type="primary" @click="addScore()">确认</el-button> <el-input v-model="scoreForm.score" autocomplete="off" clearable></el-input>
</el-form> </el-form-item>
</el-dialog> <el-button type="primary" @click="addScore()">确认</el-button>
</el-col> </el-form>
</el-row> </el-dialog>
</el-col>
</el-row>
<!-- -->
<!-- -->
</div>
</div>
</div>
</div>
<el-aside class="sidebar2" v-if="this.$route.params.operationSign == 1" style="position: absolute;margin-top: 85px" :style="{ height : 180 +'px'}">
<div class="sidebar-box">
<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>
</div> </div>
</el-aside> </el-aside>
<el-aside class="sidebar2" style="position: absolute;margin-top: 55px" :style="{ height : 185 +'px'}"> <el-aside class="sidebar2" v-if="this.$route.params.operationSign != 1" style="position: absolute;margin-top: 0px" :style="{ height : 185 + 55 +'px'}">
<div class="sidebar-box"> <div class="sidebar-box">
<div> <div>
<div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注说明</div> <div class="img-list-title" style="height: 30px;line-height: 30px;font-size: 14px">标注说明</div>
......
DAPlatform-front/src/components/imageAnnotation/layerAnnotation.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div class="sidebar" style="position: absolute;margin-top: 0px;height: 170px;width: 300px"> <div class="sidebar" style="position: absolute;margin-top: 0px;height: 170px;width: 300px">
<div class="sidebar-box" style="height: 235px"> <div class="sidebar-box" style="height: 235px">
<div> <div>
<div class="img-list-title" style="font-size: 14px;height: 30px;line-height: 30px">标注描述</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"> <div style="font-size:14px;margin: 5px;text-align: left">
<div class="tool-button-left" style="text-align: left"> <div class="tool-button-left" style="text-align: left">
<div style="margin-top: 15px"></div> <div style="margin-top: 15px"></div>
...@@ -249,9 +249,10 @@ export default { ...@@ -249,9 +249,10 @@ export default {
i = 1 i = 1
}) })
var _this = this;
setTimeout(function () { setTimeout(function () {
if (i == 0) { if (i == 0) {
this.$destroy() _this.$destroy()
next() next()
} }
},500) },500)
......
DAPlatform-front/src/components/imageAnnotation/layerShow.vue
<template> <template>
<!-- <div class="layout" :style="{ height : height_res+'px'}">--> <!-- <div class="layout" :style="{ height : height_res+'px'}">-->
<div class="layout"> <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>-->
<!--&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%"> <el-container style="margin-top: 20px;height: 100%">
<transition name="fade"> <transition name="fade">
<div class = "alert1" v-show="isInfo"> <div class = "alert1" v-show="isInfo">
...@@ -49,28 +28,37 @@ ...@@ -49,28 +28,37 @@
<transition name="fade"> <transition name="fade">
<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> <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> </transition>
<!-- 侧边栏--> <!-- 侧边栏-->
<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"> <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>纬度:</a>
<el-input type="text" style="width: 40px;" v-model="centerX"></el-input>
<a>经度:</a>
<el-input type="text" style="width: 40px" 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>
<el-aside class="sidebar" style="position: absolute;margin-top: 60px;height: 225px"> <div class="sidebar" style="width:300px;position: absolute;margin-top: 0px;height: 225px">
<div class="sidebar-box" style="height: 225px">
<div style="text-align:left;">
<div class="img-list-title" style="text-align:center;font-size: 14px;height: 30px;line-height: 30px">工具栏</div>
<div style="margin-top: 10px;margin-left: 10px"></div>
<el-button-group style="margin-left: 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>纬度:</a>
<el-input type="text" style="width: 40px;" v-model="centerX"></el-input>
<a>经度:</a>
<el-input type="text" style="width: 40px" v-model="centerY"></el-input>
</el-button-group>
<div style="margin-top: 10px"></div>
<div style="text-align:left;margin-left: 10px ; 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" @click="commentScore = true">打分</el-button>
<el-button style="font-size: 12px;padding: 10px 20px;" v-if="this.$route.params.operationSign == 1" @click="submit()">提交</el-button>
</div>
</div>
</div>
</div>
<div class="sidebar" v-if="this.$route.params.operationSign == 1" style="width:300px;position: absolute;margin-top: 130px;height: 170px">
<div class="sidebar-box" style="height: 225px"> <div class="sidebar-box" style="height: 225px">
<div> <div>
<div class="img-list-title" style="font-size: 14px;height: 30px;line-height: 30px">标注描述</div> <div class="img-list-title" style="font-size: 14px;height: 30px;line-height: 30px">标注描述</div>
...@@ -78,9 +66,20 @@ ...@@ -78,9 +66,20 @@
</div> </div>
</div> </div>
</el-aside> </div>
<el-aside class="sidebar" style="position: absolute;margin-top: 285px;height: calc(100vh - 71px - 400px);"> <div class="sidebar" v-if="this.$route.params.operationSign != 1" style="width:300px;position: absolute;margin-top: 85px;height: 215px">
<div class="sidebar-box" style="height: 225px">
<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>
</div>
<div class="sidebar" style="width:300px;position: absolute;margin-top: 300px;height: calc(100vh - 71px - 350px);">
<div class="sidebar-box"> <div class="sidebar-box">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick"> <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="地标列表" name="first"> <el-tab-pane label="地标列表" name="first">
...@@ -113,7 +112,7 @@ ...@@ -113,7 +112,7 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
</el-aside> </div>
<!-- 工作台--> <!-- 工作台-->
<el-main class="workbench" style="width: 60%;padding: 0"> <el-main class="workbench" style="width: 60%;padding: 0">
...@@ -921,7 +920,7 @@ ...@@ -921,7 +920,7 @@
margin-left: 50px; margin-left: 50px;
/*border: 2px solid #409eff;*/ /*border: 2px solid #409eff;*/
border-radius: 5px; border-radius: 5px;
box-shadow: 0px 0px 10px #dbdbdb; /*box-shadow: 0px 0px 10px #dbdbdb;*/
background-color: white; background-color: white;
} }
.img-list-title{ .img-list-title{
...@@ -975,14 +974,19 @@ ...@@ -975,14 +974,19 @@
background-color: #409EFF; background-color: #409EFF;
} }
/deep/ .el-tabs__item.is-active{ /deep/ .el-tabs__item.is-active{
background-color: white;
color: black;
}
/deep/ .el-tabs__item{
background-color: #409EFF; background-color: #409EFF;
color: white; color: white;
/*border-bottom: 5px solid #409EFF;*/
}
/deep/ .el-tabs__item{
background-color: white;
color: #409EFF;
width: 150px; width: 150px;
/*border-right: 1px solid white;*/ /*height: 35px;*/
border-bottom: 1px solid #409EFF;
border-top: 1px solid #409EFF;
} }
/deep/ .el-tabs--card>.el-tabs__header .el-tabs__item{ /deep/ .el-tabs--card>.el-tabs__header .el-tabs__item{
transition: color 0s ease; transition: color 0s ease;
...@@ -991,4 +995,35 @@ ...@@ -991,4 +995,35 @@
/deep/ .el-tabs--card>.el-tabs__header .el-tabs__nav{ /deep/ .el-tabs--card>.el-tabs__header .el-tabs__nav{
border: 0; border: 0;
} }
/deep/ .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
border-bottom-color: #409EFF;
}
/deep/ .el-tabs--card>.el-tabs__header .el-tabs__item {
border-bottom-color: #409EFF;
}
/deep/ .el-radio-button__orig-radio:checked+.el-radio-button__inner {
background-color:#ecf5ff;
color: rgba(51, 135, 255, 0.76);
border: 1px solid #cadcee;
}
/deep/ .el-button-group .el-button--primary:first-child {
background-color:#ecf5ff;
color: rgba(51, 135, 255, 0.76);
border: 1px solid #cadcee;
}
/deep/ .el-button-group .el-button--primary:last-child{
background-color:#ecf5ff;
color: rgba(51, 135, 255, 0.76);
border: 1px solid #cadcee;
}
</style> </style>
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