.

src/views/Login/Login.vue

@@ -59,8 +59,8 @@ export default {
     data() {
         return {
             form: {
-                userName: "yjj",
-                userPwd: "147414"
+                userName: "demo",
+                userPwd: "123456"
             },
             isShowDialog: false,
             orgList: null,
@@ -68,25 +68,23 @@ export default {
         };
     },
     created() {},
-    methods: {
-        /* 登录按钮 */
-        onSignIn(formName) {
-            this.$refs[formName].validate(valid => {
-                if (valid) {
-                    reqLogin(this.form)
-                        .then(res => {
-                            localStorage.setItem("token", res.token);
-                            this.doOrganizationChoose();
-                        })
-                        .catch(err => {
-                            console.log("登录失败", err);
-                            this.$message.error("登录失败!")
-                        });
-                } else {
-                    console.log("error submit!!");
-                    return false;
-                }
+    methods: {/* 登录按钮 */
+        onSignIn() {
+            const loading = this.$loading({
+                lock: true,
+                text: "登录中...",
+                spinner: "el-icon-loading",
+                background: "rgba(0, 0, 0, 0.7)"
             });
+            reqLogin(this.form)
+                .then(res => {
+                    loading.close();
+                    localStorage.setItem("token", res.token);
+                    this.doOrganizationChoose();
+                })
+                .catch(err => {
+                    console.log("登录失败", err);
+                });
         },
         handleSet: function() {
             if (!this.orgSelected) {
@@ -95,43 +93,37 @@ export default {
         },
         doOrganizationChoose() {
             this.loading = true;
-            reqOrgChoose()
-                .then(res => {
-                    if (res == null || res.length == 0) {
-                        this.$message.info("您没有加入任何组织!");
-                    } else if (res.length > 1) {
-                        this.isShowDialog = true;
-                        this.orgList = res;
-                    } else {
-                        // this.setOrganizationId(res[0].id);
-                    }
-                })
-                .catch(err => {
-                    console.log(err);
-                    this.loading = false;
-                });
+            reqOrgChoose().then(res => {
+                if (res == null || res.length == 0) {
+                    this.$message.info("您没有加入任何组织!");
+                } else if (res.length > 1) {
+                    this.isShowDialog = true;
+                    this.orgList = res;
+                } else {
+                    this.setOrganizationId(res[0].id);
+                }
+            }).catch(err => {
+                console.log(err)
+                this.loading = false;
+            })
         },
-        setOrganizationId(id) {
+        setOrganizationId(id){
             if (!id) {
                 this.$message.error("发生了一点不愉快的错误！");
                 return;
             }
             this.loading = true;
-            reqOrganizationId({ orgId: id })
-                .then(res => {
-                    this.isShowDialog = false;
+            reqOrganizationId({orgId: id}).then(res => {
+                this.isShowDialog = false;
                     //导航到 正式页面
                     this.$router.replace("/home/Index");
-                })
-                .catch(err => {
-                    if (err.errMsg) this.$message.error(err.errMsg);
+            }).catch(err => {
+                if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
-                })
-                .finally(res => {
-                    this.loading = false;
-                });
-        }
-    },
+            }).finally( res => {
+                this.loading = false;
+            })
+        },},
     mounted() {}
 };
 </script>

src/views/deliveryRoomManagement/detail/Detail.vue

@@ -116,19 +116,21 @@
                 </div>
             </article>
             <article class="carousel">
-                <div class="contianer" v-if="empty[0].length>0">
-                    <el-carousel height="360px" indicator-position="none" :interval="3000">
+                <div class="contianer" v-if="img1" style="height:480px;width:700px; overflow: hidden;">
+                    <!-- <el-carousel height="480px" indicator-position="none" :interval="300000">
                         <el-carousel-item v-for="(item, index) in empty[0]" :key="index">
                             <img :src="item" style="width:100%" />
                         </el-carousel-item>
-                    </el-carousel>
+                    </el-carousel>-->
+                    <img :src="img1" style="width:700px" />
                 </div>
-                <div class="contianer" v-if="empty[1].length>0">
-                    <el-carousel height="360px" indicator-position="none" :interval="3000">
+                <div class="contianer" v-if="img2" style="height:480px;700px; overflow: hidden;">
+                    <!-- <el-carousel height="480px" indicator-position="none" :interval="300000">
                         <el-carousel-item v-for="(item, index) in empty[1]" :key="index">
                             <img :src="item" style="width:100%" />
                         </el-carousel-item>
-                    </el-carousel>
+                    </el-carousel>-->
+                    <img :src="img2" style="width:700px;" />
                 </div>
             </article>
             <article class="charts">
@@ -216,12 +218,6 @@ import EEleT from "./charts/EEleT";
 import EEnvT from "./charts/EEnvT";
 import ESowT from "./charts/ESowT";
 
-import empty1 from "../../../assets/img/empty1.jpg";
-import empty2 from "../../../assets/img/empty2.jpg";
-import empty3 from "../../../assets/img/empty3.jpg";
-import empty4 from "../../../assets/img/empty4.jpg";
-import empty5 from "../../../assets/img/empty5.jpg";
-
 import {
     reqBedInfo,
     reqPiggyData,
@@ -276,23 +272,25 @@ export default {
             bed: null,
             date: "",
             format: {
-                f1: (percentage) => {
+                f1: percentage => {
                     return `产仔数:${this.bed.litter.deliverNumber}`;
                 },
-                f2:(percentage) => {
+                f2: percentage => {
                     return `活仔数:${this.bed.litter.deliverNumber}`;
                 },
-                f3:(percentage) => {
+                f3: percentage => {
                     return `存活率:${percentage}%`;
                 },
-                f4:(percentage) => {
+                f4: percentage => {
                     return `预计断奶剩余天数:${30}`;
                 },
-                f5:(percentage) => {
+                f5: percentage => {
                     return `仔猪日龄:${30}`;
                 }
             },
             empty: [[], []],
+            img1: null,
+            img2: null,
             isShow: false,
             containerT: [],
             containertime: [],
@@ -301,14 +299,21 @@ export default {
             animalTemp: [],
             battery: [],
             piggyData: null,
-            imgData: null
+            imgData: null,
+            timer: null
         };
     },
     created() {
         //this.$route.query.id   bed.litter.mother.earTagNo
         this.getDeliveryTable(this.$route.query.code);
+        this.timer = setInterval(() => {
+            //this.getPiggyData(this.bed.deviceId, this.bed.deviceCh);
+            this.getDeliveryTable(this.$route.query.code);
+        }, 1000 * 30);
+    },
+    beforeDestroy() {
+        clearInterval(this.timer)
     },
-    beforeDestroy() {},
     methods: {
         getDeliveryTable(code) {
             let data = { code };
@@ -338,11 +343,15 @@ export default {
                     this.animalTemp = [];
                     this.battery = [];
                     res.content.forEach(item => {
-                        this.time.unshift(item.time);
-                        this.envTemp.unshift(item.envTemp);
-                        this.animalTemp.unshift(item.animalTemp);
-                        this.battery.unshift(item.battery * 100);
+                        this.time.push(item.time);
+                        this.envTemp.push(item.envTemp);
+                        this.animalTemp.push(item.animalTemp);
+                        this.battery.push(item.battery * 100);
                     });
+                    this.time.reverse()
+                    this.envTemp.reverse()
+                    this.animalTemp.reverse()
+                    this.battery.reverse()
                 })
                 .catch(err => {
                     console.error(err);
@@ -358,30 +367,34 @@ export default {
                     if (this.piggyData.length > 0) {
                         this.containerT = [];
                         this.containertime = [];
+                        //加载一张图片
+                        this.loadImage(this.piggyData[0]);
                         for (let i = 0; i < this.piggyData.length; i++) {
-                            this.loadImage(this.piggyData[i], i);
+                            // this.loadImage(this.piggyData[i], i);
                             //
-                            this.containerT.unshift(this.piggyData[i].temp);
-                            this.containertime.unshift(
+                            this.containerT.push(this.piggyData[i].temp);
+                            this.containertime.push(
                                 this.piggyData[i].created
                             );
                         }
+                        this.containerT.reverse()
+                        this.containertime.reverse()
                     }
                 })
                 .catch(err => {
                     console.error(err);
                 });
         },
-        loadImage(piggydata, y) {
+        loadImage(piggydata) {
             //每个有两个图片
             let file1 = piggydata.file1;
             let ai1 = JSON.parse(piggydata.aiData1);
-            this.drawImage(file1, ai1, 0, y);
+            this.drawImage(file1, ai1, 1);
             let file2 = piggydata.file2;
             let ai2 = JSON.parse(piggydata.aiData2);
-            this.drawImage(file2, ai2, 1, y);
+            this.drawImage(file2, ai2, 2);
         },
-        drawImage(file, ai, x, y) {
+        drawImage(file, ai, x) {
             //x一维，y二维
             let canvas = new fabric.Canvas(file);
             canvas.clear();
@@ -407,7 +420,9 @@ export default {
                     }
                 }
                 let tmp = canvas.toDataURL("image/png");
-                this.empty[x][y] = tmp;
+                if (x === 1) this.$set(this, "img1", tmp);
+                else this.$set(this, "img2", tmp);
+                // this.empty[x][y] = tmp;
                 this.$forceUpdate();
             };
             img.crossOrigin = "Anonymous";
@@ -503,7 +518,7 @@ export default {
             margin: 30px;
             > div {
                 width: 700px;
-                height: 400px;
+                height: 500px;
                 // border: 1px solid #00f;
             }
         }

src/views/deliveryRoomManagement/detail/charts/EConT.vue

@@ -18,7 +18,7 @@ export default {
         // 原始温度上加 3
         dataArr2() {
             return this.dataArr.map(item => {
-                return item * 1 + 3.18
+                return (item * 1 + 3.18).toFixed(2)
             })
         }
     },

src/views/index/Index.vue

@@ -108,7 +108,6 @@ export default {
         getIndexInfo() {
             reqIndexInfo()
                 .then(res => {
-                    console.log(res);
                     this.info = res;
                     this.chart_a_data.data1 = [
                         {
@@ -139,7 +138,6 @@ export default {
         getProductionWarnList() {
             reqProductionWarnList({ pageSize: 1000, pageNum: 1 })
                 .then(res => {
-                    console.log(res.content)
                     this.tableData = res.content;
                 })
                 .catch(err => {

猪仔管家/data/styles.css

@@ -1,172 +0,0 @@
-.ax_default {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:400;
-  font-style:normal;
-  font-size:13px;
-  color:#333333;
-  text-align:center;
-  line-height:normal;
-}
-.box_1 {
-}
-._分类按纽 {
-  font-size:16px;
-  text-align:left;
-  line-height:26px;
-}
-.heading_1 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  font-size:32px;
-  text-align:left;
-}
-.box_3 {
-}
-.ellipse {
-}
-._图片 {
-}
-.button {
-}
-.primary_button {
-  color:#FFFFFF;
-}
-.link_button {
-  color:#169BD5;
-}
-._一级标题 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  font-size:32px;
-  text-align:left;
-}
-._二级标题 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  font-size:24px;
-  text-align:left;
-}
-._三级标题 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  font-size:18px;
-  text-align:left;
-}
-._四级标题 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  font-size:14px;
-  text-align:left;
-}
-._五级标题 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  text-align:left;
-}
-._六级标题 {
-  font-family:'Arial Normal', 'Arial';
-  font-weight:bold;
-  font-style:normal;
-  font-size:10px;
-  text-align:left;
-}
-._文本段落 {
-  text-align:left;
-}
-._文本链接 {
-  color:#0000FF;
-}
-.line {
-}
-.text_field {
-  color:#000000;
-  text-align:left;
-}
-.droplist {
-  color:#000000;
-  text-align:left;
-}
-.list_box {
-  color:#000000;
-  text-align:left;
-}
-.radio_button {
-  text-align:left;
-}
-.html_button {
-  text-align:center;
-}
-.tree_node {
-  text-align:left;
-}
-.table_cell {
-}
-.menu_item {
-}
-._流程形状 {
-}
-.icon {
-}
-._默认样式 {
-}
-._文本链接1 {
-  color:#0000FF;
-}
-.image {
-}
-._鼠标悬停文本链接时 {
-}
-._鼠标按下文本链接时 {
-}
-._形状 {
-  font-family:'微软雅黑';
-  font-weight:400;
-  font-style:normal;
-  color:#797979;
-}
-.label {
-  font-size:14px;
-  text-align:left;
-}
-.flow_shape {
-}
-.shape {
-}
-.heading_11 {
-  font-family:'Arial Negreta', 'Arial Normal', 'Arial';
-  font-weight:700;
-  font-style:normal;
-  font-size:32px;
-  text-align:left;
-}
-.image1 {
-  color:#000000;
-}
-.paragraph {
-  text-align:left;
-}
-.icon1 {
-}
-.box_2 {
-}
-._文本段落1 {
-  text-align:left;
-}
-._形状1 {
-}
-._图片1 {
-}
-.box_11 {
-}
-.label1 {
-  font-size:14px;
-  text-align:left;
-}
-._鼠标按下文本链接时1 {
-}