From b04f0da78d4fc27fd9414f1224d5dba9b0aabc94 Mon Sep 17 00:00:00 2001 From: xiaoliumang <664147088@qq.com> Date: Tue, 3 Sep 2024 10:08:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=EF=BC=9A=E6=BC=94=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=88=E8=B0=83=E6=95=B4=E4=B8=8E?= =?UTF-8?q?=E5=8E=9F=E5=9E=8B=E4=B8=80=E8=87=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/breedMgmt/BLUP.vue | 94 +++++++++--------- src/views/breedMgmt/paternityTest.vue | 96 +++++++++---------- src/views/geneMgmt/SPN.vue | 2 +- src/views/geneMgmt/SPNPanel.vue | 8 +- src/views/geneMgmt/sequence.vue | 18 ++-- .../phylogeneticAnalysis/evolutionaryTree.vue | 18 ++-- src/views/variety-resources/pig-list.vue | 26 ++--- 7 files changed, 130 insertions(+), 132 deletions(-) diff --git a/src/views/breedMgmt/BLUP.vue b/src/views/breedMgmt/BLUP.vue index eec82c6..4f75714 100644 --- a/src/views/breedMgmt/BLUP.vue +++ b/src/views/breedMgmt/BLUP.vue @@ -177,26 +177,25 @@ export default { o: '255.85' }, { - id: 2, + id: 1, a: '若尔盖', b: '82010000991', c: '雌', d: '86', e: '133', f: '160', - g: '192', - h: '19', - i: '567', + g: '196', + h: '20', + i: '569', j: '10.3', - k: '41.2', + k: '41.36', l: '4560', m: '4', n: '3.2', o: '252.16' }, - { - id: 3, + id: 2, a: '若尔盖', b: '82010000992', c: '雌', @@ -206,7 +205,7 @@ export default { g: '199', h: '21', i: '587', - j: '10.05', + j: '10.5', k: '43.69', l: '4578', m: '4.2', @@ -214,7 +213,7 @@ export default { o: '259.69' }, { - id: 6, + id: 3, a: '若尔盖', b: '82010000993', c: '雌', @@ -231,7 +230,6 @@ export default { n: '3.5', o: '250.76' }, - { id: 4, a: '若尔盖', @@ -240,36 +238,36 @@ export default { d: '89', e: '129', f: '159', - g: '199', - h: '18', - i: '599', - j: '9.9', - k: '40.86', - l: '4600', - m: '4.3', - n: '3.4', - o: '264.85' - }, - { - id: 4, - a: '若尔盖', - b: '82010000995', - c: '雌', - d: '89', - e: '129', - f: '159', - g: '199', + g: '197', h: '18', i: '599', j: '11', - k: '41.86', + k: '41.36', l: '4578', m: '4.3', n: '3.4', + o: '264.34' + }, + { + id: 5, + a: '若尔盖', + b: '82010000995', + c: '雌', + d: '96', + e: '126', + f: '156', + g: '192', + h: '20', + i: '578', + j: '9.9', + k: '40.86', + l: '4600', + m: '4', + n: '3.2', o: '255.24' }, { - id: 4, + id: 6, a: '若尔盖', b: '82010000996', c: '雌', @@ -284,10 +282,10 @@ export default { l: '4523', m: '4.2', n: '3.4', - o: '260.85' + o: '260.27' }, { - id: 4, + id: 7, a: '若尔盖', b: '82010000997', c: '雌', @@ -296,13 +294,13 @@ export default { f: '160', g: '195', h: '24', - i: '589', + i: '598', j: '10.5', - k: '44.86', + k: '44.25', l: '4538', m: '4', n: '3.2', - o: '238.85' + o: '238.70' } ], tableDataGBLUP: [ @@ -374,7 +372,7 @@ export default { tableDatassGBLUP: [ { a: '若尔盖', - b: '82010000991', + b: '82010000990', c: '雌', d: '6', e: '血液', @@ -382,7 +380,7 @@ export default { }, { a: '若尔盖', - b: '82010000994', + b: '82010000991', c: '雌', d: '6', e: '血液', @@ -398,27 +396,19 @@ export default { }, { a: '若尔盖', - b: '82010000990', + b: '82010000993', c: '雌', d: '6', e: '血液', f: '76' }, - { - a: '若尔盖', - b: '82010000993', - c: '雌', - d: '6', - e: '血液', - f: '-10' - }, { a: '若尔盖', b: '82010000994', c: '雌', d: '6', e: '血液', - f: '-20' + f: '-10' }, { a: '若尔盖', @@ -434,6 +424,14 @@ export default { c: '雌', d: '6', e: '血液', + f: '-1' + }, + { + a: '若尔盖', + b: '82010000997', + c: '雌', + d: '6', + e: '血液', f: '60' } ], diff --git a/src/views/breedMgmt/paternityTest.vue b/src/views/breedMgmt/paternityTest.vue index 6fce0b4..ccf2058 100644 --- a/src/views/breedMgmt/paternityTest.vue +++ b/src/views/breedMgmt/paternityTest.vue @@ -79,81 +79,81 @@ export default { { id: 0, a: '若尔盖', - b: '82010000991', - c: '雌', - d: '8', - e: '血液', - f: '82020000981', - g: '99.99%' - }, - { - id: 1, - a: '若尔盖', - b: '82010000992', - c: '雌', - d: '6', - e: '血液', - f: '82020000986', - g: '69.99%' - }, - { - id: 2, - a: '若尔盖', - b: '82010000993', - c: '雌', - d: '6', - e: '血液', - f: '82020000990', - g: '79.99%' - }, - { - id: 3, - a: '若尔盖', - b: '82010000994', + b: '82010000990', c: '雌', d: '6', e: '血液', f: '82020000991', - g: '98.96%' + g: '99.89%' }, { - id: 3, + id: 1, a: '若尔盖', - b: '82010000995', + b: '82010000991', c: '雌', d: '6', e: '血液', f: '82020000992', g: '67%' }, + { + id: 2, + a: '若尔盖', + b: '82010000992', + c: '雌', + d: '6', + e: '血液', + f: '82020000993', + g: '96.32%' + }, { id: 3, a: '若尔盖', + b: '82010000993', + c: '雌', + d: '6', + e: '血液', + f: '82020000994', + g: '98.96%' + }, + { + id: 4, + a: '若尔盖', + b: '82010000994', + c: '雌', + d: '6', + e: '血液', + f: '82020000995', + g: '67%' + }, + { + id: 5, + a: '若尔盖', + b: '82010000995', + c: '雌', + d: '6', + e: '血液', + f: '82020000996', + g: '97.65%' + }, + { + id: 6, + a: '若尔盖', b: '82010000996', c: '雌', d: '6', e: '血液', - f: '82020000993', - g: '97.65%' + f: '82020000997', + g: '67%' }, { - id: 3, + id: 7, a: '若尔盖', b: '82010000997', c: '雌', d: '6', e: '血液', - f: '82020000994', - g: '67%' - }, - { - id: 3, - a: '若尔盖', - b: '82010000998', - c: '雌', - d: '6', - e: '血液', - f: '82020000976', + f: '82020000998', g: '96.23%' } ], diff --git a/src/views/geneMgmt/SPN.vue b/src/views/geneMgmt/SPN.vue index 98b0457..3c1a499 100644 --- a/src/views/geneMgmt/SPN.vue +++ b/src/views/geneMgmt/SPN.vue @@ -154,7 +154,7 @@ export default { c: 'ARS-UCD1.2', d: '10', e: '10011109', - f: 'A', + f: 'G', g: 'C', h: '--' }, diff --git a/src/views/geneMgmt/SPNPanel.vue b/src/views/geneMgmt/SPNPanel.vue index 7fbe400..0819507 100644 --- a/src/views/geneMgmt/SPNPanel.vue +++ b/src/views/geneMgmt/SPNPanel.vue @@ -83,7 +83,7 @@ export default { a: 'test_2', b: 'illumina', c: 'ARS-UCD1.2', - d: '4563', + d: '2365', e: '--' }, { @@ -91,7 +91,7 @@ export default { a: 'test_3', b: 'illumina', c: 'ARS-UCD1.2', - d: '2587', + d: '2589', e: '--' }, { @@ -99,7 +99,7 @@ export default { a: 'test_4', b: 'illumina', c: 'ARS-UCD1.2', - d: '7854', + d: '4568', e: '--' }, { @@ -107,7 +107,7 @@ export default { a: 'test_5', b: 'illumina', c: 'ARS-UCD1.2', - d: '3354', + d: '2587', e: '--' }, { diff --git a/src/views/geneMgmt/sequence.vue b/src/views/geneMgmt/sequence.vue index fd86c4f..cb72e2a 100644 --- a/src/views/geneMgmt/sequence.vue +++ b/src/views/geneMgmt/sequence.vue @@ -81,7 +81,7 @@ export default { { id: 1, a: 'CX_82010000991', - b: '8.6MB', + b: '11.05MB', c: '2024-03-06', d: '西门塔尔', e: '已上传' @@ -89,7 +89,7 @@ export default { { id: 2, a: 'CX_82010000992', - b: '21.23MB', + b: '12.36MB', c: '2024-03-06', d: '华西牛', e: '已上传' @@ -97,7 +97,7 @@ export default { { id: 3, a: 'CX_82010000993', - b: '13.21MB', + b: '14.78MB', c: '2024-03-06', d: '西门塔尔', e: '已上传' @@ -105,13 +105,13 @@ export default { { id: 4, a: 'CX_82010000994', - b: '15.3MB', + b: '14.36MB', c: '2024-03-06', d: '西藏高山牦牛', e: '已上传' }, { - id: 3, + id: 5, a: 'CX_82010000995', b: '18.64MB', c: '2024-03-06', @@ -119,7 +119,7 @@ export default { e: '已上传' }, { - id: 3, + id: 6, a: 'CX_82010000996', b: '15.78MB', c: '2024-03-06', @@ -127,15 +127,15 @@ export default { e: '已上传' }, { - id: 3, + id: 7, a: 'CX_82010000997', - b: '13.58MB', + b: '13.85MB', c: '2024-03-06', d: '西门塔尔', e: '已上传' }, { - id: 3, + id: 8, a: 'CX_82010000998', b: '16.12MB', c: '2024-03-06', diff --git a/src/views/phylogeneticAnalysis/evolutionaryTree.vue b/src/views/phylogeneticAnalysis/evolutionaryTree.vue index 4e68499..81e538e 100644 --- a/src/views/phylogeneticAnalysis/evolutionaryTree.vue +++ b/src/views/phylogeneticAnalysis/evolutionaryTree.vue @@ -80,7 +80,7 @@ export default { a: '若尔盖', b: '82010000990', c: '45MB', - d: '2024.03.06', + d: '2024-03-06', e: 'PhyML' }, { @@ -88,7 +88,7 @@ export default { a: '若尔盖', b: '82010000991', c: '46MB', - d: '2024.03.06', + d: '2024-03-06', e: 'PhyML' }, { @@ -96,7 +96,7 @@ export default { a: '若尔盖', b: '82010000992', c: '56MB', - d: '2024.03.27', + d: '2024-03-06', e: 'PhyML' }, { @@ -104,7 +104,7 @@ export default { a: '若尔盖', b: '82010000993', c: '34MB', - d: '2024.08.02', + d: '2024-03-06', e: 'PhyML' }, { @@ -112,7 +112,7 @@ export default { a: '若尔盖', b: '82010000994', c: '29MB', - d: '2024.05.03', + d: '2024-03-06', e: 'PhyML' }, { @@ -120,7 +120,7 @@ export default { a: '若尔盖', b: '82010000995', c: '45MB', - d: '2024.04.23', + d: '2024-03-06', e: 'PhyML' }, { @@ -128,7 +128,7 @@ export default { a: '若尔盖', b: '82010000996', c: '68MB', - d: '2024.06.03', + d: '2024-03-06', e: 'PhyML' }, { @@ -136,7 +136,7 @@ export default { a: '若尔盖', b: '82010000997', c: '45MB', - d: '2024.06.03', + d: '2024-03-06', e: 'PhyML' }, { @@ -144,7 +144,7 @@ export default { a: '若尔盖', b: '82010000998', c: '47MB', - d: '2024.06.03', + d: '2024-03-06', e: 'PhyML' } ], diff --git a/src/views/variety-resources/pig-list.vue b/src/views/variety-resources/pig-list.vue index 24bd0a3..b734089 100644 --- a/src/views/variety-resources/pig-list.vue +++ b/src/views/variety-resources/pig-list.vue @@ -676,7 +676,7 @@ label="瘦肉率" label-class-name="my-label" content-class-name="my-content" - >45 + >46 Date: Tue, 3 Sep 2024 10:23:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/geneMgmt/SPNPanel.vue | 11 ++++------- src/views/phylogeneticAnalysis/evolutionaryTree.vue | 8 ++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/views/geneMgmt/SPNPanel.vue b/src/views/geneMgmt/SPNPanel.vue index 7fbe400..6bdddf0 100644 --- a/src/views/geneMgmt/SPNPanel.vue +++ b/src/views/geneMgmt/SPNPanel.vue @@ -10,14 +10,11 @@ size="mini" > - + @@ -66,8 +63,8 @@ export default { data() { return { searchForm: { - farm: '', - number: '' + a: '', + b: '' }, tableData: [ { diff --git a/src/views/phylogeneticAnalysis/evolutionaryTree.vue b/src/views/phylogeneticAnalysis/evolutionaryTree.vue index 4e68499..039946d 100644 --- a/src/views/phylogeneticAnalysis/evolutionaryTree.vue +++ b/src/views/phylogeneticAnalysis/evolutionaryTree.vue @@ -11,13 +11,13 @@ > @@ -71,8 +71,8 @@ export default { data() { return { searchForm: { - farm: '', - number: '' + a: '', + b: '' }, tableData: [ {