1.修改样式。

2.设备管理中增加设备厂家。

src/utils/page.js

@@ -5,6 +5,7 @@ function autoAdjustHeight(el) {
     if(header!=null){
         headerHeight = header.offsetHeight;
     }
+    console.log("headerHeight=" + headerHeight);
 
     //页面高度-列表上面的高度-header高度-分页组件高度
     return window.innerHeight - el.offsetTop - headerHeight - 40;

src/views/base/deviceInfo-detail.vue

@@ -121,6 +121,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
+            <el-form-item label="设备厂家" prop="manufacturer">
+              <el-select v-model="formModel.manufacturer" style="width:80%">
+                <el-option v-for="(item,index) in manufacturerList" 
+                :label="item.name" :value="item.value" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+        </el-row>
+          <!-- <el-col :span="12">
             <el-form-item label="场景值" prop="type">
               <el-select v-model="formModel.deviceAddress" filterable placeholder="请选择" style="width:80%">
                 <el-option
@@ -131,18 +142,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="设备厂家" prop="manufacturer">
-              <el-select v-model="formModel.manufacturer" style="width:80%">
-                <el-option v-for="(item,index) in manufacturerList" 
-                :label="item.name" :value="item.value" :key="index"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+          </el-col> -->
         <!-- <el-row>
           <el-col :span="12">
             <el-form-item label="开锁密码" prop="unlockPassword">

src/views/base/deviceInfo-list.vue

@@ -184,9 +184,9 @@
             </el-col> -->
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-link type="primary" @click="handleBindPerson(row)">用户关联</el-link>
-            </el-col>
+            </el-col> -->
             <el-col :span="8" v-if="row.manufacturer=='1'">
               <el-link type="primary" @click="handleEditRule(row)">验证规则</el-link>
             </el-col>

src/views/layout/TagsView/index.vue

@@ -226,9 +226,11 @@ export default {
         margin-right: 15px;
       }
       &.active {
-        background-color: #42b983;
-        color: #fff;
-        border-color: #42b983;
+        // background-color: #42b983;
+        // border-color: #42b983; 
+        background-color:#3385FF;
+        border-color: #3385FF;
+        color: #fff;   
         &::before {
           content: '';
           background: #fff;