Merge branch 'dev-liuyi' into dev

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

@@ -50,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',
@@ -103,6 +103,18 @@ 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' }
+            },
         ]
     },
     {

src/views/breedMgmt/BLUP.vue

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

@@ -151,7 +151,7 @@ export default {
         page: 1,
         pagesize: 20
       },
-      total: 2
+      total: 9
     }
   },
   methods: {

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

@@ -7,7 +7,7 @@
         <div class="echartsdiv">
           <!-- 总资源展示两个图表 -->
           <div id="Inventory" class="chartstyle"></div>
-          <div id="Inventory1" class="chartstyle"></div>
+          <div id="Inventory1" class="chartstylepc"></div>
         </div>
       </div>
       <div class="layoutsdiv">
@@ -80,7 +80,7 @@
             <!-- 遗传病风险警告图表 -->
             <div id="Inventory3" class="chartstyle3"></div>
             <div style="font-weight: 600; width: 100%">
-              群体遗传比风险概率图
+              群体遗传比风险概览图
             </div>
           </div>
           <div class="flexdiv">
@@ -157,12 +157,11 @@ export default {
         legend: {
           left: 'center',
           top: 'bottom',
-          data: ['西门塔尔牛', '九龙牦牛', '安格斯牛', '黄牛', '荷斯坦牛']
         },
         series: [
           {
             type: 'pie',
-            radius: [30, 110],
+            radius: [30, 70],
             roseType: 'area',
             data: [
               { value: 40, name: '西门塔尔牛' },
@@ -273,6 +272,10 @@ export default {
       height: 400px;
       text-align: center;
     }
+    .chartstylepc {
+      height: 400px;
+      text-align: center;
+    }
     .chartstyle2 {
       height: 350px;
       text-align: center;
@@ -322,7 +325,10 @@ export default {
     width: 47% !important;
   }
   .chartstyle {
-    height: 300px !important;
+    height: 380px !important;
+  }
+  .chartstylepc {
+    height: 380px !important;
   }
   .chartstyle2 {
     height: 310px !important;

src/views/layout/left-menu.vue

@@ -24,22 +24,22 @@
       :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="/quick-Search/quick-Search">
-        <i class="el-icon-folder-checked"></i>
+        <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>
@@ -47,7 +47,7 @@
 
       <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>
@@ -58,25 +58,31 @@
       </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="/disease-resistance/disease-resistance">
-        <i class="el-icon-orange"></i>
+        <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="el-icon-document"></i>
+        <i class="icon iconfont icon-dangan"></i>
         <span slot="title">档案信息</span>
       </el-menu-item>
     </el-menu>
@@ -169,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
@@ -249,6 +269,12 @@ export default {
     detailClick() {
       this.$router.push('/phylogeneticAnalysis/evolutionaryTree')
     },
+    detailClickgo() {
+      this.$router.push('/breedMgmt/BLUP')
+    },
+    detailClick1() {
+      this.$router.push('/disease-resistance/disease-resistance')
+    },
     report(row) {
       if (row.b == '82010000990') {
         window.open(

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;
     }
   }
 }