From 8264ffa3594e0a14a5e9996189d31059693baf55 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 18 Jan 2022 17:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=B1=BB=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/screen-loading/index.vue       | 68 -------------------
 .../visual/basicinfo/personCategory/index.vue | 18 +++--
 .../screen-table/index.vue => recordList.vue} | 51 +++++++++++---
 3 files changed, 51 insertions(+), 86 deletions(-)
 delete mode 100644 src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue
 rename src/views/modules/visual/basicinfo/personCategory/{components/screen-table/index.vue => recordList.vue} (88%)

diff --git a/src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue b/src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue
deleted file mode 100644
index cc8bda6f..00000000
--- a/src/views/modules/visual/basicinfo/personCategory/components/screen-loading/index.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div class="screen-loading">
-    <svg width="50px"
-         height="50px">
-      <circle cx="25"
-              cy="25"
-              r="20"
-              fill="transparent"
-              stroke-width="3"
-              stroke-dasharray="31.415, 31.415"
-              stroke="#29cdff"
-              stroke-linecap="round">
-        <animateTransform attributeName="transform"
-                          type="rotate"
-                          values="0, 25 25;360, 25 25"
-                          dur="1.5s"
-                          repeatCount="indefinite" />
-        <animate attributeName="stroke"
-                 values="#02bcfe;#3be6cb;#02bcfe"
-                 dur="3s"
-                 repeatCount="indefinite" />
-      </circle>
-
-      <circle cx="25"
-              cy="25"
-              r="10"
-              fill="transparent"
-              stroke-width="3"
-              stroke-dasharray="15.7, 15.7"
-              stroke="#29cdff"
-              stroke-linecap="round">
-        <animateTransform attributeName="transform"
-                          type="rotate"
-                          values="360, 25 25;0, 25 25"
-                          dur="1.5s"
-                          repeatCount="indefinite" />
-        <animate attributeName="stroke"
-                 values="#3be6cb;#02bcfe;#3be6cb"
-                 dur="3s"
-                 repeatCount="indefinite" />
-      </circle>
-    </svg>
-    <div class="loading-tip">
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'DvLoading'
-}
-</script>
-
-<style lang="scss" scoped>
-.screen-loading {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  .loading-tip {
-    font-size: 14px;
-    color: #fff;
-  }
-}
-</style>
diff --git a/src/views/modules/visual/basicinfo/personCategory/index.vue b/src/views/modules/visual/basicinfo/personCategory/index.vue
index 807d66c3..3b0896bb 100644
--- a/src/views/modules/visual/basicinfo/personCategory/index.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/index.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="warning-box">
+  <div @click="hiddenTypeList()"
+       class="warning-box">
     <cpt-card>
       <div class="title">
         <img src="@/assets/img/shuju/title-tip.png" />
@@ -80,7 +81,7 @@
 
 <script>
 import { requestPost } from "@/js/dai/request";
-import screenTable from "./components/screen-table/index";
+import screenTable from "./recordList";
 import cptCard from "@/views/modules/visual/cpts/card";
 import nextTick from "dai-js/tools/nextTick";
 
@@ -133,12 +134,16 @@ export default {
 
   },
   methods: {
+    hiddenTypeList () {
+
+      this.$refs.ref_recordlist.hiddenTypeList()
+    },
     async getApiData () {
       //获取各类人数
       await this.getCategoryData()
 
 
-      this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
+      this.$refs.ref_recordlist.getRecordlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
 
     },
     initData () {
@@ -183,7 +188,7 @@ export default {
       this.pageNo = 1;
       this.categoryKey = item.categoryKey
 
-      this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
+      this.$refs.ref_recordlist.getRecordlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
     },
 
     //获取各类人数
@@ -221,12 +226,11 @@ export default {
     pageSizeChangeHandleNew (val) {
       this.pageNo = 1;
       this.pageSize = val;
-      this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
+      this.$refs.ref_recordlist.getRecordlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
     },
     pageCurrentChangeHandleNew (val) {
       this.pageNo = val;
-      this.getUserwarnlist();
-      this.$refs.ref_recordlist.getUserwarnlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
+      this.$refs.ref_recordlist.getRecordlist(this.monthId, this.categoryKey, this.pageNo, this.pageSize)
     },
   },
   watch: {
diff --git a/src/views/modules/visual/basicinfo/personCategory/components/screen-table/index.vue b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
similarity index 88%
rename from src/views/modules/visual/basicinfo/personCategory/components/screen-table/index.vue
rename to src/views/modules/visual/basicinfo/personCategory/recordList.vue
index d8c0a854..a6ceee56 100644
--- a/src/views/modules/visual/basicinfo/personCategory/components/screen-table/index.vue
+++ b/src/views/modules/visual/basicinfo/personCategory/recordList.vue
@@ -15,10 +15,10 @@
           {{ '调整时间' }}
         </div>
         <div class="table-header-th table-header-select"
-             style="width:10%"
-             @click.stop="handleShowType()">
-          <span>{{ typeShow }}</span>
-          <img src="@/assets/img/xiala.png" />
+             style="width:10%">
+          <span @click.stop="handleShowType()">{{ typeShow }}</span>
+          <img @click.stop="handleShowType()"
+               src="@/assets/img/xiala.png" />
 
           <div class="user_list"
                v-show="showTypeSelect">
@@ -61,7 +61,7 @@
         <screen-loading v-if="visibleLoading">加载中</screen-loading>
         <div class="no-data"
              v-if="tableData.length == 0 && !visibleLoading">
-          <img src="../../../../../../../assets/img/modules/visual/noData.png"
+          <img src="@/assets/img/modules/visual/noData.png"
                alt=""
                srcset=""
                class="no-data-img" />
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import ScreenLoading from "../screen-loading/index";
+import ScreenLoading from "../../components/screen-loading/index";
 import { requestPost } from "@/js/dai/request";
 import Vue from "vue";
 
@@ -117,15 +117,39 @@ export default {
   },
 
   mounted () {
-
+    this.loadTypeList()
   },
 
   created () { },
 
   methods: {
+    hiddenTypeList () {
+
+      this.showTypeSelect = false
+    },
+    async loadTypeList () {
+      //获取分类
+
+      const url = "/sys/dict/data/dictlist"
+
+      let params = {
+        dictType: 'ic_user_change_type'
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.typeList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+
+    },
 
     //具体流动列表
-    async getUserwarnlist (monthId, categoryKey, pageNo, pageSize) {
+    async getRecordlist (monthId, categoryKey, pageNo, pageSize) {
       this.visibleLoading = true
       if (monthId) {
         this.monthId = monthId
@@ -170,7 +194,7 @@ export default {
     handleClickType (value, label) {
       this.typeShow = label
       this.selType = value
-      this.getUserwarnlist()
+      this.getRecordlist()
       this.showTypeSelect = !this.showTypeSelect
     },
 
@@ -204,11 +228,15 @@ export default {
       }
       &-select {
         position: relative;
-        cursor: pointer;
+
         // display: flex;
         // justify-content: space-around;
 
+        > span {
+          cursor: pointer;
+        }
         > img {
+          cursor: pointer;
           margin-left: 10px;
           // width: 10px;
           // height: 10px;
@@ -286,7 +314,7 @@ export default {
       }
 
       &-tr:hover {
-        background: url("../../../../../../../assets/img/modules/visual/hover-bac.png")
+        background: url("../../../../../assets/img/modules/visual/hover-bac.png")
           no-repeat center;
         background-size: 100% 100%;
       }
@@ -323,6 +351,7 @@ export default {
     font-family: PingFang SC;
     font-weight: 400;
     color: #ffffff;
+    cursor: pointer;
 
     .user_item_content {
       display: flex;