.

src/api/cultivateSeed.js

@@ -10,5 +10,5 @@ export const reqClanInfo = (data) => ajax("post", "/farm-huyang/sheep/genealogy"
 
 
 /* 虚拟配种 VirtualMating */
-export const reqVirtualMatingList = (data) => ajax("post", "/farm-huyang/sheep/genealogy", data)
+export const reqVirtualMatingList = (id) => ajax("post", "/farm-huyang/sheep/breeding", {id})
 

src/views/cultivateSeed/sub/virtualMating.vue

@@ -16,37 +16,34 @@
                     style="width: 100%; margin-top: 20px"
                 >
                     <el-table-column label="母羊编号" width="300" align="center">
-                        <template #default="scope">
-                            <h2 style="color: #333">{{ scope.row.id }}</h2>
+                        <template #default>
+                            <h2 style="color: #333">{{ $route.query.id }}</h2>
                         </template>
                     </el-table-column>
-                    <el-table-column label="母羊编号" width="300" align="center">
-                        <template #default="scope">
-                            <h2 style="color: #333">{{ scope.row.name }}</h2>
+                    <el-table-column label="母羊级别" width="300" align="center">
+                        <template #default>
+                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
+                                <h2 style="color: #333" v-if="item.value == $route.query.level">{{ item.label }}</h2>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="id" label="公羊编号" align="center"></el-table-column>
+                    <el-table-column prop="amount2" label="公羊级别" align="center">
+                        <template v-slot="scope">
+                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
+                                <el-tag v-if="item.value == scope.row['level']">{{ item.label }}</el-tag>
+                            </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="amount1" label="公羊编号" align="center"></el-table-column>
-                    <el-table-column prop="amount2" label="公羊级别" align="center"></el-table-column>
-                    <el-table-column prop="amount3" label="特性一" align="center"></el-table-column>
-                    <el-table-column prop="amount3" label="特性二" align="center"></el-table-column>
-                    <el-table-column prop="amount3" label="特性三" align="center"></el-table-column>
-                    <el-table-column prop="amount3" label="评分" align="center" sortable>
+                    <el-table-column prop="birthWeight" label="出生体重(kg)" align="center"></el-table-column>
+                    <el-table-column prop="twelveWeight" label="十二月体重(kg)" align="center"></el-table-column>
+                    <el-table-column prop="grade" label="评分" align="center" sortable>
                         <template v-slot="scope">
-                            <span style="color:#409EFF">{{ scope.row['amount3'] }}</span>
+                            <span style="color:#409EFF">{{ scope.row['grade'] }}</span>
                         </template>
                     </el-table-column>
                 </el-table>
 
-                <el-row type="flex" justify="end" style="margin-top: 30px;">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :page-count="totalPages"
-                        ></el-pagination>
-                    </el-col>
-                </el-row>
             </article>
         </section>
     </div>
@@ -55,7 +52,7 @@
 <script>
 import { reqVirtualMatingList } from "@/api/cultivateSeed.js";
 
-const pageSize = 15;
+let pageSize = 15;
 const tableData = [
     {
         id: "12987121",
@@ -171,27 +168,26 @@ export default {
             multipleSelection: [],
             pageNum: 1,
             tableData,
-            totalPages: 1
         };
     },
     created() {
-        // if(!this.$route.query.id) {
-        //     this.$router.replace('/home/gradeAssess')
-        //     this.message.warning("静止非法跳转链接！");
-        // }
+        if(!this.$route.query.id) {
+            this.$router.replace('/home/gradeAssess')
+            this.message.warning("静止非法跳转链接！");
+        }
         this.getVirtualMatingList();
     },
     methods: {
         // 虚拟配种列表
         getVirtualMatingList() {
-            reqVirtualMatingList({
-                searchStr: this.search,
-                pageSize,
-                pageNum: this.pageNum
-            })
+            reqVirtualMatingList(this.$route.query.id)
                 .then(res => {
-                    // this.tableData = res.content;
-                    this.totalPages = res.totalPages;
+                    let tableData = []
+                    Object.keys(res.male).forEach(item => {
+                        tableData.push({...res.male[item], grade: item})
+                    })
+                    pageSize = tableData.length
+                    this.tableData = tableData
                 })
                 .catch(err => {
                     console.log(err);
@@ -222,10 +218,6 @@ export default {
                 }
             }
         },
-        pageChange(p) {
-            this.pageNum = p
-            this.getVirtualMatingList();
-        }
     }
 };
 </script>

src/views/production/batch.vue

@@ -71,7 +71,7 @@
                     :row-key="getRowKeys"
                 >
                     <el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
-                    <el-table-column prop="id" label="种母羊编码" width="100"></el-table-column>
+                    <el-table-column prop="id" label="羊编码" width="100"></el-table-column>
                     <el-table-column label="入场时间" width="200">
                         <template v-slot="scope">
                             <span>{{ scope.row['entryTime'].substr(0,10) }}</span>