Skip to content

D
DA-Platform

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

Commit fa7c7d33 by 李景熙
Options

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

parents 704e4247 8366dc41
Showing with 30 additions and 40 deletions
DAPlatform-front/index.html
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<title>daplatform</title> <title>众包标注平台</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
DAPlatform-front/src/assets/js/env.js
...@@ -3,8 +3,7 @@ let isTest = true ...@@ -3,8 +3,7 @@ let isTest = true
var baseURL var baseURL
if (!isTest) { if (!isTest) {
baseURL = 'http://47.92.1.107/api' baseURL = 'http://47.92.1.107/api'
} } else {
else {
baseURL = 'http://localhost:9100/api' baseURL = 'http://localhost:9100/api'
} }
......
DAPlatform-front/src/assets/scss/mixin.scss
...@@ -49,4 +49,11 @@ ...@@ -49,4 +49,11 @@
} }
} }
} }
}
@mixin optionButton {
.el-table {
.el-button {
width: 6em;
}
}
} }
\ No newline at end of file
DAPlatform-front/src/components/CheckDetail.vue
...@@ -89,30 +89,6 @@ export default { ...@@ -89,30 +89,6 @@ export default {
text-align: left; text-align: left;
padding: 30px 20px 30px 20px; padding: 30px 20px 30px 20px;
} }
ul{ @include optionButton;
padding:0 20px 0 20px;
max-height: 400px;
overflow-y: auto;
&::-webkit-scrollbar{
width: 5px;
}
&::-webkit-scrollbar-thumb{
background-color: #E4E7ED;
border-radius: 3px;
}
li{
list-style: none;
margin-bottom: 10px;
overflow: hidden;
span{
float: left;
line-height: 28px;
}
.el-button{
float: right;
margin-left: 10px;
}
}
}
} }
</style> </style>
DAPlatform-front/src/components/CompletedTaskDetail.vue
...@@ -80,5 +80,6 @@ export default { ...@@ -80,5 +80,6 @@ export default {
text-align: left; text-align: left;
padding: 30px 20px 30px 20px; padding: 30px 20px 30px 20px;
} }
@include optionButton;
} }
</style> </style>
DAPlatform-front/src/components/Login.vue
<template> <template>
<div class="login-container"> <div class="login-container">
<div class="login-panel" :style="{height: panelHeight}"> <div class="login-panel" :style="{height: panelHeight}">
<div class="logo">DAPlatform</div> <div class="logo">众包标注平台</div>
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect" <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
active-text-color="#409EFF"> active-text-color="#409EFF">
<el-menu-item index="1">登录</el-menu-item> <el-menu-item index="1">登录</el-menu-item>
......
DAPlatform-front/src/components/NavHeader.vue
...@@ -22,8 +22,15 @@ ...@@ -22,8 +22,15 @@
</template> </template>
<script> <script>
const indexs = new Set(['/taskhall', '/ongoing', '/releasetask', '/completed', const indices = {
'/check', '/publishtask', '/userhome', '/']) taskhall: '/taskhall',
ongoingtask: '/ongoing',
releasetask: '/releasetask',
completed: '/completed',
check: '/check',
publishtask: '/publishtask',
userhome: '/userhome'
}
export default { export default {
name: 'nav-header', name: 'nav-header',
...@@ -42,9 +49,7 @@ export default { ...@@ -42,9 +49,7 @@ export default {
watch: { watch: {
// 对路由变化作出响应... // 对路由变化作出响应...
'$route' (to, from) { '$route' (to, from) {
var index = to.fullPath.indexOf('/', 1) if (indices.hasOwnProperty(to.name)) { this.$store.commit('setActiveIndex', indices[to.name]) }
var toPath = to.fullPath.substring(0, index === -1 ? to.fullPath.length : index + 1)
if (indexs.has(toPath)) { this.$store.commit('setActiveIndex', toPath) }
} }
}, },
methods: { methods: {
......
DAPlatform-front/src/components/OngoingTaskDetail.vue
...@@ -157,5 +157,6 @@ export default { ...@@ -157,5 +157,6 @@ export default {
text-align: left; text-align: left;
padding: 30px 20px 30px 20px; padding: 30px 20px 30px 20px;
} }
@include optionButton;
} }
</style> </style>
DAPlatform-front/src/components/ongoingtask.vue
...@@ -40,11 +40,11 @@ export default { ...@@ -40,11 +40,11 @@ export default {
params: { task: encodeURIComponent(JSON.stringify(task)) } params: { task: encodeURIComponent(JSON.stringify(task)) }
}) })
}, },
deleteRow (id,index) { deleteRow (id, index) {
// alert(index) // alert(index)
// console.log(this.tasks) // console.log(this.tasks)
// //
// console.log(tasks) // console.log(tasks)
this.axios({ this.axios({
method: 'post', method: 'post',
url: 'task/giveUpTask', url: 'task/giveUpTask',
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
type: 'info', type: 'info',
message: '任务删除成功' message: '任务删除成功'
}) })
this.tasks.splice(index,1) this.tasks.splice(index, 1)
} else { } else {
this.$message({ this.$message({
type: 'info', type: 'info',
......
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