Browse Source

种羊档案完成

linan 4 years ago
parent
commit
0366f6e6f4

+ 6 - 0
src/api/antiepidemic.js

@@ -0,0 +1,6 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
+

+ 11 - 0
src/api/breed.js

@@ -0,0 +1,11 @@
+import { ajax } from "../sdk/ajax";
+
+/* seedSheepFile import { reqSeedSheepList } from '@/api/breed.js' */
+// 获取种羊档案
+export const reqSeedSheepList = (data) => ajax("post", "/farm-huyang/sheep/list", data)
+
+// 新增种羊档案
+export const reqAddSeedSheepFile = (data) => ajax("post", "/farm-huyang/sheep/add", data)
+
+// 删除种羊档案
+export const reqDelSeedSheepFile = (data) => ajax("post", "/farm-huyang/sheep/delete", data)

+ 6 - 0
src/api/cultivateSeed.js

@@ -0,0 +1,6 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
+

+ 5 - 0
src/api/device.js

@@ -0,0 +1,5 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)

+ 6 - 0
src/api/fileInfo.js

@@ -0,0 +1,6 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
+

+ 5 - 0
src/api/harmless.js

@@ -0,0 +1,5 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)

+ 6 - 0
src/api/material.js

@@ -0,0 +1,6 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
+

+ 6 - 0
src/api/production.js

@@ -0,0 +1,6 @@
+import { ajax } from "../sdk/ajax";
+
+
+/* 登录 */
+export const reqLogin = (data) => ajax("post", "/core/auth/login", data)
+

+ 4 - 1
src/store/index.js

@@ -1,12 +1,15 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+// [ seedSheedSource, seedSheedLevel, seedSheedStatus ]
+import publicType from './publicType.js' // 公共的类型 
 
 Vue.use(Vuex)
 
 export default new Vuex.Store({
 	strict: true,
 	state: {
-		token: localStorage.getItem("token")
+		token: localStorage.getItem("token"),
+		...publicType
 	},
 	getters: {
 		token: state => state.token,

+ 27 - 0
src/store/publicType.js

@@ -0,0 +1,27 @@
+// 种羊来源 类型
+const seedSheedSource = [
+    {label: "本场出生", value: 1},
+    {label: "它场转入", value: 2}
+]
+
+// 种羊等级
+const seedSheedLevel = [
+    {label: "甲", value: 1},
+    {label: "乙", value: 2},
+    {label: "丙", value: 3},
+    {label: "丁", value: 4}
+]
+
+// 种羊状态
+const seedSheedStatus = [
+    {label: "后备", value: 1},
+    {label: "采精", value: 2},
+    {label: "查情", value: 3},
+    {label: "配种", value: 4},
+    {label: "妊检", value: 5},
+    {label: "分娩", value: 6},
+    {label: "断奶", value: 7},
+    {label: "淘汰", value: 8}
+]
+
+export default {seedSheedSource, seedSheedLevel, seedSheedStatus}

+ 6 - 6
src/views/Home/Home.vue

@@ -2,7 +2,7 @@
     <div class="home">
         <header class="header">
             <div class="left">
-                慧牧科技 
+                湖羊生产管理 
                 <el-button
                     @click="onMenuCollapse"
                     circle
@@ -49,9 +49,9 @@
                         :unique-opened="true"
                         :default-openeds="defaultUnfoldedMenu"
                         select="1-1"
-                        background-color="rgba(40,44,52)"
-                        text-color="#ddd"
-                        active-text-color="#ff4121"
+                        background-color="#545c64"
+                        text-color="#fff"
+                        active-text-color="#ffd04b"
                     >
                         <div v-for="(item) in menuData " :key="item.index">
                             <el-submenu
@@ -159,7 +159,7 @@ export default {
     display: flex;
     flex-direction: column;
     >.header {
-        background-color: rgb(48, 57, 75);
+        background-color: #4b545e;
         height: 40px;
         padding: 10px 20px;
         margin-bottom: 5px;
@@ -190,7 +190,7 @@ export default {
             box-sizing: border-box;
             .col1 {
                 margin-right: 5px;
-                background-color: rgb(40,44,52);
+                background-color: #545c64;
                 // background-image: linear-gradient(to bottom, rgb(85, 70, 148) , rgb(41, 33, 85), rgb(41, 33, 85));
             }
             .col2 {

+ 2 - 1
src/views/antiepidemic/illnessLog.vue

@@ -1,8 +1,9 @@
 <template>
     <!-- 静态  疾病登记  illnessLog-->
     <div class="illnessLog">
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">疾病登记</h2>
         <header id="header">
-            疾病登记
+            
             <el-row type="flex">
                 <el-col :span="4">
                     <el-select v-model="value" placeholder="请选择">

+ 3 - 5
src/views/antiepidemic/immuneLog.vue

@@ -1,14 +1,12 @@
 <template>
     <!-- 静态  免疫记录  immuneLog-->
     <div class="immuneLog">
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">免疫记录</h2>
+
         <header id="header">
-            免疫记录
             <el-row type="flex">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"></el-input>
                 </el-col>
                 <el-col :span="4">
                     <el-select v-model="value" placeholder="请选择">

+ 3 - 1
src/views/antiepidemic/immunePlan.vue

@@ -1,8 +1,10 @@
 <template>
     <!-- 静态  免疫计划  immunePlan-->
     <div class="immunePlan">
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">免疫计划</h2>
+
         <header id="header">
-            免疫计划
+            
             <el-row type="flex">
                 <el-col :span="4">
                     <el-select v-model="value" placeholder="请选择">

+ 2 - 1
src/views/antiepidemic/immuneProce.vue

@@ -1,8 +1,9 @@
 <template>
     <!-- 静态  免疫程序  immuneProce-->
     <div class="immuneProce">
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">免疫程序</h2>
         <header id="header">
-            免疫程序
+            
             <el-row type="flex">
                 <el-col :span="4">
                     <el-select v-model="value" placeholder="请选择">

+ 2 - 23
src/views/breed/collectSeedLog.vue

@@ -2,25 +2,9 @@
     <div class="collectSeedLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">采精记录</h2>
         <header id="header">
-            
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -37,7 +21,6 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
                     <el-table-column prop="a" label="种母羊编码"></el-table-column>
                     <el-table-column prop="b" label="入场时间"></el-table-column>
@@ -130,16 +113,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 2 - 22
src/views/breed/matingLog.vue

@@ -2,24 +2,9 @@
     <div class="matingLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">配种记录</h2>
         <header id="header">
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -36,7 +21,6 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
                     <el-table-column prop="a" label="种母羊编码"></el-table-column>
                     <el-table-column prop="b" label="查情时间"></el-table-column>
@@ -123,16 +107,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 2 - 23
src/views/breed/matingSuccLog.vue

@@ -2,25 +2,9 @@
     <div class="matingSuccLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">查情记录</h2>
         <header id="header">
-            
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -37,7 +21,6 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
                     <el-table-column prop="a" label="种母羊编码"></el-table-column>
                     <el-table-column prop="b" label="查情时间"></el-table-column>
@@ -127,16 +110,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 2 - 39
src/views/breed/offFieldLog.vue

@@ -2,24 +2,9 @@
     <div class="offFieldLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">离场记录</h2>
         <header id="header">
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -36,9 +21,7 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
-                    <el-table-column type="selection" width="55"></el-table-column>
                     <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>
@@ -55,11 +38,6 @@
                         </template>
                     </el-table-column> -->
                 </el-table>
-                <div style="margin-top: 20px">
-                    <el-button @click="toggleSelection([tableData[1], tableData[2]])">切换第二、第三行的选中状态</el-button>
-                    <el-button @click="toggleSelection()">取消选择</el-button>
-                    <el-button @click="inStore">入待宰栏</el-button>
-                </div>
 
                 <el-row type="flex" justify="end">
                     <el-col :span="8" class="pagination">
@@ -133,27 +111,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        toggleSelection(rows) {
-            if (rows) {
-                rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
-                });
-            } else {
-                this.$refs.multipleTable.clearSelection();
-            }
-        },
-        // 入待宰栏
-        inStore() {},
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 2 - 17
src/views/breed/parturitionLog.vue

@@ -2,24 +2,9 @@
     <div class="parturitionLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">分娩记录</h2>
         <header id="header">
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>

+ 2 - 18
src/views/breed/pregnancyTestLog.vue

@@ -2,25 +2,9 @@
     <div class="pregnancyTestLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">断奶信息</h2>
         <header id="header">
-            
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>

+ 185 - 92
src/views/breed/seedSheepFile.vue

@@ -2,31 +2,15 @@
     <div class="seedSheepFile">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">种羊档案</h2>
         <header id="header">
-            
-            <el-row type="flex">
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
+                    <el-input v-model="searchStr" placeholder="请选择"></el-input>
                 </el-col>
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-button type="primary" @click="getSeedSheepList">查找</el-button>
                 </el-col>
                 <el-col :span="4">
-                    <el-button type="primary">查找</el-button>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">新增</el-button>
+                    <el-button type="primary" @click="add">新增档案</el-button>
                 </el-col>
             </el-row>
         </header>
@@ -37,25 +21,42 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
-                    <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 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="体重"></el-table-column>
-                    <el-table-column prop="g" label="饲养员"></el-table-column>
-                    <el-table-column prop="g" label="等级评级"></el-table-column>
-                    <!-- <el-table-column label="操作" width="150">
+                    <el-table-column prop="id" label="种母羊编码" width="100"></el-table-column>
+                    <el-table-column prop="created" label="入场时间" width="200"></el-table-column>
+                    <el-table-column prop="dayOfAge" label="入场日龄"></el-table-column>
+                    <el-table-column label="种羊来源">
+                        <template slot-scope="scope">
+                            <div v-for="item in $store.state['seedSheedSource']" :key="item.value">
+                                <span v-if="item.value == scope.row['source']">{{ item.label }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="position" label="当前位置"></el-table-column>
+                    <el-table-column label="当前状态">
+                        <template slot-scope="scope">
+                            <div v-for="item in $store.state['seedSheedStatus']" :key="item.value">
+                                <span v-if="item.value == scope.row['status']">{{ item.label }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="cost" label="成本价格(元)"></el-table-column>
+                    <el-table-column prop="weight" label="体重(kg)"></el-table-column>
+                    <el-table-column prop="feederName" label="饲养员"></el-table-column>
+                    <el-table-column label="等级评级">
+                        <template slot-scope="scope">
+                            <div v-for="item in $store.state['seedSheedLevel']" :key="item.value">
+                                <span v-if="item.value == scope.row['level']">{{ item.label }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="150">
                         <template slot-scope="scope">
-                            <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
                             <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">
                                 <el-button slot="reference" type="text" size="small">删除</el-button>
                             </el-popconfirm>
                         </template>
-                    </el-table-column> -->
+                    </el-table-column>
                 </el-table>
 
                 <el-row type="flex" justify="end">
@@ -64,86 +65,178 @@
                             @current-change="pageChange"
                             background
                             layout="prev, pager, next"
-                            :page-count="10"
+                            :page-count="Number(totalPages)"
                         ></el-pagination>
                     </el-col>
                 </el-row>
             </article>
         </section>
+
+        <el-dialog title="新增种羊档案" :visible.sync="isShow" width="45%">
+            <el-row type="flex">
+                <el-col :span="15">
+                    <el-form
+                        ref="addSeedSheepForm"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
+                        <el-form-item label="日龄">
+                            <el-input v-model="formData.dayOfAge"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="种羊来源">
+                            <el-radio-group v-model="formData.source">
+                                <el-radio
+                                    v-for="item in $store.state['seedSheedSource']"
+                                    :key="item.value"
+                                    :label="item.value"
+                                >{{ item.label }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+
+                        <el-form-item label="当前位置">
+                            <el-input v-model="formData.position"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="当前状态">
+                            <el-select v-model="formData.status" placeholder="请选择">
+                                <el-option
+                                    v-for="item in $store.state['seedSheedStatus']"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+
+                        <el-form-item label="成本价格(元)">
+                            <el-input v-model="formData.cost"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="体重(kg)">
+                            <el-input v-model="formData.weight"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="饲养员">
+                            <el-select v-model="formData.feeder" placeholder="请选择">
+                                <el-option label="甲" :value="90003"></el-option>
+                                <el-option label="乙" :value="2"></el-option>
+                                <el-option label="丙" :value="3"></el-option>
+                                <el-option label="丁" :value="4"></el-option>
+                            </el-select>
+                        </el-form-item>
+
+                        <el-form-item label="等级评级">
+                            <el-radio-group v-model="formData.level">
+                                <el-radio
+                                    v-for="item in $store.state['seedSheedLevel']"
+                                    :key="item.value"
+                                    :label="item.value"
+                                >{{ item.label }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <el-button @click="isShow=false">取 消</el-button>
+                            <el-button type="primary" @click="submitForm('addSeedSheepForm')">保 存</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+import {
+    reqSeedSheepList,
+    reqAddSeedSheepFile,
+    reqDelSeedSheepFile
+} from "@/api/breed.js";
 
-const pageSize = 10
-const tableData = [
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "带骨羊前腿",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "胴体",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                {
-                    a: "15463",
-                    b: "羔羊肉卷",
-                    c: "2020-07-14",
-                    d: "49kg",
-                    e: "48kg",
-                    f: "1.6%",
-                    g: "张小刚",
-                },
-                
-                
-            ]
+const pageSize = 10;
+const rules = {};
 
 export default {
     data() {
         return {
-            value: "",
-            multipleSelection: [],
             page: 1,
-            tableData
+            searchStr: "",
+            tableData: [],
+            totalPages: "",
+            isShow: false,
+            rules,
+            formData: {
+                dayOfAge: "222",
+                source: 1,
+                position: "xx牧场",
+                status: 1,
+                cost: 3000,
+                weight: 48,
+                feeder: 90003,
+                level: 1
+            }
         };
     },
-    created() {},
+    created() {
+        this.getSeedSheepList();
+    },
     methods: {
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
+        submitForm(formName) {
+            this.$refs[formName].validate(valid => {
+                if (valid) {
+                    // 新增种羊档案
+                    reqAddSeedSheepFile(this.formData)
+                        .then(res => {
+                            // 获取种羊档案列表
+                            this.getSeedSheepList();
+                            this.$message.success("新增种羊档案成功!");
+                        })
+                        .catch(err => {
+                            console.log(err);
+                            this.$message.error("新增种羊档案失败!");
+                        });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 获取种羊档案列表
+        getSeedSheepList() {
+            reqSeedSheepList({
+                pageNum: this.page,
+                pageSize,
+                searchStr: this.searchStr
+            })
+                .then(res => {
+                    this.tableData = res.content;
+                    this.totalPages = res.totalPages;
+                })
+                .catch(err => {
+                    console.log(err);
+                });
+        },
+
+        add() {
+            this.isShow = true;
+        },
+        del(row) {
+            console.log(row);
+            reqDelSeedSheepFile({ id: row.id })
+                .then(res => {
+                    this.getSeedSheepList();
+                    this.$message.success("删除种羊档案成功!");
+                })
+                .catch(err => {
+                    console.log(err);
+                    this.$message.error("删除种羊档案失败!");
+                });
         },
-        edit(row) {},
-        del(row) {},
         pageChange(p) {
             console.log(p);
+            this.page = p;
+            this.getSeedSheepList();
         }
     }
 };

+ 2 - 39
src/views/breed/shiftFieldLog.vue

@@ -2,24 +2,9 @@
     <div class="shiftFieldLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">转舍记录</h2>
         <header id="header">
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -36,9 +21,7 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
-                    <el-table-column type="selection" width="55"></el-table-column>
                     <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>
@@ -55,11 +38,6 @@
                         </template>
                     </el-table-column> -->
                 </el-table>
-                <div style="margin-top: 20px">
-                    <el-button @click="toggleSelection([tableData[1], tableData[2]])">切换第二、第三行的选中状态</el-button>
-                    <el-button @click="toggleSelection()">取消选择</el-button>
-                    <el-button @click="inStore">入待宰栏</el-button>
-                </div>
 
                 <el-row type="flex" justify="end">
                     <el-col :span="8" class="pagination">
@@ -133,27 +111,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        toggleSelection(rows) {
-            if (rows) {
-                rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
-                });
-            } else {
-                this.$refs.multipleTable.clearSelection();
-            }
-        },
-        // 入待宰栏
-        inStore() {},
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 2 - 23
src/views/breed/weaningLog.vue

@@ -2,24 +2,9 @@
     <div class="weaningLog">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">断奶信息</h2>
         <header id="header">
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -36,9 +21,7 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
-                    <el-table-column type="selection" width="55"></el-table-column>
                     <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>
@@ -129,16 +112,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 2 - 38
src/views/fileInfo/areaInfo.vue

@@ -2,24 +2,9 @@
     <div class="areaInfo">
         <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">栋舍信息</h2>
         <header id="header">
-            <el-row type="flex">
+            <el-row type="flex" :gutter="20">
                 <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
+                    <el-input v-model="value" placeholder="请选择"/>
                 </el-col>
                 <el-col :span="4">
                     <el-button type="primary">查找</el-button>
@@ -36,7 +21,6 @@
                     :data="tableData"
                     tooltip-effect="dark"
                     style="width: 100%"
-                    @selection-change="handleSelectionChange"
                 >
                     <el-table-column type="selection" width="55"></el-table-column>
                     <el-table-column prop="a" label="屠宰批次"></el-table-column>
@@ -55,11 +39,6 @@
                         </template>
                     </el-table-column> -->
                 </el-table>
-                <div style="margin-top: 20px">
-                    <el-button @click="toggleSelection([tableData[1], tableData[2]])">切换第二、第三行的选中状态</el-button>
-                    <el-button @click="toggleSelection()">取消选择</el-button>
-                    <el-button @click="inStore">入待宰栏</el-button>
-                </div>
 
                 <el-row type="flex" justify="end">
                     <el-col :span="8" class="pagination">
@@ -133,27 +112,12 @@ export default {
     data() {
         return {
             value: "",
-            multipleSelection: [],
             page: 1,
             tableData
         };
     },
     created() {},
     methods: {
-        toggleSelection(rows) {
-            if (rows) {
-                rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
-                });
-            } else {
-                this.$refs.multipleTable.clearSelection();
-            }
-        },
-        // 入待宰栏
-        inStore() {},
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
         edit(row) {},
         del(row) {},
         pageChange(p) {

+ 0 - 2
src/views/fileInfo/workerInfo.vue

@@ -122,8 +122,6 @@ const tableData = [
                     f: "1.6%",
                     g: "张小刚",
                 },
-                
-                
             ]
 
 export default {

+ 58 - 84
src/views/template/Aa.vue

@@ -1,104 +1,78 @@
 <template>
-<!-- 静态  -->
+    <!--  dialog 实例 -->
     <div class="GroupRecord">
-        <header id="header">
+        <el-dialog title="新增种羊档案" :visible.sync="isShow" width="30%">
             <el-row type="flex">
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1区" value="11"></el-option>
-                        <el-option label="2区" value="22"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="1舍" value="13"></el-option>
-                        <el-option label="2舍" value="24"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-select v-model="value" placeholder="请选择">
-                        <el-option label="可用" value="15"></el-option>
-                        <el-option label="可用" value="26"></el-option>
-                    </el-select>
-                </el-col>
-                <el-col :span="4">
-                    <el-button type="primary">查找</el-button>
+                <el-col :span="14">
+                    <el-form
+                        ref="addSeedSheepForm"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
+                        <el-form-item label="日龄" prop="nodeName">
+                            <el-input v-model="formData.dayOfAge"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="配置信息:" prop="meta">
+                            <el-input
+                                v-model="formData.meta"
+                                type="textarea"
+                                placeholder="请输入内容,JSON格式"
+                                :autosize="{ minRows: 4 }"
+                            ></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="aaa" prop="code">
+                            <el-select v-model="formData.s" placeholder="请选择">
+                                <el-option label="甲" :value="1"></el-option>
+                                <el-option label="乙" :value="2"></el-option>
+                                <el-option label="丙" :value="3"></el-option>
+                                <el-option label="丁" :value="4"></el-option>
+                            </el-select>
+                        </el-form-item>
+
+                        <el-form-item label="等级评级">
+                            <el-radio-group v-model="formData.a">
+                                <el-radio :label="1">备选项</el-radio>
+                                <el-radio :label="2">备选项</el-radio>
+                                <el-radio :label="3">备选项</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <el-button @click="isShow=false">取 消</el-button>
+                            <el-button type="primary" @click="submitForm('addSeedSheepForm')">保 存</el-button>
+                        </el-form-item>
+                    </el-form>
                 </el-col>
             </el-row>
-        </header>
-        <section>
-            <article class="table">
-                <el-table :data="tableData" border style="width: 100%">
-                    <el-table-column prop="date" sortable label="日期" width="180"></el-table-column>
-                    <el-table-column prop="id" sortable label="猪编号" width="180"></el-table-column>
-                    <el-table-column prop="name" label="状态" width="180"></el-table-column>
-                    <el-table-column prop="address" label="耳标号"></el-table-column>
-                    <el-table-column label="操作" width="150">
-                        <template slot-scope="scope">
-                            <el-button @click="look(scope.row)" type="text" size="small">查看</el-button>
-                            <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
-                            <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">
-                                <el-button slot="reference" type="text" size="small">删除</el-button>
-                            </el-popconfirm>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <el-row type="flex" justify="end">
-                    <el-col :span="8" class="pagination">
-                        <el-pagination
-                            @current-change="pageChange"
-                            background
-                            layout="prev, pager, next"
-                            :page-count="10"
-                        ></el-pagination>
-                    </el-col>
-                </el-row>
-            </article>
-        </section>
+        </el-dialog>
     </div>
 </template>
 
 <script>
+const rules = {};
 export default {
     data() {
         return {
-            value: "",
-            tableData: [
-                {
-                    date: "2020-05-02",
-                    name: "可用",
-                    id: '825',
-                    address: "6895564457554"
-                },
-                {
-                    date: "2020-05-04",
-                    name: "不可用",
-                    id: '826',
-                    address: "6895564456725"
-                },
-                {
-                    date: "2020-05-03",
-                    name: "可用",
-                    id: '830',
-                    address: "6895564457594"
-                }
-            ]
+            isShow: true,
+            formData: {},
+            rules
         };
     },
     created() {},
     methods: {
-        look(row) {
-            console.log(row)
-            this.$router.push({
-                path: 'UnityTrace',
-                query: row
-            })
+        submitForm(formName) {
+            this.$refs[formName].validate(valid => {
+                if (valid) {
+                    alert("submit!");
+                } else {
+                    console.log("error submit!!");
+                    return false;
+                }
+            });
         },
-        edit(row) {},
-        del(row) {},
-        pageChange(p) {
-            console.log(p)
-        }
     }
 };
 </script>