修改依赖bug

public/index.html

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

src/assets/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3368735 */
-  src: url('iconfont.woff2?t=1687687235044') format('woff2'),
-       url('iconfont.woff?t=1687687235044') format('woff'),
-       url('iconfont.ttf?t=1687687235044') format('truetype');
+  font-family: "iconfont"; /* Project id 4669413 */
+  src: url('iconfont.woff2?t=1725246332040') format('woff2'),
+       url('iconfont.woff?t=1725246332040') format('woff'),
+       url('iconfont.ttf?t=1725246332040') format('truetype');
 }
 
 .iconfont {
@@ -13,147 +13,43 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.ai-yangniuxueyuan:before {
-  content: "\e627";
-}
-
-.ai-xianshangwenzhen:before {
-  content: "\e61e";
-}
-
-.ai-jiaoliushequ:before {
-  content: "\e61c";
-}
-
-.ai-hangqing-wulianwang:before {
-  content: "\e618";
-}
-
-.ai-jiaqin:before {
-  content: "\e62f";
-}
-
-.ai-a-jiankangguanli:before {
-  content: "\e626";
-}
-
-.ai-a-wenzhenyiyuan:before {
-  content: "\e623";
-}
-
-.ai-a-yangniuxueyuan:before {
-  content: "\e624";
-}
-
-.ai-a-jiaoliushequ:before {
-  content: "\e625";
-}
-
-.ai-fenwubaoshou:before {
-  content: "\e61d";
-}
-
-.ai-luguanli:before {
+.icon-icon_bingjia:before {
   content: "\e61b";
 }
 
-.ai-baoxianguanli:before {
-  content: "\e61a";
-}
-
-.ai-shouye:before {
-  content: "\e619";
-}
-
-.ai-baoxiangongsi:before {
+.icon-jiyinjianceke:before {
   content: "\e610";
 }
 
-.ai-zhifu:before {
-  content: "\e611";
+.icon-chaxuncaijia:before {
+  content: "\e635";
 }
 
-.ai-shangchuancailiao:before {
-  content: "\e612";
-}
-
-.ai-lipeishouli:before {
-  content: "\e613";
-}
-
-.ai-bangdingshebei:before {
-  content: "\e614";
-}
-
-.ai-heyanshebei:before {
-  content: "\e615";
-}
-
-.ai-tijiaobaodanshenqing:before {
-  content: "\e616";
-}
-
-.ai-baoxianbaoan:before {
-  content: "\e617";
-}
-
-.ai-dianzijianyi:before {
-  content: "\e60f";
-}
-
-.ai-jianyirenzheng:before {
-  content: "\e60e";
-}
-
-.ai-xipusuyuan:before {
-  content: "\e60d";
-}
-
-.ai-huanjingguanli:before {
-  content: "\e60c";
-}
-
-.ai-yangguanli:before {
-  content: "\e60b";
-}
-
-.ai-a-ai_huaban1fuben15:before {
-  content: "\e601";
-}
-
-.ai-a-ai_huaban1fuben14:before {
-  content: "\e602";
-}
-
-.ai-a-ai_huaban1fuben11:before {
-  content: "\e603";
-}
-
-.ai-a-ai_huaban1fuben10:before {
-  content: "\e604";
-}
-
-.ai-a-ai_huaban1fuben17:before {
-  content: "\e605";
-}
-
-.ai-a-ai_huaban1fuben16:before {
-  content: "\e606";
-}
-
-.ai-a-ai_huaban1fuben18:before {
-  content: "\e607";
-}
-
-.ai-a-ai_huaban1fuben12:before {
-  content: "\e608";
-}
-
-.ai-a-ai_huaban1fuben13:before {
-  content: "\e609";
-}
-
-.ai-a-ai_huaban1fuben19:before {
+.icon-xitongguanli:before {
   content: "\e60a";
 }
 
+.icon-gaojichaxun:before {
+  content: "\e632";
+}
+
+.icon-dangan:before {
+  content: "\e676";
+}
+
+.icon-nannvbili:before {
+  content: "\e73f";
+}
+
+.icon-pinzhong:before {
+  content: "\e645";
+}
+
+.icon-fenxi-05:before {
+  content: "\ec81";
+}
+
+.icon-shouye:before {
+  content: "\e61d";
+}
+

src/router/index.js

@@ -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,
@@ -47,13 +50,13 @@ const routes = [
                 path: '/geneMgmt/SPN',
                 component: () =>
                     import('../views/geneMgmt/SPN.vue'),
-                meta: { title: 'SPN位点管理', activeMenu: '/geneMgmt/SPN' }
+                meta: { title: 'SNP位点管理', activeMenu: '/geneMgmt/SPN' }
             },
             {
                 path: '/geneMgmt/SPNPanel',
                 component: () =>
                     import('../views/geneMgmt/SPNPanel.vue'),
-                meta: { title: 'SPN Panel位点管理', activeMenu: '/geneMgmt/SPNPanel' }
+                meta: { title: 'SNP Panel位点管理', activeMenu: '/geneMgmt/SPNPanel' }
             },
             {
                 path: '/geneMgmt/sequence',
@@ -63,7 +66,6 @@ const routes = [
             }
         ]
     },
-
     {
         // 繁育管理
         path: '/breedMgmt',
@@ -101,6 +103,31 @@ const routes = [
                     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' }
+            }
         ]
     },
     {
@@ -116,19 +143,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 +170,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 +180,8 @@ router.beforeEach((to, from, next) => {
         if (to.path === '/login') {
             next()
         }
-        next('/login')
     }
-    // next('/login')
 }
+    // next('/login')
 )
 export default router

src/views/archive-information/archive-information.vue

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

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
@@ -70,8 +70,8 @@
           <el-button size="mini" type="text" class="detail-btn"
             ><a
               target="_blank"
-              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/99715011920%E7%89%9B%E9%81%97%E4%BC%A0%E7%97%85%E5%9F%BA%E5%9B%A0%E6%A3%80%E6%B5%8B%E6%8A%A5%E5%91%8A.pdf"
-              >查看</a
+              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/82010000945ABLUP%E8%82%B2%E7%A7%8D%E6%8A%A5%E5%91%8A.pdf"
+              >预览</a
             ></el-button
           >
           <!-- </template> -->
@@ -95,15 +95,14 @@
           sortable
         ></el-table-column>
         <el-table-column label="详情">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="download(scope.row.id)"
-              class="detail-btn"
-              >查看</el-button
+          <el-button size="mini" type="text" class="detail-btn">
+            <a
+              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/82010000923GBLUP%E8%82%B2%E7%A7%8D%E6%8A%A5%E5%91%8A.pdf"
+              target="_blank"
             >
-          </template>
+              预览
+            </a>
+          </el-button>
         </el-table-column>
       </el-table>
       <el-table
@@ -124,15 +123,13 @@
           sortable
         ></el-table-column>
         <el-table-column label="详情">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="download(scope.row.id)"
-              class="detail-btn"
-              >查看</el-button
-            >
-          </template>
+          <el-button size="mini" type="text" class="detail-btn">
+            <a
+              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/82010000995ssGBLUP%E8%82%B2%E7%A7%8D%E6%8A%A5%E5%91%8A.pdf"
+              target="_blank"
+              >预览</a
+            ></el-button
+          >
         </el-table-column>
       </el-table>
       <div class="page-box">
@@ -180,78 +177,130 @@ export default {
           o: '255.85'
         },
         {
-          id: 2,
+          id: 1,
           a: '若尔盖',
           b: '82010000991',
           c: '雌',
-          d: '90',
-          e: '130',
-          f: '155',
-          g: '192',
-          h: '19',
-          i: '567',
-          j: '9.9',
-          k: '41.2',
-          l: '4490',
-          m: '4.0',
+          d: '86',
+          e: '133',
+          f: '160',
+          g: '196',
+          h: '20',
+          i: '569',
+          j: '10.3',
+          k: '41.36',
+          l: '4560',
+          m: '4',
           n: '3.2',
-          o: '252.85'
+          o: '252.16'
         },
-
         {
-          id: 3,
+          id: 2,
           a: '若尔盖',
           b: '82010000992',
           c: '雌',
-          d: '91',
+          d: '95',
           e: '130',
           f: '155',
-          g: '192',
-          h: '19',
-          i: '567',
-          j: '9.9',
-          k: '41.2',
-          l: '4490',
-          m: '4.0',
-          n: '3.2',
-          o: '252.85'
+          g: '199',
+          h: '21',
+          i: '587',
+          j: '10.5',
+          k: '43.69',
+          l: '4578',
+          m: '4.2',
+          n: '3.3',
+          o: '259.69'
         },
         {
-          id: 6,
+          id: 3,
           a: '若尔盖',
           b: '82010000993',
           c: '雌',
-          d: '98',
-          e: '140',
-          f: '175',
-          g: '199',
-          h: '20',
-          i: '597',
-          j: '12.9',
-          k: '47.2',
-          l: '4690',
-          m: '4.9',
-          n: '3.4',
-          o: '259.85'
+          d: '84',
+          e: '128',
+          f: '154',
+          g: '200',
+          h: '19',
+          i: '566',
+          j: '10.8',
+          k: '41.58',
+          l: '4589',
+          m: '4',
+          n: '3.5',
+          o: '250.76'
         },
-
         {
           id: 4,
           a: '若尔盖',
           b: '82010000994',
           c: '雌',
-          d: '96',
-          e: '140',
-          f: '185',
-          g: '199',
-          h: '20',
-          i: '597',
-          j: '12.9',
-          k: '47.2',
-          l: '4800',
-          m: '4.9',
+          d: '89',
+          e: '129',
+          f: '159',
+          g: '197',
+          h: '18',
+          i: '599',
+          j: '11',
+          k: '41.36',
+          l: '4578',
+          m: '4.3',
           n: '3.4',
-          o: '254.85'
+          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: 6,
+          a: '若尔盖',
+          b: '82010000996',
+          c: '雌',
+          d: '84',
+          e: '130',
+          f: '155',
+          g: '193',
+          h: '22',
+          i: '589',
+          j: '10.3',
+          k: '42.59',
+          l: '4523',
+          m: '4.2',
+          n: '3.4',
+          o: '260.27'
+        },
+        {
+          id: 7,
+          a: '若尔盖',
+          b: '82010000997',
+          c: '雌',
+          d: '87',
+          e: '129',
+          f: '160',
+          g: '195',
+          h: '24',
+          i: '598',
+          j: '10.5',
+          k: '44.25',
+          l: '4538',
+          m: '4',
+          n: '3.2',
+          o: '238.70'
         }
       ],
       tableDataGBLUP: [
@@ -261,23 +310,23 @@ export default {
           c: '雌',
           d: '6',
           e: '血液',
-          f: '1'
+          f: '-10'
         },
         {
           a: '若尔盖',
           b: '82010000991',
           c: '雌',
-          d: '8',
+          d: '6',
           e: '血液',
-          f: '3'
+          f: '50'
         },
         {
           a: '若尔盖',
           b: '82010000992',
           c: '雌',
-          d: '7',
+          d: '6',
           e: '血液',
-          f: '5'
+          f: '-10'
         },
         {
           a: '若尔盖',
@@ -285,7 +334,7 @@ export default {
           c: '雌',
           d: '6',
           e: '血液',
-          f: '4'
+          f: '40'
         },
         {
           a: '若尔盖',
@@ -293,41 +342,57 @@ export default {
           c: '雌',
           d: '6',
           e: '血液',
-          f: '9'
+          f: '77'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000995',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '-10'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000996',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '20'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000997',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '-10'
         }
       ],
       tableDatassGBLUP: [
-        {
-          a: '若尔盖',
-          b: '82010000991',
-          c: '雌',
-          d: '8',
-          e: '血液',
-          f: '3'
-        },
-        {
-          a: '若尔盖',
-          b: '82010000994',
-          c: '雌',
-          d: '6',
-          e: '血液',
-          f: '8'
-        },
-        {
-          a: '若尔盖',
-          b: '82010000992',
-          c: '雌',
-          d: '7',
-          e: '血液',
-          f: '5'
-        },
         {
           a: '若尔盖',
           b: '82010000990',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '6'
+          f: '80'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000991',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '0'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000992',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '20'
         },
         {
           a: '若尔盖',
@@ -335,14 +400,46 @@ export default {
           c: '雌',
           d: '6',
           e: '血液',
-          f: '4'
+          f: '76'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000994',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '-10'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000995',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '30'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000996',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '-1'
+        },
+        {
+          a: '若尔盖',
+          b: '82010000997',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '60'
         }
       ],
       form: {
         page: 1,
         pagesize: 20
       },
-      total: 5
+      total: 8
     }
   },
   methods: {
@@ -406,4 +503,12 @@ export default {
 /deep/ .cell {
   font-weight: normal;
 }
+
+/deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+  background-color: #67c23a;
+  border-color: #67c23a;
+}
+/deep/ .el-radio-button__inner:hover {
+  color: #67c23a;
+}
 </style>

src/views/breedMgmt/paternityTest.vue

@@ -38,18 +38,17 @@
         <el-table-column prop="c" label="性别"></el-table-column>
         <el-table-column prop="d" label="月龄"></el-table-column>
         <el-table-column prop="e" label="样本"></el-table-column>
-        <el-table-column prop="d" label="疑是父母编号"></el-table-column>
-        <el-table-column prop="e" label="相似度"></el-table-column>
+        <el-table-column prop="f" label="疑是父母编号"></el-table-column>
+        <el-table-column prop="g" label="相似度" sortable></el-table-column>
         <el-table-column label="亲缘关系结果">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="download(scope.row.id)"
-              class="detail-btn"
-              >查看</el-button
-            >
-          </template>
+          <el-button size="mini" type="text" class="detail-btn"
+            ><a
+              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/82010000990%E5%88%86%E5%AD%90%E8%82%B2%E7%A7%8D%E4%BA%B2%E5%AD%90%E9%89%B4%E5%AE%9A.pdf"
+              target="_blank"
+              rel="noopener noreferrer"
+              >预览</a
+            ></el-button
+          >
         </el-table-column>
       </el-table>
       <div class="page-box">
@@ -80,59 +79,89 @@ export default {
         {
           id: 0,
           a: '若尔盖',
-          b: '82010000991',
+          b: '82010000990',
           c: '雌',
-          d: '8',
+          d: '6',
           e: '血液',
-          f: '82020000981',
-          g: '99.99%'
+          f: '82020000991',
+          g: '99.89%'
         },
         {
           id: 1,
           a: '若尔盖',
+          b: '82010000991',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000992',
+          g: '67%'
+        },
+        {
+          id: 2,
+          a: '若尔盖',
           b: '82010000992',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '82020000986',
-          g: '69.99%'
+          f: '82020000993',
+          g: '96.32%'
         },
         {
-          id: 2,
+          id: 3,
+          a: '若尔盖',
+          b: '82010000993',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000994',
+          g: '98.96%'
+        },
+        {
+          id: 4,
           a: '若尔盖',
           b: '82010000994',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '82020000985',
-          g: '79.99%'
+          f: '82020000995',
+          g: '67%'
         },
         {
-          id: 3,
+          id: 5,
           a: '若尔盖',
           b: '82010000995',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '82020000989',
-          g: '98.99%'
+          f: '82020000996',
+          g: '97.65%'
         },
         {
-          id: 3,
+          id: 6,
           a: '若尔盖',
-          b: '82010000998',
+          b: '82010000996',
           c: '雌',
           d: '6',
           e: '血液',
-          f: '82020000976',
-          g: '78.99%'
+          f: '82020000997',
+          g: '67%'
+        },
+        {
+          id: 7,
+          a: '若尔盖',
+          b: '82010000997',
+          c: '雌',
+          d: '6',
+          e: '血液',
+          f: '82020000998',
+          g: '96.23%'
         }
       ],
       form: {
         page: 1,
         pagesize: 20
       },
-      total: 5
+      total: 8
     }
   },
   methods: {
@@ -153,10 +182,10 @@ export default {
       this.form.page = parseInt(val)
     },
     download(id) {
-      this.$message({
-        message: '下载成功',
-        type: 'success'
-      })
+      // this.$message({
+      //   message: '下载成功',
+      //   type: 'success'
+      // })
     }
   }
 }

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
@@ -151,7 +151,7 @@ export default {
         page: 1,
         pagesize: 20
       },
-      total: 2
+      total: 9
     }
   },
   methods: {
@@ -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

@@ -9,7 +9,7 @@
         label-width="auto"
         size="mini"
       >
-        <el-form-item label="标记编号">
+        <el-form-item label="标记编号" style="margin-bottom: 10px">
           <el-input
             v-model="searchForm.a"
             placeholder="请输入标记编号"
@@ -154,8 +154,8 @@ export default {
           c: 'ARS-UCD1.2',
           d: '10',
           e: '10011109',
-          f: 'T',
-          g: 'G',
+          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>
@@ -40,15 +37,9 @@
         <el-table-column prop="d" label="位点数目"></el-table-column>
         <el-table-column prop="e" label="描述"></el-table-column>
         <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="download(scope.row.id)"
-              class="detail-btn"
-              >详情</el-button
-            >
-          </template>
+          <el-button size="mini" type="text" class="detail-btn">
+            <router-link :to="{ path: '/geneMgmt/SPN' }">详情</router-link>
+          </el-button>
         </el-table-column>
       </el-table>
       <div class="page-box">
@@ -72,24 +63,88 @@ export default {
   data() {
     return {
       searchForm: {
-        farm: '',
-        number: ''
+        a: '',
+        b: ''
       },
       tableData: [
         {
           id: 1,
-          a: '',
+          a: 'test_1',
           b: 'illumina',
-          c: '',
-          d: '',
-          e: ''
+          c: 'ARS-UCD1.2',
+          d: '1011',
+          e: '--'
+        },
+        {
+          id: 2,
+          a: 'test_2',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '2365',
+          e: '--'
+        },
+        {
+          id: 3,
+          a: 'test_3',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '2589',
+          e: '--'
+        },
+        {
+          id: 4,
+          a: 'test_4',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '4568',
+          e: '--'
+        },
+        {
+          id: 5,
+          a: 'test_5',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '2587',
+          e: '--'
+        },
+        {
+          id: 6,
+          a: 'test_6',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '1452',
+          e: '--'
+        },
+        {
+          id: 7,
+          a: 'test_7',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '7854',
+          e: '--'
+        },
+        {
+          id: 8,
+          a: 'test_8',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '5894',
+          e: '--'
+        },
+        {
+          id: 9,
+          a: 'test_9',
+          b: 'illumina',
+          c: 'ARS-UCD1.2',
+          d: '3354',
+          e: '--'
         }
       ],
       form: {
         page: 1,
         pagesize: 20
       },
-      total: 2
+      total: 9
     }
   },
   methods: {

src/views/geneMgmt/sequence.vue

@@ -35,15 +35,14 @@
         <el-table-column prop="d" label="品种"></el-table-column>
         <el-table-column prop="e" label="文件状态"></el-table-column>
         <el-table-column label="操作">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="download(scope.row.id)"
-              class="detail-btn"
-              >下载</el-button
+          <el-button size="mini" type="text" class="detail-btn">
+            <a
+              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/CX_82010000990.txt"
+              target="_blank"
+              rel="noopener noreferrer"
+              >下载</a
             >
-          </template>
+          </el-button>
         </el-table-column>
       </el-table>
       <div class="page-box">
@@ -82,7 +81,7 @@ export default {
         {
           id: 1,
           a: 'CX_82010000991',
-          b: '8.6MB',
+          b: '11.05MB',
           c: '2024-03-06',
           d: '西门塔尔',
           e: '已上传'
@@ -90,7 +89,7 @@ export default {
         {
           id: 2,
           a: 'CX_82010000992',
-          b: '21.23MB',
+          b: '12.36MB',
           c: '2024-03-06',
           d: '华西牛',
           e: '已上传'
@@ -98,7 +97,7 @@ export default {
         {
           id: 3,
           a: 'CX_82010000993',
-          b: '13.21MB',
+          b: '14.78MB',
           c: '2024-03-06',
           d: '西门塔尔',
           e: '已上传'
@@ -106,17 +105,49 @@ export default {
         {
           id: 4,
           a: 'CX_82010000994',
-          b: '15.3MB',
+          b: '14.36MB',
           c: '2024-03-06',
           d: '西藏高山牦牛',
           e: '已上传'
+        },
+        {
+          id: 5,
+          a: 'CX_82010000995',
+          b: '18.64MB',
+          c: '2024-03-06',
+          d: '西门塔尔',
+          e: '已上传'
+        },
+        {
+          id: 6,
+          a: 'CX_82010000996',
+          b: '15.78MB',
+          c: '2024-03-06',
+          d: '西门塔尔',
+          e: '已上传'
+        },
+        {
+          id: 7,
+          a: 'CX_82010000997',
+          b: '13.85MB',
+          c: '2024-03-06',
+          d: '西门塔尔',
+          e: '已上传'
+        },
+        {
+          id: 8,
+          a: 'CX_82010000998',
+          b: '16.12MB',
+          c: '2024-03-06',
+          d: '西门塔尔',
+          e: '已上传'
         }
       ],
       form: {
         page: 1,
         pagesize: 20
       },
-      total: 5
+      total: 9
     }
   },
   methods: {

src/views/index/index.vue

@@ -3,71 +3,75 @@
     <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="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>
-                <div>132</div>
+                <div>258</div>
               </div>
             </div>
             <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/303d04e7494f5e595cc624c05e03e57c4d.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,31 +133,28 @@ 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',
-          data: ['西门塔尔牛', '九龙牦牛', '安格斯牛', '黄牛', '荷斯坦牛']
+          top: '40px'
         },
         series: [
           {
             type: 'pie',
-            radius: [30, 110],
+            radius: [30, 70],
             roseType: 'area',
             data: [
               { value: 40, name: '西门塔尔牛' },
@@ -170,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',
@@ -194,7 +185,12 @@ export default {
             '82010000997'
           ]
         },
-        yAxis: { type: 'value' },
+        yAxis: {
+          type: 'value',
+          axisLine: {
+            show: false
+          }
+        },
         series: [
           {
             // name: '销量',
@@ -202,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' //改变折线颜色
+                }
+              }
+            }
           }
         ]
       })
@@ -222,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: {
@@ -247,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;
@@ -270,7 +283,11 @@ export default {
   .echartsdiv {
     display: flex;
     .chartstyle {
-      height: 400px;
+      height: 350px;
+      text-align: center;
+    }
+    .chartstylepc {
+      height: 350px;
       text-align: center;
     }
     .chartstyle2 {
@@ -297,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;
@@ -316,20 +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: 300px !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

@@ -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>
@@ -24,29 +24,30 @@
       :unique-opened="true"
     >
       <el-menu-item index="/index/index">
-        <i class="el-icon-price-tag"></i>
+        <i class="icon iconfont icon-shouye"></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="icon iconfont icon-chaxuncaijia"></i>
+        <span slot="title">快速查询</span>
       </el-menu-item>
       <el-submenu index="66">
         <template slot="title">
-          <i class="el-icon-printer"></i>
+          <i class="icon iconfont icon-jiyinjianceke"></i>
           <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>
       </el-submenu>
+
       <el-submenu index="67">
         <template slot="title">
-          <i class="el-icon-news"></i>
+          <i class="icon iconfont icon-nannvbili"></i>
           <span slot="title">繁育管理</span>
         </template>
         <el-menu-item-group>
@@ -57,27 +58,33 @@
       </el-submenu>
       <el-submenu index="68">
         <template slot="title">
-          <i class="el-icon-suitcase"></i>
+          <i class="icon iconfont icon-fenxi-05"></i>
           <span slot="title">进化分析</span>
         </template>
         <el-menu-item-group>
           <el-menu-item index="/phylogeneticAnalysis/evolutionaryTree"
             >进化树</el-menu-item
           >
+          <el-menu-item index="/phylogeneticAnalysis/pca"
+            >PCA</el-menu-item
+          >
+          <el-menu-item index="/phylogeneticAnalysis/admixture"
+            >ADMIXTURE</el-menu-item
+          >
         </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="icon iconfont icon-icon_bingjia"></i>
+        <span slot="title">遗传病风险</span>
       </el-menu-item>
       <el-menu-item index="/variety-resources/variety-resources">
-        <i class="el-icon-copy-document"></i>
+        <i class="icon iconfont icon-pinzhong"></i>
         <span slot="title">品种资源</span>
       </el-menu-item>
+      <el-menu-item index="/archive-information/archive-information">
+        <i class="icon iconfont icon-dangan"></i>
+        <span slot="title">档案信息</span>
+      </el-menu-item>
     </el-menu>
   </div>
 </template>
@@ -133,7 +140,7 @@ export default {
 
   .logo {
     max-width: 220px;
-    height: 80px;
+    height: 72px;
     color: #fff;
     font-size: 25px;
     font-weight: bold;
@@ -168,7 +175,7 @@ export default {
 
 .icon {
   vertical-align: middle;
-  font-size: 23px;
+  font-size: 18px;
   margin-right: 5px;
 }
 

src/views/phylogeneticAnalysis/admixture.vue

@@ -0,0 +1,23 @@
+<template>
+    <div class="container-box">
+      <div style="padding-top: 20%">建设中~</div>
+    </div>
+  </template>
+  
+  <script>
+  export default {
+    data() {
+      return {}
+    },
+    methods: {}
+  }
+  </script>
+  
+  <style lang="less" scoped>
+  .container-box {
+    height: 100%;
+    background: white;
+    text-align: center;
+  }
+  </style>
+  

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>
@@ -40,15 +40,14 @@
         <el-table-column prop="d" label="创建时间"></el-table-column>
         <el-table-column prop="e" label="分析工具"></el-table-column>
         <el-table-column label="详情">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              @click="download(scope.row.id)"
-              class="detail-btn"
-              >查看</el-button
+          <el-button size="mini" type="text" class="detail-btn">
+            <a
+              href="https://smart-1259258654.cos.ap-guangzhou.myqcloud.com/pdf/82010000990%E8%BF%9B%E5%8C%96%E6%A0%91%E5%88%86%E6%9E%90%E6%8A%A5%E5%91%8A.pdf"
+              target="_blank"
+              rel="noopener noreferrer"
+              >预览</a
             >
-          </template>
+          </el-button>
         </el-table-column>
       </el-table>
       <div class="page-box">
@@ -72,8 +71,8 @@ export default {
   data() {
     return {
       searchForm: {
-        farm: '',
-        number: ''
+        a: '',
+        b: ''
       },
       tableData: [
         {
@@ -81,55 +80,71 @@ export default {
           a: '若尔盖',
           b: '82010000990',
           c: '45MB',
-          d: '2024.03.06',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
           id: 2,
           a: '若尔盖',
           b: '82010000991',
-          c: '40MB',
-          d: '2024.03.06',
+          c: '46MB',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
           id: 3,
           a: '若尔盖',
           b: '82010000992',
-          c: '42MB',
-          d: '2024.03.27',
+          c: '56MB',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
           id: 4,
           a: '若尔盖',
           b: '82010000993',
-          c: '35MB',
-          d: '2024.08.02',
+          c: '34MB',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
           id: 5,
           a: '若尔盖',
           b: '82010000994',
-          c: '40MB',
-          d: '2024.05.03',
+          c: '29MB',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
           id: 6,
           a: '若尔盖',
           b: '82010000995',
-          c: '50MB',
-          d: '2024.04.23',
+          c: '45MB',
+          d: '2024-03-06',
           e: 'PhyML'
         },
         {
           id: 7,
           a: '若尔盖',
           b: '82010000996',
-          c: '38MB',
-          d: '2024.06.03',
+          c: '68MB',
+          d: '2024-03-06',
+          e: 'PhyML'
+        },
+        {
+          id: 8,
+          a: '若尔盖',
+          b: '82010000997',
+          c: '45MB',
+          d: '2024-03-06',
+          e: 'PhyML'
+        },
+        {
+          id: 9,
+          a: '若尔盖',
+          b: '82010000998',
+          c: '47MB',
+          d: '2024-03-06',
           e: 'PhyML'
         }
       ],
@@ -137,7 +152,7 @@ export default {
         page: 1,
         pagesize: 20
       },
-      total: 2
+      total: 9
     }
   },
   methods: {

src/views/phylogeneticAnalysis/pca.vue

@@ -0,0 +1,22 @@
+<template>
+  <div class="container-box">
+    <div style="padding-top: 20%">建设中~</div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {}
+  },
+  methods: {}
+}
+</script>
+
+<style lang="less" scoped>
+.container-box {
+  height: 100%;
+  background: white;
+  text-align: center;
+}
+</style>

src/views/quick-Search/quick-Search.vue

@@ -44,7 +44,17 @@
       >
         <el-table-column prop="a" label="养殖场"></el-table-column>
         <el-table-column prop="b" label="标记编号"></el-table-column>
-        <el-table-column prop="c" label="综合育种指数"></el-table-column>
+        <el-table-column label="综合育种指数">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="detailClickgo(scope.row)"
+              class="detail-btn"
+              >{{ scope.row.c }}</el-button
+            >
+          </template>
+        </el-table-column>
         <el-table-column label="系谱分析">
           <template slot-scope="scope">
             <el-button
@@ -56,7 +66,17 @@
             >
           </template>
         </el-table-column>
-        <el-table-column prop="e" label="遗传病风险"></el-table-column>
+        <el-table-column label="遗传病风险">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="detailClick1(scope.row)"
+              class="detail-btn"
+              >{{ scope.row.e }}</el-button
+            >
+          </template>
+        </el-table-column>
         <el-table-column label="详情">
           <template slot-scope="scope">
             <el-button
@@ -95,26 +115,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 +183,8 @@
     </el-dialog>
   </div>
 </template>
-
-<script>
+  
+  <script>
 export default {
   data() {
     return {
@@ -214,8 +269,19 @@ export default {
     detailClick() {
       this.$router.push('/phylogeneticAnalysis/evolutionaryTree')
     },
-    report() {
-      this.dialogVisible = true
+    detailClickgo() {
+      this.$router.push('/breedMgmt/BLUP')
+    },
+    detailClick1() {
+      this.$router.push('/disease-resistance/disease-resistance')
+    },
+    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 +317,8 @@ export default {
   }
 }
 </script>
-
-<style lang="less" scoped>
+  
+  <style lang="less" scoped>
 .container-box {
   min-height: calc(100vh - 84px);
   padding: 15px;
@@ -285,6 +351,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 +361,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 {

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,
@@ -938,6 +938,7 @@ export default {
       padding: 10px 20px;
       border-radius: 5px;
       width: 80px;
+      text-align: center;
     }
   }
 }

vue.config.js

@@ -37,13 +37,13 @@ const cdn = {
   },
   // CDN
   js: [
-    'https://unpkg.zhimg.com/vue@2.6.11/dist/vue.js',
-    'https://unpkg.zhimg.com/element-ui@2.15.6/lib/index.js',
-    'https://unpkg.zhimg.com/vue-router@3.2.0/dist/vue-router.js',
-    'https://unpkg.zhimg.com/vuex@3.4.0/dist/vuex.js',
-    'https://unpkg.zhimg.com/axios@0.26.1/dist/axios.min.js',
-    'https://unpkg.zhimg.com/moment@2.29.2/moment.js',
-    'https://unpkg.zhimg.com/jquery@3.6.0/dist/jquery.min.js'
+    'https://unpkg.com/vue@2.6.11/dist/vue.js',
+    'https://unpkg.com/element-ui@2.15.6/lib/index.js',
+    'https://unpkg.com/vue-router@3.2.0/dist/vue-router.js',
+    'https://unpkg.com/vuex@3.4.0/dist/vuex.js',
+    'https://unpkg.com/axios@0.26.1/dist/axios.min.js',
+    'https://unpkg.com/moment@2.29.2/moment.js',
+    'https://unpkg.com/jquery@3.6.0/dist/jquery.min.js'
     // 'https://unpkg.com/v-distpicker@1.2.13/dist/v-distpicker.js',
     // 'https://code.jquery.com/jquery-3.6.0.min.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
     })
@@ -98,4 +98,4 @@ module.exports = {
       }
     }
   }
-}
+}