修改资源调度弹窗,新增暂无数据组件

2 years ago · d7e9983fe3
7 changed files with 105 additions and 31 deletions
--- a/src/views/dataBoard/cpts/NoData/index.vue
+++ b/src/views/dataBoard/cpts/NoData/index.vue
@ -0,0 +1,42 @@
+<template>
+  <div class="no-data">
+    <div>
+      <img :style="{height: size + 'px'}" class="img" src="@/assets/images/overview/zanwu.png"/>
+      <div class="tips">{{ tips }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "NoData",
+  props: {
+    tips: {
+      type: String,
+      default: "暂无数据"
+    },
+    size: {
+      type: [String, Number],
+      default: 56
+    }
+  }
+}
+</script>
+
+<style scoped>
+.no-data {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  padding: 10px 0;
+}
+.tips {
+  color: #fff;
+  opacity: .6;
+  font-size: 14px;
+  margin-top: 10px;
+}
+</style>
--- a/src/views/dataBoard/cpts/sjkb-map/index.vue
+++ b/src/views/dataBoard/cpts/sjkb-map/index.vue
@ -953,6 +953,8 @@ export default {
      numPointMarker2 = new PointLayer({
        name: 'numPointMarker2',
        zIndex: 21,
+        minZoom: 2,
+        maxZoom: 19
      }).source(pointData, {
        parser: {
          type: 'json',
@ -962,7 +964,7 @@ export default {
      })
          .shape('num', 'text')
          .color('#fff')
-          .size(24)
+          .size(18)
          .style({
            textOffset: [0, 7],
            fontWeight: "bold"
--- a/src/views/dataBoard/overview/components/DemandSwiperList.vue
+++ b/src/views/dataBoard/overview/components/DemandSwiperList.vue
@ -1,6 +1,6 @@
 <template>
  <div class="t-list f-hflex">
-    <swiper ref="orderSwiper" :options="swiperOptions" v-if="list.length> 0">
+    <swiper v-if="list.length> 0" ref="orderSwiper" :options="swiperOptions">
      <swiper-slide
          v-for="(item, index) in list"
          :key="index"
@ -14,20 +14,20 @@
        </div>
      </swiper-slide>
    </swiper>
-    <div v-else class="no-data">
-      暂无数据
-    </div>
+    <NoData v-else size="80"/>
  </div>
 </template>

 <script>
 import {swiper, swiperSlide} from "vue-awesome-swiper";
+import NoData from "@/views/dataBoard/cpts/NoData";

 export default {
  name: "DemandSwiperList",
  components: {
    swiper,
    swiperSlide,
+    NoData
  },
  props: {
    list: {
@ -128,12 +128,7 @@ export default {
  }
 }

-.no-data {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  opacity: .6;
-  color: #fff;
+.no-datas {
  height: 120px;
 }
 </style>
--- a/src/views/dataBoard/overview/components/ResourceScheduling.vue
+++ b/src/views/dataBoard/overview/components/ResourceScheduling.vue
@ -36,7 +36,8 @@
                  <el-table-column label="资源类型" min-width="120" prop="personnelType">
                    <template slot-scope="{row}">
                      {{
-                        row.personnelType ? data[0].children.filter(item => item.value === row.personnelType)[0].label : ''
+                        (row.personnelType ?
+                            data[0].children.filter(item => item.value === row.personnelType)[0].label : '') || peopleTypeLabel
                      }}
                    </template>
                  </el-table-column>
@ -65,7 +66,7 @@
                  <el-table-column v-if="peopleType === '5'" label="联系人" min-width="120" prop="contact"/>
                  <el-table-column v-if="peopleType === '5'" label="联系电话" min-width="120" prop="contactMobile">
                    <template slot-scope="scope">
-                      {{ $sensitive(scope.row.mobile, 3, 7) }}
+                      {{ $sensitive(scope.row.contactMobile, 3, 7) }}
                    </template>
                  </el-table-column>

@ -78,12 +79,20 @@
                  </el-table-column>
                </el-table>
              </div>
+              <Pagination
+                  v-if="peopleType === '5' || peopleType === '4'"
+                  v-show="total > 0"
+                  :limit.sync="queryParams.pageSize"
+                  :page.sync="queryParams.pageNo"
+                  :total="total"
+                  @pagination="pageChange"
+              />
            </el-col>
          </el-row>
        </div>
      </div>
    </el-dialog>
-    <ResourceInfo ref="ResourceInfo" @ok="handleHandle" :currentLevelData="currentLevelData"/>
+    <ResourceInfo ref="ResourceInfo" :currentLevelData="currentLevelData" @ok="handleHandle"/>
  </div>
 </template>

@ -91,10 +100,11 @@
 import Title from "@/views/dataBoard/satisfactionEval/components/Title";
 import CallPhone from "@/views/dataBoard/cpts/CallPhone";
 import ResourceInfo from "@/views/dataBoard/overview/components/ResourceInfo.vue";
+import Pagination from "@/views/dataBoard/satisfactionEval/components/Pagination";

 export default {
  name: "ResourceScheduling",
-  components: {Title, CallPhone, ResourceInfo},
+  components: {Title, CallPhone, ResourceInfo, Pagination},
  props: {
    currentLevelData: {
      type: Object,
@ -105,8 +115,13 @@ export default {
  data() {
    return {
      loading: false,
+      total: 0,
      dialogVisible: false,
      list: [],
+      queryParams: {
+        pageNo: 1,
+        pageSize: 20
+      },
      peopleType: "staffGrid",
      data: [
        {
@ -145,7 +160,8 @@ export default {
      defaultProps: {
        children: 'children',
        label: 'label'
-      }
+      },
+      peopleTypeLabel: ''
    };
  },
  methods: {
@ -190,6 +206,17 @@ export default {
        this.total = res.data.data.total;
      })
    },
+
+    pageChange() {
+      this.list = []
+      if (this.peopleType === '4') {
+        this.getZzzList();
+      } else if (this.peopleType === '5') {
+        this.getLjdwList();
+      } else {
+        this.getList()
+      }
+    },
    handleViews(data) {
      // 1志愿者、2联建单位、3社区自组织、4网格员、5公益岗
      let type = this.peopleType === 'volunteer' ? 1 :
@ -197,7 +224,7 @@ export default {
              this.peopleType === '4' ? 3 :
                  this.peopleType === 'staffGrid' ? 4 :
                      this.peopleType === 'publicWelfareNum' ? 5 : ''
-      this.$refs.ResourceInfo.open(type === 3 ? data.agencyId : data.id, type,data)
+      this.$refs.ResourceInfo.open(type === 3 ? data.agencyId : data.id, type, data)
    },
    /*    handleViews() {
          this.$refs.ResourceInfo.open()
@ -205,6 +232,8 @@ export default {
    handleNodeClick(data) {
      console.log(data.value)
      if (data.value) {
+        this.list = []
+        this.peopleTypeLabel = data.label
        this.peopleType = data.value;
        console.log(data);
        if (this.peopleType === '4') {
--- a/src/views/dataBoard/overview/components/jdjs.vue
+++ b/src/views/dataBoard/overview/components/jdjs.vue
@ -32,7 +32,7 @@
          `/dataBoard/overview/potentialPeople?orgId=${currentLevelData.orgId}&level=${currentLevelData.orgLevel}&satisfactionSource=satisfaction_12345`
        )
      ">
-        <div><span class="f-pingfang">12345热线投诉人数</span></div>
+        <div><span class="f-pingfang">12345热线<br/>投诉人数</span></div>
        <div class="f-darkGray" ><b class="f-font34 f-yellow">{{event12345Num}}</b>人</div>
      </div>
      <div class="f-hflex"  @click="
@ -40,7 +40,7 @@
          `/dataBoard/overview/potentialPeople?orgId=${currentLevelData.orgId}&level=${currentLevelData.orgLevel}&satisfactionSource=satisfaction_province`
        )
      ">
-        <div><span class="f-pingfang">满意度调查不满意人数</span></div>
+        <div><span class="f-pingfang">满意度调查<br/>不满意人数</span></div>
        <div class="f-darkGray"><b class="f-font34 f-green">{{provinceSatisfactionNum}}</b>人</div>
      </div>
      <div class="f-hflex"  @click="
@ -48,7 +48,7 @@
          `/dataBoard/overview/potentialPeople?orgId=${currentLevelData.orgId}&level=${currentLevelData.orgLevel}&satisfactionSource=satisfaction_community`
        )
      ">
-        <div><span class="f-pingfang">社区自评不满意人数</span></div>
+        <div><span class="f-pingfang">社区自评<br/>不满意人数</span></div>
        <div class="f-darkGray"><b class="f-font34 f-skyBlue">{{selfInspectNum}}</b>人</div>
      </div>
    </div>
@ -397,7 +397,7 @@ export default {
    color: #a0cdff;
  }
 .f-hflex{
-  width: 83px;
+  width: 100px;
 }
 .f-flex{
  margin-top: 20px;
--- a/src/views/dataBoard/overview/components/wtqd.vue
+++ b/src/views/dataBoard/overview/components/wtqd.vue
@ -106,7 +106,7 @@
          )
        "
      >
-        <div><span class="f-pingfang">12345热线不满意数</span></div>
+        <div><span class="f-pingfang">12345热线<br/>不满意数</span></div>
        <div class="f-darkGray"><b class="f-font34 f-yellow">{{ event12345Num || 0 }}</b>件</div>
      </div>
      <div
@ -117,7 +117,7 @@
          )
        "
      >
-        <div><span class="f-pingfang">满意度调查不满意数</span></div>
+        <div><span class="f-pingfang">满意度调查<br/>不满意数</span></div>
        <div class="f-darkGray"><b class="f-font34 f-green">{{ provinceSatisfactionNum || 0 }}</b>件</div>
      </div>
      <div
@ -128,11 +128,17 @@
          )
        "
      >
-        <div><span class="f-pingfang">社区自评不满意数</span></div>
+        <div><span class="f-pingfang">社区自评<br/>不满意数</span></div>
        <div class="f-darkGray"><b class="f-font34 f-skyBlue">{{ selfInspectNum || 0 }}</b>件</div>
      </div>
    </div>
-    <EventDetails :id="this.rowId"  :is12345="false" :showDialog="showDialog" @close="close"/>
+    <EventDetails
+        :id="this.rowId"
+        :currentLevelData="currentLevelData"
+        :is12345="false"
+        :showDialog="showDialog"
+        @close="close"
+    />

  </div>
 </template>
@ -324,10 +330,10 @@ export default {
 }

 .f-darkGray {
-  margin-top: 15px;
  display: flex;
-  white-space: nowrap;
  align-items: flex-end;
+  margin-top: 15px;
+  white-space: nowrap;
 }

 .no-data {
--- a/src/views/dataBoard/overview/index.vue
+++ b/src/views/dataBoard/overview/index.vue
@ -488,7 +488,7 @@ export default {
                item3.type = 'resources'
                item3.num = item3.resources;
                item3.offsets = [-50, 50];
-                item3.latitude = centerLngLat.lat + 0.0012
+                item3.latitude = centerLngLat.lat + 0.0015
                item3.longitude = centerLngLat.lng
              }
              if (item3.hasOwnProperty("problems")) {
@ -496,14 +496,14 @@ export default {
                item3.num = item3.problems;
                item3.offsets = [50, -50];
                item3.latitude = centerLngLat.lat
-                item3.longitude = centerLngLat.lng + .0012
+                item3.longitude = centerLngLat.lng + .0015
              }
              if (item3.hasOwnProperty("events")) {
                item3.type = 'events'
                item3.num = item3.events;
                item3.offsets = [-50, -50];
-                item3.latitude = centerLngLat.lat + .0012
-                item3.longitude = centerLngLat.lng + .0012
+                item3.latitude = centerLngLat.lat + .0015
+                item3.longitude = centerLngLat.lng + .0015
              }
            })
          }