10 Commits

Author SHA1 Message Date
wuzhihao
a8236b1621 fix:快速查询模块默认图片替换 2024-08-30 17:36:37 +08:00
wuzhihao
3d5fa5f1a0 fix:快速查询模块默认图片替换 2024-08-30 17:20:24 +08:00
wuzhihao
ef619885f3 fix:优化快速查询模块 2024-08-30 17:14:44 +08:00
wuzhihao
630435ecc8 fix:优化快速查询模块 2024-08-30 17:14:35 +08:00
wuzhihao
45ceaaa250 fix:优化快速查询模块 2024-08-30 16:53:29 +08:00
wuzhihao
74aaab7d5b fix:优化快速查询模块 2024-08-30 15:59:55 +08:00
wuzhihao
97a359c60f fix:优化快速查询模块 2024-08-30 15:59:48 +08:00
liupengcheng
b96357efbc Merge branch 'dev' of https://gitea.aiotagro.com/liupengcheng/admin-jxn-testing into dev 2024-08-30 15:39:49 +08:00
liupengcheng
95f0e15115 Merge branch 'dev-liuyi' of https://gitea.aiotagro.com/liupengcheng/admin-jxn-testing into dev 2024-08-30 15:37:02 +08:00
xiaoliumang
f49316f681 feat:修改ico和标题 2024-08-29 17:05:14 +08:00
9 changed files with 140 additions and 69 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="<%= BASE_URL %>title.ico">
<title>
<%= htmlWebpackPlugin.options.title %>
</title>

BIN
public/title.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@@ -13,6 +13,11 @@ const routes = [
meta: { title: '登录', activeMenu: '/login' }
},
{
path: '/',
component: Layout,
redirect: '/login',
meta: { title: '', activeMenu: '/login' }
}, {
// 首页
path: '/index',
component: Layout,
@@ -24,21 +29,19 @@ const routes = [
meta: { title: '首页', activeMenu: '/index/index' }
}
]
},
{
// 遗传病风险
path: '/disease-resistance',
}, {
// 快速查询
path: '/quick-Search/quick-Search',
component: Layout,
children: [
{
path: '/disease-resistance/disease-resistance',
path: '/quick-Search/quick-Search',
component: () =>
import('../views/disease-resistance/disease-resistance.vue'),
meta: { title: '遗传病风险', activeMenu: '/disease-resistance/disease-resistance' }
import('../views/quick-Search/quick-Search.vue'),
meta: { title: '快速查询', activeMenu: '/quick-Search/quick-Search' }
}
]
},
{
}, {
// 基因管理
path: '/geneMgmt',
component: Layout,
@@ -63,7 +66,6 @@ const routes = [
}
]
},
{
// 繁育管理
path: '/breedMgmt',
@@ -103,6 +105,19 @@ const routes = [
},
]
},
{
// 遗传病风险
path: '/disease-resistance',
component: Layout,
children: [
{
path: '/disease-resistance/disease-resistance',
component: () =>
import('../views/disease-resistance/disease-resistance.vue'),
meta: { title: '遗传病风险', activeMenu: '/disease-resistance/disease-resistance' }
}
]
},
{
// 档案信息
path: '/archive-information',
@@ -116,19 +131,7 @@ const routes = [
}
]
},
{
// 快速查询
path: '/quick-Search/quick-Search',
component: Layout,
children: [
{
path: '/quick-Search/quick-Search',
component: () =>
import('../views/quick-Search/quick-Search.vue'),
meta: { title: '快速查询', activeMenu: '/quick-Search/quick-Search' }
}
]
},
{
// 品种资源
path: '/variety-resources',
@@ -155,7 +158,6 @@ const router = new VueRouter({
})
// 前置路由守卫
router.beforeEach((to, from, next) => {
// to到哪里取 from 从哪里来 next 放行
const token = local.get('token_sd')
if (to.meta.title) { // 修改总标题
document.title = '基芯农育种' + '-' + to.meta.title // routes数组中--meta是关键
@@ -166,9 +168,8 @@ router.beforeEach((to, from, next) => {
if (to.path === '/login') {
next()
}
next('/login')
}
// next('/login')
}
// next('/login')
)
export default router

View File

@@ -103,10 +103,11 @@
class="demo-ruleForm"
style="padding-left: 20px; box-sizing: border-box"
>
<el-form-item label="名称" prop="pic">
<div style="height: 40px"></div>
<el-form-item label="名称" prop="pic1">
<el-input
type="text"
v-model="searchForm.pic"
v-model="searchForm.pic1"
placeholder="请输入名称"
/>
</el-form-item>
@@ -158,11 +159,24 @@
</span>
</el-dialog>
<el-dialog :visible.sync="dialogVisible" width="40%">
<div
style="
color: black;
font-weight: bold;
font-size: 20px;
padding-left: 2%;
border-bottom: 2px solid #f1f1f1;
padding-bottom: 18px;
margin-bottom: 20px;
"
>
平台认证
</div>
<el-form
:model="searchForm"
status-icon
ref="searchForm"
label-width="110px"
label-width="80px"
class="demo-ruleForm"
style="padding-left: 20px; box-sizing: border-box"
>
@@ -170,7 +184,7 @@
<el-input
type="text"
v-model="searchForm.pic"
placeholder="请输入平台名称"
placeholder="请输入平台名称(爱农智慧牧场)"
/>
</el-form-item>
<el-form-item
@@ -181,7 +195,7 @@
<el-input
type="text"
v-model="searchForm.title"
placeholder="请输入手机号"
placeholder="请输入手机号(爱农智慧牧场)"
/>
</el-form-item>
<el-form-item
@@ -192,7 +206,7 @@
<el-input
type="password"
v-model="searchForm.address"
placeholder="请输入密码"
placeholder="请输入密码(爱农智慧牧场)"
/>
</el-form-item>
<el-form-item
@@ -209,7 +223,7 @@
<el-input
type="text"
v-model="searchForm.address1"
placeholder="请输入获取编码"
placeholder="请输入获取数据唯一编码"
/>
</el-form-item>
</el-form>
@@ -233,7 +247,8 @@ export default {
dialogVisible: false,
searchForm: {
farm: '',
number: ''
number: '',
pic: '爱农智慧牧场'
},
evalue: '',
tableData: [
@@ -426,4 +441,7 @@ export default {
/deep/.el-form-item__content {
margin-bottom: 20px;
}
/deep/.el-dialog__body {
padding: 0px 10px 10px 10px;
}
</style>

View File

@@ -28,7 +28,7 @@
<div class="tabsdata">
<div class="tabs">
<div>平均育种值</div>
<div>132</div>
<div>258</div>
</div>
</div>
<div style="text-align: center">
@@ -46,7 +46,7 @@
<div style="display: flex">
<img
style="width: 100%"
src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/303d04e7494f5e595cc624c05e03e57c4d.jpg"
src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/3045dfe9ebb60507a75748a7c58393a0da.jpg"
alt=""
/>
<!-- <div

View File

@@ -11,8 +11,8 @@
<el-image
class="el-img-box"
v-else
style="height: 72px; width: 80px"
src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/youpin/20240724/xl34jq31yvdzd73b5im9.png"
style="height: 72px; width: 100%; background-color: white"
src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/304274395c99e45476a1c783cc806e72b8.jpg"
fit="cover"
></el-image>
</div>
@@ -27,9 +27,9 @@
<i class="el-icon-price-tag"></i>
<span slot="title">首页</span>
</el-menu-item>
<el-menu-item index="/disease-resistance/disease-resistance">
<i class="el-icon-orange"></i>
<span slot="title">遗传病风险</span>
<el-menu-item index="/quick-Search/quick-Search">
<i class="el-icon-folder-checked"></i>
<span slot="title">快速查询</span>
</el-menu-item>
<el-submenu index="66">
<template slot="title">
@@ -44,6 +44,7 @@
<el-menu-item index="/geneMgmt/sequence">原始测序数据</el-menu-item>
</el-menu-item-group>
</el-submenu>
<el-submenu index="67">
<template slot="title">
<i class="el-icon-news"></i>
@@ -66,18 +67,18 @@
>
</el-menu-item-group>
</el-submenu>
<el-menu-item index="/archive-information/archive-information">
<i class="el-icon-document"></i>
<span slot="title">档案信息</span>
</el-menu-item>
<el-menu-item index="/quick-Search/quick-Search">
<i class="el-icon-folder-checked"></i>
<span slot="title">快速查询</span>
<el-menu-item index="/disease-resistance/disease-resistance">
<i class="el-icon-orange"></i>
<span slot="title">遗传病风险</span>
</el-menu-item>
<el-menu-item index="/variety-resources/variety-resources">
<i class="el-icon-copy-document"></i>
<span slot="title">品种资源</span>
</el-menu-item>
<el-menu-item index="/archive-information/archive-information">
<i class="el-icon-document"></i>
<span slot="title">档案信息</span>
</el-menu-item>
</el-menu>
</div>
</template>
@@ -133,7 +134,7 @@ export default {
.logo {
max-width: 220px;
height: 80px;
height: 72px;
color: #fff;
font-size: 25px;
font-weight: bold;

View File

@@ -95,26 +95,61 @@
>
<img
style="width: 80%"
src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/307d7b147050a9475b2580aa1d1ae44476.jpg"
src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/30934b551c5bab2f2727d4dfa9ccd85a69.jpg"
alt=""
/>
</div>
<el-dialog :visible.sync="dialogVisible" width="40%">
<div style="text-align: center">
<div class="btmstyle">1</div>
<div class="btmstyle">综合分子育种报告</div>
<div class="textstyle">
<div>标记编号:213</div>
<div>养殖场:234</div>
<div>品种信息:43223</div>
<div>标记编号:82010000990</div>
<div>养殖场:若尔盖</div>
<div>品种信息:牦牛</div>
</div>
<div class="textdiv">
<div style="font-weight: bold; padding: 30px 0px 6px 14px">
1. 繁育管理的育种值
</div>
<div class="pl">综合育种值225.85</div>
<div class="pl">性状名称: 外貌评分生长性状产奶性状</div>
<div class="pl">
分析说明:
该个体在生长性能上的优异表现更在经济性能上展现了其潜在的高价值基于此我们强烈推荐将此个体作为未来育种计划中的亲本首选以期望通过其遗传优势孕育出更多具备优良性状的后代
</div>
</div>
<div class="textdiv">
<div style="font-weight: bold; padding: 30px 0px 6px 14px">
2. 进化分析结果中的近交系数
</div>
<div class="pl">近交系数: 0</div>
<div class="pl">
分析说明:
经过精确的遗传评估该个体和82010001456的近交系数计算结果为零意味着它们在遗传上不存在亲缘关系因此这两个个体可以作为无亲缘关系的育种候选者进行交配以产生后代这样的配对有助于避免近交衰退同时促进遗传多样性的保持为育种项目带来潜在的遗传增益
</div>
</div>
<div
style="
text-align: left;
padding: 30px 0px 18px 14px;
font-weight: bold;
"
class="textdiv"
style="border-bottom: 2px solid #ebebeb; padding-bottom: 50px"
>
11
<div style="font-weight: bold; padding: 30px 0px 6px 14px">
3. 携带遗传基因风险警告
</div>
<div class="pl">风险等级:</div>
<div class="pl">
建议措施:
经过专业的基因检测分析确认该个体并未携带任何已知的遗传性疾病相关基因在进行繁育计划时可以放心地将该个体纳入考虑以实现遗传改良的目标
</div>
</div>
</div>
<div
class="textdiv"
style="border-bottom: 2px solid #ebebeb; padding-bottom: 20px"
>
<div style="font-weight: bold; padding: 30px 0px 6px 14px">总结</div>
<div class="pl">
繁育经过严格的遗传评估和基因检测该个体证实具备出色的生长性能和繁殖能力特别值得注意的是基因检测结果表明该个体并未携带任何已知的遗传性疾病相关基因因此我们可以放心地选择此个体作为繁育计划中的亲本以期在维持遗传多样性的同时促进后代群体生产性能的提升和遗传改良
选配该个体和82010001456的近交系数为0不存在亲缘关系可放心进行繁育
</div>
</div>
<span slot="footer" class="dialog-footer">
@@ -128,8 +163,8 @@
</el-dialog>
</div>
</template>
<script>
<script>
export default {
data() {
return {
@@ -214,8 +249,13 @@ export default {
detailClick() {
this.$router.push('/phylogeneticAnalysis/evolutionaryTree')
},
report() {
this.dialogVisible = true
report(row) {
if (row.b == '82010000990') {
window.open(
'https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/82010000990%E7%BB%BC%E5%90%88%E5%88%86%E5%AD%90%E8%82%B2%E7%A7%8D%E6%8A%A5%E5%91%8A.pdf',
'_blank'
)
}
},
// 搜索
searchClick() {
@@ -251,8 +291,8 @@ export default {
}
}
</script>
<style lang="less" scoped>
<style lang="less" scoped>
.container-box {
min-height: calc(100vh - 84px);
padding: 15px;
@@ -285,6 +325,9 @@ export default {
.btmstyle {
border-bottom: 2px solid #ebebeb;
padding-bottom: 26px;
font-size: 24px;
font-weight: bold;
color: black;
}
.textstyle {
display: flex;
@@ -292,7 +335,15 @@ export default {
border-bottom: 2px solid #ebebeb;
}
.textstyle div {
margin-right: 15%;
margin-right: 10%;
}
.textdiv div {
text-align: left;
}
.pl {
padding-left: 14px;
padding-bottom: 4px;
line-height: 18px;
}
// table
/deep/.el-table th.el-table__cell {

View File

@@ -78,7 +78,7 @@ module.exports = {
chainWebpack: config => {
// if (IS_PRODUCTION) {
config.plugin('html').tap(args => {
args[0].title = '智慧畜牧平台'
args[0].title = '基芯农育种'
args[0].cdn = cdn
return args
})