Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into test

3 years ago · 9cadaf0c21
27 changed files with 247 additions and 163 deletions
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@ -3,9 +3,9 @@ const t = {}
 t.loading = '加载中...'

 t.brand = {}
-t.brand.lg = '数字社区工作平台'
+t.brand.lg = '数字社区综合服务平台'
 t.brand.mini = '数字'
-t.brand.work = '数字社区工作平台'
+t.brand.work = '数字社区综合服务平台'
 t.brand.workMini = '工作端'

 t.add = '新增'
--- a/src/router/index.js
+++ b/src/router/index.js
@ -237,6 +237,29 @@ router.beforeEach((to, from, next) => {
      name: "人员预警",
      url: "visual/warning/index",
    },
+    {
+      icon: "icon-setting",
+      id: "2221321001",
+      name: "社区党建",
+      // url: "visual/basicinfo/basicInfoMain",
+      children: [
+        {
+          url: "/visual/communityParty/party",
+          name: "党员信息统计",
+          id: "5feawfwaefwa578",
+        },
+        {
+          url: "/visual/communityParty/community",
+          name: "区域化党建",
+          id: "5fwaefwaefawef588",
+        },
+        {
+          url: "/visual/communityParty/elegant",
+          name: "党员风采榜",
+          id: "5fwaefwaefawef589",
+        },
+      ],
+    },
    {
      icon: "icon-setting",
      id: "6",
@ -244,63 +267,40 @@ router.beforeEach((to, from, next) => {
      children: [
        {
          url: "visual/communityGovern/processAnalyze",
-          name: "项目处理分析",
+          name: "事件处置分析",
          id: "processAnalyze",
        },
        {
          url: "/visual/communityGovern/typeAnalyze",
-          name: "项目分类分析",
+          name: "事件分类分析",
          id: "typeAnalyze",
        },
        {
          url: "/visual/communityGovern/resibuzz",
-          name: "居民热议",
+          name: "居民热议分析",
          id: "resibuzz",
        },
        {
          url: "/visual/communityGovern/distributionAnalyze",
-          name: "项目分布分析",
+          name: "事件分布分析",
          id: "distributionAnalyze",
        },
      ],
    },
-    {
-      icon: "icon-setting",
-      id: "2221321001",
-      name: "社区党建",
-      // url: "visual/basicinfo/basicInfoMain",
-      children: [
-        {
-          url: "/visual/communityParty/party",
-          name: "党员信息统计",
-          id: "5feawfwaefwa578",
-        },
-        {
-          url: "/visual/communityParty/community",
-          name: "区域化党建",
-          id: "5fwaefwaefawef588",
-        },
-        {
-          url: "/visual/communityParty/elegant",
-          name: "党员风采",
-          id: "5fwaefwaefawef589",
-        },
-      ],
-    },
    {
      icon: "icon-setting",
      id: "2221321123",
-      name: "措施清单",
+      name: "社区服务",
      // url: "visual/basicinfo/basicInfoMain",
      children: [
        {
          url: "/visual/measure/service",
-          name: "服务措施分析",
+          name: "需求服务分析",
          id: "5feawfwaefwa57",
        },
        {
          url: "/visual/measure/volunteer",
-          name: "志愿者服务分析",
+          name: "志愿服务分析",
          id: "5fwaefwaefawef58",
        },
      ],
@ -315,7 +315,7 @@ router.beforeEach((to, from, next) => {
    {
      icon: "icon-setting",
      id: "44rq22222q2222",
-      name: "AI安防",
+      name: "智慧安防",
      // url: "visual/basicinfo/basicInfoMain",
      children: [
        {
--- a/src/utils/index.js
+++ b/src/utils/index.js
@ -115,3 +115,33 @@ export function dateFormats(fmt, date) {
  }
  return fmt
 }
+//  根据身份证计算出生日期，性别，年龄
+export function computedCard(idCard) {
+  let sex = null;
+  let birth = null;
+  let myDate = new Date();
+  let month = myDate.getMonth() + 1;
+  let day = myDate.getDate();
+  let age = 0;
+
+  if(idCard.length===18){
+    age = myDate.getFullYear() - idCard.substring(6, 10) - 1;
+    sex = idCard.substring(16,17);
+    birth = idCard.substring(6,10)+"-"+idCard.substring(10,12)+"-"+idCard.substring(12,14);
+    if (idCard.substring(10, 12) < month || idCard.substring(10, 12) === month && idCard.substring(12, 14) <= day) age++;
+
+  }
+  if(idCard.length===15){
+    age = myDate.getFullYear() - idCard.substring(6, 8) - 1901;
+    sex = idCard.substring(13,14);
+    birth = "19"+idCard.substring(6,8)+"-"+idCard.substring(8,10)+"-"+idCard.substring(10,12);
+    if (idCard.substring(8, 10) < month || idCard.substring(8, 10) === month && idCard.substring(10, 12) <= day) age++;
+  }
+
+  if(sex%2 === 0)
+    sex = '0';  // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
+  else
+    sex = '1';
+  return  {age , sex, birth}
+}
+
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@ -33,7 +33,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="18">
-              <el-form-item label="所属家庭" required>
+              <el-form-item label="所属房屋" required>
                <div class="resi-cell-value">
                  <div class="resi-cell-col">
                    <el-form-item prop="VILLAGE_ID">
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@ -32,7 +32,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="18">
-              <el-form-item label="所属家庭" required>
+              <el-form-item label="所属房屋" required>
                <div class="resi-cell-value">
                  <div class="resi-cell-col">
                    <el-form-item prop="VILLAGE_ID">
@ -99,48 +99,7 @@
                </div>
            </el-form-item>
          </el-col>
-          <!-- <el-col :span="6">
-              <el-form-item :prop="form.BUILD_ID" label="所属楼宇">
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                  clearable class="resi-cell-select" @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-              <el-form-item :prop="form.HOME_ID" label="所属家庭">
-                <div class="resi-cell-value">
-                  <el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
-                  clearable class="resi-cell-select resi-cell-select-small"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                  <el-select v-model.trim="form.HOME_ID" placeholder="请选择" size="small"
-                  clearable class="resi-cell-select-small"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-            </el-form-item>
-          </el-col> -->
+          
        </el-row>
        <el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row">
            <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
@ -158,6 +117,7 @@
                        size="small"
                        clearable
                        placeholder="请输入内容"
+                        @blur="handleValidBlur(n)"
                        >
                      </el-input>
                      <el-input
@ -267,6 +227,7 @@

 <script>
 import { isCard, isMobile } from '@/utils/validate'
+import { computedCard } from '@/utils/index'

 export default {
  name: 'resiForm',
@ -525,6 +486,14 @@ export default {
        // }
      })
    },
+    handleValidBlur(n) {
+      console.log('n---', n)
+      if (n.columnName !== 'ID_CARD') return
+      if (!isCard(this.form.ID_CARD)) return
+      const { sex, birth } = computedCard(this.form.ID_CARD)
+      this.form.BIRTHDAY = birth
+      this.form.GENDER = sex == 1 ? '1' : '2'
+    },
    handleOpenSearch () {
      this.openSearch = !this.openSearch
    },
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@ -28,7 +28,7 @@
          </el-col>
          <el-col :span="18">
            <div class="resi-cell">
-              <div class="resi-cell-label">所属小区</div>
+              <div class="resi-cell-label">所属房屋</div>
              <div class="resi-cell-value">
                <el-select
                  v-model.trim="form.VILLAGE_ID"
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@ -61,7 +61,7 @@
        border
        style="width: 100%"
        class="resi-table"
-        :height="maxTableHeight"
+        :height="tableHeight"
        :span-method="arraySpanMethod"
      >
        <el-table-column label="序号" prop="desc" align="center" width="50" />
@ -189,10 +189,12 @@ export default {
    };
  },
  computed: {
-    maxTableHeight() {
-      return this.clientHeight - 360;
-    },
-    ...mapGetters(["clientHeight"]),
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
+    }
  },
  watch: {
    timeRange(val) {
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@ -98,12 +98,16 @@ export default {
  },
  computed: {
    rowHeight () {
-      return (this.clientHeight - 120) + 'px'
+
+      return this.$store.state.inIframe ? this.clientHeight - 120 + this.iframeHeight + 'px' : this.clientHeight - 120 + 'px'
+
    },
    treeHeight () {
-      return (this.clientHeight - 200) + 'px'
+      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
+
    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  methods: {
    async loadTree (isRefresh) {
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@ -11,7 +11,7 @@
        <el-form-item label="所属楼栋"
                      label-width="150px"
                      style="display: block">
-          <span>{{ agencyObj.communityName }}—{{agencyObj.label}}</span>
+          <span>{{ agencyObj.neighborHoodName }}—{{agencyObj.label}}</span>
        </el-form-item>

        <el-form-item label="单元号"
@ -231,7 +231,7 @@ export default {

    async addRoom () {
      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X  
-      if (regCard.test(this.dataForm.ownerIdCard) === false) {
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
        this.btnDisable = false
        this.$message({
          type: 'warning',
@ -240,7 +240,7 @@ export default {
        return false;
      }
      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-      if (regPhone.test(this.dataForm.ownerPhone) === false) {
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
        this.btnDisable = false
        this.$message({
          type: 'warning',
@ -335,13 +335,13 @@ export default {
          { required: true, message: '是否出租不能为空', trigger: 'blur' }
        ],
        ownerPhone: [
-          { required: true, message: '房主电话不能为空', trigger: 'blur' }
+          { required: false }
        ],
        ownerName: [
-          { required: true, message: '房主姓名不能为空', trigger: 'blur' }
+          { required: false }
        ],
        ownerIdCard: [
-          { required: true, message: '房主身份证号不能为空', trigger: 'blur' }
+          { required: false }
        ],
      }
    },
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@ -80,34 +80,41 @@
                         :selectable="checkSelect"
                         width="55">
        </el-table-column>
-        <el-table-column prop="houseName"
+        <el-table-column prop="houseNameShow"
                         label="房屋名称"
-                         width="120">
+                         min-width="160">
        </el-table-column>
        <el-table-column prop="neighborHoodName"
                         label="所属小区"
-                         width="160">
+                         min-width="150">
        </el-table-column>
        <el-table-column prop="buildingName"
-                         label="所属楼栋">
+                         label="所属楼栋"
+                         width="80">
        </el-table-column>
-        <el-table-column prop="unitNum"
-                         label="单元号">
+        <el-table-column prop="unitNumShow"
+                         label="单元号"
+                         width="70">
        </el-table-column>
        <el-table-column prop="doorName"
-                         label="门牌号">
+                         label="门牌号"
+                         width="70">
        </el-table-column>
        <el-table-column prop="houseType"
-                         label="类型">
+                         label="类型"
+                         width="50">
        </el-table-column>
        <el-table-column prop="purpose"
-                         label="用途">
+                         label="用途"
+                         width="50">
        </el-table-column>
        <el-table-column prop="rentFlag"
-                         label="是否出租">
+                         label="是否出租"
+                         width="80">
        </el-table-column>
        <el-table-column prop="ownerName"
-                         label="房主姓名">
+                         label="房主姓名"
+                         width="90">
        </el-table-column>
        <el-table-column prop="ownerPhone"
                         label="房主电话"
@ -214,6 +221,8 @@ export default {
      selection: [],
      showDeletBtn: false,

+      tableData: [],
+
      //form相关
      formShow: false,
      formTitle: '新增房屋',
@ -229,7 +238,6 @@ export default {
  },
  computed: {
    tableHeight () {
-
      return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300

    },
@ -298,6 +306,8 @@ export default {
        this.total = data.total
        this.validTableDataNum = 0
        data.list.forEach(item => {
+          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + '单元' + item.doorName
+          item.unitNumShow = item.unitNum + '单元'
          if (item.agencyId === this.staffAgencyId) {
            item.showBtn = true
            this.validTableDataNum++
@ -327,6 +337,7 @@ export default {
    },

    handleAdd () {
+
      this.formTitle = '新增房屋'
      this.formShow = true
      this.$nextTick(() => {
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@ -297,7 +297,7 @@ export default {
      currentPage: 1,
      pageSize: 20,
      total: null,
-      tableHeight: 0,
+      searchH: 0,
      conditions: [],
      activeName: '',
      tableData: [],
@ -336,6 +336,14 @@ export default {
    }

  },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
  async created () {
    if (this.$route.query) {
      let query = this.$route.query
@ -352,12 +360,16 @@ export default {
    // this.handleSearch()
    // this.getTableData()
    this.pageLoading = true
+    this.searchH = this.$refs.resiSearch.$el.offsetHeight
    console.log('storeoooo----0000', this.$store)
    console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight)
-    this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    
  },
  mounted () {
    
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    // })
    console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
  },
  methods: {
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@ -235,6 +235,7 @@

 <script>
 import axios from 'axios'
+import { mapGetters } from 'vuex'
 export default {
  data() {
    return {
@ -253,7 +254,7 @@ export default {
      pageSize: 20,
      total: null,
      tableData: [],
-      tableHeight: 400,
+      searchH: 0,
      unloadPencent: 0,
      addLevel: '1',
      addType: 'add',
@ -321,6 +322,14 @@ export default {
        mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
      }
    }
+  },
+   computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
  },
  async created() {
    this.customerId = localStorage.getItem('customerId')
@ -340,10 +349,11 @@ export default {
    
    // this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
  },
+  
  mounted() {
    
    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
      console.log('tableHeight', this.tableHeight)
    })
    
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@ -634,13 +634,11 @@ export default {
  computed: {
    tableHeight () {

-      return (this.clientHeight - 430)
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430

    },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  watch: {

--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@ -675,13 +675,11 @@ export default {
  computed: {
    tableHeight () {

-      return (this.clientHeight - 430)
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430

    },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  watch: {

--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@ -589,6 +589,7 @@
 </template>

 <script>
+import { mapGetters } from 'vuex'
 export default {
  data() {
    return {
@ -601,7 +602,7 @@ export default {
      pageSize: 20,
      total: null,
      tableData: [],
-      tableHeight: 400,
+      searchH: 0,
      addLevel: "1",
      addType: "add",
      value: "",
@ -846,6 +847,14 @@ export default {
      },
    };
  },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
  async created() {
    this.customerId = localStorage.getItem("customerId");

@ -860,7 +869,7 @@ export default {
  },
  mounted() {
    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
      console.log('tableHeight', this.tableHeight)
    })
  },
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@ -257,10 +257,10 @@ export default {
  computed: {
    maxTableHeight() {
      return this.$store.state.inIframe
-        ? this.clientHeight - 360 + 120
+        ? this.clientHeight - 360 + this.iframeHeigh
        : this.clientHeight - 360;
    },
-    ...mapGetters(["clientHeight"]),
+    ...mapGetters(['clientHeight', 'iframeHeight']),
  },
  watch: {
    "fmData.createTime": function (val) {
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@ -6,7 +6,7 @@
        :data="tableData"
        border
        style="width: 100%"
-         :height="maxTableHeight"
+         :height="tableHeight"
        class="resi-table"
      >
        <el-table-column label="序号" type="index" align="center" width="50" />
@ -82,10 +82,13 @@ export default {
    };
  },
  computed: {
-    maxTableHeight() {
-      return this.clientHeight - 280;
+    tableHeight () {
+      const h = this.clientHeight - 240 + this.iframeHeigh
+      const _h = this.clientHeight - 240
+      return this.$store.state.inIframe ? h : _h
    },
-    ...mapGetters(["clientHeight"]),
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  watch: {},
  mounted() {
--- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
@ -1,6 +1,6 @@
 <template>
  <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
      <el-form :inline="true"
               :model="formData"
               ref="ref_searchform"
@ -218,7 +218,7 @@ export default {
        scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd	
        scheduledEndTime: '',//预计处理结束时间	yyyy-mm-dd
      },
-
+      sHeight: 0,
      tableData: [],

      //form相关
@ -239,6 +239,7 @@ export default {

    //获取网格下拉框数据
    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
  },

  methods: {
@ -473,12 +474,13 @@ export default {
  },
  computed: {
    tableHeight () {
-
-      return (this.clientHeight - 380)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h

    },

-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
  },
  watch: {

--- a/src/views/modules/secretaryLog/humanisticCare/careList.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue
@ -1,6 +1,6 @@
 <template>
  <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
      <el-form :inline="true"
               :model="formData"
               ref="ref_searchform"
@ -288,7 +288,7 @@ export default {
        scheduledStartTime: '',//预计关怀开始时间	yyyy-mm-dd
        scheduledEndTime: '',//预计关怀结束时间	yyyy-mm-dd
      },
-
+      sHeight: 0,
      tableData: [],

      //form相关
@ -308,6 +308,7 @@ export default {

    //获取网格下拉框数据
    await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
  },

  methods: {
@ -546,12 +547,13 @@ export default {
  },
  computed: {
    tableHeight () {
-
-      return (this.clientHeight - 430)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h

    },

-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
  },
  watch: {

--- a/src/views/modules/secretaryLog/workLog/index.vue
+++ b/src/views/modules/secretaryLog/workLog/index.vue
@ -414,12 +414,13 @@ export default {
  },
  computed: {
    tableHeight () {
-
-      return (this.clientHeight - this.sHeight)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h

    },

-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
  },
  watch: {

--- a/src/views/modules/systemManagement/serviceMatter/service.vue
+++ b/src/views/modules/systemManagement/serviceMatter/service.vue
@ -256,14 +256,12 @@ export default {
  },
  computed: {
    tableHeight () {
-
-      return (this.clientHeight - 210)
-
+      const h = this.clientHeight - 210 + this.iframeHeigh
+      const _h = this.clientHeight - 210
+      return this.$store.state.inIframe ? h : _h
    },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  watch: {

--- a/src/views/modules/visual/basicinfo/people.vue
+++ b/src/views/modules/visual/basicinfo/people.vue
@ -126,7 +126,7 @@
                   src="@/assets/img/shuju/people/huzhu.png" />
              <img class="huzhu-ico"
                   src="@/assets/img/shuju/people/huzhu-home.png" />
-              <div class="huzhu-name">{{ houseInfo.ownerName }}</div>
+              <div class="huzhu-name">{{ houseInfo&&houseInfo.ownerName?houseInfo.ownerName:'暂不清楚' }}</div>
              <p>（户主）</p>
            </div>

--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@ -123,6 +123,7 @@
 <script>
 import Sortable from 'sortablejs'
 import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'

 export default {
  name: 'RoleList',
@ -164,9 +165,13 @@ export default {

  },
  computed: {
-    tableHeight() {
-      return document.documentElement.clientHeight - 220;
-    }
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  methods: {

--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@ -201,10 +201,12 @@ export default {
  },
  computed: {
    tableHeight () {
-      return this.clientHeight - 360
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
    },

-    ...mapGetters(['clientHeight', 'env'])
+    ...mapGetters(['clientHeight', 'iframeHeight', 'env'])
  },
  methods: {
    //重置搜索条件
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@ -136,6 +136,7 @@
 </template>

 <script>
+import { mapGetters } from 'vuex'
 export default {
  data () {
    return {
@ -148,7 +149,7 @@ export default {
      pageSize: 20,
      total: null,
      tableData: [],
-      tableHeight: 500,
+      sHeight: 0,
      addLevel: '1',
      addType: 'add',
      value: '',
@ -192,6 +193,15 @@ export default {
      }
    }
  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
  async created () {
    this.customerId = localStorage.getItem('customerId')
    this.getTableData()
@ -200,7 +210,7 @@ export default {
  },
  mounted () {
    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 280
      console.log('tableHeight', this.tableHeight)
    })
  },
--- a/src/views/modules/workSys/elegantCate.vue
+++ b/src/views/modules/workSys/elegantCate.vue
@ -69,6 +69,7 @@

 import { requestPost } from '@/js/dai/request'
 import elegantEdit from './elegantEdit.vue'
+import { mapGetters } from 'vuex'
 export default {

  data () {
@ -79,7 +80,7 @@ export default {
      tableParams: {
        customerId: ''
      },
-      tableHeight: 500,
+      // tableHeight: 500,
      search: '',
      dataList: [],

@ -101,7 +102,14 @@ export default {
      }
      console.log('this.dataList', this.dataList)
      return this.dataList
-    }
+    },
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
  },
  components: {
    elegantEdit
@ -112,10 +120,10 @@ export default {
    this.initData(user.customerId, user.customerName)
  },
  mounted() {
-    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
-      console.log('tableHeight', this.tableHeight)
-    })
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
+    //   console.log('tableHeight', this.tableHeight)
+    // })
  },
  methods: {
    cellStyle ({ row, column, rowIndex, columnIndex }) {
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@ -192,6 +192,7 @@
 <script>
 import axios from 'axios'
 import Sortable from 'sortablejs'
+import { mapGetters } from 'vuex'
 export default {
  data() {
    return {
@ -206,7 +207,7 @@ export default {
      total: null,
      conditions: [],
      tableData: [],
-      tableHeight: 500,
+      sHeight: 0,
      isWarn: null,
      level: null,
      options: [
@ -286,6 +287,15 @@ export default {
      }
    }
  },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
  async created() {
    this.customerId = localStorage.getItem('customerId')
    this.getTableData()
@ -294,7 +304,7 @@ export default {
  mounted() {
    this.rowDrop()
    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 230 + 'px'
+      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 230
      console.log('tableHeight', this.tableHeight)
    })
  },