.

src/api/deliveryRoomManagement.js

@@ -1,9 +1,5 @@
-import { ajaxTest, ajax } from "../sdk/ajax";
-// 以后根地址统一 删掉这句就行
+import { ajax } from "../sdk/ajax";
+// 产床管理
 
-/* 个体数据 */
-export const reqDeliveryRoomInfo = (data) => ajaxTest("get", "/api/statistic", data)
-
-export const reqUpload = (data) => ajax("get", "/publics/proxy/piggy", data)
-
-export const reqImglist = () => ajax("get", "/analyse/upload/piglet-images")
+/* 产房信息 DeliveryRoom*/
+export const reqDeliveryRoom = (data) => ajax("post", "/farm-piglet/table/list", data)

src/api/infoInform.js

@@ -1,6 +1,10 @@
 import { ajax } from "../sdk/ajax";
 // 消息通知
 
+/* 生产预警  ProductionWarn */
+export const reqProductionWarnList = () => ajax("post", "/farm-piglet/production-warning/list")
+
+
 /* 设备故障  DvFault == DeviceFault*/
 export const reqDvFaultList = (data) => ajax("post", "/farm-huyang/device/list", data)
 

src/store/publicType.js

@@ -7,13 +7,21 @@ const deviceType = [
 
 // 设备状态  
 const deviceStatus = [
-    { label: "正常工作", value: 1 },
-    { label: "暂停使用", value: 2 },
+    { label: "暂停使用", value: 1 },
+    { label: "正常工作", value: 2 },
     { label: "故障", value: 3 }
 ]
 
+// 产床状态  
+const obstetricTableStatus = [
+    { label: "空床", value: 1 },
+    { label: "进床", value: 2 },
+    { label: "哺乳", value: 3 },
+    { label: "断奶", value: 4 }
+]
+
 export default {
-    deviceType, deviceStatus
+    deviceType, deviceStatus, obstetricTableStatus
 }
 
 

src/views/deliveryRoomManagement/DeliveryRoom.vue

@@ -1,19 +1,19 @@
 <template>
     <div class="deliveryRoom">
-        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">厂房信息</h2>
+        <h2 style="margin-bottom: 20px;padding-bottom:7px;border-bottom:2px solid #ddd">产床信息</h2>
         <header style="margin-bottom:20px">
             <el-row type="flex" :gutter="20" align="middle">
                 <el-col :span="3">
-                    <el-input v-model="S_form.area" placeholder="请输入产床号"></el-input>
+                    <el-input v-model="S_form.searchStr" placeholder="请输入产床号"></el-input>
                 </el-col>
                 <el-col :span="3">
-                    <el-select v-model="S_form.area" placeholder="请选择栋舍">
+                    <el-select v-model="S_form.building" placeholder="请选择栋舍">
                         <el-option label="选项一" :value="1"></el-option>
                         <el-option label="选项二" :value="1"></el-option>
                     </el-select>
                 </el-col>
                 <el-col :span="3">
-                    <el-select v-model="S_form.area" placeholder="请选择产房">
+                    <el-select v-model="S_form.house " placeholder="请选择产房">
                         <el-option label="选项一" :value="1"></el-option>
                         <el-option label="选项二" :value="1"></el-option>
                     </el-select>
@@ -21,12 +21,71 @@
                 <el-col :span="2">
                     <el-button type="primary" @click="getBasicsInfoList">查找</el-button>
                 </el-col>
-                <el-col :span="2">
-                    <el-button type="primary" @click="add">新增</el-button>
-                </el-col>
             </el-row>
         </header>
         <section class="section">
+            <!-- <ul class="ul">
+                <li
+                    class="li"
+                    v-for="(item, index) in list"
+                    :key="index"
+                    @click="toDetail(item.table.status, '产床00'+(index+1))"
+                >
+                    <h5>产床00{{ index+1 }}</h5>
+                    <img class="img" :src="typeImgUrl[item.table.status - 1]" />
+                    <p v-if="item.table.status == 1" class="info fontC">空床</p>
+                    <div class="info" v-if="item.table.status == 2">
+                        <p class="p">
+                            <span class="title">母猪耳标：</span>
+                            <span class="content">{{ item.id }}</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">入床时间：</span>
+                            <span class="content">2020-07-25</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">预计产仔：</span>
+                            <span class="content">2020-08-1</span>
+                        </p>
+                    </div>
+                    <div class="info" v-else-if="item.table.status == 3">
+                        <p class="p">
+                            <span class="title">母猪耳标：</span>
+                            <span class="content">{{ item.id }}</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">产子时间：</span>
+                            <span class="content">2020-07-20</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">仔猪日龄：</span>
+                            <span class="content">10天</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">产仔数：</span>
+                            <span class="content">9</span>
+                        </p>
+                    </div>
+                    <div class="info" v-else-if="item.table.status == 4">
+                        <p class="p">
+                            <span class="title">母猪耳标：</span>
+                            <span class="content">{{ item.id }}</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">断奶时间：</span>
+                            <span class="content">2020-07-20</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">断奶活仔数：</span>
+                            <span class="content">8</span>
+                        </p>
+                        <p class="p">
+                            <span class="title">断奶活仔率：</span>
+                            <span class="content">98%</span>
+                        </p>
+                    </div>
+                </li>
+            </ul> -->
             <ul class="ul">
                 <li
                     @click="toDetail(item.type, '产床00'+(index+1))"
@@ -36,7 +95,7 @@
                 >
                     <h5>产床00{{ index+1 }}</h5>
                     <img class="img" :src="typeImgUrl[item.type - 1]" />
-                    <p v-if="item.type == 1" class="info fontC">空床时间{{ 4 }}天</p>
+                    <p v-if="item.type == 1" class="info fontC">空床</p>
                     <div class="info" v-if="item.type == 2">
                         <p class="p">
                             <span class="title">母猪耳标：</span>
@@ -95,77 +154,11 @@
                         @current-change="pageChange"
                         background
                         layout="prev, pager, next"
-                        :page-count="500"
+                        :page-count="Number(totalPages)"
                     ></el-pagination>
                 </el-col>
             </el-row>
         </section>
-
-        <el-dialog title="新增" :visible.sync="isShow" width="40%">
-            <el-row type="flex">
-                <el-col :span="20">
-                    <el-form
-                        ref="addDeliveryRoom"
-                        :model="formData"
-                        :rules="rules"
-                        label-width="140px"
-                    >
-                        <el-form-item label="名称">
-                            <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
-                        <el-form-item label="有效期/单位">
-                            <el-row type="flex" :gutter="20">
-                                <el-col :span="10">
-                                    <el-input v-model.number="formData.periodOfValidity"></el-input>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-select v-model="formData.unit" placeholder="请选择">
-                                        <el-option
-                                            v-for="item in $store.state['periodOfValidityUnit']"
-                                            :key="item.value"
-                                            :label="item.label"
-                                            :value="item.value"
-                                        ></el-option>
-                                    </el-select>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="库存/规格">
-                            <el-row type="flex" :gutter="20">
-                                <el-col :span="10">
-                                    <el-input v-model.number="formData.safeThreshold"></el-input>
-                                </el-col>
-                                <el-col :span="6">
-                                    <el-input v-model="formData.specifications"></el-input>
-                                </el-col>
-                            </el-row>
-                        </el-form-item>
-                        <el-form-item label="厂家">
-                            <el-input v-model="formData.factory"></el-input>
-                        </el-form-item>
-                        <el-form-item label="用法">
-                            <el-input type="textarea" autosize v-model="formData.usageIntro"></el-input>
-                        </el-form-item>
-                        <el-form-item label="注意事项">
-                            <el-input type="textarea" autosize v-model="formData.note"></el-input>
-                        </el-form-item>
-                        <el-form-item label="状态">
-                            <el-radio-group v-model="formData.status">
-                                <el-radio
-                                    v-for="item in $store.state['drugStatus']"
-                                    :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('addDeliveryRoom')">保 存</el-button>
-                        </el-form-item>
-                    </el-form>
-                </el-col>
-            </el-row>
-        </el-dialog>
     </div>
 </template>
 
@@ -176,7 +169,7 @@ import typeImgUrl_2 from "@/assets/deliveryRoom_2.jpg";
 import typeImgUrl_3 from "@/assets/deliveryRoom_3.jpg";
 import typeImgUrl_4 from "@/assets/deliveryRoom_4.jpg";
 
-// import { reqDeliveryRoomList } from "@/api/deliveryRoomManagement.js"tuodan
+import { reqDeliveryRoom } from "@/api/deliveryRoomManagement.js";
 
 // 每页数据条数
 const pageSize = 10;
@@ -218,53 +211,46 @@ export default {
     data() {
         return {
             list,
-            isShow: false,
             rules,
             pageSize,
             page: 1,
-            S_form: {},
-            formData: {
-                name: ""
+            totalPages: 1,
+            typeImgUrl: [typeImgUrl_1, typeImgUrl_2, typeImgUrl_3, typeImgUrl_4],
+            S_form: {
+                searchStr: null,
+                building: null,
+                house: null,
             },
-            typeImgUrl: [typeImgUrl_1, typeImgUrl_2, typeImgUrl_3, typeImgUrl_4]
+            
         };
     },
-    created() {},
+    created() {
+        this.getDeliveryRoom()
+    },
     methods: {
-        submitForm(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    // reqAddMOutStore(this.formData)
-                    //     .then(res => {
-                    //         // 物料出库列表
-                    //         this.getMOutStoreList();
-                    //         if (res.errCode) {
-                    //             this.$message.error(res.errMsg);
-                    //         } else {
-                    //             this.$message.success("成功");
-                    //         }
-                    //         // this.isShow = false
-                    //     })
-                    //     .catch(err => {
-                    //         console.log(err);
-                    //         this.$message.error("失败！");
-                    //     });
-                } else {
-                    return false;
-                }
-            });
+        getDeliveryRoom() {
+            reqDeliveryRoom({
+                pageNum: this.page,
+                pageSize,
+                ...this.S_form,
+            })
+                .then(res => {
+                    console.log(res);
+                    // this.list = res.content
+                    this.totalPages = res.totalPages
+                })
+                .catch(err => {
+                    console.error(err);
+                });
         },
         toDetail(type, roomNum) {
-            // if(type == 1) {
-            //     this.$message.warning("产床为空！")
-            //     return
-            // }
+            if(type == 1) {
+                this.$message.warning("产床为空！")
+                return
+            }
             this.$router.push({ path: "Detail", query: { type, roomNum } });
         },
         getBasicsInfoList() {},
-        add() {
-            this.isShow = true;
-        },
         pageChange(p) {
             console.log(p);
             this.page = p;

src/views/infoInform/deviceFault.vue

@@ -10,7 +10,7 @@
                     <el-button type="primary" @click="getDvFaultList">查找</el-button>
                 </el-col>
                 <el-col :span="4">
-                    <el-button type="primary" @click="add">新增</el-button>
+                    <!-- <el-button type="primary" @click="add">新增</el-button> -->
                 </el-col>
             </el-row>
         </header>
@@ -25,13 +25,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column prop="name" label="设备名称"></el-table-column>
-                    <el-table-column label="设备类型">
-                        <template v-slot="scope">
-                            <div v-for="item in $store.state['deviceType']" :key="item.value">
-                                <span v-if="item.value == scope.row['style']">{{ item.label }}</span>
-                            </div>
-                        </template>
-                    </el-table-column>
+                    <el-table-column prop="code" label="设备编码"></el-table-column>
                     <el-table-column label="设备状态">
                         <template v-slot="scope">
                             <div v-for="item in $store.state['deviceStatus']" :key="item.value">
@@ -43,7 +37,6 @@
                             </div>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="code" label="产品编码"></el-table-column>
                     <el-table-column prop="position" label="地址"></el-table-column>
                     <el-table-column label="操作" width="150">
                         <template v-slot="scope">
@@ -79,9 +72,6 @@
                                 placeholder="选择日期"
                             ></el-date-picker>
                         </el-form-item>
-                        <el-form-item label="设备名称">
-                            <el-input v-model="formData.name"></el-input>
-                        </el-form-item>
                         <el-form-item label="设备类型">
                             <el-select v-model="formData.style" filterable placeholder="请选择">
                                 <el-option
@@ -101,9 +91,6 @@
                                 >{{ item.label }}</el-radio>
                             </el-radio-group>
                         </el-form-item> -->
-                        <el-form-item label="产品编码">
-                            <el-input v-model="formData.code"></el-input>
-                        </el-form-item>
                         <el-form-item label="地址">
                             <el-input v-model="formData.position"></el-input>
                         </el-form-item>

src/views/infoInform/productionWarn.vue

@@ -7,90 +7,108 @@
                 <el-table-column label="公告标题">
                     <template v-slot="props">
                         <span>【通知】</span>
-                        <span>{{ props.row['title'] }}</span>
+                        <span>{{ props.row['message'] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="time" label="公告时间" fixed="right" width="180"></el-table-column>
+                <el-table-column prop="warningTime" label="公告时间" fixed="right" width="180"></el-table-column>
             </el-table>
         </section>
     </div>
 </template>
 
 <script>
+import { reqProductionWarnList } from "@/api/infoInform.js";
+
+const pageSize = 10;
+
 export default {
     name: "productionWarn",
     data() {
         return {
+            page: 1,
             tableData: [
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
                 {
-                    title: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
-                    time: "2020-08-24 14:28:43"
+                    message: "产床001上的仔猪预计七天后可进行断奶，请留意观察",
+                    warningTime: "2020-08-24 14:28:43"
                 },
             ]
         };
     },
-    created() {},
-    methods: {}
+    created() {
+        this.getProductionWarnList()
+    },
+    methods: {
+        getProductionWarnList() {
+            reqProductionWarnList({pageSize,pageNum:this.page})
+                .then(res => {
+                    console.log(res);
+                    this.tableData = res
+                })
+                .catch(err => {
+                    console.error(err);
+                });
+        },
+    }
 };
 </script>
 

src/views/statisticAnalysis/charts/PSY_chart.vue

@@ -74,9 +74,6 @@ export default {
                 yAxis: [
                     {
                         type: "value",
-                        axisLabel: {
-                            formatter: "{value} ℃"
-                        },
                         scale: true
                     }
                 ],