Merge branch 'feature/routepage' of Epans/calf-feed-pc into develop

src/views/Login.vue

@@ -24,7 +24,7 @@
         <img src="@/assets/images/logo.png" alt="">
       </div>
       <div class="new-login-r">
-        <div class="title">用户登录</div>
+        <div class="title">用户登录：</div>
         <el-form ref="loginFormRef" :model="loginForm" :rules="loginFormRules" class="login-form" auto-complete="on" label-position="left">
           <el-form-item prop="user_name">
             <!-- <span class="svg-container">

src/views/formulaPlan/FeedPlan.vue

@@ -358,6 +358,8 @@ export default {
         feed_time: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}'),
       },
 
+      
+
       addFormRules:{
         name: [ { required: true, message: '饲喂计划名称必填', trigger: 'blur' },  ],
         formula_id: [ { required: true, message: '配方模板必填', trigger: 'blur' },  ],

src/views/workManagement/WorkTaskAssign.vue

@@ -2,7 +2,7 @@
  
   <div>
 
-
+ 
      
 
  
@@ -101,8 +101,8 @@ export default {
     //   console.log('this.isButtonEdit==========',this.isButtonEdit)
      
 
-    //  //获取下拉框
-    //  // this.get_select_list1()
+    //  获取下拉框
+    //  this.get_select_list1()
 
     //   //表格 - 初始化 
     //   this.get_table_data()