.

.eslintrc.js

@@ -1,14 +1,14 @@
-// module.exports = {
-//   root: true,
-//   env: {
-//     node: true
-//   },
-//   extends: ['plugin:vue/essential'],
-//   rules: {
-//     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-//     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
-//   },
-//   parserOptions: {
-//     parser: 'babel-eslint'
-//   }
-// }
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  extends: ['plugin:vue/essential'],
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  }
+}

package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "cnpm": "^6.1.1",
     "core-js": "^3.3.2",
+    "default-passive-events": "^2.0.0",
     "echarts": "^4.8.0",
     "element-ui": "^2.13.2",
     "vue": "^2.6.10",

src/aaaaaaaa.vue

@@ -0,0 +1,52 @@
+<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-item label="密度">
+                <el-radio-group v-model="formData.density">
+                    <el-radio
+                        v-for="item in $store.state['seedDensity']"
+                        :key="item.value"
+                        :label="item.value"
+                    >{{ item.label }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item label="配种时间">
+                <el-date-picker
+                    v-model="formData.opeTime"
+                    type="date"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                ></el-date-picker>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+
+<script>
+export default {
+    name: "Af",
+    data() {
+        return {
+            opeTime: this.$moment().format("YYYY-MM-DD"),
+            aa: this.$store.state['dispatchStatus'][0].value,
+        };
+    },
+    created() {},
+    methods: {
+        
+    }
+};
+</script>

src/main.js

@@ -1,12 +1,13 @@
 import Vue from 'vue'
 
 import ElementUI from 'element-ui';
-import '../theme/index.css'
-// import 'element-ui/lib/theme-chalk/index.css';
+// import '../theme/index.css'
+import 'element-ui/lib/theme-chalk/index.css';
 import App from './App.vue'
 import router from './router'
 import store from './store'
 import vueModuleLoader from 'vue-module-loader'
+import 'default-passive-events' // ( https://www.jianshu.com/p/23850d4cade8 )
 import localModule from './module'
 import './assets/css/reset.scss'
 

src/views/Home/Home - 副本.vue

@@ -0,0 +1,316 @@
+<template>
+    <div class="home">
+        <header class="header">
+            <div class="left">
+                慧牧科技 
+                <el-button
+                    @click="onMenuCollapse"
+                    circle
+                    style="font-size: 20px"
+                    :icon="menuCollapse? 'el-icon-s-unfold' : 'el-icon-s-fold'"
+                ></el-button>
+            </div>
+            <div class="right">
+                <span class="warp">
+                    <el-dropdown  @command="onLogOut">
+                        <span class="el-dropdown-link">
+                            账号管理
+                            <i class="el-icon-arrow-down el-icon--right"></i>
+                        </span>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item>退出登录</el-dropdown-item>
+                            <el-dropdown-item>切换账号</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                </span>
+                <span>
+                    <el-dropdown @command="onLogOut">
+                        <span class="el-dropdown-link">
+                            权限切换
+                            <i class="el-icon-arrow-down el-icon--right"></i>
+                        </span>
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item disabled>权限一</el-dropdown-item>
+                            <el-dropdown-item divided>权限二</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
+                </span>
+            </div>
+        </header>
+        <section class="section">
+            <div class="tac">
+                <div class="col1">
+                    <el-menu
+                        default-active="2"
+                        class="el-menu-vertical-demo"
+                        @open="handleOpen"
+                        @close="handleClose"
+                        :collapse="menuCollapse"
+                        :unique-opened="true"
+                        :default-openeds="defaultUnfoldedMenu"
+                        select="1-1"
+                        background-color="rgba(46,38,87)"
+                        text-color="#fff"
+                        active-text-color="#ffd04b"
+                    >
+                        <div v-for="(item) in menuData " :key="item.index">
+                            <el-submenu
+                                v-if="item.childList && item.childList.length > 0"
+                                :index="item.index"
+                            >
+                                <template slot="title">
+                                    <i :class="item.iconClassName"></i>
+                                    <span slot="title">{{ !menuCollapse? item.optionName : '' }}</span>
+                                    <!-- <span slot="title">{{ item.oneMenuName }}</span> -->
+                                </template>
+                                <el-menu-item
+                                    v-for="(item1) in item.childList"
+                                    :key="item1.index"
+                                    :index="item1.index"
+                                    :routerName="item1.routerName"
+                                    @click="onClickMenu(item1)"
+                                >{{ item1.optionName }}</el-menu-item>
+                            </el-submenu>
+                            <el-menu-item
+                                v-else
+                                :index="item.index"
+                                :disabled="item.disabled"
+                                :routerName="item.routerName"
+                                @click="onClickMenu(item)"
+                            >
+                                <i :class="item.iconClassName"></i>
+                                <span slot="title">{{ !menuCollapse? item.optionName : '' }}</span>
+                            </el-menu-item>
+                        </div>
+                    </el-menu>
+                </div>
+                <div class="col2">
+                    <header class="col2_header">
+                        <el-tag
+                            v-for="tag in tags"
+                            :key="tag.routerName"
+                            closable
+                            @close="close(tag)"
+                            @click="clickTag(tag)"
+                            :type="tag.type?tag.type:'info'"
+                            class="item"
+                        >{{tag.name}}</el-tag>
+                    </header>
+                    <div class="warp">
+                        <router-view />
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+</template>
+
+<script>
+import { menuData } from "./mencCofig.js";
+
+export default {
+    data() {
+        return {
+            // 菜单配置
+            menuData,
+            menuCollapse: false, //是否水平折叠收起菜单
+            defaultUnfoldedMenu: [menuData[0].index], // 默认展开第一项
+            tags: []
+        };
+    },
+    created() {
+        console.log(this)
+        console.log('========')
+        console.log(this.$http)
+        this.defaultUnfoldedMenu = [
+            localStorage.getItem("defaultUnfoldedMenu")
+        ];
+        this.menuCollapse = JSON.parse(localStorage.getItem("menuCollapse"));
+        this.tags = JSON.parse(localStorage.getItem("tagsNavList")) || [];
+    },
+    methods: {
+        // 收取菜单按钮
+        onMenuCollapse() {
+            this.menuCollapse = !this.menuCollapse;
+            localStorage.setItem("menuCollapse", this.menuCollapse);
+            this.defaultUnfoldedMenu = [
+                localStorage.getItem("defaultUnfoldedMenu")
+            ];
+        },
+        // 菜单展开
+        handleOpen(key, keyPath) {
+            console.log(key, keyPath);
+            localStorage.setItem("defaultUnfoldedMenu", "" + key);
+        },
+        // 菜单收取
+        handleClose(key, keyPath) {
+            console.log(key, keyPath);
+        },
+        // 点击菜单项
+        onClickMenu(item) {
+            let _this = this;
+            // 如果要跳转的路由和当前路由一致就 return
+            if (this.$router.history.current.name == item.routerName) return;
+            this.$router.push({
+                name: item.routerName
+            });
+            // 如果tags中已经存在 return
+            let temp = includes(item.routerName);
+            if (temp) {
+                this.tags.forEach(item => {
+                    item.type = "info";
+                });
+                temp.type = "success";
+                return;
+            }
+            this.tags.forEach(item => {
+                item.type = "info";
+            });
+            this.tags.push({
+                name: item.optionName,
+                routerName: item.routerName,
+                type: "success"
+            });
+
+            this.changeTagColor(item.routerName);
+            localStorage.setItem("tagsNavList", JSON.stringify(this.tags));
+            // 查看当前 tags里有没有传进来的路由，返回 true false
+
+            function includes(routerName) {
+                let tags = _this.tags;
+                return tags.find(item => {
+                    return item.routerName == routerName;
+                });
+            }
+        },
+        // 点击 tag
+        clickTag(tag) {
+            console.log(tag.routerName);
+            if (this.$router.history.current.name == tag.routerName) return;
+            this.$router.push({
+                name: tag.routerName
+            });
+            this.changeTagColor(tag.routerName);
+            localStorage.setItem("tagsNavList", JSON.stringify(this.tags));
+        },
+        // 点击 tag 的小×
+        close(tag) {
+            console.log(tag);
+            let spliceIndex = this.tags.findIndex(item => {
+                return item.routerName == tag.routerName;
+            });
+            console.log(spliceIndex);
+            this.tags.splice(spliceIndex, 1);
+            localStorage.setItem("tagsNavList", JSON.stringify(this.tags));
+        },
+        // 改变tag的颜色 公用的
+        changeTagColor(routerName) {
+            this.tags.forEach(item => {
+                if (item.routerName == routerName) {
+                    item.type = "success";
+                } else {
+                    item.type = "info";
+                }
+            });
+        },
+        onLogOut() {
+            this.$router.push('login')
+        }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.home {
+    height: 100%;
+    overflow: hidden;
+    box-sizing: border-box;
+    background-color: #eee;
+    display: flex;
+    flex-direction: column;
+    .header {
+        // background-color: #029b62;
+        // background-color: rgb(46,38,87);
+        background-color: rgb(85, 70, 148);
+        height: 40px;
+        padding: 10px 20px;
+        margin-bottom: 5px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .left {
+            font-size: 25px;
+            color: #fff;
+            /deep/ .is-circle {
+                margin-left: 40px;
+            }
+        }
+        .right {
+            .warp {
+                margin-right: 20px;
+            }
+        }
+    }
+    .section {
+        flex: 1;
+        box-sizing: border-box;
+        overflow: auto;
+        .tac {
+            flex: 1;
+            display: flex;
+            height: 96%;
+            box-sizing: border-box;
+            .col1 {
+                margin-right: 5px;
+                background-color: rgb(46,38,87);
+                // background-image: linear-gradient(to bottom, rgb(85, 70, 148) , rgb(41, 33, 85), rgb(41, 33, 85));
+            }
+            .col2 {
+                flex: 1;
+                background-color: #fff;
+                padding: 0 15px 15px 15px;
+                border-radius: 5px;
+                margin-right: 5px;
+                height: 100%;
+                overflow: auto;
+                .col2_header {
+                    position: relative;
+                    width: 85%;
+                    height: 50px;
+                    overflow: hidden;
+                    border-bottom: 2px solid #eee;
+                    background-color: #fff;
+                    padding: 10px;
+                    display: flex;
+                    align-items: center;
+                    box-sizing: border-box;
+                    z-index: 3;
+                    position: fixed;
+                    .item {
+                        margin-right: 8px;
+                        cursor: pointer;
+                    }
+                }
+                .warp {
+                    margin: 15px;
+                    padding-top: 55px;
+                }
+            }
+        }
+    }
+    // border: 1px solid #f00;
+}
+
+.el-menu-vertical-demo:not(.el-menu--collapse) {
+    width: 200px;
+    min-height: 400px;
+}
+// 下拉菜单
+.el-dropdown-link {
+    cursor: pointer;
+    color: #fff;
+}
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+</style>

src/views/Home/Home.vue

@@ -2,7 +2,7 @@
     <div class="home">
         <header class="header">
             <div class="left">
-                慧牧科技 
+                湖羊养殖管理 
                 <el-button
                     @click="onMenuCollapse"
                     circle
@@ -49,7 +49,7 @@
                         :unique-opened="true"
                         :default-openeds="defaultUnfoldedMenu"
                         select="1-1"
-                        background-color="rgba(46,38,87)"
+                        background-color="#545c64"
                         text-color="#fff"
                         active-text-color="#ffd04b"
                     >
@@ -84,22 +84,13 @@
                         </div>
                     </el-menu>
                 </div>
+
                 <div class="col2">
-                    <header class="col2_header">
-                        <el-tag
-                            v-for="tag in tags"
-                            :key="tag.routerName"
-                            closable
-                            @close="close(tag)"
-                            @click="clickTag(tag)"
-                            :type="tag.type?tag.type:'info'"
-                            class="item"
-                        >{{tag.name}}</el-tag>
-                    </header>
                     <div class="warp">
                         <router-view />
                     </div>
                 </div>
+
             </div>
         </section>
     </div>
@@ -115,7 +106,6 @@ export default {
             menuData,
             menuCollapse: false, //是否水平折叠收起菜单
             defaultUnfoldedMenu: [menuData[0].index], // 默认展开第一项
-            tags: []
         };
     },
     created() {
@@ -123,7 +113,7 @@ export default {
             localStorage.getItem("defaultUnfoldedMenu")
         ];
         this.menuCollapse = JSON.parse(localStorage.getItem("menuCollapse"));
-        this.tags = JSON.parse(localStorage.getItem("tagsNavList")) || [];
+        
     },
     methods: {
         // 收取菜单按钮
@@ -136,13 +126,10 @@ export default {
         },
         // 菜单展开
         handleOpen(key, keyPath) {
-            console.log(key, keyPath);
             localStorage.setItem("defaultUnfoldedMenu", "" + key);
         },
         // 菜单收取
-        handleClose(key, keyPath) {
-            console.log(key, keyPath);
-        },
+        handleClose(key, keyPath) {},
         // 点击菜单项
         onClickMenu(item) {
             let _this = this;
@@ -151,67 +138,9 @@ export default {
             this.$router.push({
                 name: item.routerName
             });
-            // 如果tags中已经存在 return
-            let temp = includes(item.routerName);
-            if (temp) {
-                this.tags.forEach(item => {
-                    item.type = "info";
-                });
-                temp.type = "success";
-                return;
-            }
-            this.tags.forEach(item => {
-                item.type = "info";
-            });
-            this.tags.push({
-                name: item.optionName,
-                routerName: item.routerName,
-                type: "success"
-            });
-
-            this.changeTagColor(item.routerName);
-            localStorage.setItem("tagsNavList", JSON.stringify(this.tags));
-            // 查看当前 tags里有没有传进来的路由，返回 true false
-
-            function includes(routerName) {
-                let tags = _this.tags;
-                return tags.find(item => {
-                    return item.routerName == routerName;
-                });
-            }
-        },
-        // 点击 tag
-        clickTag(tag) {
-            console.log(tag.routerName);
-            if (this.$router.history.current.name == tag.routerName) return;
-            this.$router.push({
-                name: tag.routerName
-            });
-            this.changeTagColor(tag.routerName);
-            localStorage.setItem("tagsNavList", JSON.stringify(this.tags));
-        },
-        // 点击 tag 的小×
-        close(tag) {
-            console.log(tag);
-            let spliceIndex = this.tags.findIndex(item => {
-                return item.routerName == tag.routerName;
-            });
-            console.log(spliceIndex);
-            this.tags.splice(spliceIndex, 1);
-            localStorage.setItem("tagsNavList", JSON.stringify(this.tags));
-        },
-        // 改变tag的颜色 公用的
-        changeTagColor(routerName) {
-            this.tags.forEach(item => {
-                if (item.routerName == routerName) {
-                    item.type = "success";
-                } else {
-                    item.type = "info";
-                }
-            });
         },
         onLogOut() {
-            this.$router.push('login')
+            this.$router.redirect('login')
         }
     }
 };
@@ -225,10 +154,8 @@ export default {
     background-color: #eee;
     display: flex;
     flex-direction: column;
-    .header {
-        // background-color: #029b62;
-        // background-color: rgb(46,38,87);
-        background-color: rgb(85, 70, 148);
+    >.header {
+        background-color: #4b545e;
         height: 40px;
         padding: 10px 20px;
         margin-bottom: 5px;
@@ -259,7 +186,8 @@ export default {
             box-sizing: border-box;
             .col1 {
                 margin-right: 5px;
-                background-color: rgb(46,38,87);
+                background-color: #545c64;
+                border-radius: 15px;
                 // background-image: linear-gradient(to bottom, rgb(85, 70, 148) , rgb(41, 33, 85), rgb(41, 33, 85));
             }
             .col2 {
@@ -270,27 +198,9 @@ export default {
                 margin-right: 5px;
                 height: 100%;
                 overflow: auto;
-                .col2_header {
-                    position: relative;
-                    width: 85%;
-                    height: 50px;
-                    overflow: hidden;
-                    border-bottom: 2px solid #eee;
-                    background-color: #fff;
-                    padding: 10px;
-                    display: flex;
-                    align-items: center;
-                    box-sizing: border-box;
-                    z-index: 3;
-                    position: fixed;
-                    .item {
-                        margin-right: 8px;
-                        cursor: pointer;
-                    }
-                }
+                
                 .warp {
                     margin: 15px;
-                    padding-top: 55px;
                 }
             }
         }

src/views/deliveryRoomManagement/DeliveryRoom.vue

@@ -1,9 +1,39 @@
 <template>
     <div class="deliveryRoom">
+        <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-col>
+                <el-col :span="3">
+                    <el-select v-model="S_form.area" 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-option label="选项一" :value="1"></el-option>
+                        <el-option label="选项二" :value="1"></el-option>
+                    </el-select>
+                </el-col>
+                <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 @click="toDetail(item.type, '产房00'+(index+1))" class="li" v-for="(item, index) in list" :key="index">
+                <li
+                    @click="toDetail(item.type, '产房00'+(index+1))"
+                    class="li"
+                    v-for="(item, index) in list"
+                    :key="index"
+                >
                     <h5>产房00{{ index+1 }}</h5>
                     <img class="img" :src="typeImgUrl[item.type - 1]" />
                     <p v-if="item.type == 1" class="info fontC">空床时间{{ 4 }}天</p>
@@ -26,14 +56,13 @@
                             <span class="title">母猪耳标：</span>
                             <span class="content">{{ item.id }}</span>
                         </p>
-                       <p class="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>
@@ -59,19 +88,84 @@
                         </p>
                     </div>
                 </li>
-
             </ul>
-            <el-row type="flex" justify="center">
-                <el-col :span="8" class="pagination">
+            <el-row type="flex" justify="center" style="margin-top: 20px;">
+                <el-col :span="6" class="pagination">
                     <el-pagination
                         @current-change="pageChange"
                         background
                         layout="prev, pager, next"
-                        :page-count="1"
+                        :page-count="500"
                     ></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>
 
@@ -82,10 +176,11 @@ 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"
+// import { reqDeliveryRoomList } from "@/api/deliveryRoomManagement.js"tuodan
 
 // 每页数据条数
 const pageSize = 10;
+const rules = {};
 
 let list = [
     {
@@ -123,26 +218,52 @@ export default {
     data() {
         return {
             list,
-            typeImgUrl: [
-                typeImgUrl_1,
-                typeImgUrl_2,
-                typeImgUrl_3,
-                typeImgUrl_4
-            ],
+            isShow: false,
+            rules,
             pageSize,
-            page: 1
+            page: 1,
+            S_form: {},
+            formData: {
+                name: ""
+            },
+            typeImgUrl: [typeImgUrl_1, typeImgUrl_2, typeImgUrl_3, typeImgUrl_4]
         };
     },
-    created() {
-    },
+    created() {},
     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;
+                }
+            });
+        },
         toDetail(type, roomNum) {
             // if(type == 1) {
             //     this.$message.warning("产床为空！")
             //     return
             // }
-            this.$router.push({path: "Detail",query: {type,roomNum}})
+            this.$router.push({ path: "Detail", query: { type, roomNum } });
+        },
+        getBasicsInfoList() {},
+        add() {
+            this.isShow = true;
         },
         pageChange(p) {
             console.log(p);
@@ -157,27 +278,29 @@ export default {
 .deliveryRoom {
     .section {
         background-color: #eee;
+        padding: 10px 10px 20px 10px;
+        border-radius: 10px;
         .ul {
             display: flex;
             flex-direction: row;
             flex-wrap: wrap;
-            
+
             .li {
                 background-color: #fff;
                 border: 2px solid #fff;
-                padding: 5px;
+                border-radius: 8px;
+                padding: 6px;
                 margin: 6px;
                 display: flex;
                 flex-direction: column;
                 width: 200px;
-                height: 420px;
-                
-                
+                height: 430px;
+
                 h5 {
                     text-align: center;
                     font-size: 30px;
                     color: #424242;
-                    background-color: #D2E4F0;
+                    background-color: #d2e4f0;
                 }
                 .img {
                     width: 100%;
@@ -207,16 +330,12 @@ export default {
                     font-weight: 600;
                 }
             }
-            .li:hover{
-                border: 2px solid #32ADF4;
+            .li:hover {
+                border: 2px solid #32adf4;
             }
         }
     }
 }
 
 // border: 1px solid #00f;
-
-.pagination {
-    margin-top: 5px;
-}
 </style>

src/views/tableLog.vue

@@ -0,0 +1,49 @@
+<template>
+    <div>
+        <el-table
+                    :data="tableData"
+                    tooltip-effect="dark"
+                    style="width: 100%"
+                >
+                    <el-table-column prop="id" label="序号" width="60"></el-table-column>
+                    <el-table-column label="入库日期">
+                        <template v-slot="scope">
+                            <span>{{ scope.row['inTime'].substr(0,10) }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <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['buyer']">{{ `${item.name}(${item.position})` }}</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column label="操作" width="150">
+                        <template v-slot="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>
+    </div>
+</template>
+
+
+<script>
+export default {
+    name: "Af",
+    data() {
+        return {
+            tableData: [],
+        };
+    },
+    created() {},
+    methods: {
+        
+    }
+};
+</script>