East 3 éve
szülő
commit
32df59e5a5

+ 7 - 2
src/views/main-sidebar-sub-menu.vue

@@ -5,7 +5,7 @@
     :popper-class="'site-sidebar--' + sidebarLayoutSkin + '-popper'">
     <template slot="title">
       <icon-svg :name="menu.icon || ''" class="site-sidebar__menu-icon"></icon-svg>
-      <span>{{ menu.name }}</span>
+      <span class="white">{{ menu.name }}</span>
     </template>
     <sub-menu
       v-for="item in menu.list" 
@@ -16,7 +16,7 @@
   </el-submenu>
   <el-menu-item v-else :index="menu.menuId + ''" @click="gotoRouteHandle(menu)">
     <icon-svg :name="menu.icon || ''" class="site-sidebar__menu-icon"></icon-svg>
-    <span style="margin-left: -20px">{{ menu.name }}</span>
+    <span class="white" style="margin-left: -20px">{{ menu.name }}</span>
   </el-menu-item>
 </template>
 
@@ -53,3 +53,8 @@
     }
   }
 </script>
+<style scoped>
+.white {
+  color: #fff;
+}
+</style>

+ 6 - 1
src/views/main-sidebar.vue

@@ -8,7 +8,7 @@
         class="site-sidebar__menu">
         <el-menu-item index="home" @click="$router.push({ name: 'home' })">
           <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
-          <span slot="title">首页</span>
+          <span class="white" slot="title">首页</span>
         </el-menu-item>
         <!-- <el-submenu index="demo">
           <template slot="title">
@@ -110,3 +110,8 @@
     }
   }
 </script>
+<style scoped>
+.white {
+  color: #fff;
+}
+</style>

+ 1 - 1
src/views/modules/pigbasic/pbbasic.vue

@@ -176,7 +176,7 @@
               align="center"
               label="养殖状态">
               <template slot-scope="scope">
-                <span>{{scope.row.outFenceStatus? outFenceStatus[scope.row.outFenceStatus].label: ''}}</span>
+                <span>{{ outFenceStatus[scope.row.outFenceStatus].label }}</span>
               </template>
             </el-table-column>
             <el-table-column

+ 7 - 4
src/views/modules/pigbasic/pbentry-add-or-update.vue

@@ -165,7 +165,7 @@
           // periodId: '',
           sex: '母',
           birthday: '',
-          healthStatus: 1,
+          healthStatus: true,
           weight: 5,
           originPlace: '',
           breed: '',
@@ -183,9 +183,12 @@
           unitId: [
             { required: true, message: '单元不能为空', trigger: 'blur' }
           ],
-          // periodId: [
-          //   { required: true, message: '栏期不能为空', trigger: 'blur' }
-          // ],
+          breed: [
+            { required: true, message: '品种不能为空', trigger: 'blur' }
+          ],
+          birthday: [
+            { required: true, message: '品种不能为空', trigger: 'blur' }
+          ],
           healthStatus: [
             { required: true, message: '健康状态不能为空', trigger: 'blur' }
           ],