房屋管理样式

3 years ago · 693c0d0f1c
7 changed files with 90 additions and 27 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -13,11 +13,11 @@ export default {
  watch: {
    "$i18n.locale": "i18nHandle",
  },
-  created() {
+  created () {
    this.i18nHandle(this.$i18n.locale);
  },
  methods: {
-    i18nHandle(val, oldVal) {
+    i18nHandle (val, oldVal) {
      localStorage.setItem("language", val);
      document.querySelector("html").setAttribute("lang", val);
      document.title = messages[val].brand.lg;
@ -26,7 +26,7 @@ export default {
        window.location.reload();
      }
    },
-    refreshView() {
+    refreshView () {
      // In order to make the cached page re-rendered
      this.$store.dispatch("delAllCachedViews", this.$route);

@ -41,7 +41,7 @@ export default {
    ...mapActions(["setClientHeight", "setSize", "setResolution", "setEnv"]),
  },
  computed: {},
-  mounted() {
+  mounted () {
    console.log("开始：：：：" + localStorage.getItem("userType"));
    if (!localStorage.getItem("userType")) {
      localStorage.setItem("userType", "oper");
@ -148,6 +148,7 @@ export default {
 }
 .name-a {
  cursor: pointer;
+  color: #0056d6;
 }
 .dialog-h {
  .el-dialog__body {
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@ -119,8 +119,8 @@
 }
 //操作栏更多
 .diy-button--other {
-  text-decoration: underline !important;
-  color: #002765 !important;
+  // text-decoration: underline !important;
+  color: #505050 !important;
  font-size: 14px !important;
  // min-width: 60px !important;
  // height: 32px !important;
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@ -28,11 +28,12 @@
  .m-edit-map{

    .m-edit-map-search{
-      margin-bottom: 10px;
+      margin-bottom: 8px;
    }
    .m-map-item{
-      margin-top:10px;
-      height:280px;
+      // margin-top:10px;
+      height:225px;
+      width:400px;
      padding-bottom:10px;
    }
  
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@ -305,6 +305,7 @@ let loading // 加载动画
 export default {
  data () {
    return {
+      searchHeight: 190,//搜索栏高度
      importBuildingLoading: false,
      importRoomLoading: false,
      total: 0,
@ -344,8 +345,9 @@ export default {
  },
  computed: {
    tableHeight () {
-
-      return this.$store.state.inIframe ? this.clientHeight - 465 + this.iframeHeight : this.clientHeight - 465
+      console.log(this.searchHeight)
+      let height = this.searchHeight + 270
+      return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height

    },

@ -912,6 +914,20 @@ export default {
  },
  watch: {

+    '$store.state.sidebarFold': {
+      handler (newVal, oldVal) {
+        if (newVal) {//收起
+          this.searchHeight = 155
+
+        } else {
+
+          this.searchHeight = 190
+        }
+
+
+      },
+      deep: true
+    }
  },
  props: {
    staffAgencyId: {
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@ -243,6 +243,7 @@
                     :remark="remark"
                     :updateStartDate="updateStartDate"
                     :updateEndDate="updateEndDate"
+                     :searchHeight="searchHeight"
                     @toNextLevel="toNextLevel"
                     @refreshTree="refreshTree"></build-table>

@ -310,6 +311,7 @@ export default {
    }
    return {
      boxHeight: true,
+      searchHeight: 190,
      filterText: '',
      treeLoading: true,
      treeData: [],
@ -387,6 +389,8 @@ export default {
    CDialog
  },
  async mounted () {
+    this.searchHeight = this.$refs.ref_searchform.offsetHeight
+
    this.treeLoading = true

    await this.loadOrgData()
@ -818,7 +822,8 @@ export default {
  watch: {
    filterText (val) {
      this.$refs.ref_tree.filter(val);
-    }
+    },
+
  },
  components: {
    communityTable, buildTable, roomTable
@ -826,9 +831,6 @@ export default {
 }
 </script>

-
-
-
 <style lang="scss" scoped >
@import "@/assets/scss/modules/visual/communityManage.scss";
@import "@/assets/scss/modules/management/list-main.scss";
@ -926,7 +928,7 @@ export default {
  box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08),
    0px 3px 6px -4px rgba(0, 0, 0, 0.12);
  // border-radius: 5px;
-  padding: 19px 15px;
+  padding: 24px 15px;
  overflow-y: hidden;
 }

--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@ -10,7 +10,8 @@
                   icon="el-icon-plus"
                   @click="handleAdd">新增小区</el-button>

-        <div class="u-btn-upload">
+        <div v-if="showImportBtn"
+             class="u-btn-upload">

          <el-popover v-if="showImportBtn"
                      popper-class="btn-popper"
@ -302,6 +303,7 @@
               :close-on-click-modal="false"
               :close-on-press-escape="false"
               width="1150px"
+               title="导出模板"
               top="5vh"
               class="dialog-h">
      <community-export-info v-if="diyDialog"
@ -336,6 +338,8 @@ let loading // 加载动画
 export default {
  data () {
    return {
+      searchHeight: 190,//搜索栏高度
+      // tableHeight: 0,
      importBuildingLoading: false,
      importRoomLoading: false,
      importCommunityLoading: false,
@ -384,8 +388,12 @@ export default {
    CommunityForm,
    CommunityDetail,
    communityExportInfo
+  },
+  activated () {
+
  },
  async mounted () {
+
    this.customerId = localStorage.getItem('customerId')
    // this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
    //   elseParams: {
@ -393,14 +401,7 @@ export default {
    //   }
    // });
  },
-  computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 465 + this.iframeHeight : this.clientHeight - 465
-
-    },

-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
  methods: {
    reportForm () {
      let paramMap = {
@ -1132,6 +1133,16 @@ export default {
      }
    }
  },
+  computed: {
+    tableHeight () {
+      console.log(this.searchHeight)
+      let height = this.searchHeight + 270
+      return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
  watch: {
    selection (val) {

@ -1140,6 +1151,21 @@ export default {
      } else {
        this.showDeletBtn = false
      }
+
+    },
+    '$store.state.sidebarFold': {
+      handler (newVal, oldVal) {
+        if (newVal) {//收起
+          this.searchHeight = 155
+
+        } else {
+
+          this.searchHeight = 190
+        }
+
+
+      },
+      deep: true
    }
  },
  props: {
@ -1176,6 +1202,7 @@ export default {
      default: '',
    },

+
  }
 }
 </script>
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@ -302,6 +302,7 @@ let loading; // 加载动画
 export default {
  data () {
    return {
+      searchHeight: 190,//搜索栏高度
      source: "tree", //来源
      importRoomLoading: false,
      total: 0,
@ -376,9 +377,10 @@ export default {
  },
  computed: {
    tableHeight () {
-      return this.$store.state.inIframe
-        ? this.clientHeight - 465 + this.iframeHeight
-        : this.clientHeight - 465;
+      console.log(this.searchHeight)
+      let height = this.searchHeight + 270
+      return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height
+
    },

    ...mapGetters(["clientHeight", "iframeHeight"]),
@ -980,6 +982,20 @@ export default {
        this.showDeletBtn = false;
      }
    },
+    '$store.state.sidebarFold': {
+      handler (newVal, oldVal) {
+        if (newVal) {//收起
+          this.searchHeight = 155
+
+        } else {
+
+          this.searchHeight = 190
+        }
+
+
+      },
+      deep: true
+    }
  },
  props: {
    staffAgencyId: {