Merge branch 'master' of http://192.168.1.7:3000/Chen/anotherVersion

src/views/modules/alarm/indoor.vue

@@ -5,16 +5,6 @@
       <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 placeholder="牧场" v-model="form.farmId" :disabled="farmId > 0" @change="farmChange">
-                <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 style="width: 140px">
               <el-select v-model="form.verifyStatus">
                 <el-option
@@ -68,7 +58,7 @@
           </el-form>
         </div>
       </el-header>
-      <!-- role表格 -->
+      <!-- 室内环境表格 -->
       <el-main>
         <div class="rect rect-table">
           <el-table
@@ -87,12 +77,6 @@
               align="center"
               label="当前日期">
             </el-table-column>
-            <!-- <el-table-column
-              prop="farmName"
-              header-align="center"
-              align="center"
-              label="牧场">
-            </el-table-column> -->
             <el-table-column
               prop="pigstyName"
               header-align="center"