Merge branch 'master' of http://223.75.76.159:9090/xiao547607/smart-community-server-portal

.env.development

@@ -1,5 +1,5 @@
-VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+#VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://192.168.33.26:8080/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/

src/views/base/alarmConfig-list.vue

@@ -63,7 +63,6 @@
       style="min-height:400px;"
       v-loading="loading"
       stripe
-      :height="tableHeight"
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
     >
@@ -89,7 +88,7 @@
           <span v-html="row.needMeasureTemperature ? '是': '否'"></span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="480">
+      <el-table-column label="操作" width="200" fixed="right">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">修改</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(row)">删除</el-button>