Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/issue-#318 #341

Merged
merged 1 commit into from
Oct 31, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions src/pages/Project/Overview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -254,27 +254,24 @@
</router-link>
</div>
<!-- List -->
<div v-show="!displayByGrid">
<div class="row project-item-title">
<div class="col-4">計劃名稱</div>
<div class="col-2">資料起始年份</div>
<div class="col-2">委託單位</div>
<div class="col-1">樣區數量</div>
<div class="col-2">相機位置數</div>
<div class="col-1">資料量</div>
</div>
<router-link
class="row project-item-content"
v-for="proj in projects"
:key="proj.id"
:to="proj.id"
>
<div class="col-4">{{ proj.title }}</div>
<div class="col-2">{{ proj.startTime.split('-')[0] }}</div>
<div class="col-2">{{ proj.funder }}</div>
<div class="col-1">58</div>
<div class="col-2">1200</div>
<div class="col-1">400,000</div>
<div v-show="!displayByGrid" class="mx-3">
<el-row class="project-item-title">
<el-col :span="8">計劃名稱</el-col>
<el-col :span="4">資料起始年份</el-col>
<el-col :span="4">委託單位</el-col>
<el-col :span="3">樣區數量</el-col>
<el-col :span="3">相機位置數</el-col>
<el-col :span="2">資料量</el-col>
</el-row>
<router-link v-for="proj in projects" :key="proj.id" :to="proj.id">
<el-row class="project-item-content">
<el-col :span="8">{{ proj.title }}</el-col>
<el-col :span="4">{{ proj.startTime.split('-')[0] }}</el-col>
<el-col :span="4">{{ proj.funder }}</el-col>
<el-col :span="3">{{ proj.totalStudyArea }}</el-col>
<el-col :span="3">{{ proj.totalLcameraLocation }}</el-col>
<el-col :span="2">{{ proj.totalData }}</el-col>
</el-row>
</router-link>
</div>
</div>
Expand Down Expand Up @@ -341,7 +338,7 @@ export default {
SORTED_BY_ENUM,
sortedBy: '-oldestAnnotationTime',
busy: false,
displayByGrid: true,
displayByGrid: false,
projectTypeOption,
speciesOption,
areaOption,
Expand Down