Skip to content

Commit

Permalink
Merge pull request #29 from zprobot/main
Browse files Browse the repository at this point in the history
update: link
  • Loading branch information
ypriverol authored Apr 4, 2024
2 parents 5823076 + e69474a commit 6b03d44
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 54 deletions.
4 changes: 2 additions & 2 deletions src/components/AeShow/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const getProteinTable = async () => {
const handleClose = (tag) => {
dataHistory.value.splice(proteinTags.value.indexOf(tag), 1)
proteinTags.value.splice(proteinTags.value.indexOf(tag), 1)
routerName.value ==='tissues' ? router.push({ path: "/ae/tissues", query: { protein: tags.value } }) : router.push({ path: "/ae/cellline", query: { protein: tags.value} })
routerName.value ==='tissues' ? router.push({ path: "/baseline/tissues", query: { protein: tags.value } }) : router.push({ path: "/baseline/cellline", query: { protein: tags.value} })
}
// qeury
const queryProtein = (input) => {
Expand Down Expand Up @@ -165,7 +165,7 @@ const queryProtein = (input) => {
}
})
if (proteinTags.value.length != input.value.length) {
routerName.value ==='tissues' ? router.push({ path: "/ae/tissues", query: { protein: tags.value } }) : router.push({ path: "/ae/cellline", query: { protein: tags.value } })
routerName.value ==='tissues' ? router.push({ path: "/baseline/tissues", query: { protein: tags.value } }) : router.push({ path: "/baseline/cellline", query: { protein: tags.value } })
//router.push({ path: "/ae/tissues", query: { protein: proteinTags.value } })
} else {
showImg.value = true
Expand Down
2 changes: 1 addition & 1 deletion src/layout/Menu/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div>
<router-link class="navBar" to="/home">Home</router-link>
<router-link class="navBar" to="/datasets">Datasets</router-link>
<router-link class="navBar" to="/ae">Absolute</router-link>
<router-link class="navBar" to="/baseline">Absolute</router-link>
</div>
</div>
</template>
Expand Down
6 changes: 3 additions & 3 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ const routes = [
component: () => import('@/views/information')
},
{
path: '/ae',
path: '/baseline',
name: 'overview',
component: () => import('@/views/overview'),
children: [
{
path: '/ae/tissues',
path: '/baseline/tissues',
name: 'tissues',
component: () => import('@/components/AeShow')
},
{
path: '/ae/cellline',
path: '/baseline/cellline',
name: 'cellline',
component: () => import('@/components/AeShow')
}
Expand Down
2 changes: 1 addition & 1 deletion src/views/home/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</router-link>
</div>
<div class="card-box" style="display: flex; flex-direction: column; align-items: center; justify-content: space-around; padding: 1.5rem;">
<router-link to="/ae">
<router-link to="/baseline">
<el-icon size="50px"><Histogram /></el-icon>
<div
style="
Expand Down
51 changes: 4 additions & 47 deletions src/views/overview/index.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
<template>
<div>
<div class="display-box">
<!-- <h1 class="title">
<span>Protein </span>
<span
v-for="(s, index) in font"
:key="index"
v-bind:style="{ color: fontColor[index] }"
>{{ s }}</span
>
</h1> -->
<!-- serch -->
<div class="search-box">
<div style="color: rgb(75, 85, 99); font-weight: bold; font-size: 2rem">
Protein Search
Expand Down Expand Up @@ -52,22 +42,6 @@
:suffix-icon="Search"
/>
</div>
<!-- <div style="">
</div> -->
<!-- <div style="width: 30%"></div> -->

<!-- <router-link
class="link"
:to="{
path: '/ae/tissues',
query: {
protein: input,
},
}"
>
<el-button type="primary" size="large" plain>Search</el-button>
</router-link> -->
</div>
<div class="select-box">
<span>select type:</span>
Expand Down Expand Up @@ -137,23 +111,6 @@ onMounted(() => {
checkedTissue.value = !status
checkedCellLine.value = status
})
// const font = ["V", "i", "s", "u", "a", "l", "i", "z", "a", "t", "i", "o", "n"];
// const fontColor = [
// "#25BEF6",
// "#EB3E71",
// "#0BB88D",
// "#FF7B22",
// "#25BEF6",
// "#EB3E71",
// "#0BB88D",
// "#FF7B22",
// "#25BEF6",
// "#EB3E71",
// "#0BB88D",
// "#FF7B22",
// "#25BEF6",
// ];
// input protien name
const input = ref("");
const onEnter = () => {
Expand All @@ -162,9 +119,9 @@ const onEnter = () => {
return;
}
if (checkedTissue.value) {
router.push({ path: "/ae/tissues", query: { protein: [input.value] } });
router.push({ path: "/baseline/tissues", query: { protein: [input.value] } });
} else {
router.push({ path: "/ae/cellline", query: { protein: [input.value] } });
router.push({ path: "/baseline/cellline", query: { protein: [input.value] } });
}
};
Expand All @@ -184,9 +141,9 @@ const onSearch = (val) => {
}
input.value = val;
if (checkedTissue.value) {
router.push({ path: "/ae/tissues", query: { protein: [val] } });
router.push({ path: "/baseline/tissues", query: { protein: [val] } });
} else {
router.push({ path: "/ae/cellline", query: { protein: [val] } });
router.push({ path: "/baseline/cellline", query: { protein: [val] } });
}
};
Expand Down

0 comments on commit 6b03d44

Please sign in to comment.