2021-07-01

config/index.js

@@ -23,8 +23,8 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    // host: '192.168.1.113',
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '192.168.1.113',
+    // host: 'localhost', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/store/index.js

@@ -47,7 +47,8 @@ export default new Vuex.Store({
     getManList (content) {
       http({
         url: http.adornUrl('/management/employee/findAll'),
-        method: 'get'
+        method: 'get',
+        params: http.adornParams({})
       }).then(res => {
         if (res.data.code === 0) {
           content.commit('setManList', res.data.all)
@@ -59,7 +60,8 @@ export default new Vuex.Store({
     getIllnes (content) {
       http({
         url: http.adornUrl('/management/healthdisease/findAll'),
-        method: 'get'
+        method: 'get',
+        params: http.adornParams({})
         // `${url}/management/healthdisease/findAll`
       }).then(res => {
         if (res.data.code === 0) {
@@ -72,7 +74,8 @@ export default new Vuex.Store({
     getCause (content) {
       http({
         url: http.adornUrl('/management/healthdiseasecause/findAll'),
-        method: 'get'
+        method: 'get',
+        params: http.adornParams({})
       }).then(res => {
         if (res.data.code === 0) {
           content.commit('setCause', res.data.all)
@@ -83,7 +86,8 @@ export default new Vuex.Store({
     getSymptom (content) {
       http({
         url: http.adornUrl('/management/healthsymptom/findAll'),
-        method: 'get'
+        method: 'get',
+        params: http.adornParams({})
       }).then(res => {
         if (res.data.code === 0) {
           content.commit('setSymptom', res.data.all)
@@ -94,7 +98,8 @@ export default new Vuex.Store({
     getTmentplan (content) {
       http({
         url: http.adornUrl('/management/healthtreatmentplan/findAll'),
-        method: 'get'
+        method: 'get',
+        params: http.adornParams({})
       }).then(res => {
         if (res.data.code === 0) {
           content.commit('setTmentplan', res.data.all)

src/views/modules/alarm/check.vue

@@ -0,0 +1,65 @@
+<template>
+  <el-dialog
+    title="确认说明"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    width="600px">
+    <el-form 
+      :model="dataForm" 
+      ref="dataForm" 
+      label-width="80px" 
+      size="mini"
+      style="margin-left: 20px;width: 500px">
+      <el-form-item label="操作人员" prop="verifyUser">
+        <!-- <el-input v-model="dataForm.verifyUser" disabled> -->
+          {{dataForm.verifyUser}}
+        <!-- </el-input> -->
+      </el-form-item>
+      <el-form-item label="确认时间" prop="verifyTime">
+        <!-- <el-input v-model="dataForm.verifyTime" disabled></el-input> -->
+        {{dataForm.verifyTime}}
+      </el-form-item>
+      <el-form-item label="确认描述" prop="verifyDescription">
+        <el-input
+          type="textarea"
+          :rows="8"
+          v-model="dataForm.verifyDescription"
+          disabled>
+        </el-input>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="mini" @click="visible = false">关闭</el-button>
+      <!-- <el-button size="mini" type="primary" @click="dataFormSubmit()">确定</el-button> -->
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    // props: ["thresholdTypes"],
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          // id: '',
+          verifyDescription: '',
+          verifyTime: '',
+          verifyUser: ''
+        }
+      }
+    },
+    methods: {
+      // 在ealarm.vue调用该方法
+      init (row) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          this.dataForm.verifyDescription = row.verifyDescription
+          this.dataForm.verifyTime = row.verifyTime
+          this.dataForm.verifyUser = row.verifyUser
+        })
+      }
+    }
+  }
+</script>

src/views/modules/alarm/indoor.vue

@@ -16,6 +16,16 @@
               </el-select>
             </el-form-item> -->
             <el-form-item style="width: 140px">
+              <el-select v-model="form.verifyStatus">
+                <el-option
+                  v-for="item in verifyStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item style="width: 140px">
               <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
                   v-for="item in pigstyList"
@@ -115,12 +125,21 @@
               label="操作">
               <template slot-scope="scope">
                 <el-button
+                  v-if="!form.verifyStatus"
                   type="text"
                   size="mini"
                   style="color: rgb(24,144,255)"
                   @click="verifyHandle(scope.row.id)">
                   处理确认
                 </el-button>
+                <el-button
+                  v-else
+                  type="text"
+                  size="mini"
+                  style="color: rgb(24,144,255)"
+                  @click="verifyCheck(scope.row)">
+                  查看确认
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -135,6 +154,7 @@
           </el-pagination>
           <!-- 弹窗, 新增 / 修改 -->
           <verify v-if="verifyVisible" ref="verify" @refreshDataList="getDataList" :thresholdTypes="thresholdTypes"></verify>
+          <check v-if="checkVisible" ref="check"></check>
         </div>
       </el-main>
     </el-container>
@@ -143,6 +163,7 @@
 
 <script>
   import verify from './verify'
+  import check from './check.vue'
   export default {
     data () {
       return {
@@ -150,8 +171,19 @@
           // farmId: '',
           pigstyId: '',
           time: [],
-          warningType: ''
+          warningType: '',
+          verifyStatus: false
         },
+        verifyStatus: [
+          {
+            value: false,
+            label: '未处理'
+          },
+          {
+            value: true,
+            label: '已处理'
+          }
+        ],
         dataList: [],
         pageIndex: 1,
         pageSize: 10,
@@ -177,6 +209,7 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
+        checkVisible: false
         // pigsty: {
         //   farmId: '',
         //   pigstyId: ''
@@ -187,7 +220,8 @@
       this.getDataList()
     },
     components: {
-      verify
+      verify,
+      check
     },
     methods: {
       // 获取数据列表
@@ -205,7 +239,8 @@
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 1,
-            'warningType': this.form.warningType || undefined
+            'warningType': this.form.warningType || undefined,
+            'verifyStatus': this.form.verifyStatus
           })
         }).then(async({data}) => {
           if (data && data.code === 0) {
@@ -296,8 +331,16 @@
         this.form.pigstyId = ''
         this.form.time = []
         this.form.warningType = ''
+        this.form.verifyStatus = false
         // this.pigstySelectedList = this.pigstyList
       },
+      // 查看确认
+      verifyCheck (row) {
+        this.checkVisible = true
+        this.$nextTick(() => {
+          this.$refs.check.init(row)
+        })
+      },
       // 确认处理
       verifyHandle (id) {
         this.verifyVisible = true

src/views/modules/alarm/meteo.vue

@@ -15,6 +15,16 @@
                 </el-option>
               </el-select>
             </el-form-item> -->
+            <el-form-item style="width: 140px">
+              <el-select v-model="form.verifyStatus">
+                <el-option
+                  v-for="item in verifyStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-date-picker
                 v-model="form.time"
@@ -105,12 +115,21 @@
               label="操作">
               <template slot-scope="scope">
                 <el-button
+                  v-if="!form.verifyStatus"
                   type="text"
                   size="mini"
                   style="color: rgb(24,144,255)"
                   @click="verifyHandle(scope.row.id)">
                   处理确认
                 </el-button>
+                <el-button
+                  v-else
+                  type="text"
+                  size="mini"
+                  style="color: rgb(24,144,255)"
+                  @click="verifyCheck(scope.row)">
+                  查看确认
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -125,6 +144,7 @@
           </el-pagination>
           <!-- 弹窗, 新增 / 修改 -->
           <verify v-if="verifyVisible" ref="verify" @refreshDataList="getDataList" :thresholdTypes="thresholdTypes"></verify>
+          <check v-if="checkVisible" ref="check"></check>
         </div>
       </el-main>
     </el-container>
@@ -133,14 +153,26 @@
 
 <script>
   import verify from './verify'
+  import check from './check.vue'
   export default {
     data () {
       return {
         form: {
           // farmId: '',
           time: [],
-          warningType: ''
+          warningType: '',
+          verifyStatus: false
         },
+        verifyStatus: [
+          {
+            value: false,
+            label: '未处理'
+          },
+          {
+            value: true,
+            label: '已处理'
+          }
+        ],
         dataList: [],
         pageIndex: 1,
         pageSize: 10,
@@ -164,13 +196,15 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
+        checkVisible: false
       }
     },
     activated () {
       this.getDataList()
     },
     components: {
-      verify
+      verify,
+      check
     },
     methods: {
       // 获取数据列表
@@ -187,7 +221,8 @@
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 2,
-            'warningType': this.form.warningType || undefined
+            'warningType': this.form.warningType || undefined,
+            'verifyStatus': this.form.verifyStatus
           })
         }).then(async({data}) => {
           if (data && data.code === 0) {
@@ -239,6 +274,14 @@
         // this.form.farmId = this.$cookie.get('farmId') === 'null'? '': parseInt(this.$cookie.get('farmId'))
         this.form.time = []
         this.form.warningType = ''
+        this.form.verifyStatus = false
+      },
+      // 查看确认
+      verifyCheck (row) {
+        this.checkVisible = true
+        this.$nextTick(() => {
+          this.$refs.check.init(row)
+        })
       },
       // 确认处理
       verifyHandle (id) {

src/views/modules/alarm/temp.vue

@@ -5,6 +5,16 @@
       <el-header>
         <div class="rect rect-form">
           <el-form :inline="true" :model="form" @keyup.enter.native="getDataList()" size="mini" ref="form">
+            <el-form-item style="width: 140px">
+              <el-select v-model="form.verifyStatus">
+                <el-option
+                  v-for="item in verifyStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item style="width: 180px">
               <el-input placeholder="耳标" v-model="form.earTag"></el-input>
             </el-form-item>
@@ -144,12 +154,21 @@
               label="操作">
               <template slot-scope="scope">
                 <el-button
+                  v-if="!form.verifyStatus"
                   type="text"
                   size="mini"
                   style="color: rgb(24,144,255)"
                   @click="verifyHandle(scope.row.id)">
                   处理确认
                 </el-button>
+                <el-button
+                  v-else
+                  type="text"
+                  size="mini"
+                  style="color: rgb(24,144,255)"
+                  @click="verifyCheck(scope.row)">
+                  查看确认
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -164,6 +183,7 @@
           </el-pagination>
           <!-- 弹窗, 新增 / 修改 -->
           <verify v-if="verifyVisible" ref="verify" @refreshDataList="getDataList" :thresholdTypes="thresholdTypes"></verify>
+          <check v-if="checkVisible" ref="check"></check>
         </div>
       </el-main>
     </el-container>
@@ -172,6 +192,7 @@
 
 <script>
   import verify from './verify'
+  import check from './check.vue'
   export default {
     data () {
       return {
@@ -180,8 +201,19 @@
           pigstyId: '',
           time: [],
           warningType: '',
-          earTag: ''
+          earTag: '',
+          verifyStatus: false
         },
+        verifyStatus: [
+          {
+            value: false,
+            label: '未处理'
+          },
+          {
+            value: true,
+            label: '已处理'
+          }
+        ],
         dataList: [],
         pageIndex: 1,
         pageSize: 10,
@@ -209,6 +241,7 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
+        checkVisible: false
         // pigsty: {
         //   farmId: '',
         //   pigstyId: ''
@@ -219,7 +252,8 @@
       this.getDataList()
     },
     components: {
-      verify
+      verify,
+      check
     },
     methods: {
       // 获取数据列表
@@ -239,7 +273,8 @@
             'endTime': this.form.time[1] || undefined,
             'belongTo': 3,
             'warningType': this.form.warningType || undefined,
-            'earTag': this.form.earTag || undefined
+            'earTag': this.form.earTag || undefined,
+            'verifyStatus': this.form.verifyStatus
           })
         }).then(async({data}) => {
           if (data && data.code === 0) {
@@ -314,8 +349,16 @@
         this.form.time = []
         this.form.warningType = ''
         this.form.earTag = ''
+        this.form.verifyStatus = false
         // this.pigstySelectedList = this.pigstyList
       },
+      // 查看确认
+      verifyCheck (row) {
+        this.checkVisible = true
+        this.$nextTick(() => {
+          this.$refs.check.init(row)
+        })
+      },
       // 确认处理
       verifyHandle (id) {
         this.verifyVisible = true

src/views/modules/alarm/water.vue

@@ -16,6 +16,16 @@
               </el-select>
             </el-form-item> -->
             <el-form-item style="width: 140px">
+              <el-select v-model="form.verifyStatus">
+                <el-option
+                  v-for="item in verifyStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item style="width: 140px">
               <el-select placeholder="猪舍" v-model="form.pigstyId">
                 <el-option
                   v-for="item in pigstyList"
@@ -115,12 +125,21 @@
               label="操作">
               <template slot-scope="scope">
                 <el-button
+                  v-if="!form.verifyStatus"
                   type="text"
                   size="mini"
                   style="color: rgb(24,144,255)"
                   @click="verifyHandle(scope.row.id)">
                   处理确认
                 </el-button>
+                <el-button
+                  v-else
+                  type="text"
+                  size="mini"
+                  style="color: rgb(24,144,255)"
+                  @click="verifyCheck(scope.row)">
+                  查看确认
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -135,6 +154,7 @@
           </el-pagination>
           <!-- 弹窗, 新增 / 修改 -->
           <verify v-if="verifyVisible" ref="verify" @refreshDataList="getDataList" :thresholdTypes="thresholdTypes"></verify>
+          <check v-if="checkVisible" ref="check"></check>
         </div>
       </el-main>
     </el-container>
@@ -143,6 +163,7 @@
 
 <script>
   import verify from './verify'
+  import check from './check.vue'
   export default {
     data () {
       return {
@@ -150,8 +171,19 @@
           // farmId: '',
           pigstyId: '',
           time: [],
-          warningType: ''
+          warningType: '',
+          verifyStatus: false
         },
+        verifyStatus: [
+          {
+            value: false,
+            label: '未处理'
+          },
+          {
+            value: true,
+            label: '已处理'
+          }
+        ],
         dataList: [],
         pageIndex: 1,
         pageSize: 10,
@@ -177,6 +209,7 @@
           }
         ],
         verifyVisible: false, // 弹窗是否显示
+        checkVisible: false
         // pigsty: {
         //   farmId: '',
         //   pigstyId: ''
@@ -187,7 +220,8 @@
       this.getDataList()
     },
     components: {
-      verify
+      verify,
+      check
     },
     methods: {
       // 获取数据列表
@@ -205,6 +239,7 @@
             'startTime': this.form.time[0] || undefined,
             'endTime': this.form.time[1] || undefined,
             'belongTo': 4,
+            'verifyStatus': this.form.verifyStatus
             // 'warningType': this.form.warningType || undefined
           })
         }).then(async({data}) => {
@@ -296,10 +331,18 @@
         this.form.pigstyId = ''
         this.form.time = []
         this.form.warningType = ''
+        this.form.verifyStatus = false
         // this.pigstySelectedList = this.pigstyList
         // console.log(this.$cookie.get('farmId'));
         // console.log(this.form.id);
       },
+      // 查看确认
+      verifyCheck (row) {
+        this.checkVisible = true
+        this.$nextTick(() => {
+          this.$refs.check.init(row)
+        })
+      },
       // 确认处理
       verifyHandle (id) {
         this.verifyVisible = true

src/views/modules/envir/ealarm-add-or-update.vue

@@ -12,19 +12,9 @@
       label-width="80px" 
       size="mini"
       style="margin-left: 20px;width: 500px">
-      <!-- <el-form-item label="牧场名称" prop="farmId">
-        <el-select v-model="dataForm.farmId" :disabled="farmId > 0" style="width: 100%">
-          <el-option
-            v-for="item in farmList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="参数名称" prop="thresholdType">
         <!-- <el-input v-model.number="dataForm.thresholdType" placeholder="请输入数字"></el-input> -->
-        <el-select v-model="dataForm.thresholdType" style="width: 100%">
+        <el-select v-model="dataForm.thresholdType" style="width: 100%" :disabled="dataForm.id > 0">
           <el-option
             v-for="item in thresholdTypes"
             :key="item.value"
@@ -49,27 +39,6 @@
   export default {
     props: ["thresholdTypes"],
     data () {
-      // var validateEmail = (rule, value, callback) => {
-      //   // if (!isEmail(value)) {
-      //   //   callback(new Error('邮箱格式错误'))
-      //   // } else {
-      //   //   callback()
-      //   // }
-      //   if (value === '') {
-      //     callback()
-      //   } else if (!isEmail(value)) {
-      //     callback(new Error('邮箱格式错误'))
-      //   } else {
-      //     callback()
-      //   }
-      // }
-      // var validateMobile = (rule, value, callback) => {
-      //   if (!isMobile(value)) {
-      //     callback(new Error('手机号格式错误'))
-      //   } else {
-      //     callback()
-      //   }
-      // }
       return {
         visible: false,
         dataForm: {
@@ -80,18 +49,13 @@
           // farmId: ''
         },
         dataRule: {
-          // farmId: [
-          //   { required: true, message: '牧场名称不能为空', trigger: 'blur' }
-          // ],
           thresholdType: [
             { required: true, message: '参数名称不能为空', trigger: 'blur' }
           ],
           thresholdValue: [
             { required: true, message: '参数阈值不能为空', trigger: 'blur' }
           ]
-        },
-        // farmList: [], // 牧场List
-        // farmId: undefined
+        }
       }
     },
     methods: {
@@ -118,24 +82,6 @@
             }
           })
         }
-        // // 获取所有牧场
-        // this.farmList = []
-        // let farmList = []
-        // this.$http({
-        //   url: this.$http.adornUrl("/management/farm/findAll"),
-        //   method: "post",
-        // }).then(({data}) => {
-        //   if (data && data.code === 0) {
-        //     farmList = data.all
-        //     farmList.forEach(farm => {
-        //       let item = {
-        //         label: farm.name,
-        //         value: farm.id
-        //       }
-        //       this.farmList.push(item)
-        //     })
-        //   }
-        // })
       },
       // 表单提交
       dataFormSubmit () {

src/views/modules/envir/ealarm.vue

@@ -122,7 +122,7 @@
                 <el-button
                   type="text"
                   size="mini"
-                  @click="deleteHandle"
+                  @click="deleteHandle(scope.row.id)"
                   style="color: rgb(24,144,255)">
                   删除
                 </el-button>

src/views/modules/health/hdisease.vue

@@ -7,8 +7,8 @@
               :inline="true"
               :model="searchForm"
               size="mini">
-            <el-form-item>
-              <el-input placeholder="耳标" v-model="searchForm.earTag"></el-input>
+            <el-form-item style="width: 200px">
+              <el-input placeholder="耳标" style="width: 200px" v-model="searchForm.earTag"></el-input>
             </el-form-item>
             <el-form-item style="width: 140px">
               <el-select v-model="searchForm.sympotomName" placeholder="症状">
@@ -38,6 +38,9 @@
             <el-form-item>
               <el-button icon="el-icon-search" @click="search">查 询</el-button>
             </el-form-item>
+            <el-form-item>
+              <el-button icon="el-icon-circle-close" @click="clearAll">清 空</el-button>
+            </el-form-item>
           </el-form>
         </div>
       </el-header>
@@ -351,6 +354,14 @@ export default {
     search () {
       this.init()
     },
+    clearAll () {
+      this.searchForm.earTag = ''
+      this.searchForm.causeName = ''
+      this.searchForm.diseaseName = ''
+      this.searchForm.doctor = ''
+      this.searchForm.treatmentPlan = ''
+      this.searchForm.sympotomName = ''
+    },
     init () {
       let params = {
         page: this.page,
@@ -359,13 +370,14 @@ export default {
         diseaseName: this.searchForm.diseaseName,
         causeName: this.searchForm.causeName,
         doctor: this.searchForm.doctor,
-        treatmentPlan: this.searchForm.treatmentPlan
+        treatmentPlan: this.searchForm.treatmentPlan,
+        symptomName: this.searchForm.sympotomName
       }
       this.dataListLoading = true
       this.$http({
         url: this.$http.adornUrl('/management/healthmedicalrecord/list'),
-        method: 'post',
-        data: this.$http.adornData(params, true)
+        method: 'get',
+        params: this.$http.adornParams(params)
       })
       .then(res => {
         if (res.data.code === 0) {

src/views/modules/health/hisolate.vue

@@ -14,16 +14,21 @@
               <el-button icon="el-icon-search" @click="search">查 询</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button icon="el-icon-plus" @click="visibleDialog = true">新 增</el-button>
-            </el-form-item>
-            <el-form-item>
-              <el-button icon="el-icon-delete" @click="delAll">批量删除</el-button>
+              <el-button icon="el-icon-circle-close" @click="clearAll">清 空</el-button>
             </el-form-item>
           </el-form>
         </div>
       </el-header>
       <el-main>
         <div class="rect" style="margin-top: 20px">
+          <el-form inline size="mini">
+            <el-form-item>
+              <el-button icon="el-icon-plus" @click="visibleDialog = true">新 增</el-button>
+            </el-form-item>
+            <el-form-item>
+              <el-button icon="el-icon-delete" @click="delAll">批量删除</el-button>
+            </el-form-item>
+          </el-form>
           <el-table
               id="select"
               height="530"
@@ -209,6 +214,9 @@ export default {
     search () {
       this.init()
     },
+    clearAll () {
+      this.searchForm.eartag = ''
+    },
     init () {
       let params = {
         page: this.page,
@@ -218,8 +226,8 @@ export default {
       this.dataListLoading = true
       this.$http({
         url: this.$http.adornUrl('/management/healthisolationrecord/list'),
-        method: 'post',
-        data: this.$http.adornData(params, true)
+        method: 'get',
+        params: this.$http.adornParams(params)
       })
           .then(res => {
             if (res.data.code === 0) {

src/views/modules/health/hrecord.vue

@@ -259,8 +259,8 @@ export default {
       this.dataListLoading = true
       this.$http({
         url: this.$http.adornUrl('/management/healthmedicalrecord/list'),
-        method: 'post',
-        data: this.$http.adornData(params, true)
+        method: 'get',
+        params: this.$http.adornParams(params)
       })
           .then(res => {
             if (res.data.code === 0) {

src/views/modules/health/htreat.vue

@@ -35,9 +35,12 @@
                 <el-option v-for="item in tmentplanList" :key="item.id" :label="item.medicantName" :value="item.medicantName"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item style="width: 140px">
+            <el-form-item>
               <el-button icon="el-icon-search" @click="search">查 询</el-button>
             </el-form-item>
+            <el-form-item>
+              <el-button icon="el-icon-circle-close" @click="clearAll">清 空</el-button>
+            </el-form-item>
           </el-form>
         </div>
       </el-header>
@@ -360,6 +363,14 @@ export default {
     search () {
       this.init()
     },
+    clearAll () {
+      this.searchForm.earTag = ''
+      this.searchForm.causeName = ''
+      this.searchForm.diseaseName = ''
+      this.searchForm.doctor = ''
+      this.searchForm.treatmentPlan = ''
+      this.searchForm.sympotomName = ''
+    },
     init () {
       let params = {
         page: this.page,
@@ -368,13 +379,14 @@ export default {
         diseaseName: this.searchForm.diseaseName,
         causeName: this.searchForm.causeName,
         doctor: this.searchForm.doctor,
-        treatmentPlan: this.searchForm.treatmentPlan
+        treatmentPlan: this.searchForm.treatmentPlan,
+        symptomName: this.searchForm.sympotomName
       }
       this.dataListLoading = true
       this.$http({
         url: this.$http.adornUrl('/management/healthmedicalrecord/list'),
-        method: 'post',
-        data: this.$http.adornData(params, true)
+        method: 'get',
+        params: this.$http.adornParams(params)
       })
           .then(res => {
             if (res.data.code === 0) {

src/views/modules/health/hvaccine.vue

@@ -14,7 +14,7 @@
               <el-button icon="el-icon-search" @click="init">查 询</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button icon="el-icon-circle-close">清 空</el-button>
+              <el-button icon="el-icon-circle-close" @click="clearAll">清 空</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -237,8 +237,8 @@ export default {
       }
       this.$http({
         url: this.$http.adornUrl('/management/healthimmunerecord/list'),
-        method: 'post',
-        data: this.$http.adornData(params, false)
+        method: 'get',
+        params: this.$http.adornParams(params)
       })
       .then(res => {
         if (res.data.code === 0) {
@@ -318,6 +318,9 @@ export default {
         }
       })
     },
+    clearAll () {
+      this.searchForm.earTag = ''
+    },
     delAll () {
       this.$http({
         url: this.$http.adornUrl('/management/healthimmunerecord/delete'),

src/views/modules/pigbasic/pbadopt.vue

@@ -40,28 +40,6 @@ export default {
   components: {
     InAndOut,
     Statistics
-  },
-  activated() {
-    // this.getDataList();
-  },
-  methods: {
-    // 获取入栏 \ 出栏 饼状图的数据
-    // getDataList() {
-    //   // this.dataListLoading = true;
-    //   this.$http({
-    //     url: this.$http.adornUrl("/management/yearpigbase/outAndInProportion"),
-    //     method: "get",
-    //     params: this.$http.adornParams()
-    //   }).then( ({ data }) => {
-    //     console.log(data.data);
-    //     if (data && data.code === 0) {
-    //       this.proportion = data.data
-    //     } else {
-    //       this.proportion = null
-    //     }
-    //   })
-    // },
-    
   }
 }
 </script>