Browse Source

2021-07-23

East 4 năm trước cách đây
mục cha
commit
9c210ba4da
36 tập tin đã thay đổi với 34 bổ sung42 xóa
  1. 1 1
      src/views/modules/alarm/indoor.vue
  2. 1 1
      src/views/modules/alarm/meteo.vue
  3. 1 1
      src/views/modules/alarm/temp.vue
  4. 1 1
      src/views/modules/alarm/water.vue
  5. 1 1
      src/views/modules/basic/breed.vue
  6. 0 1
      src/views/modules/basic/feeder.vue
  7. 0 1
      src/views/modules/basic/period.vue
  8. 0 1
      src/views/modules/basic/pigsty.vue
  9. 0 1
      src/views/modules/basic/unit.vue
  10. 1 1
      src/views/modules/breed/beartag.vue
  11. 2 2
      src/views/modules/breed/bfeed.vue
  12. 2 2
      src/views/modules/breed/bfood.vue
  13. 1 1
      src/views/modules/breed/btransfer.vue
  14. 1 1
      src/views/modules/breed/btrecord.vue
  15. 2 2
      src/views/modules/env/huan.vue
  16. 1 1
      src/views/modules/envir/ealarm.vue
  17. 1 1
      src/views/modules/envir/eindoor.vue
  18. 1 1
      src/views/modules/envir/emeteo.vue
  19. 1 1
      src/views/modules/envir/ewater.vue
  20. 1 1
      src/views/modules/job/schedule-log.vue
  21. 1 1
      src/views/modules/job/schedule.vue
  22. 1 1
      src/views/modules/monitor/areaAdmin.vue
  23. 1 1
      src/views/modules/monitor/camera.vue
  24. 1 1
      src/views/modules/monitor/cameraBrand.vue
  25. 0 1
      src/views/modules/pigbasic/pbentry.vue
  26. 1 1
      src/views/modules/pigbasic/pbexit.vue
  27. 1 1
      src/views/modules/pigbasic/pbpedigree.vue
  28. 1 1
      src/views/modules/pigbasic/pbzhong.vue
  29. 1 2
      src/views/modules/pigfarm/pfperson.vue
  30. 1 1
      src/views/modules/sys/config.vue
  31. 1 1
      src/views/modules/sys/department.vue
  32. 1 1
      src/views/modules/sys/job.vue
  33. 1 1
      src/views/modules/sys/log.vue
  34. 0 2
      src/views/modules/sys/pasture.vue
  35. 2 2
      src/views/modules/sys/role.vue
  36. 1 1
      src/views/modules/sys/user.vue

+ 1 - 1
src/views/modules/alarm/indoor.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item style="width: 140px">
               <el-select v-model="form.verifyStatus">
                 <el-option

+ 1 - 1
src/views/modules/alarm/meteo.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0">
                 <el-option

+ 1 - 1
src/views/modules/alarm/temp.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item style="width: 140px">
               <el-select v-model="form.verifyStatus">
                 <el-option

+ 1 - 1
src/views/modules/alarm/water.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0" @change="farmChange">
                 <el-option

+ 1 - 1
src/views/modules/basic/breed.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bpighouse">
     <div class="rect rect-form">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item style="width: 200px">
           <el-input v-model="dataForm.keyword" placeholder="品种" style="width: 200px" clearable></el-input>
         </el-form-item>

+ 0 - 1
src/views/modules/basic/feeder.vue

@@ -6,7 +6,6 @@
           <el-form
             :inline="true"
             :model="dataForm"
-            @keyup.enter.native="getDataList()"
             size="mini">
             <el-form-item style="width: 500px">
               <el-input

+ 0 - 1
src/views/modules/basic/period.vue

@@ -6,7 +6,6 @@
           <el-form
             :inline="true"
             :model="dataForm"
-            @keyup.enter.native="getDataList()"
             size="mini">
             <el-form-item style="width: 140px">
               <el-select 

+ 0 - 1
src/views/modules/basic/pigsty.vue

@@ -6,7 +6,6 @@
           <el-form
             :inline="true"
             :model="dataForm"
-            @keyup.enter.native="getDataList()"
             size="mini">
             <el-form-item style="width: 180px">
               <el-input

+ 0 - 1
src/views/modules/basic/unit.vue

@@ -6,7 +6,6 @@
           <el-form
             :inline="true"
             :model="dataForm"
-            @keyup.enter.native="getDataList()"
             size="mini">
             <el-form-item style="width: 140px">
               <el-select 

+ 1 - 1
src/views/modules/breed/beartag.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item>
               <el-input v-model="form.eartag" placeholder="耳标" clearable></el-input>
             </el-form-item>

+ 2 - 2
src/views/modules/breed/bfeed.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mod-role">
     <div class="rect rect-form">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <!-- <el-form-item style="width: 100px">
           <el-select placeholder="猪舍"></el-select>
         </el-form-item>
@@ -27,7 +27,7 @@
       </el-form>
     </div>
     <div class="rect rect-table">
-      <!-- <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <!-- <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item>
           <el-button 
             icon="el-icon-plus"

+ 2 - 2
src/views/modules/breed/bfood.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mod-role">
     <div class="rect rect-form">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item>
           <el-input v-model="dataForm.ingredients" placeholder="饲料名称" clearable></el-input>
         </el-form-item>
@@ -21,7 +21,7 @@
       </el-form>
     </div>
     <div class="rect rect-table">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item>
           <el-button 
             icon="el-icon-plus"

+ 1 - 1
src/views/modules/breed/btransfer.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item>
               <el-input v-model="form.eartag" placeholder="耳标" clearable></el-input>
             </el-form-item>

+ 1 - 1
src/views/modules/breed/btrecord.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item>
               <el-input v-model="form.earTag" placeholder="耳标" clearable></el-input>
             </el-form-item>

+ 2 - 2
src/views/modules/env/huan.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="rect rect-form">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item style="width: 200px">
           <el-input v-model="dataForm.keyword" placeholder="设备编号" style="width: 200px" clearable></el-input>
         </el-form-item>
@@ -25,7 +25,7 @@
       </el-form>
     </div>
     <div class="rect rect-table">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item>
           <el-button 
             icon="el-icon-plus"

+ 1 - 1
src/views/modules/envir/ealarm.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <!-- <el-form-item style="width: 140px">
               <el-select placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0">
                 <el-option

+ 1 - 1
src/views/modules/envir/eindoor.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <!-- <el-form-item style="width: 50px">
               <el-button type="success" :disabled="abnormalStatus===false" @click="changeClick">正常</el-button>
             </el-form-item>

+ 1 - 1
src/views/modules/envir/emeteo.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <!-- <el-form-item style="width: 50px">
               <el-button type="success" :disabled="abnormalStatus===false" @click="changeClick">正常</el-button>
             </el-form-item>

+ 1 - 1
src/views/modules/envir/ewater.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <!-- <el-form-item style="width: 50px">
               <el-button type="success" :disabled="abnormalStatus===false" @click="changeClick">正常</el-button>
             </el-form-item>

+ 1 - 1
src/views/modules/job/schedule-log.vue

@@ -4,7 +4,7 @@
     :close-on-click-modal="false"
     :visible.sync="visible"
     width="75%">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm">
       <el-form-item>
         <el-input v-model="dataForm.id" placeholder="任务ID" clearable></el-input>
       </el-form-item>

+ 1 - 1
src/views/modules/job/schedule.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-schedule">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm">
       <el-form-item>
         <el-input v-model="dataForm.beanName" placeholder="bean名称" clearable></el-input>
       </el-form-item>

+ 1 - 1
src/views/modules/monitor/areaAdmin.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item style="width:200px">
               <el-input v-model="form.keyword" style="width:200px" placeholder="请输入区域"></el-input>
             </el-form-item>

+ 1 - 1
src/views/modules/monitor/camera.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item label="区域">
               <el-select v-model="form.areaId">
                 <el-option v-for="item in column" :key="item.id" :value="item.id" :label="item.name"></el-option>

+ 1 - 1
src/views/modules/monitor/cameraBrand.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item style="width:200px">
               <el-input v-model="form.keyword" style="width:200px" placeholder="请输入品牌"></el-input>
             </el-form-item>

+ 0 - 1
src/views/modules/pigbasic/pbentry.vue

@@ -7,7 +7,6 @@
           <el-form 
             :inline="true" 
             :model="form" 
-            @keyup.enter.native="getDataList()" 
             size="mini" 
             ref="form">
             <el-form-item style="width: 200px">

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

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item>
               <el-input v-model="form.eartag" placeholder="耳标" clearable></el-input>
             </el-form-item>

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

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item>
               <el-input v-model="form.eartag" placeholder="耳标" clearable></el-input>
             </el-form-item>

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

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+          <el-form :inline="true" :model="form" size="mini" ref="form">
             <el-form-item>
               <el-input v-model="form.eartag" placeholder="耳标" clearable></el-input>
             </el-form-item>

+ 1 - 2
src/views/modules/pigfarm/pfperson.vue

@@ -2,8 +2,7 @@
   <div class="branch">
     <el-form
       :inline="true"
-      :model="dataForm"
-      @keyup.enter.native="getDataList()">
+      :model="dataForm">
       <el-form-item style="width: 500px">
         <el-input
           v-model="dataForm.key"

+ 1 - 1
src/views/modules/sys/config.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm">
       <el-form-item>
         <el-input v-model="dataForm.paramKey" placeholder="参数名" clearable></el-input>
       </el-form-item>

+ 1 - 1
src/views/modules/sys/department.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <!-- <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" size="mini">
+          <el-form :inline="true" :model="dataForm" size="mini">
             <el-form-item>
               <el-input v-model="dataForm.keyword" placeholder="角色名称" clearable></el-input>
             </el-form-item>

+ 1 - 1
src/views/modules/sys/job.vue

@@ -4,7 +4,7 @@
       <!-- form表单 -->
       <!-- <el-header>
         <div class="rect rect-form">
-          <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" size="mini">
+          <el-form :inline="true" :model="dataForm" size="mini">
             <el-form-item>
               <el-input v-model="dataForm.roleName" placeholder="角色名称" clearable></el-input>
             </el-form-item>

+ 1 - 1
src/views/modules/sys/log.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mod-log">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form :inline="true" :model="dataForm">
       <el-form-item>
         <el-input v-model="dataForm.key" placeholder="用户名/用户操作" clearable></el-input>
       </el-form-item>

+ 0 - 2
src/views/modules/sys/pasture.vue

@@ -4,7 +4,6 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
         size="mini">
         <el-form-item style="width: 500px">
           <el-input
@@ -26,7 +25,6 @@
       <el-form
         :inline="true"
         :model="dataForm"
-        @keyup.enter.native="getDataList()"
         size="mini">
         <el-form-item>
           <el-button 

+ 2 - 2
src/views/modules/sys/role.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mod-role">
     <div class="rect rect-form">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item>
           <el-input v-model="dataForm.roleName" placeholder="角色名称" clearable></el-input>
         </el-form-item>
@@ -15,7 +15,7 @@
       </el-form>
     </div>
     <div class="rect rect-table">
-      <el-form size="mini" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form size="mini" :inline="true" :model="dataForm">
         <el-form-item>
           <el-button 
             icon="el-icon-plus"

+ 1 - 1
src/views/modules/sys/user.vue

@@ -11,7 +11,7 @@
         <!-- form表单 -->
         <el-header>
           <div class="rect rect-form">
-            <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+            <el-form :inline="true" :model="form" size="mini" ref="form">
               <el-form-item>
                 <el-input v-model="form.username" placeholder="姓名/手机号码" clearable></el-input>
               </el-form-item>