页面样式已调整

.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_COMPANY_HEALTH_WECHAT_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 
 #企业版

src/views/base/alarmConfig-list.vue

@@ -61,9 +61,10 @@
       >删除选中项</el-button>
     </el-row>
     <el-table
+    ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
+      :height="tableHeight"
       stripe
       @sort-change="sortChange"
       @selection-change="handleSelectionChange"
@@ -145,6 +146,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
+      tableHeight:"",
       companyResult: [],
       treeData: [],
       props: {
@@ -156,7 +158,6 @@ export default {
     };
   },
   created() {
-    this.tableHeight = window.innerHeight - 280;
     this.loadTree();
   },
   methods: {
@@ -226,6 +227,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/base/companyInfo-list.vue

@@ -28,7 +28,7 @@
             :label="company.name"
             :value="company.id"
           ></el-option>
-        </el-select> -->
+        </el-select>-->
         <el-select-tree
           size="mini"
           :props="props"
@@ -36,9 +36,7 @@
           :value="queryModel.parentId"
           @getValue="getSelectedValue($event)"
           height="200"
-        >
-        </el-select-tree>
-        &nbsp;
+        ></el-select-tree>&nbsp;
         <el-checkbox v-model="queryModel.subordinate">是否包含下级单位</el-checkbox>
       </el-form-item>
       <el-form-item>
@@ -76,58 +74,56 @@
         @click="batchImportVisible = true"
       >导入</el-button>
     </el-row>
-    <el-row style="padding-left:5px;">
-      <el-table
-            :data="tableData"
-            style="min-height:400px;"
-            v-loading="loading"
-            stripe
-            :height="tableHeight"
-            @sort-change="sortChange"
-            @selection-change="handleSelectionChange"
-          >
-            <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column prop="sortNo" label="序号" width="120"></el-table-column>
-            <el-table-column prop="name" label="单位名称" width="230"></el-table-column>
-            <el-table-column prop="shortName" label="简称" width="120"></el-table-column>
-            <el-table-column prop="parentName" label="上级单位" width="230"></el-table-column>
-            <el-table-column prop="typeN" label="性质" width="80"></el-table-column>
-            <el-table-column prop="remark" sort-by="remark_" width="350" label="备注"></el-table-column>
-            <el-table-column label="操作" width="350" fixed="right">
-              <template slot-scope="{row}">
-                <el-row>
-                  <el-col>
-                    <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
-                    <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>-
-                    <el-link type="primary" :underline="false" @click="bindDevice(row)">绑定设备</el-link>-
-                    <el-popover
-                      placement="left"
-                      width="300"
-                      trigger="click"
-                      @show="openQRCode(row)"
-                      @hide="closeQRCode(row)"
-                    >
-                      <div :id="row.id" ref="qrCodeDiv"></div>
-                      <el-link type="primary" :underline="false" slot="reference">健康公示二维码</el-link>
-                    </el-popover>
-                    <span v-if="row.type != null && row.type != ''">
-                      -
-                      <el-link type="primary" :underline="false" @click="openDP(row)">大屏网址</el-link>
-                    </span>
-                  </el-col>
-                </el-row>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination
-            :current-page.sync="pageIndex"
-            :total="totalElements"
-            :page-sizes="pageSizeList"
-            @current-change="changePage"
-            @size-change="pageSizeChange"
-            layout="total, sizes, prev, pager, next, jumper"
-          ></el-pagination>
-    </el-row>
+    <el-table
+      ref="formTable"
+      :data="tableData"
+      v-loading="loading"
+      stripe
+      :height="tableHeight"
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="sortNo" label="序号" width="120"></el-table-column>
+      <el-table-column prop="name" label="单位名称" width="230"></el-table-column>
+      <el-table-column prop="shortName" label="简称" width="120"></el-table-column>
+      <el-table-column prop="parentName" label="上级单位" width="230"></el-table-column>
+      <el-table-column prop="typeN" label="性质" width="80"></el-table-column>
+      <el-table-column prop="remark" sort-by="remark_" width="350" label="备注"></el-table-column>
+      <el-table-column label="操作" width="350" fixed="right">
+        <template slot-scope="{row}">
+          <el-row>
+            <el-col>
+              <el-link type="primary" :underline="false" @click="handleEdit(row)">编辑</el-link>-
+              <el-link type="danger" :underline="false" @click="handleDelete(row)">删除</el-link>-
+              <el-link type="primary" :underline="false" @click="bindDevice(row)">绑定设备</el-link>-
+              <el-popover
+                placement="left"
+                width="300"
+                trigger="click"
+                @show="openQRCode(row)"
+                @hide="closeQRCode(row)"
+              >
+                <div :id="row.id" ref="qrCodeDiv"></div>
+                <el-link type="primary" :underline="false" slot="reference">健康公示二维码</el-link>
+              </el-popover>
+              <span v-if="row.type != null && row.type != ''">
+                -
+                <el-link type="primary" :underline="false" @click="openDP(row)">大屏网址</el-link>
+              </span>
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
     <companyInfo-detail
       v-if="showModal"
       :businessKey="businessKey"
@@ -220,7 +216,7 @@ export default {
       showModal: false,
       modalTitle: "",
       businessKey: "",
-      tableHeight: 400,
+      tableHeight: "",
       showDeviceModal: false,
       companyId: "",
       qrCode: "",
@@ -241,13 +237,10 @@ export default {
       headers: {
         Authorization: getToken()
       },
-      xlsLoading:false,
-    }
+      xlsLoading: false
+    };
   },
   created() {
-    this.tableHeight = window.innerHeight - 320;
-    this.treeHeight = window.innerHeight - 200;
-
     var self = this;
 
     companyInfoApi.list().then(function(response) {
@@ -267,13 +260,12 @@ export default {
     loadTree() {
       var formData = new FormData();
 
-      companyInfoApi.loadChildren(formData).then((resp)=>{
+      companyInfoApi.loadChildren(formData).then(resp => {
         var jsonData = resp.data;
 
-        if(jsonData.result){
+        if (jsonData.result) {
           this.treeData = jsonData.data;
-        }
-        else{
+        } else {
           this.$message.error(jsonData.message + "");
         }
       });
@@ -284,13 +276,12 @@ export default {
       var formData = new FormData();
       formData.append("parentId", tree.id);
 
-      companyInfoApi.loadChildren(formData).then((resp)=>{
+      companyInfoApi.loadChildren(formData).then(resp => {
         var jsonData = resp.data;
 
-        if(jsonData.result){
+        if (jsonData.result) {
           resolve(jsonData.data);
-        }
-        else{
+        } else {
           this.$message.error(jsonData.message + "");
         }
       });
@@ -328,8 +319,10 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-
-          //self.tableHeight = window.innerHeight - 280;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;
@@ -450,11 +443,13 @@ export default {
       var companyId = record.id;
       var type = record.type;
       var dpUrl = record.wallUrl;
-      if(dpUrl == "" || dpUrl == null){
+      if (dpUrl == "" || dpUrl == null) {
         if ("1" == type) {
           //企业版
           dpUrl =
-            process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+            process.env.VUE_APP_COMPANY_HEALTH_QY_URL +
+            "?companyId=" +
+            companyId;
         } else if ("2" == type) {
           //校园版
           dpUrl =
@@ -464,11 +459,13 @@ export default {
         } else {
           //企业版
           dpUrl =
-            process.env.VUE_APP_COMPANY_HEALTH_QY_URL + "?companyId=" + companyId;
+            process.env.VUE_APP_COMPANY_HEALTH_QY_URL +
+            "?companyId=" +
+            companyId;
         }
-      }else{
+      } else {
         //填写了固定地址wallUrl
-         dpUrl = dpUrl + "?companyId=" + companyId;
+        dpUrl = dpUrl + "?companyId=" + companyId;
       }
       window.open(dpUrl);
     },
@@ -526,11 +523,9 @@ export default {
           files.length
         } 个文件，共选择了 ${files.length + fileList.length} 个文件`
       );
-    },
-  },
-  mounted: function() {
-
+    }
   },
+  mounted: function() {},
   components: {
     "companyInfo-detail": companyInfoDetail,
     "companyDeviceRelation-list": companyDeviceRelationList,

src/views/base/deviceInfo-list.vue

@@ -72,8 +72,8 @@
       >删除选中项</el-button>
     </el-row>
     <el-table
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -331,8 +331,6 @@ export default {
     };
   },
   created() {
-    this.tableHeight = window.innerHeight - 280;
-
     var formData = new FormData();
     formData.append("catalogName", "设备类型");
     dataDictionaryApi.findByCatalogName(formData).then(response => {
@@ -420,6 +418,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/base/devicePerson-list.vue

@@ -134,8 +134,8 @@
       >数据同步</el-button>
     </el-row>
     <el-table
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -388,8 +388,6 @@ export default {
       }
     });
 
-    
-
     companyPositionApi.detailForCompany().then(function(response) {
       var jsonData = response.data.data;
       if (jsonData.position1Name != null && jsonData.position1Name != "") {
@@ -421,8 +419,8 @@ export default {
     queryDevice(aliasName) {
       var self = this;
       var formData = new FormData();
-      formData.append("aliasName",aliasName);
-      formData.append("limit",10);
+      formData.append("aliasName", aliasName);
+      formData.append("limit", 10);
 
       deviceInfoApi.query(formData).then(function(response) {
         var jsonData = response.data;
@@ -525,7 +523,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-          self.tableHeight = window.innerHeight - 320;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;
@@ -651,8 +653,6 @@ export default {
   async mounted() {
     var self = this;
     this.queryDevice("");
-    //this.changePage(1);
-    //self.tableHeight = window.innerHeight - self.$refs.queryForm.$el.offsetTop - 100;
   },
   components: {
     "el-select-tree": SelectTree
@@ -679,6 +679,8 @@ export default {
   text-align: left;
 }
 .el-select-dropdown__wrap .el-scrollbar__wrap {
-  margin: 0px; max-height: 10; overflow: scroll;
+  margin: 0px;
+  max-height: 10;
+  overflow: scroll;
 }
 </style>

src/views/base/messageNotice-list.vue

@@ -46,8 +46,8 @@
       >删除选中项</el-button>
     </el-row>
     <el-table
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -115,10 +115,6 @@ export default {
       businessKey: ""
     };
   },
-  created() {
-    this.tableHeight = window.innerHeight - 280;
-  },
-
   components: {
     "messageNotice-detail": messageNoticeDetail
   },
@@ -154,6 +150,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/base/messageReport-list.vue

@@ -37,8 +37,8 @@
     <el-row class="button-group">
     </el-row>
     <el-table
+    ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -93,9 +93,6 @@ export default {
       businessKey: ""
     };
   },
-  created() {
-    this.tableHeight = window.innerHeight - 280;
-  },
   methods: {
     changePage(pageIndex) {
       var self = this;
@@ -128,6 +125,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/base/personDeviceLog-list.vue

@@ -112,9 +112,8 @@
       >导出数据</el-button>
     </el-row>
     <el-table
-      ref="tablesssssss"
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -325,7 +324,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-          self.tableHeight = window.innerHeight - 320;
+          
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/base/personInfo-list.vue

@@ -174,8 +174,8 @@
       >解绑设备</el-button>
     </el-row>
     <el-table
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -681,7 +681,10 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
-          self.tableHeight = window.innerHeight - 320;
+
+          //页面高度-列表上面的高度-分页栏高度
+          //45为分页栏的高度
+          self.tableHeight = window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/base/temperatureRecord-list.vue

@@ -87,9 +87,8 @@
       >导出数据</el-button>
     </el-row>-->
     <el-table
-      ref="tablesssssss"
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       show-summary
       :summary-method="getSummaries"
@@ -284,7 +283,10 @@ export default {
           var jsonData = response.data.data.list;
 
           self.tableData = jsonData;
-          self.tableHeight = window.innerHeight - 320;
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop;
         })
         .catch(error => {
           self.loading = false;

src/views/base/warningPusher-list.vue

@@ -72,8 +72,8 @@
       >删除选中项</el-button>
     </el-row>
     <el-table
+      ref="formTable"
       :data="tableData"
-      style="min-height:400px;"
       v-loading="loading"
       stripe
       :height="tableHeight"
@@ -189,7 +189,6 @@ export default {
     };
   },
   created() {
-    this.tableHeight = window.innerHeight - 280;
     this.loadTree();
   },
   methods: {
@@ -238,7 +237,7 @@ export default {
 
       formData.append("name", self.queryModel.name);
       formData.append("phone", self.queryModel.phone);
-      if(self.queryModel.companyId == null ){
+      if (self.queryModel.companyId == null) {
         self.queryModel.companyId = "";
       }
       formData.append("companyId", self.queryModel.companyId);
@@ -261,6 +260,11 @@ export default {
           self.tableData = jsonData.data;
           self.totalPages = jsonData.totalPages;
           self.totalElements = jsonData.recordsTotal;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         })
         .catch(error => {
           self.loading = false;

src/views/business/workAttendance-list.vue

@@ -111,7 +111,7 @@
         @click="exportXls"
       >导出数据</el-button>
     </el-row>
-    <el-table ref="table" stripe :data="tableData" :height="tableHeight" style="width: 100%">
+    <el-table ref="formTable" stripe :data="tableData" :height="tableHeight" style="width: 100%">
       <el-table-column label="序号" fixed="left" type="index" :index="indexMethod"></el-table-column>
       <el-table-column label="姓名" fixed="left" prop="name"></el-table-column>
       <el-table-column prop="position1" :label="position1" v-if="position1Show"></el-table-column>
@@ -345,9 +345,13 @@ export default {
           self.totalPages = jsonData.data.totalPage;
           self.totalElements = jsonData.data.totalElements;
 
-          self.tableHeight = window.innerHeight - 280;
           self.dayColumns = jsonData.data.dayColumns;
           self.tmplKey = jsonData.data.tmplKey;
+
+          //45为分页栏的高度
+          //页面高度-列表上面的高度-分页栏高度
+          self.tableHeight =
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
         } else {
           self.$message({
             type: "warning",