Merge branch 'web-v2' into web-v2-pro

README.md

@@ -54,6 +54,7 @@
     │  ├─3.3.5-BaoJingZhuaPai&DianHuaBaoJing (报警抓拍&电话报警版本)
     │  └─3.3.6-zzjg&jzbj (组织架构&建筑布局版本)
     │    └─jiaoTongDaXue-Demo(交通大学演示版本)
+    ├─3.3.5&3.3.6-qiPinDingWei (包含 3.3.3 & 3.3.5 & 3.3.6 版本所有内容-增加蓝牙气瓶定位/东北大学需求相关功能)
     ├─web-v2-temp (包含 3.3.3 & 3.3.5 & 3.3.6 版本所有内容)
     ├─3.3.7-scxjy (手持巡检仪版本)
     │

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/associatedCabinetLock.vue

@@ -6,7 +6,7 @@
         <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
       </div>
       <div class="associatedCabinetLock-min-page">
-        <el-form ref="form" :model="form" label-width="0px">
+        <el-form style="flex: 1;flex-direction: column;display: flex;overflow: hidden;" ref="form" :model="form" label-width="0px">
           <el-table  border :data="tableList" ref="multipleTable">
           <el-table-column label="柜锁编号" align="center" prop="hardwareNum" width="300px"/>
           <el-table-column label="柜锁名称" align="center" prop="name" width="200px"/>