修复bug

3 years ago · fe4b87ad08
2 changed files with 148 additions and 104 deletions
--- a/src/views/modules/communityService/dqfwzx/index.vue
+++ b/src/views/modules/communityService/dqfwzx/index.vue
@ -2,23 +2,26 @@
  <div>
    <el-card class="resi-card-table">
      <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">新增</el-button>
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >新增</el-button
+        >
      </div>

-      <div class="m-center"
-           v-if="tableData.length > 0">
+      <div class="m-center" v-if="tableData.length > 0">
        <div class="center-left">
          <div class="list">
-            <div @click="currentIndex = index"
-                 class="item"
-                 :class="{ 'z-on': currentIndex == index }"
-                 :key="'ct' + index"
-                 v-for="(item, index) in tableData">
-              <div class="item-btn"
-                   v-if="currentIndex == index"
-                   @click="handleEdit">
+            <div
+              @click="currentIndex = index"
+              class="item"
+              :class="{ 'z-on': currentIndex == index }"
+              :key="'ct' + index"
+              v-for="(item, index) in tableData"
+            >
+              <div
+                class="item-btn"
+                v-if="currentIndex == index"
+                @click="handleEdit"
+              >
                修改
              </div>
              <div class="item-name">{{ item.centerName }}</div>
@ -48,88 +51,107 @@
            >
          </div> -->

-          <div id="centerIndexApp"
-               class="div_map"></div>
-
-          <el-table :data="tableData[currentIndex].matterList"
-                    border
-                    style="width: 100%"
-                    class="resi-table"
-                    :max-height="maxTableHeight">
-            <el-table-column label="序号"
-                             type="index"
-                             align="center"
-                             width="50" />
-            <el-table-column prop="matterName"
-                             label="事项名称">
+          <div id="centerIndexApp" class="div_map"></div>
+
+          <el-table
+            :data="tableData[currentIndex].matterList"
+            border
+            style="width: 100%"
+            class="resi-table"
+            :max-height="maxTableHeight"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            />
+            <el-table-column prop="matterName" label="事项名称">
            </el-table-column>
-            <el-table-column prop="allowTime"
-                             label="可预约时间	">
+            <el-table-column prop="allowTime" label="可预约时间	">
            </el-table-column>
-            <el-table-column fixed="right"
-                             label="操作"
-                             align="center"
-                             width="120">
+            <el-table-column
+              fixed="right"
+              label="操作"
+              align="center"
+              width="120"
+            >
              <template slot-scope="scope">
-                <el-button @click="handleOrder(scope.$index)"
-                           type="text"
-                           size="small">预约</el-button>
-
-                <el-button @click="handleOrderList(scope.$index)"
-                           type="text"
-                           size="small"
-                           style="margin-right: 10px; color: #00a7a9">预约记录</el-button>
+                <el-button
+                  @click="handleOrder(scope.$index)"
+                  type="text"
+                  size="small"
+                  >预约</el-button
+                >
+
+                <el-button
+                  @click="handleOrderList(scope.$index)"
+                  type="text"
+                  size="small"
+                  style="margin-right: 10px; color: #00a7a9"
+                  >预约记录</el-button
+                >
              </template>
            </el-table-column>
          </el-table>
        </div>
      </div>
-      <div class="m-hint"
-           v-else>
-        <el-empty description="暂无内容"
-                  :image-size="200"></el-empty>
+      <div class="m-hint" v-else>
+        <el-empty description="暂无内容" :image-size="200"></el-empty>
      </div>
    </el-card>

    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleClose">
-      <edit-form ref="eleEditForm"
-                 @dialogCancle="handleClose"
-                 @dialogOk="handleEditSuccess"></edit-form>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
    </el-dialog>

    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="form2Show"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="预约"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleCloseForm2">
-      <order-form ref="eleOrderForm"
-                  @dialogCancle="handleCloseForm2"
-                  @dialogOk="handleOrderSuccess"></order-form>
+    <el-dialog
+      :visible.sync="form2Show"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="预约"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleCloseForm2"
+    >
+      <order-form
+        ref="eleOrderForm"
+        @dialogCancle="handleCloseForm2"
+        @dialogOk="handleOrderSuccess"
+      ></order-form>
    </el-dialog>

    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="orderListShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="预约记录"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="handleCloseOrderList">
-      <order-list ref="eleOrderList"
-                  @dialogCancle="handleCloseOrderList"></order-list>
+    <el-dialog
+      :visible.sync="orderListShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="预约记录"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleCloseOrderList"
+    >
+      <order-list
+        ref="eleOrderList"
+        @dialogCancle="handleCloseOrderList"
+      ></order-list>
    </el-dialog>
  </div>
 </template>
@ -150,7 +172,7 @@ let loading; // 加载动画

 export default {
  components: { editForm, orderForm, orderList },
-  data () {
+  data() {
    return {
      openSearch: false,

@ -167,23 +189,23 @@ export default {
    };
  },
  computed: {
-    maxTableHeight () {
-      return this.clientHeight - 410;
+    maxTableHeight() {
+      return this.clientHeight - 520;
    },
    ...mapGetters(["clientHeight"]),
  },
  watch: {
-    currentIndex () {
+    currentIndex() {
      this.setMap();
    },
  },
-  async mounted () {
+  async mounted() {
    await this.loadAgency();
    await this.getTableData();
  },
  methods: {
    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap () {
+    initMap() {
      // 定义地图中心点坐标
      var center = new window.TMap.LatLng(36.0722275, 120.38945519);
      // 定义map变量，调用 TMap.Map() 构造函数创建地图
@ -203,7 +225,7 @@ export default {
      infoWindowList = Array(10);
    },

-    setMarker (lat, lng, centerName) {
+    setMarker(lat, lng, centerName) {
      markers.setGeometries([]);
      markers.add([
        {
@ -217,11 +239,11 @@ export default {
      ]);
    },

-    setCenter (lat, lng) {
+    setCenter(lat, lng) {
      map.setCenter(new window.TMap.LatLng(lat, lng));
    },

-    setMap () {
+    setMap() {
      const { tableData, currentIndex } = this;
      let item = tableData[currentIndex];
      if (item) {
@ -230,24 +252,24 @@ export default {
      }
    },

-    handleClose () {
+    handleClose() {
      this.formShow = false;
    },
-    handleCloseForm2 () {
+    handleCloseForm2() {
      this.form2Show = false;
    },
-    handleCloseOrderList () {
+    handleCloseOrderList() {
      this.orderListShow = false;
    },

-    async handleAdd () {
+    async handleAdd() {
      this.formShow = true;
      await nextTick();
      console.log(this.$refs);
      this.$refs.eleEditForm.initForm("add");
    },

-    async handleWatch () {
+    async handleWatch() {
      this.formShow = true;
      await nextTick();
      this.$refs.eleEditForm.initForm(
@ -256,7 +278,7 @@ export default {
      );
    },

-    async handleEdit () {
+    async handleEdit() {
      this.formShow = true;
      await nextTick();
      this.$refs.eleEditForm.initForm(
@ -265,12 +287,12 @@ export default {
      );
    },

-    handleEditSuccess () {
+    handleEditSuccess() {
      this.handleClose();
      this.getTableData();
    },

-    async handleOrder (index) {
+    async handleOrder(index) {
      this.form2Show = true;
      await nextTick();
      this.$refs.eleOrderForm.initForm(
@ -280,18 +302,18 @@ export default {
      );
    },

-    handleOrderSuccess () {
+    handleOrderSuccess() {
      this.handleCloseForm2();
    },

-    async handleOrderList (index) {
+    async handleOrderList(index) {
      this.orderListShow = true;
      await nextTick(0);
      console.log(this.$refs);
      this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
    },

-    async handleDel (rowData, rowIndex) {
+    async handleDel(rowData, rowIndex) {
      console.log(rowData, rowIndex);
      const url =
        "/heart/iccommunityselforganization/delcommunityselforganization";
@ -309,7 +331,7 @@ export default {
      }
    },

-    async getTableData () {
+    async getTableData() {
      const oldLen = this.tableData.length;
      const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
      const { data, code, msg } = await requestPost(url, {
@ -330,7 +352,7 @@ export default {
    },

    //加载组织
-    async loadAgency () {
+    async loadAgency() {
      const url = "/epmetuser/customerstaff/staffbasicinfo";
      let params = {};

@ -358,6 +380,27 @@ export default {
  .center-left {
    width: 25%;
    .list {
+      padding-right: 10px;
+      height: calc(100vh - 210px);
+      overflow-y: auto;
+      &::-webkit-scrollbar {
+        /*滚动条整体样式*/
+        width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
+        height: 1px;
+      }
+      &::-webkit-scrollbar-thumb {
+        /*滚动条里面小方块*/
+        border-radius: 8px;
+        box-shadow: inset 0 0 5px rgba(#333, 0.1);
+        background: linear-gradient(270deg, #eee, #aaa);
+      }
+      &::-webkit-scrollbar-track {
+        /*滚动条里面轨道*/
+        box-shadow: inset 0 0 5px rgba(#333, 0.1);
+        border-radius: 8px;
+        background: #eee;
+      }
+
      .item {
        position: relative;
        box-sizing: border-box;
@ -420,6 +463,7 @@ export default {
    }
    .div_map {
      margin-bottom: 10px;
+      height: 300px;
    }
  }
 }
@ -448,7 +492,7 @@ export default {
 }

 .resi-card-table {
-  margin-top: 20px;
+  // margin-top: 20px;
 }
 .resi-row-btn {
  margin-bottom: 13px;
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@ -54,7 +54,7 @@
        </el-upload>

        <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >excel导出</el-button
+          >导出</el-button
        >
      </div>
      <el-table
@ -203,7 +203,7 @@ export default {
        createTime: ["", ""],
      },

-      importBtnTitle: "excel导入",
+      importBtnTitle: "导入",
      importLoading: false,

      //积分记录
@ -293,7 +293,7 @@ export default {
      // })
      //   .then((res) => {
      //     this.importLoading = false;
-      //     this.importBtnTitle = "excel导入";
+      //     this.importBtnTitle = "导入";
      //     console.log("resresresresresresres", res);

      //     this.getTableData();
@ -307,7 +307,7 @@ export default {
      //     console.log("失败", err);
      //   });
        this.importLoading = false
-      this.importBtnTitle = 'excel导入'
+      this.importBtnTitle = '导入'
      this.$refs.upload.clearFiles();
    },