From f41f127f5411c49f9ca72369c25c970dcb765a3e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 21 Jan 2022 16:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                 |    1 +
 public/index.html                            |    2 +-
 src/assets/img/shequ/close.png               |  Bin 0 -> 425 bytes
 src/assets/scss/modules/search.scss          |  217 ++++
 src/js/store/index.js                        |    2 +-
 src/main.js                                  |    2 +-
 src/router/index.js                          |    2 +-
 src/store/index.js                           |    2 +-
 src/views/main-content.vue                   |  184 ++--
 src/views/modules/shequ/cpts/fangwu-info.vue |  211 ++++
 src/views/modules/shequ/cpts/pan-chart.vue   |  184 ++++
 src/views/modules/shequ/cpts/people-more.vue |  513 +++++++++
 src/views/modules/shequ/cpts/xuqiu-info.vue  |  205 ++++
 src/views/modules/shequ/index.vue            | 1018 +++++++++++++++++-
 src/views/modules/visual/cpts/line-chart.vue |   24 +-
 15 files changed, 2460 insertions(+), 107 deletions(-)
 create mode 100644 src/assets/img/shequ/close.png
 create mode 100644 src/assets/scss/modules/search.scss
 create mode 100644 src/views/modules/shequ/cpts/fangwu-info.vue
 create mode 100644 src/views/modules/shequ/cpts/pan-chart.vue
 create mode 100644 src/views/modules/shequ/cpts/people-more.vue
 create mode 100644 src/views/modules/shequ/cpts/xuqiu-info.vue

diff --git a/package.json b/package.json
index 3f52cd7ea..699ce11d7 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "xlsx": "^0.17.1"
   },
   "devDependencies": {
+    "@antv/f2": "^3.8.10-beta.1",
     "@vue/cli-plugin-babel": "^3.10.0",
     "@vue/cli-plugin-eslint": "^3.10.0",
     "@vue/cli-service": "^3.10.0",
diff --git a/public/index.html b/public/index.html
index ebeef6102..9e19414c1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
   <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico" />
   <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=LWBBZ-TIGC3-VFP3L-YNMWH-FJB7T-JFBLO"></script>
   <!-- f2图表 -->
-  <script src="https://gw.alipayobjects.com/os/antv/assets/f2/3.4.2/f2.min.js"></script>
+  <!-- <script src="https://gw.alipayobjects.com/os/lib/antv/f2/3.8.1/dist/f2.min.js"></script> -->
 
   <!-- 站点配置 -->
   <script>
diff --git a/src/assets/img/shequ/close.png b/src/assets/img/shequ/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..a77645b342289b343177bfd81de26796061a1434
GIT binary patch
literal 425
zcmeAS@N?(olHy`uVBq!ia0vp^ZXnFU3?!Qw{%;3TDgizru0Yz<)YRD6*vQDp#KZ(h
z0@*+Ykc0!qRF2g^b=)OEe!&b%%HfgGwex=d{rCCH{bdXcjGCS<jv*e$mrmO)*yJG4
zChl&sl`Gr8#8g?;bR)C0fy&eqLOBdKpB-VYytnRt4-4Ps>i_EH+w}!MsZ8Je{9b&y
z68qY|Z<9(FntO6xy%aZjb=aoBtKn(7p7OoX+s^j$p0dApz|fI#@g^;qfCC{)>e5$|
z-rb*m=?F_@UZY!<u!)%Tg3fCUzDoly_(-yzZ56!WB+jUt%I)p4)!^th!_BVchQ`PG
zOOs6fN|Uy&t4uM^uY6*#IQ4@?;Pu@_>bzF-n_oK0En~jwZ>}9Zq5GwSUK)et47rf1
zP;FlMnDqba82`KOlYBFGj^YmPqU8!^9zBf_s)qbU?N1a=qy`B)<SLqSU9k!>c6_U9
zD)WWuQm{k5k}cmCuS>;_@70VMW~#pM`INmavQd)rOjN#DIQOsFEwg}u#=zj|>gTe~
HDWM4ftXi8G

literal 0
HcmV?d00001

diff --git a/src/assets/scss/modules/search.scss b/src/assets/scss/modules/search.scss
new file mode 100644
index 000000000..ae6c6a6c6
--- /dev/null
+++ b/src/assets/scss/modules/search.scss
@@ -0,0 +1,217 @@
+@import "../c/config";
+@import "../c/function";
+
+.m-info {
+    padding: 0;
+    .wrap {
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 30px 40px;
+        .logo {
+            margin-bottom: 30px;
+            img {
+                display: block;
+                margin: 0 auto;
+            }
+        }
+
+        .search {
+            margin: 0 auto 30px;
+            width: 750px;
+            height: 53px;
+            border: 2px solid #0082fb;
+            border-radius: 8px;
+            display: flex;
+            align-items: center;
+
+            .input {
+                position: relative;
+                select {
+                    border: none;
+                    font-size: 16px;
+                    width: 90px;
+                    line-height: 32px;
+                    text-align: center;
+                    color: #0082fb;
+                }
+
+                input {
+                    margin-left: 20px;
+                    width: 500px;
+                    border: none;
+                    line-height: 24px;
+                    font-size: 18px;
+                    font-family: PingFang SC;
+                    font-weight: 400;
+                    color: #333;
+                }
+
+                .close-btn {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                    bottom: 0;
+                    margin: auto 0;
+                    width: 30px;
+                    height: 30px;
+                    background-color: #eee;
+                    border-radius: 100%;
+                    cursor: pointer;
+
+                    img {
+                        display: block;
+                        margin: 8px auto;
+                        width: 14px;
+                        height: 14px;
+                        opacity: 0.3;
+                    }
+                }
+            }
+
+            .btn {
+                margin-left: auto;
+                width: 120px;
+                line-height: 49px;
+                background: #0082fb;
+                border-radius: 0px 6 px 6 px 0px;
+                font-size: 22px;
+                text-align: center;
+                font-family: PingFang SC;
+                font-weight: 500;
+                color: #ffffff;
+                cursor: pointer;
+            }
+        }
+    }
+}
+.m-panel {
+    padding: 0 10px;
+
+    .operate {
+        text-align: right;
+    }
+}
+.m-list {
+    .list-title {
+        margin-bottom: 20px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #333333;
+    }
+
+    .list-title2 {
+        margin-bottom: 10px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #333333;
+    }
+
+    .list {
+        display: flex;
+        flex-wrap: wrap;
+
+        .item {
+            position: relative;
+            margin-right: 46px;
+            margin-bottom: 20px;
+            width: 80px;
+            text-align: center;
+            cursor: pointer;
+
+            .corner-mark {
+                position: absolute;
+                top: -4px;
+                right: -4px;
+                color: #ccc;
+                font-size: 20px;
+                z-index: 1;
+                &.z-on {
+                    color: #0082fb;
+                }
+            }
+
+            .icon {
+                position: relative;
+                display: block;
+                margin: 0 auto;
+                width: 78px;
+                height: 78px;
+
+                &::before {
+                    content: "";
+                    position: absolute;
+                    z-index: 0;
+                    display: block;
+                    top: 0;
+                    left: 0;
+                    right: 0;
+                    bottom: 0;
+                    margin: auto;
+                    width: 64px;
+                    height: 64px;
+                    border-radius: 10px;
+                    background-color: #f4f4f4;
+                }
+
+                img {
+                    position: relative;
+                    width: 78px;
+                    height: 78px;
+                    object-fit: cover;
+                }
+
+                .icon-svg {
+                    position: relative;
+                    display: block;
+                    margin: auto;
+                    width: 78px;
+                    height: 78px;
+                    object-fit: cover;
+                }
+            }
+            p {
+                margin: 0;
+                line-height: 24px;
+                font-size: 16px;
+                font-family: PingFang SC;
+                font-weight: 400;
+                color: #333333;
+            }
+        }
+    }
+}
+
+.m-tb {
+    margin-bottom: 20px;
+}
+
+.m-data {
+    padding: 0;
+    margin-top: 20px;
+
+    .wrap {
+        background-color: #fff;
+        border-radius: 10px;
+        padding: 30px 40px;
+
+        .headline {
+            margin-bottom: 20px;
+            font-size: 24px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #333333;
+        }
+
+        .cnt {
+            display: flex;
+            .chart {
+                width: 500px;
+            }
+            .tb {
+                width: calc(100% - 500px);
+            }
+        }
+    }
+}
diff --git a/src/js/store/index.js b/src/js/store/index.js
index d3aca2ad2..483238a6b 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -28,7 +28,7 @@ export default new Vuex.Store({
       {
         ...window.SITE_CONFIG["contentTabDefault"],
         name: "indexWork",
-        title: "indexWork",
+        title: "首页",
       },
     ],
     contentTabsActiveName: "indexWork",
diff --git a/src/main.js b/src/main.js
index 72159ce23..05b7580e0 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,10 +32,10 @@ import getQueryPara from "dai-js/modules/getQueryPara";
 
 // 兼容token传参登录
 if (getQueryPara("token")) {
+  console.log('token', getQueryPara("token"));
   Cookies.set("token", getQueryPara("token"));
 }
 
-
 window.app = Object.assign(
   {},
   {
diff --git a/src/router/index.js b/src/router/index.js
index 228413045..eb545fb48 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -443,7 +443,7 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) {
       component: null,
       name: "",
       meta: {
-        ...window.SITE_CONFIG["contentTabDefault"],
+        // ...window.SITE_CONFIG["contentTabDefault"],
         menuId: menuList[i].id,
         title: menuList[i].name,
       },
diff --git a/src/store/index.js b/src/store/index.js
index a92e7e3fc..d411b20e9 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -24,7 +24,7 @@ export default new Vuex.Store({
       {
         ...window.SITE_CONFIG['contentTabDefault'],
         'name': 'indexWork',
-        'title': 'indexWork'
+        'title': '首页'
       }
     ],
     contentTabsActiveName: 'indexWork',
diff --git a/src/views/main-content.vue b/src/views/main-content.vue
index 067cef1fc..890964127 100644
--- a/src/views/main-content.vue
+++ b/src/views/main-content.vue
@@ -4,44 +4,61 @@
     <template v-if="$route.meta.isTab && !$store.state.inIframe">
       <el-dropdown class="aui-content--tabs-tools">
         <i class="el-icon-arrow-down"></i>
-        <el-dropdown-menu slot="dropdown"
-                          :show-timeout="0">
-          <el-dropdown-item @click.native="tabRemoveHandle($store.state.contentTabsActiveName)">{{ $t('contentTabs.closeCurrent') }}</el-dropdown-item>
-          <el-dropdown-item @click.native="tabsCloseOtherHandle()">{{ $t('contentTabs.closeOther') }}</el-dropdown-item>
-          <el-dropdown-item @click.native="tabsCloseAllHandle()">{{ $t('contentTabs.closeAll') }}</el-dropdown-item>
+        <el-dropdown-menu slot="dropdown" :show-timeout="0">
+          <el-dropdown-item
+            @click.native="tabRemoveHandle($store.state.contentTabsActiveName)"
+            >{{ $t("contentTabs.closeCurrent") }}</el-dropdown-item
+          >
+          <el-dropdown-item @click.native="tabsCloseOtherHandle()">{{
+            $t("contentTabs.closeOther")
+          }}</el-dropdown-item>
+          <el-dropdown-item @click.native="tabsCloseAllHandle()">{{
+            $t("contentTabs.closeAll")
+          }}</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-      <el-tabs v-model="$store.state.contentTabsActiveName"
-               @tab-click="tabSelectedHandle"
-               @tab-remove="tabRemoveHandle">
-        <el-tab-pane v-for="item in $store.state.contentTabs"
-                     :key="item.name"
-                     :name="item.name"
-                     :label="item.title"
-                     :closable="item.name !== 'home'"
-                     :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }">
-          <template v-if="item.name === 'home'">
-            <svg slot="label"
-                 class="icon-svg aui-content--tabs-icon-nav"
-                 aria-hidden="true">
+      <el-tabs
+        v-model="$store.state.contentTabsActiveName"
+        @tab-click="tabSelectedHandle"
+        @tab-remove="tabRemoveHandle"
+      >
+        <el-tab-pane
+          v-for="item in $store.state.contentTabs"
+          :key="item.name"
+          :name="item.name"
+          :label="item.title"
+          :closable="item.name !== 'indexWork'"
+          :class="{ 'is-iframe': tabIsIframe(item.iframeURL) }"
+        >
+          <template v-if="item.name === 'indexWork'">
+            <svg
+              slot="label"
+              class="icon-svg aui-content--tabs-icon-nav"
+              aria-hidden="true"
+            >
               <use xlink:href="#icon-home"></use>
             </svg>
           </template>
           <template v-if="tabIsIframe(item.iframeURL)">
-            <iframe :src="item.iframeURL + '?token=' + token + '&customerId=' + customerId"
-                  ref="iframes"
-                  class="iframes"
-                  id="iframes"
-                  width="100%"
-                  height="100%"
-                  frameborder="0"
-                  scrolling="yes"
-                  ></iframe>
-                   <!-- <div v-if="tabIsIframe(item.iframeURL)" id="addend-iframe" style="height: 100%;"> </div> -->
+            <iframe
+              :src="
+                item.iframeURL + '?token=' + token + '&customerId=' + customerId
+              "
+              ref="iframes"
+              class="iframes"
+              id="iframes"
+              width="100%"
+              height="100%"
+              frameborder="0"
+              scrolling="yes"
+            ></iframe>
+            <!-- <div v-if="tabIsIframe(item.iframeURL)" id="addend-iframe" style="height: 100%;"> </div> -->
           </template>
           <keep-alive v-else>
-            <router-view v-if="item.name === $store.state.contentTabsActiveName"
-                         @changeCustomerName="changeCustomerName" />
+            <router-view
+              v-if="item.name === $store.state.contentTabsActiveName"
+              @changeCustomerName="changeCustomerName"
+            />
           </keep-alive>
         </el-tab-pane>
       </el-tabs>
@@ -56,86 +73,107 @@
 </template>
 
 <script>
-import { isURL } from '@/utils/validate'
-import Cookie from 'js-cookie'
+import { isURL } from "@/utils/validate";
+import Cookie from "js-cookie";
 export default {
-  data () {
+  data() {
     return {
-      iframeUrl: '',
-      token: '',
-      customerId: ''
-    }
+      iframeUrl: "",
+      token: "",
+      customerId: "",
+    };
   },
-  created () {
+  created() {
     // this.$nextTick(() => {
     //   this.sendMessage()
     // })
-    this.token = Cookie.get('token')
-    this.customerId = localStorage.getItem('customerId')
+    this.token = Cookie.get("token");
+    this.customerId = localStorage.getItem("customerId");
   },
   methods: {
-    changeCustomerName (customerName) {
-      this.$emit('changeCustomerName', customerName)
+    changeCustomerName(customerName) {
+      this.$emit("changeCustomerName", customerName);
     },
     // tabs, 是否通过iframe展示
-    tabIsIframe (url) {
+    tabIsIframe(url) {
       // this.appendIframe(url)
-      this.iframeUrl = url + '?token=' + Cookie.get('token') + '&customerId=' + localStorage.getItem('customerId')
-      return isURL(url)
+      this.iframeUrl =
+        url +
+        "?token=" +
+        Cookie.get("token") +
+        "&customerId=" +
+        localStorage.getItem("customerId");
+      return isURL(url);
     },
     // tabs, 选中tab
-    tabSelectedHandle (tab) {
-      tab = this.$store.state.contentTabs.filter(item => item.name === tab.name)[0]
+    tabSelectedHandle(tab) {
+      tab = this.$store.state.contentTabs.filter(
+        (item) => item.name === tab.name
+      )[0];
       if (tab) {
         this.$router.push({
-          'name': tab.name,
-          'params': { ...tab.params },
-          'query': { ...tab.query }
-        })
+          name: tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query },
+        });
       }
     },
     // tabs, 删除tab
-    tabRemoveHandle (tabName) {
-      if (tabName === 'home') {
-        return false
+    tabRemoveHandle(tabName) {
+      if (tabName === "home") {
+        return false;
       }
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      );
       if (this.$store.state.contentTabs.length <= 0) {
-        this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home'
-        return false
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = "home";
+        return false;
       }
       // 当前选中tab被删除
       if (tabName === this.$store.state.contentTabsActiveName) {
-        let tab = this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1]
+        let tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ];
         this.$router.push({
           name: tab.name,
           params: { ...tab.params },
-          query: { ...tab.query }
-        })
+          query: { ...tab.query },
+        });
       }
     },
     // tabs, 关闭其它
-    tabsCloseOtherHandle () {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => {
-        return item.name === 'home' || item.name === this.$store.state.contentTabsActiveName
-      })
+    tabsCloseOtherHandle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => {
+          return (
+            item.name === "home" ||
+            item.name === this.$store.state.contentTabsActiveName
+          );
+        }
+      );
     },
     // tabs, 关闭全部
-    tabsCloseAllHandle () {
-      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home')
-      this.$router.push({ name: 'home' })
+    tabsCloseAllHandle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name === "home"
+      );
+      this.$router.push({ name: "home" });
     },
-    sendMessage () {
+    sendMessage() {
       // const iframe = this.$refs.iframes.contentWindow
-      const iframe = document.getElementsByClassName('iframes')[0].contentWindow
+      const iframe =
+        document.getElementsByClassName("iframes")[0].contentWindow;
 
-      console.log('iframe', iframe)
+      console.log("iframe", iframe);
       // iframe.postMessage({
       //   token: Cookie.get('token'),
       //   customerId: localStorage.getItem('customerId')
       // }, '*')
-      iframe.postMessage({ name: 'lalalal' }, '*')
+      iframe.postMessage({ name: "lalalal" }, "*");
     },
-  }
-}
+  },
+};
 </script>
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
new file mode 100644
index 000000000..ec0bad720
--- /dev/null
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <div>
+      <el-form
+        ref="ref_form"
+        :inline="false"
+        :model="dataForm"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="所属小区"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.neighborHoodName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="所属楼栋"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.buildingName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="单元号"
+          prop="buildingUnitId"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.unitNum }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="门牌号"
+          prop="doorName"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.doorName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="房屋类型"
+          prop="houseType"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.houseType }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="房屋用途"
+          prop="purpose"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.purpose }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="是否出租"
+          prop="rentFlag"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.rentFlag }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="房主姓名"
+          prop="ownerName"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.ownerName }}</span>
+        </el-form-item>
+        <el-form-item
+          label="房主电话"
+          prop="ownerPhone"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.ownerPhone }}</span>
+        </el-form-item>
+        <el-form-item
+          label="房主身份证"
+          prop="ownerIdCard"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.ownerIdCard }}</span>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">关闭</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+let loading; // 加载动画
+export default {
+  data() {
+    return {
+      formType: "detail", //表单操作类型 add新增，edit编辑，detail详情
+      dataForm: {
+        neighborHoodId: "", // 所属小区ID
+        buildingId: "", //所属楼栋ID
+        buildingUnitId: "", //所属单元ID
+        doorName: "", //门牌号
+        houseType: "", //房屋类型【楼房，平房，别墅】
+        purpose: "", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 1, //是否出租【是：1，否：0】
+        ownerPhone: "", //房主电话
+        ownerName: "", //房主名字
+        ownerIdCard: "", //房主身份证
+      },
+    };
+  },
+  components: {},
+  mounted() {},
+
+  methods: {
+    async initForm(type, row) {
+      this.$refs.ref_form.resetFields();
+
+      this.formType = type;
+      if (row) {
+        this.dataForm = JSON.parse(JSON.stringify(row));
+      }
+    },
+
+    handleCancle() {
+      this.$emit("dialogCancle");
+      this.resetData();
+    },
+
+    resetData() {
+      this.dataForm = {
+        neighborHoodId: "", // 所属小区ID
+        buildingId: "", //所属楼栋ID
+        buildingUnitId: "", //所属单元ID
+        doorName: "", //门牌号
+        houseType: "1", //房屋类型【楼房，平房，别墅】
+        purpose: "1", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 1, //是否出租【是：1，否：0】
+        ownerPhone: "", //房主电话
+        ownerName: "", //房主名字
+        ownerIdCard: "", //房主身份证
+      };
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  computed: {},
+  props: {},
+};
+</script>
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+</style>
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequ/cpts/pan-chart.vue b/src/views/modules/shequ/cpts/pan-chart.vue
new file mode 100644
index 000000000..774198608
--- /dev/null
+++ b/src/views/modules/shequ/cpts/pan-chart.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="m-chart">
+    <canvas id="myChart" :width="width" :height="height" />
+  </div>
+</template>
+
+<script>
+import nextTick from "dai-js/tools/nextTick";
+import F2 from "@antv/f2/lib/index-all";
+
+// ios下字体渲染有bug
+const fontFamily = "PingFang SC";
+const fontSize = 14;
+
+let chart;
+let srcData = [];
+
+const iniChart = function (config, srcData, total) {
+  chart = new F2.Chart({
+    id: "myChart",
+    ...config,
+  });
+
+  let data = [
+    {
+      const: "const",
+      name: "交通出行",
+      count: 51.39,
+    },
+    {
+      const: "const",
+      name: "饮食",
+      count: 356.68,
+    },
+    {
+      const: "const",
+      name: "生活日用",
+      count: 20.0,
+    },
+    {
+      const: "const",
+      name: "住房缴费",
+      count: 116.53,
+    },
+  ];
+  console.log("-----------------------------------", srcData);
+  data = srcData;
+
+  chart.source(data);
+  chart.coord("polar", {
+    transposed: true,
+    radius: 0.9,
+    innerRadius: 0.6,
+  });
+  chart.axis(false);
+  chart.legend(false);
+  // chart.legend({
+  //   position: "bottom",
+  //   align: "center",
+  // });
+  chart.tooltip(false);
+  chart.guide().html({
+    position: ["50%", "50%"],
+    html: `<div style="text-align: center;width:150px;height: 35px;">\n      <p style="font-size: 18px;color: #999;margin: 0" id="title">总人数</p>\n      <p style="font-size: 30px;color: #343434;margin: 0;font-weight: bold;" id="count">${total}</p>\n      </div>`,
+  });
+  chart
+    .interval()
+    .position("const*count")
+    .adjust("stack")
+    .color("name", [
+      "#e70014",
+      "#ea6200",
+      "#f59701",
+      "#fcc900",
+      "#fef200",
+      "#cedc01",
+      "#8fc41e",
+      "#22ad38",
+      "#009b44",
+      "#009c6c",
+      "#019e97",
+      "#00a1be",
+      "#00a2c1",
+      "#00a0ea",
+      "#0085d2",
+      "#0067b6",
+      "#00469b",
+      "#1d2089",
+      "#5e1986",
+      "#920784",
+      "#bd0081",
+      "#e5007f",
+      "#e5026d",
+      "#e4024e",
+      "#e40031",
+    ]);
+  chart.pieLabel({
+    sidePadding: 30,
+    activeShape: true,
+    label1: function label1(data) {
+      return {
+        text: data.count + "人",
+        fill: "#343434",
+        fontWeight: "bold",
+        fontSize: 14
+      };
+    },
+    label2: function label2(data) {
+      return {
+        text: data.name,
+        fill: "#999",
+        fontSize: 14
+      };
+    },
+    onClick: function onClick(ev) {
+      const data = ev.data;
+      if (data) {
+        // $("#title").text(data.name);
+        // $("#count").text(data.count);
+      }
+    },
+  });
+  chart.render();
+
+  // 注意：需要把chart return 出来
+  return chart;
+};
+
+export default {
+  name: "chart",
+  props: {
+    list: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    total: {
+      type: Number,
+      default: 0,
+    },
+    config: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    width: {
+      type: Number,
+      default: 400,
+    },
+    height: {
+      type: Number,
+      default: 260,
+    },
+  },
+  data() {
+    return {
+      iniLoading: false,
+    };
+  },
+  watch: {
+    list(data) {
+      // chart.changeData(data);
+      srcData = data;
+    },
+  },
+  async created() {
+    await nextTick(200);
+    iniChart(this.config, this.list, this.total);
+    await nextTick(200);
+    this.iniLoading = true;
+  },
+
+  methods: {
+    setList(data) {
+      chart.changeData(data);
+      srcData = data;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
new file mode 100644
index 000000000..b316115df
--- /dev/null
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="m-pop">
+    <div class="wrap">
+      <cpt-card>
+        <div class="title">
+          <img src="@/assets/img/shuju/title-tip.png" />
+          <span>更多信息</span>
+        </div>
+
+        <div class="btn-close" @click="handleClose">
+          <img src="@/assets/img/shuju/people/close.png" />
+        </div>
+
+        <div
+          :key="'fieldSubList' + index"
+          v-for="(fieldSubList, index) in fieldList"
+        >
+          <div class="list">
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属网格：</span>
+              <span>{{ gridName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属小区：</span>
+              <span>{{ xiaoquName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属楼宇：</span>
+              <span>{{ louName }}-{{ danyuanName }}</span>
+            </div>
+            <div class="item" v-if="index == 0">
+              <span class="item-field">所属家庭：</span>
+              <span>{{ homeName }}</span>
+            </div>
+            <div class="item" :key="field.itemId" v-for="field in fieldSubList">
+              <span class="item-field">{{ field.label }}：</span>
+
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  info[field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
+                info[field.columnName] == null ? "--" : info[field.columnName]
+              }}</span>
+            </div>
+          </div>
+
+          <div class="line"></div>
+        </div>
+
+        <div class="tabs">
+          <div
+            class="tab-btn"
+            @click="subStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div
+            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+            class="tab"
+            :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+            :key="'tab' + index"
+            @click="groupIndex = index"
+            v-for="(item, index) in groupList"
+          >
+            {{ item.label }}
+          </div>
+          <div
+            class="tab-btn"
+            @click="addStartGroupIndex"
+            v-if="groupList.length > 9"
+          >
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div
+          :key="'group' + index"
+          v-show="groupIndex % groupList.length == index"
+          v-for="(group, index) in groupList"
+        >
+          <div
+            v-if="
+              group.tableName == 'ic_resi_demand' &&
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            "
+          >
+            <div
+              class="list"
+              :key="'ic_resi_demand' + infoIndex"
+              v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand"
+            >
+              <div
+                class="item"
+                :key="field.itemId"
+                v-for="field in group.itemList"
+              >
+                <span class="item-field">{{ field.label }}：</span>
+                <span
+                  v-if="
+                    field.itemType == 'select' ||
+                    field.itemType == 'radio' ||
+                    field.itemType == 'checkbox' ||
+                    field.itemType == 'cascader'
+                  "
+                  >{{
+                    infoItem[field.columnName] == null
+                      ? "--"
+                      : getOptionLabel(
+                          field.options,
+                          infoItem[field.columnName],
+                          field.itemType
+                        )
+                  }}</span
+                >
+
+                <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div class="list" v-else>
+            <div
+              class="item"
+              :key="field.itemId"
+              v-for="field in group.itemList"
+            >
+              <span class="item-field">{{ field.label }}：</span>
+              <span
+                v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                "
+                >{{
+                  !allInfo[group.tableName] ||
+                  allInfo[group.tableName][0][field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        allInfo[group.tableName][0][field.columnName],
+                        field.itemType
+                      )
+                }}</span
+              >
+
+              <span v-else>{{
+                !allInfo[group.tableName] ||
+                allInfo[group.tableName][0][field.columnName] == null
+                  ? "--"
+                  : allInfo[group.tableName][0][field.columnName]
+              }}</span>
+            </div>
+          </div>
+        </div>
+      </cpt-card>
+    </div>
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: "peopleMore",
+  props: {
+    userId: {
+      type: String,
+      default: "",
+    },
+    gridName: {
+      type: String,
+      default: "",
+    },
+  },
+
+  components: {
+    cptCard,
+  },
+
+  data() {
+    return {
+      fieldList: [],
+      groupList: [],
+      groupIndex: 0,
+      startGroupIndex: 0,
+      info: {},
+      allInfo: {},
+
+      xiaoquList: [],
+      louList: [],
+      danyuanList: [],
+      homeList: [],
+    };
+  },
+
+  computed: {
+    xiaoquName() {
+      const {
+        xiaoquList,
+        info: { VILLAGE_ID },
+      } = this;
+      if (Array.isArray(xiaoquList) && xiaoquList.length > 0 && VILLAGE_ID) {
+        let item = xiaoquList.find((item) => item.value == VILLAGE_ID);
+        if (item) {
+          return item.label;
+        }
+      }
+      return "";
+    },
+    louName() {
+      const {
+        louList,
+        info: { BUILD_ID },
+      } = this;
+      if (Array.isArray(louList) && louList.length > 0 && BUILD_ID) {
+        let item = louList.find((item) => item.value == BUILD_ID);
+        if (item) {
+          return item.label;
+        }
+      }
+      return "";
+    },
+    danyuanName() {
+      const {
+        danyuanList,
+        info: { UNIT_ID },
+      } = this;
+      if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+        let item = danyuanList.find((item) => item.value == UNIT_ID);
+        if (item) {
+          return item.label;
+        }
+      }
+      return "";
+    },
+    danyuanName() {
+      const {
+        danyuanList,
+        info: { UNIT_ID },
+      } = this;
+      if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+        let item = danyuanList.find((item) => item.value == UNIT_ID);
+        if (item) {
+          return item.label;
+        }
+      }
+      return "";
+    },
+    homeName() {
+      const {
+        homeList,
+        info: { HOME_ID },
+      } = this;
+      if (Array.isArray(homeList) && homeList.length > 0 && HOME_ID) {
+        let item = homeList.find((item) => item.value == HOME_ID);
+        if (item) {
+          return item.label;
+        }
+      }
+      return "";
+    },
+  },
+
+  watch: {
+    userId() {
+      this.getApiData();
+    },
+  },
+
+  mounted() {
+    this.getApiData();
+  },
+
+  methods: {
+    addStartGroupIndex() {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex < groupList.length - 9) {
+        this.startGroupIndex = startGroupIndex + 1;
+      } else {
+        this.startGroupIndex = groupList.length - 9;
+      }
+    },
+    subStartGroupIndex() {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex > 0) {
+        this.startGroupIndex = startGroupIndex - 1;
+      } else {
+        this.startGroupIndex = 0;
+      }
+    },
+    handleClose() {
+      this.$emit("close");
+    },
+
+    async getApiData() {
+      await this.getField();
+      await this.getInfo();
+      this.getXiaoquList();
+      this.getLouList();
+      this.getDanyuanList();
+      this.getHomeList();
+    },
+
+    getOptionLabel(options, value, type = "") {
+      if (Array.isArray(options)) {
+        let valueArr = value.split(",");
+        if (type == "cascader") {
+          if (valueArr.length > 0) {
+            let level1 = options.find((item) => item.value == valueArr[0]);
+            if (level1) {
+              if (valueArr.length > 1 && level1.children) {
+                let level2 = level1.children.find(
+                  (item) => item.value == valueArr[1]
+                );
+                if (level2) {
+                  return level1.label + "-" + level2.label;
+                }
+              }
+              return level1.label;
+            }
+          }
+        } else {
+          return valueArr
+            .map((val) => {
+              let item = options.find((item) => item.value == val);
+              if (item && item.label) {
+                return item.label;
+              }
+              return "--";
+            })
+            .join("、");
+        }
+      }
+      return "--";
+    },
+
+    //加载组织数据
+    async getField() {
+      const url = "/oper/customize/icform/getcustomerform";
+
+      const { data, code, msg } = await requestPost(url, {
+        dynamic: true,
+        formCode: "resi_base_info",
+      });
+
+      if (code === 0) {
+        this.groupList = data.groupList;
+        this.fieldList = (function (arr) {
+          let col = [];
+          let ele = [];
+          for (let i = 0; i < arr.length; i++) {
+            let item = arr[i];
+            if (item.itemType == "divider" || i == arr.length - 1) {
+              col.push([...ele]);
+              ele = [];
+            } else {
+              ele.push(item);
+            }
+          }
+          return col;
+        })(data.itemList);
+
+        this.fieldList.forEach((subList, index) => {
+          subList.forEach(async (item, subIndex) => {
+            if (item.optionSourceType == "remote" && item.optionSourceValue) {
+              this.fieldList[index][subIndex].options = await this.getOptions(
+                item.optionSourceValue
+              );
+            }
+          });
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getInfo() {
+      const url = "/epmetuser/icresiuser/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icResiUserId: this.userId,
+        formCode: "resi_base_info",
+      });
+
+      if (code === 0) {
+        this.info = data.ic_resi_user[0];
+        this.allInfo = data;
+
+        this.fieldList.forEach((subList, index) => {
+          subList.forEach((item, subIndex) => {
+            if (
+              item.itemType == "radio" &&
+              item.childGroup &&
+              this.allInfo[item.tableName] &&
+              this.allInfo[item.tableName][0][item.columnName] == "1"
+            ) {
+              this.groupList = [...this.groupList, item.childGroup];
+            }
+          });
+        });
+        console.log("1111111111111111111111111", this.groupList);
+
+        this.groupList.forEach((subList, index) => {
+          subList.itemList.forEach(async (item, subIndex) => {
+            if (item.optionSourceType == "remote" && item.optionSourceValue) {
+              this.groupList[index].itemList[subIndex].options =
+                await this.getOptions(item.optionSourceValue);
+            }
+          });
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getOptions(url) {
+      if (!url) return [];
+
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        return data;
+      } else {
+        return [];
+      }
+    },
+
+    async getXiaoquList() {
+      const url = "/gov/org/icneighborhood/neighborhoodoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        agencyId: this.info.AGENCY_ID,
+        gridId: this.info.GRID_ID,
+      });
+
+      if (code === 0) {
+        this.xiaoquList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getLouList() {
+      const url = "/gov/org/icbuilding/buildingoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        neighborHoodId: this.info.VILLAGE_ID,
+      });
+
+      if (code === 0) {
+        this.louList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getDanyuanList() {
+      const url = "/gov/org/icbuildingunit/unitoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        buildingId: this.info.BUILD_ID,
+      });
+
+      if (code === 0) {
+        this.danyuanList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getHomeList() {
+      const url = "/gov/org/ichouse/houseoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        unitId: this.info.UNIT_ID,
+      });
+
+      if (code === 0) {
+        this.homeList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style
+  lang="scss"
+  src="@/assets/scss/modules/visual/people.scss"
+  scoped
+></style>
diff --git a/src/views/modules/shequ/cpts/xuqiu-info.vue b/src/views/modules/shequ/cpts/xuqiu-info.vue
new file mode 100644
index 000000000..9d94dca7c
--- /dev/null
+++ b/src/views/modules/shequ/cpts/xuqiu-info.vue
@@ -0,0 +1,205 @@
+<template>
+  <div>
+    <div>
+      <el-form
+        ref="ref_form"
+        :inline="false"
+        :model="dataForm"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="状态"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.statusName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="所属网格"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.gridName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="需求类型"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.categoryName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="需求内容"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.content }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="上报类型"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.reportTypeName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="上报人"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.reportUserName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="上报时间"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.reportTime }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="需求人"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.demandUserName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="服务方"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.serviceShowName }}</span>
+        </el-form-item>
+
+        <el-form-item
+          label="服务时间"
+          label-width="150px"
+          style="display: block"
+        >
+          <span>{{ dataForm.wantServiceTime }}</span>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn">
+      <el-button @click="handleCancle">关闭</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+let loading; // 加载动画
+export default {
+  data() {
+    return {
+      formType: "detail", //表单操作类型 add新增，edit编辑，detail详情
+      dataForm: {
+        neighborHoodId: "", // 所属小区ID
+        buildingId: "", //所属楼栋ID
+        buildingUnitId: "", //所属单元ID
+        doorName: "", //门牌号
+        houseType: "", //房屋类型【楼房，平房，别墅】
+        purpose: "", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 1, //是否出租【是：1，否：0】
+        ownerPhone: "", //房主电话
+        ownerName: "", //房主名字
+        ownerIdCard: "", //房主身份证
+      },
+    };
+  },
+  components: {},
+  mounted() {},
+
+  methods: {
+    async initForm(type, row) {
+      this.$refs.ref_form.resetFields();
+
+      this.formType = type;
+      if (row) {
+        this.dataForm = JSON.parse(JSON.stringify(row));
+      }
+    },
+
+    handleCancle() {
+      this.$emit("dialogCancle");
+      this.resetData();
+    },
+
+    resetData() {
+      this.dataForm = {
+        neighborHoodId: "", // 所属小区ID
+        buildingId: "", //所属楼栋ID
+        buildingUnitId: "", //所属单元ID
+        doorName: "", //门牌号
+        houseType: "1", //房屋类型【楼房，平房，别墅】
+        purpose: "1", //房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 1, //是否出租【是：1，否：0】
+        ownerPhone: "", //房主电话
+        ownerName: "", //房主名字
+        ownerIdCard: "", //房主身份证
+      };
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+  computed: {},
+  props: {},
+};
+</script>
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 500px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+</style>
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/shequ/index.vue b/src/views/modules/shequ/index.vue
index 552841f09..8437ba9d9 100644
--- a/src/views/modules/shequ/index.vue
+++ b/src/views/modules/shequ/index.vue
@@ -1,33 +1,1017 @@
 <template>
   <div>
     <div class="m-info">
-      <h2>社区查询</h2>
+      <div class="wrap">
+        <div class="logo">
+          <img src="@/assets/img/shequ/logo.png" />
+        </div>
+
+        <div class="search">
+          <div class="input">
+            <select v-model="searchData.type">
+              <option value="jumin">居民</option>
+              <option value="fangwu">房屋</option>
+              <option value="xuqiu">需求</option>
+            </select>
+
+            <input
+              type="text"
+              :placeholder="typePlaceholder[searchData.type]"
+              v-model="searchData.keyword"
+              @keyup.enter="handleClickSearchBtn"
+            />
+
+            <div
+              class="close-btn"
+              v-if="searchData.keyword != ''"
+              @click="searchData.keyword = ''"
+            >
+              <img src="@/assets/img/shequ/close.png" />
+            </div>
+          </div>
+          <div class="btn" @click="handleClickSearchBtn">搜索</div>
+        </div>
+
+        <div
+          class="m-tb"
+          v-if="
+            searchData.type == 'jumin' &&
+            searchData.keyword != '' &&
+            searchStatus == 'ing'
+          "
+        >
+          <div class="tb">
+            <el-table
+              :data="searchJumin.list"
+              border
+              style="width: 100%"
+              class="resi-table"
+              :max-height="1000"
+            >
+              <el-table-column
+                label="序号"
+                type="index"
+                align="center"
+                width="50"
+              />
+              <el-table-column
+                v-for="item in searchJumin.header"
+                :key="item.columnName"
+                :prop="item.columnName"
+                :label="item.label"
+                align="center"
+                :show-overflow-tooltip="true"
+                :width="
+                  item.itemType === 'radio' ? computedWidth(item.label) : 180
+                "
+              >
+                <template slot-scope="scope">
+                  <span>{{ handleFilterSpan(scope.row, item) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="handleWatchSearchJumin(scope.$index)"
+                    type="text"
+                    size="small"
+                    >查看</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+
+            <div>
+              <el-pagination
+                @size-change="handleSizeChangeSearchJumin"
+                @current-change="handleCurrentChangeSearchJumin"
+                :current-page.sync="searchJumin.pageNo"
+                :page-sizes="[20, 50, 100, 200]"
+                :page-size="parseInt(searchJumin.pageSize)"
+                layout="sizes, prev, pager, next"
+                :total="searchJumin.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+
+        <div
+          class="m-tb"
+          v-if="
+            searchData.type == 'fangwu' &&
+            searchData.keyword != '' &&
+            searchStatus == 'ing'
+          "
+        >
+          <div class="tb">
+            <el-table
+              :data="searchFangwu.list"
+              v-loading="searchFangwu.loading"
+              border
+              :max-height="1000"
+              style="width: 100%"
+            >
+              <el-table-column
+                label="序号"
+                type="index"
+                align="center"
+                width="50"
+              />
+              <el-table-column prop="houseName" label="房屋名称" width="120">
+              </el-table-column>
+              <el-table-column
+                prop="neighborHoodName"
+                label="所属小区"
+                width="160"
+              >
+              </el-table-column>
+              <el-table-column prop="buildingName" label="所属楼栋">
+              </el-table-column>
+              <el-table-column prop="unitNum" label="单元号"> </el-table-column>
+              <el-table-column prop="doorName" label="门牌号">
+              </el-table-column>
+              <el-table-column prop="houseType" label="类型"> </el-table-column>
+              <el-table-column prop="purpose" label="用途"> </el-table-column>
+              <el-table-column prop="rentFlag" label="是否出租">
+              </el-table-column>
+              <el-table-column prop="ownerName" label="房主姓名">
+              </el-table-column>
+              <el-table-column prop="ownerPhone" label="房主电话" width="110">
+              </el-table-column>
+              <el-table-column prop="ownerIdCard" label="身份证" width="170">
+              </el-table-column>
+              <el-table-column
+                label="操作"
+                fixed="right"
+                header-align="center"
+                align="center"
+                class="operate"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    style="color: #1c6afd; text-decoration: underline"
+                    size="small"
+                    @click="handleWatchSearchFangwu(scope.row)"
+                    >查看</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <div>
+              <el-pagination
+                @size-change="handleSizeChangeSearchFangwu"
+                @current-change="handleCurrentChangeSearchFangwu"
+                :current-page.sync="searchFangwu.pageNo"
+                :page-sizes="[20, 50, 100, 200]"
+                :page-size="parseInt(searchFangwu.pageSize)"
+                layout="sizes, prev, pager, next"
+                :total="searchFangwu.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+
+        <div
+          class="m-tb"
+          v-if="
+            searchData.type == 'xuqiu' &&
+            searchData.keyword != '' &&
+            searchStatus == 'ing'
+          "
+        >
+          <div class="tb">
+            <el-table
+              :data="searchXuqiu.list"
+              v-loading="searchXuqiu.loading"
+              border
+              :max-height="1000"
+              style="width: 100%"
+            >
+              <el-table-column
+                label="序号"
+                type="index"
+                align="center"
+                width="50"
+              />
+
+              <el-table-column
+                v-for="item in searchXuqiu.header"
+                :key="item.columnName"
+                :prop="item.columnName"
+                :label="item.label"
+                :align="item.align"
+                :width="item.width"
+                :show-overflow-tooltip="true"
+              >
+                <template slot-scope="scope">
+                  <span>{{ handleFilterSpan(scope.row, item) }}</span>
+                </template>
+              </el-table-column>
+
+              <el-table-column
+                label="操作"
+                fixed="right"
+                header-align="center"
+                align="center"
+                class="operate"
+              >
+                <template slot-scope="scope">
+                  <el-button
+                    type="text"
+                    style="color: #1c6afd; text-decoration: underline"
+                    size="small"
+                    @click="handleWatchSearchXuqiu(scope.row)"
+                    >查看</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <div>
+              <el-pagination
+                @size-change="handleSizeChangeSearchXuqiu"
+                @current-change="handleCurrentChangeSearchXuqiu"
+                :current-page.sync="searchXuqiu.pageNo"
+                :page-sizes="[20, 50, 100, 200]"
+                :page-size="parseInt(searchXuqiu.pageSize)"
+                layout="sizes, prev, pager, next"
+                :total="searchXuqiu.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+
+        <div
+          class="m-tb"
+          v-if="
+            searchData.type == 'xuqiu' &&
+            searchData.keyword != '' &&
+            searchStatus == 'ing'
+          "
+        >
+          <div class="tb"></div>
+        </div>
+
+        <div class="m-list" v-if="searchStatus == 'ini'">
+          <div class="list-title">常用功能</div>
+          <div class="list">
+            <div
+              class="item"
+              :key="item.menuId"
+              @click="handleClickFunc(item)"
+              v-for="item in funcList"
+            >
+              <div class="icon">
+                <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+                  <use :xlink:href="`#${item.icon}`" />
+                </svg>
+              </div>
+              <p>{{ item.menuName }}</p>
+            </div>
+
+            <div class="item" @click="showedFuncPanel = true">
+              <div class="icon">
+                <img src="@/assets/img/shequ/function/tianjiayingyong.png" />
+              </div>
+              <p>添加应用</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- 修改弹出框 -->
+        <el-dialog
+          :visible.sync="showedFuncPanel"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          title=""
+          width="850px"
+          top="5vh"
+          @closed="showedFuncPanel = false"
+        >
+          <div class="m-panel">
+            <div
+              class="m-list"
+              v-if="selectedFuncList && selectedFuncList.length > 0"
+            >
+              <div class="list-title">常用功能</div>
+              <div class="list">
+                <div
+                  class="item"
+                  :key="item.menuId"
+                  @click="selectFuncItem(item.menuId)"
+                  v-for="item in selectedFuncList"
+                >
+                  <div class="corner-mark z-on">
+                    <i class="el-icon-success"></i>
+                  </div>
+
+                  <div class="icon">
+                    <svg
+                      class="icon-svg aui-sidebar__menu-icon"
+                      aria-hidden="true"
+                    >
+                      <use :xlink:href="`#${item.icon}`" />
+                    </svg>
+                  </div>
+                  <p>{{ item.menuName }}</p>
+                </div>
+              </div>
+            </div>
+
+            <div class="m-list">
+              <div class="list-title">所有功能</div>
+
+              <div
+                :key="'one' + menu.id"
+                v-show="menu.children && menu.children.length > 0"
+                v-for="menu in $store.state.sidebarMenuList"
+              >
+                <div class="list-title2">{{ menu.name }}</div>
+                <div class="list">
+                  <div
+                    class="item"
+                    :key="'two' + item.id"
+                    @click="selectFuncItem(item.id)"
+                    v-for="item in menu.children"
+                  >
+                    <div
+                      class="corner-mark"
+                      :class="{
+                        'z-on': selectedFuncIdList.indexOf(item.id) !== -1,
+                      }"
+                    >
+                      <i class="el-icon-success"></i>
+                    </div>
+
+                    <div class="icon">
+                      <svg
+                        class="icon-svg aui-sidebar__menu-icon"
+                        aria-hidden="true"
+                      >
+                        <use :xlink:href="`#${item.icon}`" />
+                      </svg>
+                    </div>
+                    <p>{{ item.name }}</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="operate">
+              <el-button round @click="showedFuncPanel = false">取消</el-button>
+              <el-button type="primary" round @click="editFuncList"
+                >确认</el-button
+              >
+            </div>
+          </div>
+        </el-dialog>
+      </div>
+    </div>
+
+    <div class="m-data" v-if="searchStatus == 'ini'">
+      <div class="wrap">
+        <div class="headline">人员预警</div>
+
+        <div class="cnt">
+          <div class="chart">
+            <pan-chart
+              :width="480"
+              :height="420"
+              v-if="warningChart.loading"
+              :total="warningChart.total"
+              :list="warningChart.list"
+            />
+          </div>
+          <div class="tb">
+            <el-table
+              :data="warningTb.list"
+              border
+              style="width: 100%"
+              class="resi-table"
+              :max-height="maxTableHeight"
+            >
+              <el-table-column
+                label="序号"
+                type="index"
+                align="center"
+                width="50"
+              />
+              <el-table-column prop="typeName" label="类型"> </el-table-column>
+              <el-table-column prop="gridName" label="所属网格">
+              </el-table-column>
+              <el-table-column prop="name" label="姓名"> </el-table-column>
+              <el-table-column prop="family" label="所属家庭">
+              </el-table-column>
+              <el-table-column prop="mobile" label="电话"> </el-table-column>
+              <el-table-column fixed="right" label="操作" align="center">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="handleWatchWarning(scope.$index)"
+                    type="text"
+                    size="small"
+                    >查看</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+            <div>
+              <el-pagination
+                @size-change="handleSizeChangeWarning"
+                @current-change="handleCurrentChangeWarning"
+                :current-page.sync="warningTb.pageNo"
+                :page-sizes="[20, 50, 100, 200]"
+                :page-size="parseInt(warningTb.pageSize)"
+                layout="sizes, prev, pager, next"
+                :total="warningTb.total"
+              >
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </div>
     </div>
+
+    <people-more
+      v-if="showedPeopleMoreInfo && currentPepeleId"
+      :userId="currentPepeleId"
+      :gridName="currentPepeleGridName"
+      @close="showedPeopleMoreInfo = false"
+    />
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="showedFangwuInfo"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="房屋详情"
+      width="900px"
+      @closed="showedFangwuInfo = false"
+    >
+      <fangwu-info
+        ref="fangwu_info"
+        @dialogCancle="showedFangwuInfo = false"
+      ></fangwu-info>
+    </el-dialog>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="showedXuqiuInfo"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="需求详情"
+      width="900px"
+      @closed="showedXuqiuInfo = false"
+    >
+      <xuqiu-info
+        ref="xuqiu_info"
+        @dialogCancle="showedXuqiuInfo = false"
+      ></xuqiu-info>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { requestPost } from "@/js/dai/request";
+import panChart from "@/views/modules/shequ/cpts/pan-chart";
+import { mapGetters } from "vuex";
+import nextTick from "dai-js/tools/nextTick";
+import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
+import fangwuInfo from "@/views/modules/shequ/cpts/fangwu-info";
+import xuqiuInfo from "@/views/modules/shequ/cpts/xuqiu-info";
+
 export default {
+  components: { panChart, peopleMore, fangwuInfo, xuqiuInfo },
+
   data() {
     return {
-      // i18nMessages: messages,
-      updatePassowrdVisible: false,
-      customerName: localStorage.getItem('customerName'),
-      userType: localStorage.getItem('userType')
-    }
+      searchStatus: "ini", //ing over
+      searchData: {
+        type: "jumin",
+        keyword: "",
+      },
+
+      typePlaceholder: {
+        jumin: "请输入姓名或电话或身份证号",
+        fangwu: "请输入“小区名称，楼号”，如：亿联小区，1号楼",
+        xuqiu: "请输入需求人或需求内容或服务方",
+      },
+
+      selectedFuncIdList: [],
+
+      funcList: [
+        // {
+        //   url: '',
+        //   menuId: '',
+        //   menuName: '',
+        //   icon: '',
+        // }
+      ],
+
+      showedFuncPanel: false,
+
+      warningChart: {
+        loading: false,
+        total: "",
+        list: [],
+      },
+
+      warningTb: {
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+        list: [],
+      },
+
+      searchJumin: {
+        header: [],
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+        list: [],
+      },
+
+      searchFangwu: {
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+        list: [],
+      },
+
+      searchXuqiu: {
+        header: [
+          {
+            label: "状态",
+            align: "center",
+            columnName: "statusName",
+            width: "120",
+            options: [
+              {
+                label: "待处理",
+                value: "pending",
+              },
+              {
+                label: "已取消",
+                value: "canceled",
+              },
+              {
+                label: "已派单",
+                value: "assigned",
+              },
+              {
+                label: "已接单",
+                value: "have_order",
+              },
+              {
+                label: "已完成",
+                value: "finished",
+              },
+            ],
+          },
+          {
+            label: "所属网格",
+            columnName: "gridName",
+            align: "center",
+            width: "",
+            options: [],
+          },
+          {
+            label: "需求类型",
+            columnName: "categoryName",
+            align: "center",
+            width: "",
+            options: [],
+          },
+          {
+            label: "需求内容",
+            columnName: "content",
+            align: "center",
+            width: "",
+            options: [],
+          },
+          {
+            label: "上报类型",
+            columnName: "reportTypeName",
+            align: "center",
+            width: "120",
+            options: [
+              {
+                label: "社区帮办",
+                value: "community",
+              },
+              {
+                label: "楼长帮办",
+                value: "building_caption",
+              },
+              {
+                label: "党员帮办",
+                value: "party",
+              },
+              {
+                label: "自身上报",
+                value: "self_help",
+              },
+            ],
+          },
+          {
+            label: "上报人",
+            columnName: "reportUserName",
+            align: "center",
+            width: "120",
+            options: [],
+          },
+          {
+            label: "上报时间",
+            columnName: "reportTime",
+            align: "center",
+            width: "180",
+            options: [],
+          },
+          {
+            label: "需求人",
+            columnName: "demandUserName",
+            align: "center",
+            width: "80",
+            options: [],
+          },
+          {
+            label: "服务方",
+            columnName: "serviceShowName",
+            align: "center",
+            width: "120",
+            options: [],
+          },
+          {
+            label: "服务时间",
+            columnName: "wantServiceTime",
+            align: "center",
+            width: "180",
+            options: [],
+          },
+        ],
+        pageNo: 1,
+        pageSize: window.localStorage.getItem("pageSize") || 20,
+        total: 1,
+        list: [],
+      },
+
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+
+      currentPepeleId: "",
+      currentPepeleGridName: "",
+
+      // 显示人员详情
+      showedFangwuInfo: false,
+      showedXuqiuInfo: false,
+    };
+  },
+  computed: {
+    selectedFuncList() {
+      const {
+        selectedFuncIdList,
+        $store: {
+          state: { sidebarMenuList },
+        },
+      } = this;
+      let obj = {};
+      sidebarMenuList.forEach((menu) => {
+        if (selectedFuncIdList.indexOf(menu.id) !== -1) {
+          obj[menu.id] = {
+            menuId: menu.id,
+            menuName: menu.name,
+            icon: menu.icon,
+            url: menu.url,
+          };
+        }
+        if (menu.children && menu.children.length > 0) {
+          menu.children.forEach((item) => {
+            if (selectedFuncIdList.indexOf(item.id) !== -1) {
+              obj[item.id] = {
+                menuId: item.id,
+                menuName: item.name,
+                icon: item.icon,
+                url: item.url,
+              };
+            }
+          });
+        }
+      });
+      return selectedFuncIdList.map((id) => obj[id]);
+    },
+    maxTableHeight() {
+      // return this.clientHeight - 450;
+      return 420;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {
+    "searchData.keyword": function (val) {
+      if (val == "") {
+        this.searchStatus = "ini";
+      }
+    },
   },
-  components: {},
   mounted() {
-    //关闭所有标签页
-    // tabs, 关闭全部
-    this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-      (item) => item.name === 'home'
-    )
+    this.getApiData();
   },
   methods: {
-    changeCustomerName(customerName) {
-      this.$emit('changeCustomerName', customerName)
-    }
-  }
-}
+    computedWidth(label) {
+      const wd = 20 * label.length;
+      return wd > 80 ? wd : 80;
+    },
+    handleFilterSpan(row, item) {
+      let _val = "";
+      if (item.options && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+      }
+      return _val || row[item.columnName];
+    },
+
+    handleClickSearchBtn() {
+      const {
+        searchData: { type, keyword },
+      } = this;
+      if (!keyword) return this.$message.error("请输入搜索条件");
+      if (type == "jumin") {
+        this.searchJumin.pageNo = 1;
+        this.searchJumin.total = 0;
+        this.getSearchJumin();
+      } else if (type == "fangwu") {
+        this.searchFangwu.pageNo = 1;
+        this.searchFangwu.total = 0;
+        this.getSearchFangwu();
+      } else if (type == "xuqiu") {
+        this.searchXuqiu.pageNo = 1;
+        this.searchXuqiu.total = 0;
+        this.getSearchXuqiu();
+      }
+      this.searchStatus = "ing";
+    },
+
+    handleSizeChangeWarning(val) {
+      console.log(`每页 ${val} 条`);
+      this.warningTb.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getWarningTb();
+    },
+    handleCurrentChangeWarning(val) {
+      console.log(`当前页: ${val}`);
+      this.warningTb.pageNo = val;
+      this.getWarningTb();
+    },
+    async handleWatchWarning(rowIndex) {
+      let item = this.warningTb.list[rowIndex];
+      this.currentPepeleId = item.userId;
+      this.currentPepeleGridName = item.gridName;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
+    },
+
+    handleSizeChangeSearchJumin(val) {
+      console.log(`每页 ${val} 条`);
+      this.searchJumin.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getSearchJumin();
+    },
+    handleCurrentChangeSearchJumin(val) {
+      console.log(`当前页: ${val}`);
+      this.searchJumin.pageNo = val;
+      this.getSearchJumin();
+    },
+    async handleWatchSearchJumin(rowIndex) {
+      let item = this.searchJumin.list[rowIndex];
+      this.currentPepeleId = item.icResiUserId;
+      this.currentPepeleGridName = item.GRID_ID;
+      await nextTick();
+      this.showedPeopleMoreInfo = true;
+    },
+
+    handleSizeChangeSearchFangwu(val) {
+      console.log(`每页 ${val} 条`);
+      this.searchFangwu.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getSearchFangwu();
+    },
+    handleCurrentChangeSearchFangwu(val) {
+      console.log(`当前页: ${val}`);
+      this.searchFangwu.pageNo = val;
+      this.getSearchFangwu();
+    },
+    async handleWatchSearchFangwu(row) {
+      this.showedFangwuInfo = true;
+      await nextTick();
+      this.$refs.fangwu_info.initForm("detail", row);
+    },
+
+    handleSizeChangeSearchXuqiu(val) {
+      console.log(`每页 ${val} 条`);
+      this.searchXuqiu.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getSearchXuqiu();
+    },
+    handleCurrentChangeSearchXuqiu(val) {
+      console.log(`当前页: ${val}`);
+      this.searchXuqiu.pageNo = val;
+      this.getSearchXuqiu();
+    },
+    async handleWatchSearchXuqiu(row) {
+      this.showedXuqiuInfo = true;
+      await nextTick();
+      this.$refs.xuqiu_info.initForm("detail", row);
+    },
+
+    handleClickFunc(menu) {
+      const menuId = menu.menuId;
+      var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter(
+        (item) => item.meta.menuId === menuId
+      )[0];
+      if (route) {
+        this.$router.push({ name: route.name });
+      }
+    },
+
+    getApiData() {
+      this.getFuncList();
+      this.getWarningList();
+      this.getWarningTb();
+      this.getSearchJuminHeader();
+    },
+
+    selectFuncItem(id) {
+      let index = this.selectedFuncIdList.indexOf(id);
+      if (index === -1) {
+        this.selectedFuncIdList.push(id);
+      } else {
+        this.selectedFuncIdList.splice(index, 1);
+      }
+    },
+
+    async getSearchJuminHeader() {
+      const url = "/oper/customize/icform/tableheaders";
+      const { data, code, msg } = await requestPost(url, {
+        formCode: "resi_base_info",
+      });
+      if (code === 0) {
+        console.log("居民表格header请求成功！！！！！！！！！！！！！！");
+        this.searchJumin.header = data;
+      } else {
+        return this.$message.error("网络错误");
+      }
+    },
+
+    async getSearchXuqiu() {
+      const url = "/heart/userdemand/search";
+      const {
+        searchData: { keyword },
+        searchXuqiu: { pageSize, pageNo },
+      } = this;
+      const { data, code, msg } = await requestPost(url, {
+        keyword,
+        pageSize,
+        pageNo,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.searchXuqiu.total = data.total || 0;
+        this.searchXuqiu.list = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+
+    async getSearchJumin() {
+      const url = "/epmetuser/icresiuser/search";
+      const {
+        searchData: { keyword },
+        searchJumin: { pageSize, pageNo },
+      } = this;
+      const { data, code, msg } = await requestPost(url, {
+        keyword,
+        pageSize,
+        pageNo,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.searchJumin.total = data.total || 0;
+        this.searchJumin.list = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+
+    async getSearchFangwu() {
+      const url = "/gov/org/house/search";
+      const {
+        searchData: { keyword },
+        searchFangwu: { pageSize, pageNo },
+      } = this;
+      const { data, code, msg } = await requestPost(url, {
+        keyword,
+        pageSize,
+        pageNo,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.searchFangwu.total = data.total || 0;
+        this.searchFangwu.list = data.list
+          ? data.list.map((item) => {
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+
+    async getWarningTb() {
+      const url = "/epmetuser/icresiuser/personwarn/rightlist";
+      const {
+        warningTb: { pageSize, pageNo },
+      } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.warningTb.total = data.total || 0;
+        this.warningTb.list = data.list
+          ? data.list.map((item) => {
+              item.typeName = item.type.join("、");
+              return item;
+            })
+          : [];
+      } else {
+      }
+    },
+
+    //加载组织数据
+    async getWarningList() {
+      const url = "/epmetuser/icstatsresiwarn/personwarn/leftpie";
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.warningChart.loading = true;
+        this.warningChart.total = data.total;
+        this.warningChart.list = data.list.map((item) => {
+          return {
+            name: item.typeName,
+            count: item.typeCount,
+            const: "const",
+          };
+        });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getFuncList() {
+      const url = "/gov/access/icoftenusefunction/oftenusefunctionlist";
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.funcList = data || [];
+        this.selectedFuncIdList = this.funcList.map((item) => item.menuId);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async editFuncList() {
+      const url = "/gov/access/icoftenusefunction/addoftenusefunction";
+      const { selectedFuncIdList } = this;
+      let params = selectedFuncIdList.map((menuId, sort) => {
+        return { menuId, sort };
+      });
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.$message.success("修改成功");
+        this.showedFuncPanel = false;
+        this.getFuncList();
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
 </script>
+
+<style lang="scss" src="@/assets/scss/modules/search.scss" scoped></style>
diff --git a/src/views/modules/visual/cpts/line-chart.vue b/src/views/modules/visual/cpts/line-chart.vue
index 8cb617e7d..35f141583 100644
--- a/src/views/modules/visual/cpts/line-chart.vue
+++ b/src/views/modules/visual/cpts/line-chart.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="m-chart">
-    <canvas id="myChart"
-            :width="width"
-            :height="height" />
+    <canvas id="myChart" :width="width" :height="height" />
   </div>
 </template>
 
 <script>
 import nextTick from "dai-js/tools/nextTick";
+import F2 from "@antv/f2/lib/index-all";
+
 // ios下字体渲染有bug
 const fontFamily = "PingFang SC";
 const fontSize = 14;
@@ -28,7 +28,7 @@ const addTextShape = () => {
   const group = canvas.addGroup();
   const shapes = {};
 
-  function addFn (list) {
+  function addFn(list) {
     const listLength = list.length;
     list.forEach(function (obj, index) {
       // 避免显示太多，乱七八糟
@@ -68,7 +68,7 @@ const addTextShape = () => {
 };
 
 const iniChart = function (config, srcData) {
-  chart = new window.F2.Chart({
+  chart = new F2.Chart({
     id: "myChart",
     ...config,
   });
@@ -132,7 +132,7 @@ const iniChart = function (config, srcData) {
     items: [
       {
         name: "支持",
-        marker (x, y, r, ctx) {
+        marker(x, y, r, ctx) {
           ctx.lineWidth = 10;
           ctx.strokeStyle = supColor;
           ctx.moveTo(x - r - 15, y);
@@ -143,7 +143,7 @@ const iniChart = function (config, srcData) {
       },
       {
         name: "反对",
-        marker (x, y, r, ctx) {
+        marker(x, y, r, ctx) {
           ctx.lineWidth = 10;
           ctx.strokeStyle = oppColor;
           ctx.moveTo(x - r - 15, y);
@@ -200,19 +200,19 @@ export default {
       default: 260,
     },
   },
-  data () {
+  data() {
     return {
       iniLoading: false,
     };
   },
   watch: {
-    list (data) {
+    list(data) {
       chart.changeData(data);
       srcData = data;
       addTextShape();
     },
   },
-  async created () {
+  async created() {
     await nextTick(200);
     iniChart(this.config, this.list);
     await nextTick(200);
@@ -220,12 +220,12 @@ export default {
   },
 
   methods: {
-    setList (data) {
+    setList(data) {
       chart.changeData(data);
       srcData = data;
       addTextShape();
     },
-  }
+  },
 };
 </script>