“基芯农育种”修改为“智慧育种”

src/router/index.js

@@ -7,181 +7,181 @@ import local from '../utils/local'
 Vue.use(VueRouter)
 
 const routes = [
-    {
-        path: '/login',
-        component: Login,
-        meta: { title: '登录', activeMenu: '/login' }
-    },
-    {
-        path: '/',
-        component: Layout,
-        redirect: '/login',
-        meta: { title: '', activeMenu: '/login' }
-    }, {
-        // 首页
-        path: '/index',
-        component: Layout,
-        children: [
-            {
-                path: '/index/index',
-                component: () =>
-                    import('../views/index/index.vue'),
-                meta: { title: '首页', activeMenu: '/index/index' }
-            }
-        ]
-    }, {
-        // 快速查询
+  {
+    path: '/login',
+    component: Login,
+    meta: { title: '登录', activeMenu: '/login' }
+  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/login',
+    meta: { title: '', activeMenu: '/login' }
+  }, {
+    // 首页
+    path: '/index',
+    component: Layout,
+    children: [
+      {
+        path: '/index/index',
+        component: () =>
+          import('../views/index/index.vue'),
+        meta: { title: '首页', activeMenu: '/index/index' }
+      }
+    ]
+  }, {
+    // 快速查询
+    path: '/quick-Search/quick-Search',
+    component: Layout,
+    children: [
+      {
         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: '/geneMgmt',
-        component: Layout,
-        children: [
-            {
-                path: '/geneMgmt/SPN',
-                component: () =>
-                    import('../views/geneMgmt/SPN.vue'),
-                meta: { title: 'SPN位点管理', activeMenu: '/geneMgmt/SPN' }
-            },
-            {
-                path: '/geneMgmt/SPNPanel',
-                component: () =>
-                    import('../views/geneMgmt/SPNPanel.vue'),
-                meta: { title: 'SPN Panel位点管理', activeMenu: '/geneMgmt/SPNPanel' }
-            },
-            {
-                path: '/geneMgmt/sequence',
-                component: () =>
-                    import('../views/geneMgmt/sequence.vue'),
-                meta: { title: '原始测序数据', activeMenu: '/geneMgmt/sequence' }
-            }
-        ]
-    },
-    {
-        // 繁育管理
-        path: '/breedMgmt',
-        component: Layout,
-        children: [
-            {
-                path: '/breedMgmt/BLUP',
-                component: () =>
-                    import('../views/breedMgmt/BLUP.vue'),
-                meta: { title: 'BLUP', activeMenu: '/breedMgmt/BLUP' }
-            },
-            {
-                path: '/breedMgmt/paternityTest',
-                component: () =>
-                    import('../views/breedMgmt/paternityTest.vue'),
-                meta: { title: '亲子鉴定', activeMenu: '/breedMgmt/paternityTest' }
-            },
-            {
-                path: '/breedMgmt/lineage',
-                component: () =>
-                    import('../views/breedMgmt/lineage.vue'),
-                meta: { title: '血统管理', activeMenu: '/breedMgmt/lineage' }
-            }
-        ]
-    },
+        component: () =>
+          import('../views/quick-Search/quick-Search.vue'),
+        meta: { title: '快速查询', activeMenu: '/quick-Search/quick-Search' }
+      }
+    ]
+  }, {
+    // 基因管理
+    path: '/geneMgmt',
+    component: Layout,
+    children: [
+      {
+        path: '/geneMgmt/SPN',
+        component: () =>
+          import('../views/geneMgmt/SPN.vue'),
+        meta: { title: 'SNP位点管理', activeMenu: '/geneMgmt/SPN' }
+      },
+      {
+        path: '/geneMgmt/SPNPanel',
+        component: () =>
+          import('../views/geneMgmt/SPNPanel.vue'),
+        meta: { title: 'SNP Panel位点管理', activeMenu: '/geneMgmt/SPNPanel' }
+      },
+      {
+        path: '/geneMgmt/sequence',
+        component: () =>
+          import('../views/geneMgmt/sequence.vue'),
+        meta: { title: '原始测序数据', activeMenu: '/geneMgmt/sequence' }
+      }
+    ]
+  },
+  {
+    // 繁育管理
+    path: '/breedMgmt',
+    component: Layout,
+    children: [
+      {
+        path: '/breedMgmt/BLUP',
+        component: () =>
+          import('../views/breedMgmt/BLUP.vue'),
+        meta: { title: 'BLUP', activeMenu: '/breedMgmt/BLUP' }
+      },
+      {
+        path: '/breedMgmt/paternityTest',
+        component: () =>
+          import('../views/breedMgmt/paternityTest.vue'),
+        meta: { title: '亲子鉴定', activeMenu: '/breedMgmt/paternityTest' }
+      },
+      {
+        path: '/breedMgmt/lineage',
+        component: () =>
+          import('../views/breedMgmt/lineage.vue'),
+        meta: { title: '血统管理', activeMenu: '/breedMgmt/lineage' }
+      }
+    ]
+  },
 
-    {
-        // 进化分析
-        path: '/phylogeneticAnalysis',
-        component: Layout,
-        children: [
-            {
-                path: '/phylogeneticAnalysis/evolutionaryTree',
-                component: () =>
-                    import('../views/phylogeneticAnalysis/evolutionaryTree.vue'),
-                meta: { title: '进化树', activeMenu: '/phylogeneticAnalysis/evolutionaryTree' }
-            },
-            {
-                path: '/phylogeneticAnalysis/pca',
-                component: () =>
-                    import('../views/phylogeneticAnalysis/pca.vue'),
-                meta: { title: 'PCA', activeMenu: '/phylogeneticAnalysis/pca' }
-            },
-            {
-                path: '/phylogeneticAnalysis/admixture',
-                component: () =>
-                    import('../views/phylogeneticAnalysis/admixture.vue'),
-                meta: { title: 'ADMIXTURE', activeMenu: '/phylogeneticAnalysis/admixture' }
-            },
-        ]
-    },
-    {
-        // 遗传病风险
-        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',
-        component: Layout,
-        children: [
-            {
-                path: '/archive-information/archive-information',
-                component: () =>
-                    import('../views/archive-information/archive-information.vue'),
-                meta: { title: '档案信息', activeMenu: '/archive-information/archive-information' }
-            }
-        ]
-    },
+  {
+    // 进化分析
+    path: '/phylogeneticAnalysis',
+    component: Layout,
+    children: [
+      {
+        path: '/phylogeneticAnalysis/evolutionaryTree',
+        component: () =>
+          import('../views/phylogeneticAnalysis/evolutionaryTree.vue'),
+        meta: { title: '进化树', activeMenu: '/phylogeneticAnalysis/evolutionaryTree' }
+      },
+      {
+        path: '/phylogeneticAnalysis/pca',
+        component: () =>
+          import('../views/phylogeneticAnalysis/pca.vue'),
+        meta: { title: 'PCA', activeMenu: '/phylogeneticAnalysis/pca' }
+      },
+      {
+        path: '/phylogeneticAnalysis/admixture',
+        component: () =>
+          import('../views/phylogeneticAnalysis/admixture.vue'),
+        meta: { title: 'ADMIXTURE', activeMenu: '/phylogeneticAnalysis/admixture' }
+      },
+    ]
+  },
+  {
+    // 遗传病风险
+    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',
+    component: Layout,
+    children: [
+      {
+        path: '/archive-information/archive-information',
+        component: () =>
+          import('../views/archive-information/archive-information.vue'),
+        meta: { title: '档案信息', activeMenu: '/archive-information/archive-information' }
+      }
+    ]
+  },
 
-    {
-        // 品种资源
-        path: '/variety-resources',
-        component: Layout,
-        children: [
-            {
-                path: '/variety-resources/variety-resources',
-                component: () =>
-                    import('../views/variety-resources/variety-resources.vue'),
-                meta: { title: '品种资源', activeMenu: '/variety-resources/variety-resources' }
-            },
-            {
-                path: '/variety-resources/pig-list',
-                component: () =>
-                    import('../views/variety-resources/pig-list.vue'),
-                meta: { title: '品种猪', activeMenu: '/variety-resources/pig-list' }
-            },
-        ]
-    }
+  {
+    // 品种资源
+    path: '/variety-resources',
+    component: Layout,
+    children: [
+      {
+        path: '/variety-resources/variety-resources',
+        component: () =>
+          import('../views/variety-resources/variety-resources.vue'),
+        meta: { title: '品种资源', activeMenu: '/variety-resources/variety-resources' }
+      },
+      {
+        path: '/variety-resources/pig-list',
+        component: () =>
+          import('../views/variety-resources/pig-list.vue'),
+        meta: { title: '品种猪', activeMenu: '/variety-resources/pig-list' }
+      },
+    ]
+  }
 ]
 
 const router = new VueRouter({
-    routes
+  routes
 })
 // 前置路由守卫
 router.beforeEach((to, from, next) => {
-    const token = local.get('token_sd')
-    if (to.meta.title) { // 修改总标题
-        document.title = '基芯农育种' + '-' + to.meta.title // routes数组中--meta是关键
-    }
-    if (token) { // ok
-        next()
-    } else { // no
-        if (to.path === '/login') {
-            next()
-        }
+  const token = local.get('token_sd')
+  if (to.meta.title) { // 修改总标题
+    document.title = '智慧育种' + '-' + to.meta.title // routes数组中--meta是关键
+  }
+  if (token) { // ok
+    next()
+  } else { // no
+    if (to.path === '/login') {
+      next()
     }
+  }
 }
-    // next('/login')
+  // next('/login')
 )
 export default router

src/views/breedMgmt/BLUP.vue

@@ -49,14 +49,14 @@
         <el-table-column prop="b" label="标记编号"></el-table-column>
         <el-table-column prop="c" label="性别"></el-table-column>
         <el-table-column prop="d" label="外貌评分"></el-table-column>
-        <el-table-column prop="e" label="18月龄体高(CM)"></el-table-column>
-        <el-table-column prop="f" label="18月龄体长(CM)"></el-table-column>
-        <el-table-column prop="g" label="18月龄胸围(CM)"></el-table-column>
-        <el-table-column prop="h" label="18月龄官维(CM)"></el-table-column>
-        <el-table-column prop="i" label="18月龄体重(KG)"></el-table-column>
-        <el-table-column prop="j" label="18月龄背膘厚度(MM)"></el-table-column>
-        <el-table-column prop="k" label="18月龄眼肌面积(MM)"></el-table-column>
-        <el-table-column prop="l" label="平均产奶量(KG)"></el-table-column>
+        <el-table-column prop="e" label="18月龄体高(cm)"></el-table-column>
+        <el-table-column prop="f" label="18月龄体长(cm)"></el-table-column>
+        <el-table-column prop="g" label="18月龄胸围(cm)"></el-table-column>
+        <el-table-column prop="h" label="18月龄官维(cm)"></el-table-column>
+        <el-table-column prop="i" label="18月龄体重(kg)"></el-table-column>
+        <el-table-column prop="j" label="18月龄背膘厚度(mm)"></el-table-column>
+        <el-table-column prop="k" label="18月龄眼肌面积(mm)"></el-table-column>
+        <el-table-column prop="l" label="平均产奶量(kg)"></el-table-column>
         <el-table-column prop="m" label="平均乳脂率(%)"></el-table-column>
         <el-table-column prop="n" label="平均乳蛋白率(%)"></el-table-column>
         <el-table-column
@@ -177,26 +177,25 @@ export default {
           o: '255.85'
         },
         {
-          id: 2,
+          id: 1,
           a: '若尔盖',
           b: '82010000991',
           c: '雌',
           d: '86',
           e: '133',
           f: '160',
-          g: '192',
-          h: '19',
-          i: '567',
+          g: '196',
+          h: '20',
+          i: '569',
           j: '10.3',
-          k: '41.2',
+          k: '41.36',
           l: '4560',
           m: '4',
           n: '3.2',
           o: '252.16'
         },
-
         {
-          id: 3,
+          id: 2,
           a: '若尔盖',
           b: '82010000992',
           c: '雌',
@@ -206,7 +205,7 @@ export default {
           g: '199',
           h: '21',
           i: '587',
-          j: '10.05',
+          j: '10.5',
           k: '43.69',
           l: '4578',
           m: '4.2',
@@ -214,7 +213,7 @@ export default {
           o: '259.69'
         },
         {
-          id: 6,
+          id: 3,
           a: '若尔盖',
           b: '82010000993',
           c: '雌',
@@ -231,7 +230,6 @@ export default {
           n: '3.5',
           o: '250.76'
         },
-
         {
           id: 4,
           a: '若尔盖',
@@ -240,36 +238,36 @@ export default {
           d: '89',
           e: '129',
           f: '159',
-          g: '199',
-          h: '18',
-          i: '599',
-          j: '9.9',
-          k: '40.86',
-          l: '4600',
-          m: '4.3',
-          n: '3.4',
-          o: '264.85'
-        },
-        {
-          id: 4,
-          a: '若尔盖',
-          b: '82010000995',
-          c: '雌',
-          d: '89',
-          e: '129',
-          f: '159',
-          g: '199',
+          g: '197',
           h: '18',
           i: '599',
           j: '11',
-          k: '41.86',
+          k: '41.36',
           l: '4578',
           m: '4.3',
           n: '3.4',
+          o: '264.34'
+        },
+        {
+          id: 5,
+          a: '若尔盖',
+          b: '82010000995',
+          c: '雌',
+          d: '96',
+          e: '126',
+          f: '156',
+          g: '192',
+          h: '20',
+          i: '578',
+          j: '9.9',
+          k: '40.86',
+          l: '4600',
+          m: '4',
+          n: '3.2',
           o: '255.24'
         },
         {
-          id: 4,
+          id: 6,
           a: '若尔盖',
           b: '82010000996',
           c: '雌',
@@ -284,10 +282,10 @@ export default {
           l: '4523',
           m: '4.2',
           n: '3.4',
-          o: '260.85'
+          o: '260.27'
         },
         {
-          id: 4,
+          id: 7,
           a: '若尔盖',
           b: '82010000997',
           c: '雌',
@@ -296,13 +294,13 @@ export default {
           f: '160',
           g: '195',
           h: '24',
-          i: '589',
+          i: '598',
           j: '10.5',
-          k: '44.86',
+          k: '44.25',
           l: '4538',
           m: '4',
           n: '3.2',
-          o: '238.85'
+          o: '238.70'
         }
       ],
       tableDataGBLUP: [
@@ -374,7 +372,7 @@ export default {
       tableDatassGBLUP: [
         {
           a: '若尔盖',
-          b: '82010000991',
+          b: '82010000990',
           c: '雌',
           d: '6',
           e: '血液',
@@ -382,7 +380,7 @@ export default {
         },
         {
           a: '若尔盖',
-          b: '82010000994',
+          b: '82010000991',
           c: '雌',
           d: '6',
           e: '血液',
@@ -398,27 +396,19 @@ export default {
         },
         {
           a: '若尔盖',
-          b: '82010000990',
+          b: '82010000993',
           c: '雌',
           d: '6',
           e: '血液',
           f: '76'
         },
-        {
-          a: '若尔盖',
-          b: '82010000993',
-          c: '雌',
-          d: '6',
-          e: '血液',
-          f: '-10'
-        },
         {
           a: '若尔盖',
           b: '82010000994',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '-20'
+          f: '-10'
         },
         {
           a: '若尔盖',
@@ -434,6 +424,14 @@ export default {
           c: '雌',
           d: '6',
           e: '血液',
+          f: '-1'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000997',
+          c: '雌',
+          d: '6',
+          e: '血液',
           f: '60'
         }
       ],

src/views/breedMgmt/paternityTest.vue

@@ -79,81 +79,81 @@ export default {
         {
           id: 0,
           a: '若尔盖',
-          b: '82010000991',
-          c: '雌',
-          d: '8',
-          e: '血液',
-          f: '82020000981',
-          g: '99.99%'
-        },
-        {
-          id: 1,
-          a: '若尔盖',
-          b: '82010000992',
-          c: '雌',
-          d: '6',
-          e: '血液',
-          f: '82020000986',
-          g: '69.99%'
-        },
-        {
-          id: 2,
-          a: '若尔盖',
-          b: '82010000993',
-          c: '雌',
-          d: '6',
-          e: '血液',
-          f: '82020000990',
-          g: '79.99%'
-        },
-        {
-          id: 3,
-          a: '若尔盖',
-          b: '82010000994',
+          b: '82010000990',
           c: '雌',
           d: '6',
           e: '血液',
           f: '82020000991',
-          g: '98.96%'
+          g: '99.89%'
         },
         {
-          id: 3,
+          id: 1,
           a: '若尔盖',
-          b: '82010000995',
+          b: '82010000991',
           c: '雌',
           d: '6',
           e: '血液',
           f: '82020000992',
           g: '67%'
         },
+        {
+          id: 2,
+          a: '若尔盖',
+          b: '82010000992',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000993',
+          g: '96.32%'
+        },
         {
           id: 3,
           a: '若尔盖',
+          b: '82010000993',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000994',
+          g: '98.96%'
+        },
+        {
+          id: 4,
+          a: '若尔盖',
+          b: '82010000994',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000995',
+          g: '67%'
+        },
+        {
+          id: 5,
+          a: '若尔盖',
+          b: '82010000995',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000996',
+          g: '97.65%'
+        },
+        {
+          id: 6,
+          a: '若尔盖',
           b: '82010000996',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '82020000993',
-          g: '97.65%'
+          f: '82020000997',
+          g: '67%'
         },
         {
-          id: 3,
+          id: 7,
           a: '若尔盖',
           b: '82010000997',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '82020000994',
-          g: '67%'
-        },
-        {
-          id: 3,
-          a: '若尔盖',
-          b: '82010000998',
-          c: '雌',
-          d: '6',
-          e: '血液',
-          f: '82020000976',
+          f: '82020000998',
           g: '96.23%'
         }
       ],

src/views/disease-resistance/disease-resistance.vue

@@ -45,7 +45,7 @@
         <el-table-column prop="farm" label="养殖场"></el-table-column>
         <el-table-column prop="number" label="标记编号"></el-table-column>
         <el-table-column prop="age" label="月龄"></el-table-column>
-        <el-table-column prop="result" label="监测结果"></el-table-column>
+        <el-table-column prop="result" label="检测结果"></el-table-column>
         <el-table-column label="详情">
           <template slot-scope="scope">
             <el-button
@@ -174,7 +174,7 @@ export default {
     // 当监测结果为 已携带 的状态，加上背景色,字体颜色
     cellStyle({ row, column, rowIndex, columnIndex }) {
       // 注意，这里返回的是一个对象
-      if (row.result == '携带' && column.label == '监测结果') {
+      if (row.result == '携带' && column.label == '检测结果') {
         return 'background:#d9001b;textAlign: center;color:#fff;'
       } else {
         return 'textAlign: center'

src/views/geneMgmt/SPN.vue

@@ -154,7 +154,7 @@ export default {
           c: 'ARS-UCD1.2',
           d: '10',
           e: '10011109',
-          f: 'A',
+          f: 'G',
           g: 'C',
           h: '--'
         },

src/views/geneMgmt/SPNPanel.vue

@@ -10,14 +10,11 @@
         size="mini"
       >
         <el-form-item label="Panel">
-          <el-input
-            v-model="searchForm.farm"
-            placeholder="请输入Panel"
-          ></el-input>
+          <el-input v-model="searchForm.a" placeholder="请输入Panel"></el-input>
         </el-form-item>
         <el-form-item label="检测平台">
           <el-input
-            v-model="searchForm.farm"
+            v-model="searchForm.b"
             placeholder="请输入检测平台"
           ></el-input>
         </el-form-item>
@@ -66,8 +63,8 @@ export default {
   data() {
     return {
       searchForm: {
-        farm: '',
-        number: ''
+        a: '',
+        b: ''
       },
       tableData: [
         {
@@ -83,7 +80,7 @@ export default {
           a: 'test_2',
           b: 'illumina',
           c: 'ARS-UCD1.2',
-          d: '4563',
+          d: '2365',
           e: '--'
         },
         {
@@ -91,7 +88,7 @@ export default {
           a: 'test_3',
           b: 'illumina',
           c: 'ARS-UCD1.2',
-          d: '2587',
+          d: '2589',
           e: '--'
         },
         {
@@ -99,7 +96,7 @@ export default {
           a: 'test_4',
           b: 'illumina',
           c: 'ARS-UCD1.2',
-          d: '7854',
+          d: '4568',
           e: '--'
         },
         {
@@ -107,7 +104,7 @@ export default {
           a: 'test_5',
           b: 'illumina',
           c: 'ARS-UCD1.2',
-          d: '3354',
+          d: '2587',
           e: '--'
         },
         {

src/views/geneMgmt/sequence.vue

@@ -81,7 +81,7 @@ export default {
         {
           id: 1,
           a: 'CX_82010000991',
-          b: '8.6MB',
+          b: '11.05MB',
           c: '2024-03-06',
           d: '西门塔尔',
           e: '已上传'
@@ -89,7 +89,7 @@ export default {
         {
           id: 2,
           a: 'CX_82010000992',
-          b: '21.23MB',
+          b: '12.36MB',
           c: '2024-03-06',
           d: '华西牛',
           e: '已上传'
@@ -97,7 +97,7 @@ export default {
         {
           id: 3,
           a: 'CX_82010000993',
-          b: '13.21MB',
+          b: '14.78MB',
           c: '2024-03-06',
           d: '西门塔尔',
           e: '已上传'
@@ -105,13 +105,13 @@ export default {
         {
           id: 4,
           a: 'CX_82010000994',
-          b: '15.3MB',
+          b: '14.36MB',
           c: '2024-03-06',
           d: '西藏高山牦牛',
           e: '已上传'
         },
         {
-          id: 3,
+          id: 5,
           a: 'CX_82010000995',
           b: '18.64MB',
           c: '2024-03-06',
@@ -119,7 +119,7 @@ export default {
           e: '已上传'
         },
         {
-          id: 3,
+          id: 6,
           a: 'CX_82010000996',
           b: '15.78MB',
           c: '2024-03-06',
@@ -127,15 +127,15 @@ export default {
           e: '已上传'
         },
         {
-          id: 3,
+          id: 7,
           a: 'CX_82010000997',
-          b: '13.58MB',
+          b: '13.85MB',
           c: '2024-03-06',
           d: '西门塔尔',
           e: '已上传'
         },
         {
-          id: 3,
+          id: 8,
           a: 'CX_82010000998',
           b: '16.12MB',
           c: '2024-03-06',

src/views/index/index.vue

@@ -3,28 +3,43 @@
     <div class="formtitle">若尔盖养殖场</div>
     <div class="layouts">
       <div class="layoutsdiv">
-        <div class="tile">总资源展示</div>
+        <div class="tile" style="margin-bottom: 0px">总资源展示</div>
         <div class="echartsdiv">
           <!-- 总资源展示两个图表 -->
           <div id="Inventory" class="chartstyle"></div>
           <div id="Inventory1" class="chartstylepc"></div>
         </div>
+        <div class="text">
+          <div>种质资源</div>
+          <div>基因数据资源</div>
+        </div>
       </div>
       <div class="layoutsdiv">
-        <div class="tile">综合育种植</div>
+        <div class="tile">综合育种值</div>
+        <div
+          style="
+            display: flex;
+            font-weight: bold;
+            width: 100%;
+            padding-top: 4px;
+          "
+        >
+          <div style="width: 50%; text-align: left; padding-left: 1%">
+            育种值
+          </div>
+          <div class="yzz">平均育种值</div>
+        </div>
         <div style="display: flex">
           <div
             class="echartsdiv"
             style="display: flex; flex-direction: column; width: 100%"
           >
-            <!-- 综合育种植图表 -->
             <div id="Inventory2" class="chartstyle2"></div>
-            <div style="font-weight: 600; width: 100%">群体育种值趋势图</div>
           </div>
           <div class="flexdiv">
-            <div style="width: 100%; display: flex; justify-content: center">
-              <div style="font-weight: bold; width: 70%">平均育种值</div>
-            </div>
+            <div
+              style="width: 100%; display: flex; justify-content: center"
+            ></div>
             <div class="tabsdata">
               <div class="tabs">
                 <div>平均育种值</div>
@@ -34,40 +49,29 @@
             <div style="text-align: center">
               <img
                 style="width: 100%"
-                src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/30581be380a8e407b6a193bc04d1a5f52a.jpg"
+                src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/ymc_travel/2024/09/23/eebaca34a02b3398edaf107b1ae7415e.png"
                 alt=""
               />
             </div>
           </div>
         </div>
+        <div class="rightstyle">
+          <div>群体育种值趋势图</div>
+          <div>育种牛图</div>
+        </div>
       </div>
       <div class="layoutsdiv">
         <div class="tile">系谱分析</div>
         <div style="display: flex">
           <img
             style="width: 100%"
-            src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/3045dfe9ebb60507a75748a7c58393a0da.jpg"
+            src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/ymc_travel/2024/09/23/8efcf4aa9ab05f1a4937a081a20a52d5.png"
             alt=""
           />
-          <!-- <div
-            class="echartsdiv"
-            style="display: flex; flex-direction: column; width: 100%"
-          >
-            <div
-              id="Inventory2"
-              style="height: 350px; text-align: center; width: 100%"
-            ></div>
-            <div style="font-weight: 600; width: 100%">群体系统发育NJ树</div>
-          </div>
-          <div style="width: 100%">
-            <div style="text-align: center">
-              <img
-                style="width: 80%"
-                src=""
-                alt=""
-              />
-            </div>
-          </div> -->
+        </div>
+        <div class="newstyle">
+          <div style="width: 42%; text-align: center">群体系统发育NJ树</div>
+          <div style="width: 47%; text-align: center">分布位置展示</div>
         </div>
       </div>
       <div class="layoutsdiv">
@@ -80,22 +84,13 @@
             <!-- 遗传病风险警告图表 -->
             <div id="Inventory3" class="chartstyle3"></div>
             <div style="font-weight: 600; width: 100%">
-              群体遗传比风险概览图
+              群体遗传病风险概览图
             </div>
           </div>
-          <div class="flexdiv">
-            <!-- <div style="width: 100%; display: flex; justify-content: center">
-              <div style="font-weight: bold; width: 70%">群体遗传病风险数量统计表</div>
-            </div> -->
-            <!-- <div class="tabsdata">
-              <div class="tabs">
-                <div>平均育种值</div>
-                <div>132</div>
-              </div>
-            </div> -->
+          <div class="flexdiv" style="display: flex">
             <img
-              style="width: 100%"
-              src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/iot_breed/farm/2024/08/30ed0c054a729a918a324a884a4e920ca7.jpg"
+              style="width: 110%"
+              src="https://smart-1251449951.cos.ap-guangzhou.myqcloud.com/ymc_travel/2024/09/24/d1995dff7f26663444619f1620d83bc0.png"
               alt=""
             />
           </div>
@@ -138,25 +133,23 @@ export default {
         },
         series: [
           {
-            name: '种质资源',
             type: 'bar',
-            data: [35, 140, 300, 420]
+            data: [35, 140, 300, 420],
+            itemStyle: {
+              color: '#6A63E8'
+            },
+            barWidth: 30 //柱图宽度
           }
         ]
       })
       var myChart1 = echarts.init(document.getElementById('Inventory1'))
       myChart1.setOption({
-        title: {
-          text: '基因数据资源',
-          left: 'center'
-        },
         tooltip: {
           trigger: 'item',
           formatter: '{a} <br/>{b} : {c} ({d}%)'
         },
         legend: {
-          left: 'center',
-          top: 'bottom',
+          top: '40px'
         },
         series: [
           {
@@ -169,15 +162,14 @@ export default {
               { value: 15, name: '安格斯牛' },
               { value: 10, name: '黄牛' },
               { value: 5, name: '荷斯坦牛' }
-            ]
+            ],
+            top: '70px'
           }
         ]
       })
       var myChart2 = echarts.init(document.getElementById('Inventory2'))
       myChart2.setOption({
-        title: {
-          text: '育种值'
-        },
+        title: {},
         tooltip: {},
         xAxis: {
           type: 'category',
@@ -193,7 +185,12 @@ export default {
             '82010000997'
           ]
         },
-        yAxis: { type: 'value' },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false
+          }
+        },
         series: [
           {
             // name: '销量',
@@ -201,7 +198,20 @@ export default {
             data: [
               255.85, 252.16, 259.69, 250.76, 264.34, 255.24, 260.27, 238.7
             ],
-            areaStyle: {}
+            areaStyle: {},
+            areaStyle: {
+              normal: {
+                color: '#DADFFB' //改变区域颜色
+              }
+            },
+            itemStyle: {
+              normal: {
+                color: '#6A63E8', //改变折线点的颜色
+                lineStyle: {
+                  color: '#6A63E8' //改变折线颜色
+                }
+              }
+            }
           }
         ]
       })
@@ -221,10 +231,10 @@ export default {
             name: '占比',
             type: 'pie',
             radius: '55%',
-            center: ['50%', '60%'],
+            center: ['50%', '50%'],
             data: [
-              { value: 25, name: '低风险' },
-              { value: 75, name: '高风险' }
+              { value: 25, name: '低风险', itemStyle: { color: '#5CAAF8' } },
+              { value: 75, name: '高风险', itemStyle: { color: '#E8556F' } }
             ],
             emphasis: {
               itemStyle: {
@@ -246,22 +256,26 @@ export default {
   font-weight: bold;
   padding-left: 12px;
   padding-top: 10px;
-  margin-bottom: 8px;
+  margin-bottom: 2px;
+  font-size: 20px;
 }
 .layouts {
   display: flex;
   justify-content: space-between;
   flex-wrap: wrap;
+  width: 100%;
+  overflow: hidden;
   .layouts > .layoutsdiv {
-    width: 47.5%;
+    width: 47.86%;
     margin-top: 10px;
     background: white;
     padding: 18px 14px 18px 16px;
-    border-radius: 2px;
+    border-radius: 6px;
   }
   .tile {
     border-bottom: 1px solid #29272718;
-    padding-bottom: 10px;
+    padding-bottom: 18px;
+    padding-top: 6px;
     font-weight: 600;
     color: rgb(49, 49, 49);
     margin-bottom: 20px;
@@ -269,11 +283,11 @@ export default {
   .echartsdiv {
     display: flex;
     .chartstyle {
-      height: 400px;
+      height: 350px;
       text-align: center;
     }
     .chartstylepc {
-      height: 400px;
+      height: 350px;
       text-align: center;
     }
     .chartstyle2 {
@@ -300,14 +314,16 @@ export default {
     padding-top: 30px;
     .tabs {
       width: 80%;
-      border: 1px solid #a6c5ee;
+      border: 1px solid #89d7b2;
       display: flex;
       justify-content: space-between;
-      color: #468ce7;
-      background: #f2f6fb;
+      color: #89d7b2;
+      background: #f2fffa;
+      margin-top: 26px;
+      font-size: 14px;
     }
     .tabs div {
-      border: 1px solid #a6c5ee;
+      border: 1px solid #89d7b2;
       text-align: center;
       width: 60%;
       padding: 8px 16px 8px 16px;
@@ -319,23 +335,69 @@ export default {
     justify-content: center;
     align-items: center;
   }
+  .newstyle {
+    display: flex;
+    font-weight: bold;
+    width: 100%;
+    justify-content: space-around;
+    padding-bottom: 20px;
+    position: relative;
+    margin-top: -38px;
+  }
+  .yzz {
+    width: 35%;
+    text-align: center;
+  }
+  .rightstyle {
+    display: flex;
+    font-weight: bold;
+    width: 104%;
+    justify-content: space-around;
+    margin-top: -40px;
+    padding-bottom: 20px;
+  }
+  .text {
+    display: flex;
+    font-weight: bold;
+    width: 104%;
+    justify-content: space-around;
+    padding-top: 40px;
+  }
 }
 @media (max-width: 1669px) {
+    .text {
+    padding-top: 10px !important;
+    margin-bottom: 30px;
+  }
+  .rightstyle {
+    padding-bottom: 0px !important;
+    margin-top: 0px !important;
+    width: 99% !important;
+  }
+  .yzz {
+    width: 26% !important;
+  }
+  .newstyle {
+    margin-top: -22px !important;
+  }
   .layouts > .layoutsdiv {
     width: 47% !important;
   }
   .chartstyle {
-    height: 380px !important;
+    height: 340px !important;
   }
   .chartstylepc {
     height: 380px !important;
   }
   .chartstyle2 {
-    height: 310px !important;
+    height: 340px !important;
   }
   .chartstyle3 {
     height: 270px !important;
   }
+  .tabsdata {
+    padding-top: 0px;
+  }
 }
 </style>
   

src/views/layout/left-menu.vue

@@ -37,9 +37,9 @@
           <span slot="title">基因管理</span>
         </template>
         <el-menu-item-group>
-          <el-menu-item index="/geneMgmt/SPN">SPN位点管理</el-menu-item>
+          <el-menu-item index="/geneMgmt/SPN">SNP位点管理</el-menu-item>
           <el-menu-item index="/geneMgmt/SPNPanel"
-            >SPN Panel位点管理</el-menu-item
+            >SNP Panel位点管理</el-menu-item
           >
           <el-menu-item index="/geneMgmt/sequence">原始测序数据</el-menu-item>
         </el-menu-item-group>
@@ -65,9 +65,7 @@
           <el-menu-item index="/phylogeneticAnalysis/evolutionaryTree"
             >进化树</el-menu-item
           >
-          <el-menu-item index="/phylogeneticAnalysis/pca"
-            >PCA</el-menu-item
-          >
+          <el-menu-item index="/phylogeneticAnalysis/pca">PCA</el-menu-item>
           <el-menu-item index="/phylogeneticAnalysis/admixture"
             >ADMIXTURE</el-menu-item
           >
@@ -95,7 +93,7 @@ export default {
     return {
       activeIndex: '/',
       isCollapse: false,
-      system_name: '基芯农育种',
+      system_name: '智慧育种',
       logo: '',
       index: 0,
       menuList: [], // 菜单权限列表

src/views/phylogeneticAnalysis/evolutionaryTree.vue

@@ -11,13 +11,13 @@
       >
         <el-form-item label="养殖场">
           <el-input
-            v-model="searchForm.farm"
+            v-model="searchForm.a"
             placeholder="请输入养殖场"
           ></el-input>
         </el-form-item>
         <el-form-item label="标记编号">
           <el-input
-            v-model="searchForm.farm"
+            v-model="searchForm.b"
             placeholder="请输入标记编号"
           ></el-input>
         </el-form-item>
@@ -71,8 +71,8 @@ export default {
   data() {
     return {
       searchForm: {
-        farm: '',
-        number: ''
+        a: '',
+        b: ''
       },
       tableData: [
         {
@@ -80,7 +80,7 @@ export default {
           a: '若尔盖',
           b: '82010000990',
           c: '45MB',
-          d: '2024.03.06',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -88,7 +88,7 @@ export default {
           a: '若尔盖',
           b: '82010000991',
           c: '46MB',
-          d: '2024.03.06',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -96,7 +96,7 @@ export default {
           a: '若尔盖',
           b: '82010000992',
           c: '56MB',
-          d: '2024.03.27',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -104,7 +104,7 @@ export default {
           a: '若尔盖',
           b: '82010000993',
           c: '34MB',
-          d: '2024.08.02',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -112,7 +112,7 @@ export default {
           a: '若尔盖',
           b: '82010000994',
           c: '29MB',
-          d: '2024.05.03',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -120,7 +120,7 @@ export default {
           a: '若尔盖',
           b: '82010000995',
           c: '45MB',
-          d: '2024.04.23',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -128,7 +128,7 @@ export default {
           a: '若尔盖',
           b: '82010000996',
           c: '68MB',
-          d: '2024.06.03',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -136,7 +136,7 @@ export default {
           a: '若尔盖',
           b: '82010000997',
           c: '45MB',
-          d: '2024.06.03',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
@@ -144,7 +144,7 @@ export default {
           a: '若尔盖',
           b: '82010000998',
           c: '47MB',
-          d: '2024.06.03',
+          d: '2024-03-06',
           e: 'PhyML'
         }
       ],

src/views/variety-resources/pig-list.vue

@@ -676,7 +676,7 @@
           label="瘦肉率"
           label-class-name="my-label"
           content-class-name="my-content"
-          >45
+          >46
         </el-descriptions-item>
         <el-descriptions-item
           label="肉色评分"
@@ -838,69 +838,69 @@ export default {
       tableData: [
         {
           id: '1',
-          number: 'x-01-01-001-01',
+          number: 'X-01-01-001-01',
           cate: '猪',
           varieties: '民猪'
         },
         {
           id: '2',
-          number: 'x-01-01-002-01',
+          number: 'X-01-01-002-01',
           cate: '猪',
           varieties: '八眉猪'
         },
         {
           id: '3',
-          number: 'x-01-01-003-01',
+          number: 'X-01-01-003-01',
           cate: '猪',
           varieties: '黄淮海黑猪'
         },
         {
           id: '4',
-          number: 'x-01-01-003-02',
+          number: 'X-01-01-003-02',
           cate: '猪',
           varieties: '黄淮海黑猪'
         },
         {
           id: '5',
-          number: 'x-01-01-003-03',
+          number: 'X-01-01-003-03',
           cate: '猪',
           varieties: '黄淮海黑猪'
         },
         {
           id: '6',
-          number: 'x-01-01-003-04',
+          number: 'X-01-01-003-04',
           cate: '猪',
           varieties: '黄淮海黑猪'
         },
         {
           id: '7',
-          number: 'x-01-01-003-05',
+          number: 'X-01-01-003-05',
           cate: '猪',
           varieties: '黄淮海黑猪'
         },
         {
           id: '8',
-          number: 'x-01-01-004-01',
+          number: 'X-01-01-004-01',
           cate: '猪',
           varieties: '汉江黑猪'
         },
         {
           id: '9',
-          number: 'x-01-01-005-01',
+          number: 'X-01-01-005-01',
           cate: '猪',
           varieties: '沂蒙黑猪'
         },
         {
           id: '10',
-          number: 'x-01-01-006-01',
+          number: 'X-01-01-006-01',
           cate: '猪',
           varieties: '两广小花猪'
         },
         {
           id: '11',
-          number: 'x-01-01-007-01',
+          number: 'X-01-01-007-01',
           cate: '猪',
-          varieties: '粤东猪'
+          varieties: '粤东黑猪'
         }
       ],
       dialogVisible: false,

vue.config.js

@@ -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
     })