2021-07-06

src/views/modules/alarm/indoor.vue

@@ -37,15 +37,16 @@
                 value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
-            <el-form-item style="width: 140px">
-              <el-select placeholder="报警类型" v-model="form.warningType">
+            <el-form-item style="width:200px">
+              <el-input v-model="form.warningType" style="width:200px" placeholder="报警类型"></el-input>
+              <!-- <el-select placeholder="报警类型" v-model="form.warningType">
                 <el-option
                   v-for="item in thresholdTypes"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
             <el-form-item>
               <el-button @click="getDataList()" icon="el-icon-search">查 询</el-button>
@@ -84,12 +85,10 @@
               label="猪舍">
             </el-table-column>
             <el-table-column
+              prop="warningType"
               header-align="center"
               align="center"
               label="报警类型">
-              <template slot-scope="scope">
-                <span>{{thresholdTypes[scope.row.warningType - 1].label}}</span>
-              </template>
             </el-table-column>
             <el-table-column
               prop="nowValue"
@@ -137,7 +136,7 @@
             layout="total, sizes, prev, pager, next, jumper">
           </el-pagination>
           <!-- 弹窗, 新增 / 修改 -->
-          <verify v-if="verifyVisible" ref="verify" @refreshDataList="getDataList" :thresholdTypes="thresholdTypes"></verify>
+          <verify v-if="verifyVisible" ref="verify" @refreshDataList="getDataList"></verify>
           <check v-if="checkVisible" ref="check"></check>
         </div>
       </el-main>
@@ -178,20 +177,20 @@
         pigstyList: [], // 猪舍List
         // pigstySelectedList: [], // 根据牧场限制的猪舍SelectedList
         labelPosition: 'right',
-        thresholdTypes: [
-          {
-            label: '高温',
-            value: 1
-          },
-          {
-            label: '低温',
-            value: 2
-          },
-          {
-            label: '空气污染',
-            value: 3
-          }
-        ],
+        // thresholdTypes: [
+        //   {
+        //     label: '高温',
+        //     value: 1
+        //   },
+        //   {
+        //     label: '低温',
+        //     value: 2
+        //   },
+        //   {
+        //     label: '空气污染',
+        //     value: 3
+        //   }
+        // ],
         verifyVisible: false, // 弹窗是否显示
         checkVisible: false
         // pigsty: {

src/views/modules/alarm/meteo.vue

@@ -37,7 +37,10 @@
                 value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
-            <el-form-item style="width: 140px">
+            <el-form-item style="width:200px">
+              <el-input v-model="form.warningType" style="width:200px" placeholder="报警类型"></el-input>
+            </el-form-item>
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="报警类型" v-model="form.warningType">
                 <el-option
                   v-for="item in thresholdTypes"
@@ -46,7 +49,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button @click="getDataList()" icon="el-icon-search">查 询</el-button>
             </el-form-item>

src/views/modules/alarm/temp.vue

@@ -64,7 +64,10 @@
                 value-format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
             </el-form-item>
-            <el-form-item style="width: 140px">
+            <el-form-item style="width:200px">
+              <el-input v-model="form.warningType" style="width:200px" placeholder="报警类型"></el-input>
+            </el-form-item>
+            <!-- <el-form-item style="width: 140px">
               <el-select placeholder="报警类型" v-model="form.warningType">
                 <el-option
                   v-for="item in thresholdTypes"
@@ -73,7 +76,7 @@
                   :value="item.value">
                 </el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button  @click="getDataList()" icon="el-icon-search">查 询</el-button>
             </el-form-item>

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

@@ -12,17 +12,20 @@
       label-width="80px" 
       size="mini"
       style="margin-left: 20px;width: 500px">
-      <el-form-item label="参数名称" prop="thresholdType">
+      <el-form-item label="所属范围" prop="belongTo">
         <!-- <el-input v-model.number="dataForm.thresholdType" placeholder="请输入数字"></el-input> -->
-        <el-select v-model="dataForm.thresholdType" style="width: 100%" :disabled="dataForm.id > 0">
+        <el-select v-model="dataForm.belongTo" style="width: 100%">
           <el-option
-            v-for="item in thresholdTypes"
+            v-for="item in belongTo"
             :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="dataForm.thresholdType"></el-input>
+      </el-form-item>
       <el-form-item label="参数阈值" prop="thresholdValue">
         <el-input v-model="dataForm.thresholdValue"></el-input>
       </el-form-item>
@@ -35,20 +38,40 @@
 </template>
 
 <script>
-  import { isEmail, isMobile } from '@/utils/validate'
   export default {
-    props: ["thresholdTypes"],
+    props: ["belongTo"],
     data () {
       return {
         visible: false,
         dataForm: {
           id: '',
-          thresholdName: '',
+          belongTo: '',
           thresholdType: '',
           thresholdValue: '',
           // farmId: ''
         },
+        // belongTo: [
+        //   {
+        //     label: '室内',
+        //     value: 1
+        //   },
+        //   {
+        //     label: '室外',
+        //     value: 2
+        //   },
+        //   {
+        //     label: '耳标数据',
+        //     value: 3
+        //   },
+        //   {
+        //     label: '饮用水',
+        //     value: 4
+        //   }
+        // ],
         dataRule: {
+          belongTo: [
+            { required: true, message: '参数范围不能为空', trigger: 'blur' }
+          ],
           thresholdType: [
             { required: true, message: '参数名称不能为空', trigger: 'blur' }
           ],
@@ -76,6 +99,7 @@
           }).then(({data}) => {
             if (data && data.code === 0) {
               // console.log(data)
+              this.dataForm.belongTo = data.thresholdManagement.belongTo
               this.dataForm.thresholdType = data.thresholdManagement.thresholdType
               this.dataForm.thresholdValue = data.thresholdManagement.thresholdValue
               // this.dataForm.farmId = data.thresholdManagement.farmId
@@ -87,18 +111,18 @@
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            let belong = {
-              '1': 1,
-              '2': 1,
-              '3': 1,
-              '4': 4,
-              '5': 2,
-              '6': 2,
-              '7': 2,
-              '8': 3,
-              '9': 3,
-              '10': 3
-            }
+            // let belong = {
+            //   '1': 1,
+            //   '2': 1,
+            //   '3': 1,
+            //   '4': 4,
+            //   '5': 2,
+            //   '6': 2,
+            //   '7': 2,
+            //   '8': 3,
+            //   '9': 3,
+            //   '10': 3
+            // }
             this.$http({
               url: this.$http.adornUrl(`/management/thresholdManagement/${!this.dataForm.id ? 'save' : 'update'}`),
               method: 'post',
@@ -107,7 +131,7 @@
                 'thresholdType': this.dataForm.thresholdType,
                 'thresholdValue': this.dataForm.thresholdValue,
                 'farmId': parseInt(this.$cookie.get('formFarmId')),
-                'belongTo': belong[this.dataForm.thresholdType.toString()]
+                'belongTo': this.dataForm.belongTo
               })
             }).then(({data}) => {
               if (data && data.code === 0) {

src/views/modules/envir/ealarm.vue

@@ -16,15 +16,18 @@
               </el-select>
             </el-form-item> -->
             <el-form-item style="width: 140px">
-              <el-select placeholder="参数名称" v-model="form.thresholdType">
+              <el-select placeholder="所属范围" v-model="form.belongTo">
                 <el-option
-                  v-for="item in thresholdTypes"
+                  v-for="item in belongTo"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item style="width: 200px">
+              <el-input v-model="form.thresholdType" placeholder="参数名称"  style="width: 200px"></el-input>
+            </el-form-item>
             <el-form-item>
               <el-button @click="getDataList()" icon="el-icon-search">查 询</el-button>
             </el-form-item>
@@ -96,16 +99,22 @@
             <el-table-column
               header-align="center"
               align="center"
-              label="参数名称">
+              label="所属范围">
               <template slot-scope="scope">
-                <span>{{thresholdTypes[scope.row.thresholdType - 1].label}}</span>
+                <span>{{belongTo[scope.row.belongTo - 1].label}}</span>
               </template>
             </el-table-column>
             <el-table-column
+              prop="thresholdType"
+              header-align="center"
+              align="center"
+              label="参数阈值">
+            </el-table-column>
+            <el-table-column
               prop="thresholdValue"
               header-align="center"
               align="center"
-              label="阈值">
+              label="参数名称">
             </el-table-column>
             <el-table-column
               header-align="center"
@@ -139,7 +148,7 @@
             layout="total, sizes, prev, pager, next, jumper">
           </el-pagination>
           <!-- 弹窗, 新增 / 修改 -->
-          <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :thresholdTypes="thresholdTypes"></add-or-update>
+          <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" :belongTo="belongTo"></add-or-update>
         </div>
       </el-main>
       
@@ -154,6 +163,7 @@
     data () {
       return {
         form: {
+          belongTo: '',
           thresholdType: '',
           // farmId: ''
         },
@@ -167,48 +177,66 @@
         // farmId: undefined,
         // farmList: [], // 牧场List
         labelPosition: 'right',
-        thresholdTypes: [
+        // thresholdTypes: [
+        //   {
+        //     label: '室内高温',
+        //     value: 1
+        //   },
+        //   {
+        //     label: '室内低温',
+        //     value: 2
+        //   },
+        //   {
+        //     label: '室内空气污染',
+        //     value: 3
+        //   },
+        //   {
+        //     label: '饮用水污染',
+        //     value: 4
+        //   },
+        //   {
+        //     label: '室外高温',
+        //     value: 5
+        //   },
+        //   {
+        //     label: '室外低温',
+        //     value: 6
+        //   },
+        //   {
+        //     label: '室外空气污染',
+        //     value: 7
+        //   },
+        //   {
+        //     label: '体温高温',
+        //     value: 8
+        //   },
+        //   {
+        //     label: '体温低温',
+        //     value: 9
+        //   },
+        //   {
+        //     label: '耳标电量过低',
+        //     value: 10
+        //   }
+        // ],
+        belongTo: [
           {
-            label: '室内高温',
+            label: '室内',
             value: 1
           },
           {
-            label: '室内低温',
+            label: '室外',
             value: 2
           },
           {
-            label: '室内空气污染',
+            label: '耳标数据',
             value: 3
           },
           {
-            label: '饮用水污染',
+            label: '饮用水',
             value: 4
-          },
-          {
-            label: '室外高温',
-            value: 5
-          },
-          {
-            label: '室外低温',
-            value: 6
-          },
-          {
-            label: '室外空气污染',
-            value: 7
-          },
-          {
-            label: '体温高温',
-            value: 8
-          },
-          {
-            label: '体温低温',
-            value: 9
-          },
-          {
-            label: '耳标电量过低',
-            value: 10
           }
-        ]
+        ],
       }
     },
     components: {
@@ -229,7 +257,8 @@
             'page': this.pageIndex,
             'limit': this.pageSize,
             'thresholdType': this.form.thresholdType || undefined,
-            'farmId': parseInt(this.$cookie.get('formFarmId'))
+            'farmId': parseInt(this.$cookie.get('formFarmId')),
+            'belongTo': this.form.belongTo || undefined
           })
         }).then(async({data}) => {
           // 获取所有牧场
@@ -264,6 +293,7 @@
       // form表单清空，单元SelectedList 和 栏期SelectedList重置
       clearAll () {
         this.form.thresholdType = ''
+        this.form.belongTo = ''
       },
       // 每页数
       sizeChangeHandle (val) {

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

@@ -263,8 +263,8 @@
             method: "get",
             params: this.$http.adornParams({})
           }).then(({data}) => {
-            this.dataForm.id = data.yearPigBase.id
-            this.dataForm.eartag = data.yearPigBase.eartag
+            // this.dataForm.id = pigs.map(item => item.id)
+            // this.dataForm.eartag = pigs.eartag.join()
             this.dataForm.pigstyId = data.yearPigBase.pigstyId
             this.dataForm.unitId = data.yearPigBase.unitId
             // this.dataForm.periodId = data.yearPigBase.periodId

src/views/modules/pigbasic/pbentry.vue

@@ -126,7 +126,7 @@
                 删 除
               </el-button>
             </el-form-item>
-            <el-form-item>
+            <!-- <el-form-item>
               <el-button 
                 icon="el-icon-edit" 
                 type="danger" 
@@ -134,7 +134,7 @@
                 :disabled="dataListSelections.length <= 0">
                 批量修改
               </el-button>
-            </el-form-item>
+            </el-form-item> -->
           </el-form>
           
           <el-table