合并分支 'hotfix' 到 'develop'

Hotfix

查看合并请求 !4

src/views/login.vue

@@ -212,7 +212,10 @@ export default {
       var params = {id: this.$store.state.user.user.baseJpOrganization.id}
       getAllListOrg(params).then(res => {
         if(res.code == '10000') {
+          //将数据orgList、findCode保存到网页session里
           window.sessionStorage.setItem('orgList', JSON.stringify(res.data))
+          localStorage.setItem('findCode', JSON.stringify(this.$store.state.user.user.baseJpOrganization.findCode))
+        //window.parent.postMessage({findCode: this.$store.state.user.user.baseJpOrganization.findCode}, 'http://192.168.3.188:99')
           eventBus.$emit('org', res.data)
         } else {
           this.$message.error(res.msg)

src/views/warehouse/dehumidifier/index.vue

@@ -44,7 +44,7 @@
         </div>
 
         <!--表格渲染-->
-        <el-table ref="table" v-loading="loading" :data="data" highlight-current-row border style="width: 100%;">
+        <el-table ref="table" v-loading="loading" :data="data"  stripe border  max-height="630" style="width: 100%;">
           <el-table-column type="index" label="序号" width="50px" align="center" />
           <el-table-column prop="devName" label="除湿机名称" align="center" :show-overflow-tooltip="true"/>
           <el-table-column prop="warehouseWd" label="温度" align="center"/>