.

src/api/production.js

@@ -4,6 +4,8 @@ import { ajax } from "../sdk/ajax";
 /* 批次管理  Batch*/
 export const reqBatchList = (data) => ajax("post", "/farm-huyang/batch/list", data)
 
+export const reqSeedEweSheepList = (data) => ajax("post", "/farm-huyang/sheep/listForBatch", data)
+
 export const reqAddBatch = (data) => ajax("post", "/farm-huyang/batch/create", data)
 
 

src/views/breed/seedSheepFile.vue

@@ -109,11 +109,18 @@
                         </el-form-item>
 
                         <el-form-item label="当前位置">
-                            <el-input v-model="formData.position"></el-input>
+                            <el-select v-model="formData.position" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in $store.state['areaList']"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.name"
+                                ></el-option>
+                            </el-select>
                         </el-form-item>
 
                         <el-form-item label="当前状态">
-                            <el-select v-model="formData.status" placeholder="请选择">
+                            <el-select v-model="formData.status" filterable placeholder="请选择">
                                 <el-option
                                     v-for="item in $store.state['seedSheedStatus']"
                                     :key="item.value"
@@ -186,8 +193,8 @@ export default {
             formData: {
                 dayOfAge: "222",
                 source: 1,
-                position: "xx牧场",
-                status: 1,
+                position: "",
+                status: null,
                 cost: 3000,
                 weight: 48,
                 feeder: this.$store.state["workerList"][0].id,
@@ -203,6 +210,7 @@ export default {
             this.$refs[formName].validate(valid => {
                 if (valid) {
                     // 新增种羊档案
+                    this.formData.gender = this.sheepType
                     reqAddSeedSheepFile(this.formData)
                         .then(res => {
                             // 获取种羊档案列表
@@ -245,7 +253,6 @@ export default {
             this.isShow = true;
         },
         del(row) {
-            console.log(row);
             reqDelSeedSheepFile({ id: row.id })
                 .then(res => {
                     this.getSeedSheepList();
@@ -257,7 +264,6 @@ export default {
                 });
         },
         pageChange(p) {
-            console.log(p);
             this.page = p;
             this.getSeedSheepList();
         }

src/views/device/charts/EHHumidity.vue

@@ -20,7 +20,7 @@ export default {
             // 指定图表的配置项和数据
             let option = {
                 title: {
-                    text: "温度-小时折线表",
+                    text: "湿度-小时折线表",
                     left: "center",
                     bottom: 0
                 },
@@ -36,14 +36,14 @@ export default {
                 yAxis: {
                     type: "value",
                     axisLabel: {
-                        formatter: "{value} °C"
+                        formatter: "{value} %"
                     },
                     scale: true
                 },
                 series: [
                     {
-                        name: '最高气温',
-                        data: [28, 27, 27.2, 27, 27.5, 28, 28, 29, 32, 37.8, 32, 29, 28.8],
+                        name: '湿度',
+                        data: [66, 68, 67.2, 64, 60.5, 68, 67, 67.5, 63.8, 64.8, 67, 62, 67.8],
                         type: "line",
                         markPoint: {
                             data: [

src/views/device/charts/EHT.vue

@@ -42,7 +42,7 @@ export default {
                 },
                 series: [
                     {
-                        name: '最高气温',
+                        name: '温度',
                         data: [28, 27, 27.2, 27, 27.5, 28, 28, 29, 32, 37.8, 32, 29, 28.8],
                         type: "line",
                         markPoint: {

src/views/file.vue

@@ -0,0 +1,16 @@
+<template>
+    <div>
+        <el-form>
+            <el-form-item label="当前位置">
+                <el-select v-model="formData.position" filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in $store.state['areaList']"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.name"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>

src/views/production/batch.vue

@@ -63,12 +63,14 @@
 
             <article v-show="btnFlag==2">
                 <el-table
+                    ref="multipleTableCreateBatch"
                     :data="tableData_2"
                     tooltip-effect="dark"
                     style="width: 100%"
                     @selection-change="handleSelectionChange"
+                    :row-key="getRowKeys"
                 >
-                    <el-table-column type="selection" width="55"></el-table-column>
+                    <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 label="入场时间" width="200">
                         <template v-slot="scope">
@@ -113,8 +115,9 @@
 
                 <el-row type="flex" justify="end" style="margin-top: 20px">
                     <el-col :span="14">
+                        <el-button @click="toggleSelection()">取消选择</el-button>
                         <el-button type="primary" plain @click="add">
-                            生产批次
+                            生成批次
                             <i class="el-icon-arrow-right el-icon--right"></i>
                         </el-button>
                     </el-col>
@@ -130,7 +133,7 @@
             </article>
         </section>
 
-        <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
+        <el-dialog title="生成批次" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addBatch" :model="formData" :rules="rules" label-width="140px">
@@ -146,7 +149,7 @@
                         </el-form-item>
                         <el-form-item>
                             <el-button @click="isShow=false">取 消</el-button>
-                            <el-button type="primary" @click="submitForm('addBatch')">保 存</el-button>
+                            <el-button type="primary" @click="submitForm('addBatch')">生 成</el-button>
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -156,8 +159,7 @@
 </template>
 
 <script>
-import { reqBatchList, reqAddBatch } from "@/api/production.js";
-import { reqSeedSheepList } from "@/api/breed.js";
+import { reqBatchList, reqAddBatch, reqSeedEweSheepList } from "@/api/production.js";
 
 const pageSize = 10;
 const rules = {};
@@ -181,6 +183,9 @@ export default {
                 feeder: null
             },
             multipleSelection: [],
+            getRowKeys(row) {
+                return row.id;
+            },
             rules
         };
     },
@@ -202,14 +207,14 @@ export default {
                             this.getBatchList();
                             // 获取种羊档案列表
                             this.getSeedSheepList();
-                            this.$message.success("成功！");
+                            this.$message.success("成功11！");
                             // 清空选项
                             this.toggleSelection();
                             this.isShow = false;
                         })
                         .catch(err => {
                             console.log(err);
-                            this.$message.error("失败！");
+                            this.$message.error("失败22！");
                         });
                 } else {
                     return false;
@@ -233,7 +238,7 @@ export default {
         },
         // 获取种羊档案列表
         getSeedSheepList() {
-            reqSeedSheepList({
+            reqSeedEweSheepList({
                 searchStr: this.search_2,
                 pageSize,
                 pageNum: this.pageNum_2
@@ -253,10 +258,10 @@ export default {
         toggleSelection(rows) {
             if (rows) {
                 rows.forEach(row => {
-                    this.$refs.multipleTable.toggleRowSelection(row);
+                    this.$refs.multipleTableCreateBatch.toggleRowSelection(row);
                 });
             } else {
-                this.$refs.multipleTable.clearSelection();
+                this.$refs.multipleTableCreateBatch.clearSelection();
             }
         },
         // 创建批次

src/views/production/shiftField.vue

@@ -16,11 +16,7 @@
         </header>
         <section>
             <article class="table">
-                <el-table
-                    :data="tableData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                >
+                <el-table :data="tableData" tooltip-effect="dark" style="width: 100%">
                     <el-table-column prop="id" label="序号"></el-table-column>
                     <el-table-column label="转舍时间">
                         <template v-slot="scope">
@@ -34,7 +30,9 @@
                     <el-table-column label="执行人">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['workerList']" :key="item.value">
-                                <span v-if="item.id == scope.row['opeUser']">{{ `${item.name}(${item.position})` }}</span>
+                                <span
+                                    v-if="item.id == scope.row['opeUser']"
+                                >{{ `${item.name}(${item.position})` }}</span>
                             </div>
                         </template>
                     </el-table-column>
@@ -57,7 +55,12 @@
         <el-dialog title="新增/编辑" :visible.sync="isShow" width="40%">
             <el-row type="flex">
                 <el-col :span="20">
-                    <el-form ref="addShiftField" :model="formData" :rules="rules" label-width="140px">
+                    <el-form
+                        ref="addShiftField"
+                        :model="formData"
+                        :rules="rules"
+                        label-width="140px"
+                    >
                         <el-form-item label="转舍时间">
                             <el-date-picker
                                 v-model="formData.created"
@@ -77,10 +80,24 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="转出位置">
-                            <el-input v-model="formData.fromBuilding"></el-input>
+                            <el-select v-model="formData.fromBuilding" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in $store.state['areaList']"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.name"
+                                ></el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="转入位置">
-                            <el-input v-model="formData.toBuilding"></el-input>
+                            <el-select v-model="formData.toBuilding" filterable placeholder="请选择">
+                                <el-option
+                                    v-for="item in $store.state['areaList']"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.name"
+                                ></el-option>
+                            </el-select>
                         </el-form-item>
                         <el-form-item label="执行人">
                             <el-select v-model="formData.opeUser" filterable placeholder="请选择">
@@ -107,10 +124,7 @@
 </template>
 
 <script>
-import {
-    reqShiftFieldList,
-    reqAddShiftField
-} from "@/api/production.js";
+import { reqShiftFieldList, reqAddShiftField } from "@/api/production.js";
 
 const pageSize = 10;
 const rules = {};
@@ -125,7 +139,7 @@ export default {
             totalPages: 0,
             isShow: false,
             formData: {
-                created: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
+                created: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
                 batchNo: "",
                 fromBuilding: "种猪舍",
                 toBuilding: "育肥舍",