bug修复，

src/views/Home/Home.vue

@@ -2,7 +2,7 @@
     <div class="home">
         <header class="header">
             <div class="left">
-                产品管理系统
+                {{ mainTitle }}
                 <el-button
                     @click="onMenuCollapse"
                     circle
@@ -104,7 +104,8 @@ export default {
             // 菜单配置
             menuData,
             menuCollapse: false, //是否水平折叠收起菜单
-            defaultUnfoldedMenu: [menuData[0].index] // 默认展开第一项
+            defaultUnfoldedMenu: [menuData[0].index], // 默认展开第一项
+            mainTitle: ''
         };
     },
     created() {
@@ -146,20 +147,22 @@ export default {
             http://localhost:8080/#/home?target=鲜肉储运智能管控
         */
         filterMenu(target) {
-            console.log(target);
             let path;
             switch (target) {
                 case "定点屠宰智能管控":
-                    var func = item => item.index == 1 || item.index == 2;
+                    var func = (item, index) => index == 0 || index == 1;
                     path = "firmBuy";
+                    this.mainTitle = '湖羊屠宰智能管控'
                     break;
                 case "产品制作智能监控":
-                    var func = item => item.index == 3;
+                    var func = (item, index) => index == 2;
                     path = "productInfo";
+                    this.mainTitle = '产品制作智能监控'
                     break;
                 case "鲜肉储运智能管控":
-                    var func = item => item.index == 4;
+                    var func = (item, index) => index == 3;
                     path = "dispatching";
+                    this.mainTitle = '鲜肉储运智能管控'
                     break;
             }
             this.menuData = menuData.filter(func);
@@ -177,6 +180,7 @@ export default {
         },
         // 菜单展开
         handleOpen(key, keyPath) {
+            console.log(key)
             localStorage.setItem("defaultUnfoldedMenu", "" + key);
         },
         // 菜单收取

src/views/Home/mencCofig.js

@@ -4,74 +4,60 @@ export const menuData = [
     //     optionName: "首页",
     //     iconClassName: "el-icon-s-home",
     //     routerName: "Index",
-    //     index: '-1',
     //     disabled: false
     // },
     {
         optionName: "定点屠宰智能管控",
         iconClassName: "el-icon-s-flag",
-        index: '1',
         disabled: false, // 是否禁用
         childList: [
             {
                 optionName: '企业采购',
-                index: '1-1',
                 routerName: "firmBuy"
             },
             {
                 optionName: '入待宰栏',
-                index: '1-2',
                 routerName: "inButcherHurdle"
             },
             {
                 optionName: '屠宰批次',
-                index: '1-11',
                 routerName: "slaughterBatch"
             },
             {
-                optionName: '上报检疫',
-                index: '1-3',
+                optionName: '品控检疫',
                 routerName: "reportQuarantine"
             },
             {
                 optionName: '入宰登记',
-                index: '1-4',
                 routerName: "regisSlaughter"
             },
             {
-                optionName: '宰后称重',
-                index: '1-5',
+                optionName: '屠宰分割', // 宰后称重
                 routerName: "slaughterWeight"
             },
             {
                 optionName: '入库管理',
-                index: '1-6',
                 routerName: "inStore"
             },
             {
                 optionName: '出仓管理',
-                index: '1-7',
                 routerName: "outStore"
             },
 
             {
                 optionName: '分割加工',
-                index: '1-8',
                 routerName: "segmentation"
             },
             {
                 optionName: '排酸损耗',
-                index: '1-9',
                 routerName: "drainageAcid"
             },
             {
                 optionName: '分割批次',
-                index: '1-10',
                 routerName: "splitBatch"
             },
             {
                 optionName: '成本核算',
-                index: '1-12',
                 routerName: "costAccounting"
             }
         ]
@@ -79,42 +65,34 @@ export const menuData = [
     {
         optionName: "销售管理",
         iconClassName: "el-icon-s-custom",
-        index: '2',
         disabled: false,
         childList: [
             {
                 optionName: '客户管理',
-                index: '2-1',
                 routerName: "client"
             },
             {
                 optionName: '价格管理',
-                index: '2-2',
                 routerName: "price"
             },
             {
                 optionName: '销售统计',
-                index: '2-3',
                 routerName: "sellRegister"
             },
             {
                 optionName: '屠宰直销',
-                index: '2-4',
                 routerName: "directSell"
             },
             {
                 optionName: '胴体销售',
-                index: '2-5',
                 routerName: "carcassSell"
             },
             {
                 optionName: '分割销售',
-                index: '2-6',
                 routerName: "splitSell"
             },
             {
                 optionName: '其他销售',
-                index: '2-7',
                 routerName: "elseSell"
             },
         ]
@@ -122,32 +100,26 @@ export const menuData = [
     {
         optionName: "产品制作智能监控",
         iconClassName: "el-icon-ice-cream-square",
-        index: '3',
         disabled: false,
         childList: [
             {
                 optionName: '产品档案',
-                index: '3-1',
                 routerName: "productInfo"
             },
             {
                 optionName: '分割登记',
-                index: '3-2',
                 routerName: "splitLog"
             },
             {
                 optionName: '羊皮登记',
-                index: '3-3',
                 routerName: "sheepskinLog"
             },
             {
                 optionName: '羊血登记',
-                index: '3-4',
                 routerName: "goatBloodLog"
             },
             {
                 optionName: '羊杂登记',
-                index: '3-5',
                 routerName: "goatHasletLog"
             },
             
@@ -157,27 +129,22 @@ export const menuData = [
     {
         optionName: "鲜肉储运智能管控",
         iconClassName: "el-icon-shopping-cart-1",
-        index: '4',
         disabled: false,
         childList: [
             {
                 optionName: '配送管理',
-                index: '4-2',
                 routerName: "dispatching"
             },
             {
                 optionName: '运输管理',
-                index: '4-3',
                 routerName: "transportation"
             },
             {
                 optionName: '门店管理',
-                index: '4-4',
                 routerName: "shopStore"
             },
             {
                 optionName: '产品追溯',
-                index: '4-5',
                 routerName: "productQuery"
             },
         ]
@@ -185,37 +152,30 @@ export const menuData = [
     {
         optionName: "开发用模板",
         iconClassName: "el-icon-menu",
-        index: '100',
         disabled: false, // 是否禁用
         childList: [
             {
                 optionName: '模板 1',
-                index: '100-1',
                 routerName: "aa"
             },
             {
                 optionName: '普通表格',
-                index: '100-2',
                 routerName: "ab"
             },
             {
                 optionName: '模板 3',
-                index: '100-3',
                 routerName: "ac"
             },
             {
                 optionName: '模板 4',
-                index: '100-4',
                 routerName: "ad"
             },
             {
                 optionName: '模板 5',
-                index: '100-5',
                 routerName: "ee"
             },
             {
                 optionName: '模板 6',
-                index: '100-6',
                 routerName: "af"
             }
 
@@ -235,11 +195,9 @@ const menuData描述 = [
     {
         oneMenuName: "导航一", // 一级菜单名
         iconClassName: "aaa", // element-ui图标名
-        index: '1', // 唯一标志
         childList: [ // 分组的
             {
                 groupName: '组名一',
-                index: '1-1-1',
                 list: [
                     {
                         optionName: '选项1',
@@ -250,7 +208,6 @@ const menuData描述 = [
             },
             {
                 groupName: '组名二',
-                index: '1-1-2',
                 list: [
                     {
                         optionName: '选项1',
@@ -265,12 +222,10 @@ const menuData描述 = [
     {
         oneMenuName: "导航二",
         iconClassName: "el-icon-menu",
-        index: '2',
         disabled: false, // 是否禁用
         childList: [ // 不分组的
             {
                 optionName: '选项1',
-                index: '2-1',
                 routerName: "home"
             },
             {}
@@ -281,7 +236,6 @@ const menuData描述 = [
         oneMenuName: "导航三",
         iconClassName: "el-icon-document",
         routerName: "home",
-        index: '3',
         disabled: false
     },
 

src/views/slaughterManagment/costAccounting.vue

@@ -28,6 +28,10 @@
                     <span class="title">利润率</span>
                     <span class="content">19.68%</span>
                 </li>
+                <li class="li">
+                    <span class="title">投入产出比</span>
+                    <span class="content">{{((1 - 0.1968) * 100).toFixed(2)}}%</span>
+                </li>
             </ul>
         </section>
     </div>
@@ -56,19 +60,21 @@ export default {
 <style lang="scss" scoped>
 .Index {
     .header {
-        display: flex;
-        padding-right: 11%;
+        width: 1500px;
         .left {
-            width: 50%;
             height: 400px;
+            width: 750px;
+            display: inline-block;
         }
         .right {
-            width: 50%;
             height: 400px;
+            width: 750px;
+            display: inline-block;
+            float: right;
         }
     }
     .section {
-        margin: 110px 0 0 0;
+        margin: 80px 0 0 0;
         padding: 10px 10px 10px 10px;
         border: 1px solid #ccc;
         border-radius: 10px;

src/views/slaughterManagment/cost_echarts/E-Cost.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="E-Cost">
-        <div id="E-Cost" style="height:400px;"></div>
+        <div id="E-Cost" style="height:350px;"></div>
     </div>
 </template>
 
@@ -26,8 +26,6 @@ export default {
                     bottom: 0
                 },
                 grid: {
-                    left: "8%",
-                    right: "4%",
                     containLabel: true
                 },
                 tooltip: {
@@ -67,7 +65,7 @@ export default {
                     {
                         type: "pie",
                         // 内外圈厚度
-                        radius: ["0%", "58%"],
+                        radius: ["0%", "55%"],
                         label: {
                             formatter: "{bStyle|{b}：}{c}  ({d}%)  ",
                             fontSize: 15,

src/views/slaughterManagment/cost_echarts/E-Profit.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <!-- E-Profit 利润-->
-        <div id="EGiveBirth" style="height:400px;"></div>
+        <div id="EGiveBirth" style="height:350px;"></div>
     </div>
 </template>
 

src/views/slaughterManagment/firmBuy.vue

@@ -22,7 +22,7 @@
                     tooltip-effect="dark"
                     style="width: 100%"
                 >
-                    <el-table-column prop="sheepId" label="羊耳标号"></el-table-column>
+                    <el-table-column prop="sheepId" label="养只编号"></el-table-column>
                     <el-table-column prop="acquisitionTime" label="收购时间"></el-table-column>
                     <el-table-column prop="origin" label="来源牧场"></el-table-column>
                     <el-table-column prop="acquisitionWeight" label="收购重量(kg)"></el-table-column>

src/views/slaughterManagment/inButcherHurdle.vue

@@ -171,6 +171,7 @@ export default {
             })
                 .then(res => {
                     this.tableData = res.content;
+                    console.log(res.totalPages)
                     this.totalPages = res.totalPages;
                 })
                 .catch(err => {
@@ -200,7 +201,7 @@ export default {
                 });
         },
         pageChange(p) {
-            console.log(p);
+            // console.log(p);
             this.page = p;
             // 入待宰栏列表
             this.getWaitList();

src/views/slaughterManagment/reportQuarantine.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="reportQuarantine">
-        <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 id="header">
             <el-row type="flex" :gutter="20">
                 <el-col :span="4">
@@ -25,7 +25,11 @@
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
                     <el-table-column prop="inspectionDate" label="送检日期"></el-table-column>
                     <el-table-column prop="inspectionPerson" label="送检人员"></el-table-column>
-                    <el-table-column prop="status" label="状态"></el-table-column>
+                    <el-table-column prop="status" label="状态">
+                        <template v-slot="scope">
+                            <span>{{ scope.row.status==0?'不合格':'合格' }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column prop="quarantineNo" label="检疫单编号"></el-table-column>
                     <el-table-column prop="slaughterBatch" label="屠宰批次"></el-table-column>
                     <el-table-column label="操作" width="150">
@@ -69,7 +73,10 @@
                         </el-form-item>
 
                         <el-form-item label="状态">
-                            <el-input v-model="formData.status"></el-input>
+                            <el-radio-group v-model="formData.status">
+                                <el-radio :label="0">未通过</el-radio>
+                                <el-radio :label="1">通过</el-radio>
+                            </el-radio-group>
                         </el-form-item>
 
                         <el-form-item label="检疫单编号">
@@ -121,7 +128,7 @@ export default {
             formData: {
                 inspectionDate: this.$moment().format("YYYY-MM-DD"),
                 inspectionPerson: "王炸",
-                status: "1",
+                status: 1,
                 quarantineNo: "88255662380",
                 slaughterBatch: null
             },

src/views/slaughterManagment/slaughterWeight.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="slaughterWeight">
-        <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 id="header">
             <el-row type="flex" :gutter="20">
                 <el-col :span="4">

src/views/storeTransportation/dispatching.vue

@@ -23,11 +23,11 @@
                     style="width: 100%"
                 >
                     <el-table-column prop="id" label="序号" width="80"></el-table-column>
-                    <el-table-column prop="salesNo" label="ID编码"></el-table-column>
+                    <el-table-column prop="salesNo" label="商品编码"></el-table-column>
                     <el-table-column prop="deliveryCustomer" label="配送客户/单位"></el-table-column>
                     <el-table-column prop="deliveryAddress" label="配送地址"></el-table-column>
                     <el-table-column prop="transportNo" label="运输单号"></el-table-column>
-                    <el-table-column prop="weight" label="重量"></el-table-column>
+                    <el-table-column prop="weight" label="重量(kg)"></el-table-column>
                     <el-table-column prop="distributor" label="配送员"></el-table-column>
                     <el-table-column prop="transportVehicles" label="车牌号"></el-table-column>
                     <el-table-column prop="tel" label="手机号"></el-table-column>
@@ -65,7 +65,7 @@
             <el-row type="flex">
                 <el-col :span="20">
                     <el-form ref="addDispatch" :model="formData" :rules="rules" label-width="140px">
-                        <el-form-item label="销售单号">
+                        <el-form-item label="商品编码">
                             <el-input v-model="formData.salesNo"></el-input>
                         </el-form-item>