From bfdbdafdd74370e38fadfd822ccf726154cdede2 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Wed, 13 Sep 2023 14:41:01 +0800
Subject: [PATCH 1/7] =?UTF-8?q?proxy=E4=BB=A3=E7=90=86=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 71 ++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 53c8cc608..fb36a74d2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,18 +4,17 @@
  * @LastEditors: mk 2403457699@qq.com
  * @LastEditTime: 2023-09-12 19:24:04
  * @Description: 介绍一下改动了什么
- * 
- * 
+ *
+ *
  */
 /**
  * 配置参考: https://cli.vuejs.org/zh/config/
  */
-const IS_PROD = ['production', 'test'].includes(process.env.NODE_ENV)
-const FileManagerPlugin = require('filemanager-webpack-plugin')
-
+const IS_PROD = ["production", "test"].includes(process.env.NODE_ENV);
+const FileManagerPlugin = require("filemanager-webpack-plugin");
 
 module.exports = {
-  baseUrl: process.env.NODE_ENV === 'production' ? '' : '/epmet-work-pc',
+  baseUrl: process.env.NODE_ENV === "production" ? "" : "/epmet-work-pc",
   css: {
     // 是否使用css分离插件 ExtractTextPlugin
     extract: IS_PROD,
@@ -24,63 +23,65 @@ module.exports = {
     // css预设器配置项
     loaderOptions: {},
     // 启用 CSS modules for all css / pre-processor files.
-    modules: false
+    modules: false,
   },
   chainWebpack: (config) => {
-    const svgRule = config.module.rule('svg')
-    svgRule.uses.clear()
+    const svgRule = config.module.rule("svg");
+    svgRule.uses.clear();
     svgRule
       .test(/\.svg$/)
-      .use('svg-sprite-loader')
-      .loader('svg-sprite-loader')
+      .use("svg-sprite-loader")
+      .loader("svg-sprite-loader");
   },
   productionSourceMap: false,
-  outputDir: 'epmet-work-pc',
-  assetsDir: 'static',
+  outputDir: "epmet-work-pc",
+  assetsDir: "static",
   devServer: {
     proxy: {
       // 如果请求地址以/api打头,就出触发代理机制
       // http://localhost:9588/api/login -> http://localhost:3000/api/login
-      '/linkdata/linkdata-gateway/route': {
-        target: 'http://bipaas.elinkservice.cn' // 我们要代理的真实接口地址
-      }
+      "/linkdata/linkdata-gateway/route": {
+        target: "http://bipaas.elinkservice.cn", // 我们要代理的真实接口地址
+      },
+      "/api": {
+        target: "http://localhost:8080", // 后端接口地址
+        changeOrigin: true,
+        pathRewrite: {
+          "^api": "",
+        },
+      },
     },
     open: false,
     port: 9001,
     overlay: {
       errors: true,
-      warnings: true
-    }
+      warnings: true,
+    },
   },
   // webpack简单配置
   configureWebpack: {
     // debuge调试配置
-    devtool: 'source-map',
+    devtool: "source-map",
     externals: {
-      AMap: 'AMap'
+      AMap: "AMap",
     },
     resolve: {
       //配置路径别名
       // /node_modules/@vue/cli-service/lib/config/base.js中已经配好的@路径，所以这里可以直接使用@
       alias: {
-        '@js': '@/js',
-        '@c': '@/views/components',
-        '@v': '@/views',
-        '@m': '@/img'
-      }
+        "@js": "@/js",
+        "@c": "@/views/components",
+        "@v": "@/views",
+        "@m": "@/img",
+      },
     },
     plugins: [
       new FileManagerPlugin({
         onEnd: {
-          delete: [
-            './epmet-work-pc.zip',
-          ],
-          archive: [
-            { source: './epmet-work-pc', destination: './epmet-work-pc.zip' },
-          ]
-        }
-      })
+          delete: ["./epmet-work-pc.zip"],
+          archive: [{ source: "./epmet-work-pc", destination: "./epmet-work-pc.zip" }],
+        },
+      }),
     ],
   },
-
-}
+};

From 56cf6007fcd4096cac2bcdcb287d9bd5e71997d6 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Thu, 14 Sep 2023 12:02:04 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/workflow.scss                 |   6 +-
 src/assets/scss/dataBoardMain.scss           |   3 +-
 src/components/Tree/nodeWrap.vue             | 231 +++++++++++--------
 src/main.js                                  |   1 +
 src/views/dataBoard/organizational/index.vue | 177 ++++++++++++--
 5 files changed, 294 insertions(+), 124 deletions(-)

diff --git a/src/assets/css/workflow.scss b/src/assets/css/workflow.scss
index dc9467a73..acd6fb750 100644
--- a/src/assets/css/workflow.scss
+++ b/src/assets/css/workflow.scss
@@ -962,7 +962,7 @@ html {
     position: absolute;
     height: 5px;
     width: 50%;
-    background-color: #00143C;
+    background-color: #00023a;
     top: -4px
 }
 
@@ -1168,8 +1168,8 @@ html {
 
 .dingflow-design .condition-node-box {
     padding-top: 35px;
-    padding-right: 20px;
-    padding-left: 20px;
+    padding-right: 5px;
+    padding-left: 5px;
     -webkit-box-pack: center;
     justify-content: center;
     -webkit-box-align: center;
diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss
index aae08b89d..c2988f2e1 100644
--- a/src/assets/scss/dataBoardMain.scss
+++ b/src/assets/scss/dataBoardMain.scss
@@ -7,7 +7,8 @@
 
 .g-pg {
     position: relative;
-    background-image: url(../images/home/bg.png);
+    // background-image: url(../images/home/bg.png);
+    background-color: #00023a;
     background-repeat: no-repeat;
     background-size: 100% 100%;
 }
diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue
index 33fd304be..8b1114162 100644
--- a/src/components/Tree/nodeWrap.vue
+++ b/src/components/Tree/nodeWrap.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <div class="node-wrap" v-if="nodeConfig.key === '1'">
+    <div class="node-wrap" v-if="nodeConfig.laneLevel === 1">
       <div class="node-wrap-box">
         <div class="node-box-after">
-          <span>{{ nodeConfig.name }}</span>
+          <div class="nodeBoxTop">{{ spliceNameFun(nodeConfig, 18) }}</div>
         </div>
       </div>
     </div>
@@ -14,24 +14,21 @@
             <div class="condition-node">
               <div class="condition-node-box">
                 <div class="auto-judge">
-                  <div v-if="item.title === '网格党支部'">
-                    <span class="wgdzb">
-                      {{ item.name }}
-                    </span>
+                  <div v-if="item.laneLevel >= 2 && item.laneLevel <= 7 && item.partyOrgLevel < 8">
+                    <div class="wgdzb" :title="getAllName(item)">{{ spliceNameFun(item, 18) }}</div>
                   </div>
-                  <div v-if="item.title === '楼院党小组'">
-                    <span class="lydxz">
-                      {{ item.name }}
-                    </span>
+                  <div v-if="item.partyOrgLevel === 8">
+                    <div class="lydxz" :title="getAllName(item)">
+                      {{ spliceNameFun(item, 18) }}
+                    </div>
                   </div>
-                  <div v-if="item.title === '党员中心户'">
-                    <span class="dyzxh">
-                      {{ item.name }}
-                    </span>
+                  <div v-if="item.partyOrgLevel === 9">
+                    <div class="dyzxh" :title="item.principalName">
+                      {{ spliceNameFun(item, 3) }}
+                    </div>
                   </div>
-                  <div class="lxjtWrap" v-if="item.title === '联系家庭'">
+                  <div class="lxjtWrap" v-if="item.partyOrgLevel === 10">
                     <el-popover popper-class="popperClass" placement="right" trigger="click">
-                      <!-- <el-button>click 激活</el-button> -->
                       <div class="popperList">
                         <div style="margin-bottom: 13px">家庭类别</div>
                         <div class="listMsg">
@@ -47,10 +44,10 @@
                           <span>空巢老人</span>
                         </div>
                       </div>
-                      <span slot="reference" class="lxjt">
-                        {{ item.name }}
+                      <div slot="reference" class="lxjt" :title="item.principalName">
+                        {{ spliceNameFun(item, 3) }}
                         <img src="@/assets/images/home/cjr.png" alt="" />
-                      </span>
+                      </div>
                     </el-popover>
                   </div>
                 </div>
@@ -84,113 +81,147 @@ export default {
   computed: {},
   watch: {},
   methods: {
-    
+    getIncludes(name) {
+      if (name.includes("街道党工委") || name.includes("街道党总支")) {
+        return true;
+      }
+    },
+
+    getAllName(item) {
+      return item.partyOrgName + item.principalName;
+    },
+
+    spliceNameFun(row, num) {
+      let allName = row.principalName;
+      if (num === 18) {
+        allName = row.partyOrgName + row.principalName;
+      }
+      if (allName.length > num) {
+        return allName.substring(0, num) + "...";
+      }
+      return allName;
+    },
   },
 };
 </script>
 <style scoped lang="scss">
+@mixin spanLevel {
+  font-size: 14px;
+  color: #fff;
+  word-break: break-all;
+}
+@mixin normalLevel {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
 .node-box-after {
-  span {
+  .nodeBoxTop {
     font-size: 14px;
     position: relative;
     color: #fff;
     display: inline-block;
     width: 168px;
     height: 164px;
-    &::after {
-      position: absolute;
-      content: "";
-      display: block;
-      top: -7px;
-      left: -16px;
-      width: 168px;
-      height: 164px;
-      background-image: url(~@/assets/images/home/firstLevel.png);
-      background-size: 100%;
-    }
+    padding-top: 10px;
+    text-align: center;
+    background-image: url(~@/assets/images/home/firstLevel.png);
+    background-size: 100%;
+    // &::after {
+    //   position: absolute;
+    //   content: "";
+    //   display: block;
+    //   top: -7px;
+    //   left: -16px;
+    //   width: 168px;
+    //   height: 164px;
+    //   background-image: url(~@/assets/images/home/firstLevel.png);
+    //   background-size: 100%;
+    // }
   }
 }
 .auto-judge {
   .wgdzb {
-    font-size: 14px;
-    position: relative;
-    color: #fff;
-    display: inline-block;
+    @include spanLevel;
     width: 132px;
     height: 96px;
-    &::after {
-      position: absolute;
-      content: "";
-      display: block;
-      top: -7px;
-      left: 0;
-      width: 132px;
-      height: 96px;
-      background-image: url(~@/assets/images/home/zbbg.png);
-      background-size: 100%;
-    }
+    text-align: center;
+    padding-top: 5px;
+    background-image: url(~@/assets/images/home/zbbg.png);
+    background-size: 100%;
+    // &::after {
+    //   position: absolute;
+    //   content: "";
+    //   display: block;
+    //   top: -7px;
+    //   left: 0;
+    //   width: 132px;
+    //   height: 96px;
+    //   background-image: url(~@/assets/images/home/zbbg.png);
+    //   background-size: 100%;
+    // }
   }
   .lydxz {
-    font-size: 14px;
-    position: relative;
-    color: #fff;
-    display: inline-block;
-    width: 132px;
+    @include spanLevel;
+    @include normalLevel;
+    width: 216px;
     height: 50px;
-    &::after {
-      position: absolute;
-      content: "";
-      display: block;
-      top: -2px;
-      left: -40px;
-      width: 216px;
-      height: 50px;
-      background-image: url(~@/assets/images/home/lydxzTree.png);
-      background-size: 100%;
-    }
+    padding-top: 5px;
+    background-image: url(~@/assets/images/home/lydxzTree.png);
+    background-size: 100%;
+    // &::after {
+    //   position: absolute;
+    //   content: "";
+    //   display: block;
+    //   top: -2px;
+    //   left: -40px;
+    //   width: 216px;
+    //   height: 50px;
+    //   background-image: url(~@/assets/images/home/lydxzTree.png);
+    //   background-size: 100%;
+    // }
   }
   .dyzxh {
-    font-size: 14px;
-    position: relative;
-    color: #fff;
-    display: inline-block;
+    @include spanLevel;
+    @include normalLevel;
     height: 118px;
-    width: 5px;
-    &::after {
-      position: absolute;
-      content: "";
-      display: block;
-      top: -19px;
-      left: -8px;
-      width: 30px;
-      height: 118px;
-      background-image: url(~@/assets/images/home/dyzxhTree.png);
-      background-size: 100%;
-    }
+    width: 30px;
+    writing-mode: tb-rl;
+    margin-top: -12px;
+    background-image: url(~@/assets/images/home/dyzxhTree.png);
+    background-size: 100%;
+    // &::after {
+    //   position: absolute;
+    //   content: "";
+    //   display: block;
+    //   top: -19px;
+    //   left: -8px;
+    //   width: 30px;
+    //   height: 118px;
+    //   background-image: url(~@/assets/images/home/dyzxhTree.png);
+    //   background-size: 100%;
+    // }
   }
   .lxjt {
-    font-size: 14px;
-    cursor: pointer;
-    position: relative;
-    color: #fff;
-    display: inline-block;
+    @include spanLevel;
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
     height: 118px;
-    img {
-      position: absolute;
-      bottom: 26px;
-      left: -2px;
-    }
-    &::after {
-      position: absolute;
-      content: "";
-      display: block;
-      top: -19px;
-      left: -8px;
-      width: 30px;
-      height: 118px;
-      background-image: url(~@/assets/images/home/dyzxhTree.png);
-      background-size: 100%;
-    }
+    width: 30px;
+    writing-mode: tb-rl;
+    margin-top: -12px;
+    background-image: url(~@/assets/images/home/dyzxhTree.png);
+    background-size: 100%;
+    // &::after {
+    //   position: absolute;
+    //   content: "";
+    //   display: block;
+    //   top: -19px;
+    //   left: -8px;
+    //   width: 30px;
+    //   height: 118px;
+    // }
   }
 }
 </style>
diff --git a/src/main.js b/src/main.js
index c1cbc89f0..d69976dca 100644
--- a/src/main.js
+++ b/src/main.js
@@ -64,6 +64,7 @@ Vue.use(Element, {
 });
 
 Vue.prototype.$message = message;
+Vue.prototype.$moment = Moment;
 // 弹窗底部滚动问题 弹窗需配合v-if使用
 Vue.directive("fixed", {
   inserted() {
diff --git a/src/views/dataBoard/organizational/index.vue b/src/views/dataBoard/organizational/index.vue
index 3413b09dd..4666e4528 100644
--- a/src/views/dataBoard/organizational/index.vue
+++ b/src/views/dataBoard/organizational/index.vue
@@ -2,26 +2,34 @@
   <div class="organWrap">
     <div class="top-nav">
       <div class="top-nav-list">
-        <div v-for="item in navList" :key="item.key" :class="[item.ifActive ? 'top-nav-itemAC' : 'top-nav-item']" @click="chooseNav(item)">{{ item.name }}</div>
+        <div v-for="item in navList" :key="item.key" :class="[item.ifActive ? 'top-nav-itemAC' : 'top-nav-item']" @click="chooseNav(item)">
+          {{ item.name }}
+        </div>
       </div>
     </div>
     <!-- <div style="width: 100%; height: 100%；position: relative;">
       <div style="width: 100px; height: 100px; background-color: aqua; color: #fff;" v-drag>222</div>
     </div> -->
-    <div class="content" v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'">
-      <div class="flowLevel">
-        <div>社区党委</div>
+    <!-- v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'" -->
+    <div class="content">
+      <div v-for="(item, index) in levelArr" :key="item" :class="[`flowLevel-${index + 1}`]">
+        <div>{{ getTitleNameMapFun(item) }}</div>
       </div>
-      <div class="flowLevel-2"><div>网格党支部</div></div>
+      <!-- <div class="flowLevel-6"></div>
+      <div class="flowLevel-7"></div>
+      <div class="flowLevel-8"></div>
+      <div class="flowLevel-9"></div>
+      <div class="flowLevel-10"></div> -->
+      <!-- <div class="flowLevel-2"><div>网格党支部</div></div>
       <div class="flowLevel-3"><div>楼院党小组</div></div>
       <div class="flowLevel-4"><div>党员中心户</div></div>
-      <div class="flowLevel-5"><div>联系家庭</div></div>
+      <div class="flowLevel-5"><div>联系家庭</div></div> -->
       <el-row>
         <el-col :span="4">
           <div class="contentList"></div>
         </el-col>
         <el-col :span="20">
-          <div class="dingflow-design">
+          <div class="dingflow-design" v-loading="loading">
             <nodeWrap :nodeConfig.sync="nodeConfig"></nodeWrap>
           </div>
         </el-col>
@@ -31,6 +39,9 @@
 </template>
 
 <script>
+import { Loading } from "element-ui";
+import { relativeTimeThreshold } from "moment";
+
 // import Tree from "./components/tree.vue";
 export default {
   name: "organizational",
@@ -39,6 +50,8 @@ export default {
   // },
   data() {
     return {
+      loading: false,
+      levelArr: [],
       navList: [
         {
           name: "党委组织架构",
@@ -384,7 +397,55 @@ export default {
     };
   },
   computed: {},
+  mounted() {
+    this.getTreeData();
+  },
   methods: {
+    //获取背景层级
+    getDataPLevel(item) {
+      let arr = [...this.levelArr];
+      arr.push(item.partyOrgLevel);
+      this.levelArr = [...arr];
+      if (item.children) {
+        this.getDataPLevel(item.children[0]);
+      }
+    },
+    //获取树状结构
+    getTreeData() {
+      this.loading = true;
+      this.$http
+        .get("/actual/base/organizational/structure/partyCommitteeOrg")
+        .then((res) => {
+          const {
+            data: { code, data },
+          } = res;
+          if (code === 0) {
+            this.nodeConfig = data[0];
+            this.getDataPLevel(data[0]);
+            this.loading = false;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+
+    getTitleNameMapFun(i) {
+      let titleNameMap = new Map([
+        [1, "省委"],
+        [2, "市委"],
+        [3, "区委"],
+        [4, "党工委"],
+        [5, "党委"],
+        [6, "党总支"],
+        [7, "党支部"],
+        [8, "楼院党小组"],
+        [9, "党员中心户"],
+        [10, "联系家庭"],
+      ]);
+      return titleNameMap.get(i);
+    },
+
     chooseNav(item) {
       this.navList.forEach((d) => {
         if (item.key === d.key) {
@@ -462,6 +523,7 @@ export default {
     position: relative;
     transition: transform 0.3s ease-in-out;
     transform-origin: 50% 50%;
+    // overflow: scroll;
     .contentList {
       position: relative;
       width: 100%;
@@ -469,7 +531,7 @@ export default {
       // margin-bottom: 45px;
       // background: linear-gradient(90deg, rgba(14, 121, 213, 0.14) 86%, rgba(79, 175, 255, 0) 100%);
     }
-    .flowLevel {
+    .flowLevel-1 {
       @include flowLevwlCommon;
       top: -10px;
       height: 164px;
@@ -486,11 +548,19 @@ export default {
         }
       }
     }
-    .flowLevel-2 {
+    .flowLevel-2,
+    .flowLevel-3,
+    .flowLevel-4,
+    .flowLevel-5,
+    .flowLevel-6,
+    .flowLevel-7,
+    .flowLevel-8 {
       @include flowLevwlCommon;
-      top: 184px;
-      height: 119px;
-      line-height: 119px;
+      height: 126px;
+      line-height: 126px;
+    }
+    .flowLevel-2 {
+      top: 181px;
       div {
         padding-left: 80px;
         &::after {
@@ -504,15 +574,12 @@ export default {
       }
     }
     .flowLevel-3 {
-      @include flowLevwlCommon;
-      top: 328px;
-      height: 85px;
-      line-height: 85px;
+      top: 329px;
       div {
         padding-left: 80px;
         &::after {
           @include flowLevelAfter;
-          top: 10px;
+          top: 31px;
           left: 15px;
           width: 180px;
           height: 60px;
@@ -521,8 +588,78 @@ export default {
       }
     }
     .flowLevel-4 {
+      top: 475px;
+      div {
+        padding-left: 80px;
+        &::after {
+          @include flowLevelAfter;
+          top: 35px;
+          left: 15px;
+          width: 180px;
+          height: 60px;
+          background-image: url(~@/assets/images/home/dyzxh.png);
+        }
+      }
+    }
+    .flowLevel-5 {
+      top: 623px;
+      div {
+        padding-left: 80px;
+        &::after {
+          @include flowLevelAfter;
+          top: 35px;
+          left: 15px;
+          width: 180px;
+          height: 60px;
+          background-image: url(~@/assets/images/home/lxjt.png);
+        }
+      }
+    }
+    .flowLevel-6 {
+      top: 771px;
+      div {
+        padding-left: 80px;
+        &::after {
+          @include flowLevelAfter;
+          top: 35px;
+          left: 15px;
+          width: 180px;
+          height: 60px;
+          background-image: url(~@/assets/images/home/lxjt.png);
+        }
+      }
+    }
+    .flowLevel-7 {
+      top: 922px;
+      div {
+        padding-left: 80px;
+        &::after {
+          @include flowLevelAfter;
+          top: 35px;
+          left: 15px;
+          width: 180px;
+          height: 60px;
+          background-image: url(~@/assets/images/home/lxjt.png);
+        }
+      }
+    }
+    .flowLevel-8 {
+      top: 1070px;
+      div {
+        padding-left: 80px;
+        &::after {
+          @include flowLevelAfter;
+          top: 35px;
+          left: 15px;
+          width: 180px;
+          height: 60px;
+          background-image: url(~@/assets/images/home/lxjt.png);
+        }
+      }
+    }
+    .flowLevel-9 {
       @include flowLevwlCommon;
-      top: 429px;
+      top: 1220px;
       height: 135px;
       line-height: 135px;
       div {
@@ -537,9 +674,9 @@ export default {
         }
       }
     }
-    .flowLevel-5 {
+    .flowLevel-10 {
       @include flowLevwlCommon;
-      top: 598px;
+      top: 1380px;
       height: 135px;
       line-height: 135px;
       div {

From 6747f19d4226084b6d22390f5f86f878030d77c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Thu, 14 Sep 2023 13:31:09 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BB=A1=E6=84=8F?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=80=E4=BA=9B=E9=A1=B5=E9=9D=A2=E5=92=8C=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Tabs/index.vue                 |   5 +-
 .../dissatisfiedPersonnel/detail.vue          |  64 +++++-
 .../dissatisfiedPersonnel/index.vue           |   1 -
 .../modules/BusinessRecords.vue               | 150 ++++++++++++++
 .../modules/EnjoyService.vue                  | 188 ++++++++++++++++++
 .../dissatisfiedPersonnel/modules/Family.vue  |  76 +++++++
 .../modules/MatterDetails.vue                 |  93 +++++++++
 .../modules/PointsRecord.vue                  |  51 +++++
 8 files changed, 618 insertions(+), 10 deletions(-)
 create mode 100644 src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/BusinessRecords.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/EnjoyService.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/Family.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/MatterDetails.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/PointsRecord.vue

diff --git a/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue b/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue
index 5be877630..70597d2a8 100644
--- a/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue
+++ b/src/views/dataBoard/satisfactionEval/components/Tabs/index.vue
@@ -45,10 +45,13 @@ export default {
     padding: 10px 11px;
     font-size: 14px;
     font-weight: 400;
-    color: #FFFFFF;
+    color: #96B1CE;
+    min-width: 120px;
     background: url("@/assets/images/manyidu/tab.png") repeat-x top left;
     margin-right: 4px;
+    text-align: center;
     &.cur {
+      color: #FFFFFF;
       background: url("@/assets/images/manyidu/tab_cur.png") repeat-x top left;
     }
   }
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue
index 1e670d4ff..bee4c3220 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail.vue
@@ -1,16 +1,53 @@
 <template>
-<div>
-  <Breadcrumb :list="breadcrumbList"/>
+  <div>
+    <div class="breadcrumb">
+      <Breadcrumb :list="breadcrumbList"/>
+    </div>
+    <el-row>
+      <el-col :span="10">
+        <div class="sub-title">事项详情</div>
+        <MatterDetails/>
 
+        <div class="sub-title">家庭关系</div>
+        <Family/>
+      </el-col>
+      <el-col :span="13" :offset="1">
+        <div class="sub-title">居民各项业务记录</div>
+        <BusinessRecords/>
+        <el-row>
+          <el-col :span="12">
+            <div class="sub-title">享受服务次数统计</div>
+            <EnjoyService/>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <div class="sub-title">积分记录</div>
+            <PointsRecord/>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
 
-</div>
+  </div>
 </template>
 
 <script>
 import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
+import MatterDetails from "./modules/MatterDetails"
+import Family from "./modules/Family"
+import BusinessRecords from "./modules/BusinessRecords"
+import EnjoyService from "./modules/EnjoyService"
+import PointsRecord from "./modules/PointsRecord"
+
 export default {
   name: "dissatisfiedPersonnelDetail",
-  components: {Breadcrumb},
+  components: {
+    Breadcrumb,
+    MatterDetails,
+    Family,
+    BusinessRecords,
+    EnjoyService,
+    PointsRecord
+  },
   data() {
     return {
       breadcrumbList: [{
@@ -26,14 +63,25 @@ export default {
     }
   },
   mounted() {
-    console.log(this.breadcrumbList,this.$route)
+    console.log(this.breadcrumbList, this.$route)
 
-    this.$set(this.breadcrumbList[2],'name',this.$route.query.name)
+    this.$set(this.breadcrumbList[2], 'name', this.$route.query.name)
     this.breadcrumbList[2].name = this.$route.query.name
   }
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+.sub-title {
+  background: url("@/assets/images/manyidu/icon_fk.png") no-repeat left center;
+  font-size: 18px;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 22px;
+  padding-left: 26px;
+  margin-bottom: 20px;
+}
+.breadcrumb {
+  margin-bottom: 25px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
index 2d04cac68..b68467cd3 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/index.vue
@@ -133,7 +133,6 @@ export default {
 
     },
     handleView({name,id}) {
-      this.$router.push('/dataBoard/satisfactionEval/dissatisfiedPersonnel/detail?name=张三&id=1')
     }
   }
 }
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/BusinessRecords.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/BusinessRecords.vue
new file mode 100644
index 000000000..64a501170
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/BusinessRecords.vue
@@ -0,0 +1,150 @@
+<template>
+  <div class="business-records">
+    <Tabs v-model="type" :list="typeList" @changeVal="typeChange"/>
+    <div class="table">
+      <el-table :data="list">
+        <el-table-column
+            label="序号"
+            type="index"
+            width="80"/>
+        <el-table-column
+            label="评价周期"
+            prop="key"
+            width=""/>
+        <el-table-column
+            label="姓名"
+            prop="key"
+            width=""/>
+        <el-table-column
+            label="电话"
+            prop="key"
+            width=""/>
+        <el-table-column
+            label="不满意类型"
+            prop="key"
+            width=""/>
+        <el-table-column
+            label="不满意原因"
+            prop="key"
+            width=""/>
+        <el-table-column label="操作" width="90" align="center">
+          <template slot-scope="data">
+            <el-button type="text" @click="handleView">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
+
+export default {
+  name: "BusinessRecords",
+  components: {Tabs},
+  data() {
+    return {
+      total: 10,
+      queryParams: {
+        pageNum: 0,
+        pageSize: 10,
+      },
+      type: 1,
+      typeList: [{
+        label: ' 12345投诉',
+        value: 1
+      }, {
+        label: '省满意度调查',
+        value: 2
+      }, {
+        label: '社区满意度自查',
+        value: 3
+      }, {
+        label: '事件',
+        value: 4
+      }, {
+        label: '需求',
+        value: 5
+      }, {
+        label: '服务',
+        value: 6
+      }, {
+        label: '回访记录',
+        value: 7
+      }],
+      list: [{},{},{},{},{}]
+    }
+  },
+  methods: {
+    typeChange() {
+
+    },
+    getList() {
+
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.business-records {
+  margin-bottom: 25px;
+}
+.table {
+  /deep/ .el-table td, /deep/ .el-table th, /deep/ .el-table tr {
+    padding: 14px !important;
+    border:none!important;
+    min-height: 52px;
+
+  }
+  /deep/ .el-table td, /deep/ .el-table th {
+    background: none!important;
+  }
+  /deep/ .el-table td {
+    font-size: 14px;
+    font-weight: 400;
+    color: #FFFFFF;
+    text-shadow: 1px 2px 4px rgba(10,32,60,0.51);
+  }
+
+  /deep/ .el-table tr {
+    background: none;
+    &:hover {
+      background-color: rgba(26, 149, 255, 0.3) !important;
+    }
+
+  }
+  /deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
+      background: rgba(14, 56, 115, 0.4);
+    }
+
+  /deep/ .el-table {
+    background: none !important;
+
+    &:before {
+      background: none;
+    }
+  }
+  /deep/ .el-table__header-wrapper tr {
+    color: #A3B9DA !important;
+    font-size: 14px;
+    font-weight: 400;
+    opacity: 0.76;
+    background: none;
+    &:hover {
+      background: none!important;
+    }
+  }
+  /deep/ .el-table__header-wrapper {
+    background: none!important;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/EnjoyService.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/EnjoyService.vue
new file mode 100644
index 000000000..0e8ecee58
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/EnjoyService.vue
@@ -0,0 +1,188 @@
+<template>
+  <div className="event-statistics">
+    <div id="enjoyServiceChart" style="height: 360px;"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+
+export default {
+  name: "EnjoyService",
+  data() {
+    return {}
+  },
+  mounted() {
+    this.initCharts()
+  },
+  methods: {
+    initCharts() {
+      let div = document.getElementById('enjoyServiceChart');
+      this.myChart = echarts.init(div);
+
+      let xData = ['岗位找人', '技能找人', '温暖找人', '服务找人'];
+      let tq = [300, 90, 48, 39];
+      const max = Math.max(...tq)
+
+      let barArray = new Array(xData.length).fill((parseInt(max / 100) + 1) * 100)
+      var option = {
+        title: {
+          show: false,
+          text: '',
+          x: 'center',
+          top: '15px',
+          textStyle: {
+            color: '#333333',
+            fontWeight: 500,
+            fontSize: 18,
+          },
+        },
+        tooltip: {
+          trigger: 'axis',
+          backgroundColor: 'rgba(13, 64, 71, 0.50)',
+          borderColor: 'rgba(143, 225, 252, 0.60)',
+          padding: 8,
+          textStyle: {
+            color: '#fff',
+          },
+          formatter: function (params) {
+            console.log(params)
+            var res = ''
+            for (var i = 0; i < params.length; i++) {
+              if (params[i].seriesName != "") {
+                res += '<p>' + params[0].name + ':' + params[i].data + '</p>'
+              }
+            }
+            return res;
+          },
+        },
+        grid: {
+          top: '0',
+          left: '1%',
+          right: '2%',
+          bottom: '0',
+          containLabel: true
+        },
+        yAxis: [
+          {
+            type: 'category',
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              lineStyle: {
+                color: '#323c41'
+              }
+            },
+            axisLabel: {
+              align: 'right',
+              textStyle: {
+                fontSize: 12,
+                color: '#A3B9DA'
+              }
+            },
+            boundaryGap: true,
+            data: xData,
+          }, {
+            type: 'category',
+            data: xData,
+            axisTick: {
+              show: false,
+            },
+            axisLine: {show: false},
+            axisLabel: {
+              show: false,
+            },
+            boundaryGap: true,
+
+          }
+        ],
+
+        xAxis: [
+          {
+            type: 'value',
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: 'rgba(4,187,255,0.18)',
+                type: 'dashed'
+              },
+            },
+            nameTextStyle: {
+              color: '#A3B9DA',
+              textStyle: {
+                fontSize: 12
+              },
+              align: 'center'
+            },
+            axisLabel: {
+              show: true,
+              color: '#A3B9DA',
+              textStyle: {
+                fontSize: 12
+              }
+            },
+            axisTick: {
+              show: false
+            }
+          }
+        ],
+        series: [
+          {
+            type: 'bar',
+            barWidth: 16,
+            itemStyle: {
+              // lenged文本
+              opacity: 1, // 这个是 透明度
+              color: new echarts.graphic.LinearGradient(
+                  1,
+                  0,
+                  0,
+                  0,
+                  [
+                    {
+                      offset: 0,
+                      color: '#6EDDFE' // 0% 处的颜色
+                    },
+                    {
+                      offset: 1,
+                      color: '#0B1F57' // 100% 处的颜色
+                    }
+                  ],
+                  false
+              )
+            },
+            data: tq, //data.values
+          },
+          {
+            name: '',
+            type: 'bar',
+
+            barWidth: 66,
+            barGap: '-60%',
+            data: barArray,
+            itemStyle: {
+              normal: {
+                color: 'rgba(89,130,194,0.12)'
+              }
+            },
+            zlevel: -1,
+            yAxisIndex: 1,
+          }
+        ],
+      };
+      this.myChart.setOption(option);
+      window.addEventListener("resize", () => this.myChart.resize());
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.event-statistics {
+  padding: 16px 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/Family.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/Family.vue
new file mode 100644
index 000000000..52af91e1a
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/Family.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="family">
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+      <div>居民分类：老年人</div>
+    </div>
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+      <div>居民分类：老年人</div>
+    </div>
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+    </div>
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Family"
+}
+</script>
+
+<style scoped lang="scss">
+.family {
+  width: 464px;
+  height: 340px;
+  background: url('@/assets/images/manyidu/gx_bg.png') no-repeat center;
+  position: relative;
+  margin: 40px auto;
+}
+.tag {
+  font-size: 14px;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 22px;
+  padding: 18px 24px;
+  box-sizing: border-box;
+  position: absolute;
+  &:nth-of-type(1),
+  &:nth-of-type(2) {
+    background: url("@/assets/images/manyidu/gx_big.png") no-repeat center;
+    width: 180px;
+    height: 100px;
+  }
+  &:nth-of-type(3),
+  &:nth-of-type(4) {
+    background: url("@/assets/images/manyidu/gx_small.png") no-repeat center;
+    width: 180px;
+    height: 70px;
+    padding: 15px 24px;
+  }
+  &:nth-of-type(1) {
+    left: -98px;
+    top: 34px;
+  }
+  &:nth-of-type(2) {
+    right: -68px;
+    top: 34px;
+  }
+  &:nth-of-type(3) {
+    left: -91px;
+    bottom: 41px;
+  }
+  &:nth-of-type(4) {
+    right: -44px;
+    bottom: 41px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/MatterDetails.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/MatterDetails.vue
new file mode 100644
index 000000000..b965bc1e4
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/MatterDetails.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="matter-details">
+    <div class="user-img">
+      <img src="@/assets/images/manyidu/dn_bg1.png" alt="">
+    </div>
+    <div class="tags">
+      <div class="tag red">满意度风险人员</div>
+      <div class="tag small">与子女同住</div>
+      <div class="tag">第三网格</div>
+      <div class="tag small">入户一致</div>
+      <div class="tag">13343999999</div>
+      <div class="tag">四季景园1号楼1单元101</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "MatterDetails"
+}
+</script>
+
+<style scoped lang="scss">
+.matter-details {
+  width: 607px;
+  height: 372px;
+  background: url("@/assets/images/manyidu/dn_bg2.png") no-repeat center bottom;
+  position: relative;
+  margin: 12px auto 60px;
+}
+.user-img {
+  position: absolute;
+  left: calc(50% - 87px);
+  top: calc(50% - 37px);
+}
+.tag {
+  position: absolute;
+  background: url("@/assets/images/manyidu/dn_big.png") center no-repeat;
+  width: 108px;
+  height: 107px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 16px;
+  box-sizing: border-box;
+  padding: 24px;
+  text-align: center;
+  word-break: break-all;
+  &.small {
+    width: 89px;
+    height: 89px;
+    background: url("@/assets/images/manyidu/dn_small.png") center no-repeat;
+    padding: 16px;
+  }
+  &.red {
+    background: url("@/assets/images/manyidu/dn_red.png") center no-repeat;
+    color: #FE0000;
+  }
+  &:nth-of-type(1) {
+    left: 0;
+    bottom: 15px;
+  }
+
+  &:nth-of-type(2) {
+    left: 42px;
+    bottom: 185px;
+  }
+
+  &:nth-of-type(3) {
+    left: 194px;
+    bottom: 245px;
+  }
+
+  &:nth-of-type(4) {
+    left: 384px;
+    bottom: 240px;
+  }
+
+  &:nth-of-type(5) {
+    left: 499px;
+    bottom: 157px;
+  }
+
+  &:nth-of-type(6) {
+    left: 453px;
+    bottom: 10px;
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/PointsRecord.vue b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/PointsRecord.vue
new file mode 100644
index 000000000..75f41e47a
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/dissatisfiedPersonnel/modules/PointsRecord.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div class="enjoy-service">
+      <div class="enjoy-service-item" v-for="(item,index) in 5">
+        <div class="num">+10</div>
+        <div class="info">
+          <div class="title">便民服务-配餐服务</div>
+          <div class="time">2023-07-15 15:30:30</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PointsRecord"
+}
+</script>
+
+<style scoped lang="scss">
+
+.enjoy-service {
+  padding-left: 26px;
+}
+.enjoy-service-item {
+  color: #FFFFFF;
+  display: flex;
+  padding: 14px 16px 14px;
+  margin-bottom: 8px;
+  background: #07266B;
+  .num {
+    font-size: 24px;
+    font-weight: 500;
+    line-height: 22px;
+  }
+  .info {
+    font-size: 14px;
+    margin-left: 40px;
+    .title {
+      font-weight: 500;
+      margin-bottom: 10px;
+    }
+    .time {
+      font-weight: 400;
+      color: #A3B9DA;
+    }
+  }
+}
+
+</style>
\ No newline at end of file

From 36e96f10095df30da430299c687186d9c377def9 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Thu, 14 Sep 2023 13:34:43 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/organizational/index.vue | 586 +++++++++++--------
 1 file changed, 338 insertions(+), 248 deletions(-)

diff --git a/src/views/dataBoard/organizational/index.vue b/src/views/dataBoard/organizational/index.vue
index 4666e4528..a67412a94 100644
--- a/src/views/dataBoard/organizational/index.vue
+++ b/src/views/dataBoard/organizational/index.vue
@@ -51,7 +51,7 @@ export default {
   data() {
     return {
       loading: false,
-      levelArr: [],
+      levelArr: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
       navList: [
         {
           name: "党委组织架构",
@@ -135,270 +135,358 @@ export default {
         },
       ],
       nowVal: 100,
+
       nodeConfig: {
-        title: "社区党委",
-        name: "南昌路社区党委(党委书记：解书记)",
-        key: "1",
+        partyOrgName: "市北区委",
+        partyOrgLevel: 1,
+        partyOrgPid: "0",
+        principalName: "栾秀杰",
+        laneLevel: 1,
         children: [
           {
-            title: "网格党支部",
-            name: "第一网格党支部 （支部书记：王艺发）",
-            type: 2,
+            partyOrgName: "市北区委",
+            partyOrgLevel: 2,
+            partyOrgPid: "0",
+            principalName: "栾秀杰",
+            laneLevel: 2,
             children: [
               {
-                title: "楼院党小组",
-                type: 3,
-                name: "第一楼院党小组 （组长：韩文国）",
+                partyOrgName: "市北区委",
+                partyOrgLevel: 3,
+                partyOrgPid: "0",
+                principalName: "栾秀杰",
+                laneLevel: 3,
                 children: [
                   {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "杨军",
-                  },
-                ],
-              },
-              {
-                title: "楼院党小组",
-                type: 3,
-                name: "第二楼院党小组 （组长：褚丽兰）",
-                children: [
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "杨军",
-                  },
-                ],
-              },
-            ],
-          },
-          {
-            title: "网格党支部",
-            name: "第二网格党支部 （支部书记：尤芬紫）",
-            type: 3,
-            children: [
-              {
-                title: "楼院党小组",
-                type: 3,
-                name: "第一楼院党小组 （组长：韩文国）",
-                children: [
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
+                    partyOrgName: "市北区委",
+                    partyOrgLevel: 4,
+                    partyOrgPid: "0",
+                    principalName: "栾秀杰",
+                    laneLevel: 4,
                     children: [
                       {
-                        title: "联系家庭",
-                        type: 5,
-                        name: "王宇",
-                      },
-                      {
-                        title: "联系家庭",
-                        type: 5,
-                        name: "刘冰冰",
-                      },
-                      {
-                        title: "联系家庭",
-                        type: 5,
-                        name: "杨飞宇",
-                      },
-                      {
-                        title: "联系家庭",
-                        type: 5,
-                        name: "齐天",
+                        partyOrgName: "市北区委",
+                        partyOrgLevel: 5,
+                        partyOrgPid: "0",
+                        principalName: "栾秀杰",
+                        laneLevel: 5,
+                        children: [
+                          {
+                            partyOrgName: "市北区委",
+                            partyOrgLevel: 6,
+                            partyOrgPid: "0",
+                            principalName: "栾秀杰",
+                            laneLevel: 6,
+                            children: [
+                              {
+                                partyOrgName: "市北区委",
+                                partyOrgLevel: 7,
+                                partyOrgPid: "0",
+                                principalName: "栾秀杰",
+                                laneLevel: 7,
+                                children: [
+                                  {
+                                    partyOrgName: "市北区委",
+                                    partyOrgLevel: 8,
+                                    partyOrgPid: "0",
+                                    principalName: "栾秀杰",
+                                    laneLevel: 8,
+                                    children: [
+                                      {
+                                        partyOrgName: "市北区委",
+                                        partyOrgLevel: 9,
+                                        partyOrgPid: "0",
+                                        principalName: "栾秀杰",
+                                        laneLevel: 9,
+                                        children: [
+                                          {
+                                            partyOrgName: "市北区委",
+                                            partyOrgLevel: 10,
+                                            partyOrgPid: "0",
+                                            principalName: "栾秀杰",
+                                            laneLevel: 10,
+                                          },
+                                        ],
+                                      },
+                                    ],
+                                  },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
                       },
                     ],
                   },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
-                ],
-              },
-              {
-                title: "楼院党小组",
-                type: 3,
-                name: "第二楼院党小组 （组长：褚丽兰）",
-                children: [
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
-                ],
-              },
-            ],
-          },
-          {
-            title: "网格党支部",
-            name: "第三网格党支部 （支部书记：凤桥强）",
-            type: 3,
-            children: [
-              {
-                title: "楼院党小组",
-                type: 3,
-                name: "第一楼院党小组 （组长：韩文国）",
-                children: [
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "杨军",
-                  },
-                ],
-              },
-              {
-                title: "楼院党小组",
-                type: 3,
-                name: "第二楼院党小组 （组长：褚丽兰）",
-                children: [
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "杨军",
-                  },
-                ],
-              },
-              {
-                title: "楼院党小组",
-                type: 3,
-                name: "第三楼院党小组 （组长：王丽丽）",
-                children: [
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "周游",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "王阳明",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "刘艳萍",
-                  },
-                  {
-                    title: "党员中心户",
-                    type: 4,
-                    name: "谢苗苗",
-                  },
                 ],
               },
             ],
           },
         ],
+
+        // title: "社区党委",
+        // name: "南昌路社区党委(党委书记：解书记)",
+        // key: "1",
+        // children: [
+        //   {
+        //     title: "网格党支部",
+        //     name: "第一网格党支部 （支部书记：王艺发）",
+        //     type: 2,
+        //     children: [
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第一楼院党小组 （组长：韩文国）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第二楼院党小组 （组长：褚丽兰）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //     ],
+        //   },
+        //   {
+        //     title: "网格党支部",
+        //     name: "第二网格党支部 （支部书记：尤芬紫）",
+        //     type: 3,
+        //     children: [
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第一楼院党小组 （组长：韩文国）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //             children: [
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "王宇",
+        //               },
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "刘冰冰",
+        //               },
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "杨飞宇",
+        //               },
+        //               {
+        //                 title: "联系家庭",
+        //                 type: 5,
+        //                 name: "齐天",
+        //               },
+        //             ],
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第二楼院党小组 （组长：褚丽兰）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //         ],
+        //       },
+        //     ],
+        //   },
+        //   {
+        //     title: "网格党支部",
+        //     name: "第三网格党支部 （支部书记：凤桥强）",
+        //     type: 3,
+        //     children: [
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第一楼院党小组 （组长：韩文国）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第二楼院党小组 （组长：褚丽兰）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "杨军",
+        //           },
+        //         ],
+        //       },
+        //       {
+        //         title: "楼院党小组",
+        //         type: 3,
+        //         name: "第三楼院党小组 （组长：王丽丽）",
+        //         children: [
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "周游",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "王阳明",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "刘艳萍",
+        //           },
+        //           {
+        //             title: "党员中心户",
+        //             type: 4,
+        //             name: "谢苗苗",
+        //           },
+        //         ],
+        //       },
+        //     ],
+        //   },
+        // ],
       },
     };
   },
   computed: {},
   mounted() {
-    this.getTreeData();
+    // this.getTreeData();
   },
   methods: {
     //获取背景层级
@@ -553,8 +641,7 @@ export default {
     .flowLevel-4,
     .flowLevel-5,
     .flowLevel-6,
-    .flowLevel-7,
-    .flowLevel-8 {
+    .flowLevel-7 {
       @include flowLevwlCommon;
       height: 126px;
       line-height: 126px;
@@ -644,12 +731,15 @@ export default {
       }
     }
     .flowLevel-8 {
+      @include flowLevwlCommon;
       top: 1070px;
+      height: 90px;
+      line-height: 90px;
       div {
         padding-left: 80px;
         &::after {
           @include flowLevelAfter;
-          top: 35px;
+          top: 14px;
           left: 15px;
           width: 180px;
           height: 60px;
@@ -659,7 +749,7 @@ export default {
     }
     .flowLevel-9 {
       @include flowLevwlCommon;
-      top: 1220px;
+      top: 1179px;
       height: 135px;
       line-height: 135px;
       div {
@@ -676,7 +766,7 @@ export default {
     }
     .flowLevel-10 {
       @include flowLevwlCommon;
-      top: 1380px;
+      top: 1338px;
       height: 135px;
       line-height: 135px;
       div {

From 5141ecae437ed36282beb1c47ae0cad7dfa669ef Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Thu, 14 Sep 2023 17:20:43 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84=E4=B8=8B=E9=92=BB=E9=A1=B5=E9=9D=A2=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/workflow.scss                  |   3 -
 src/components/Tree/nodeWrap.vue              |  14 +-
 src/router/index.js                           |  10 +
 .../organizational/dangTree/index.vue         | 420 +-----------------
 .../personnel/components/Breadcrumb/index.vue |  41 ++
 .../personnel/components/Pagination/index.vue | 138 ++++++
 .../personnel/components/Tabs/index.vue       |  59 +++
 .../personnel/components/Title/index.vue      |  63 +++
 .../organizational/personnel/index.vue        |  90 ++++
 .../personnel/modules/BusinessRecords.vue     | 128 ++++++
 .../personnel/modules/EnjoyService.vue        | 188 ++++++++
 .../personnel/modules/Family.vue              |  76 ++++
 .../personnel/modules/MatterDetails.vue       |  93 ++++
 .../personnel/modules/PointsRecord.vue        |  51 +++
 src/views/dataBoardMain/main-navbar.vue       |   6 +-
 15 files changed, 956 insertions(+), 424 deletions(-)
 create mode 100644 src/views/dataBoard/organizational/personnel/components/Breadcrumb/index.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/components/Pagination/index.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/components/Tabs/index.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/components/Title/index.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/index.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/modules/BusinessRecords.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/modules/EnjoyService.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/modules/Family.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/modules/MatterDetails.vue
 create mode 100644 src/views/dataBoard/organizational/personnel/modules/PointsRecord.vue

diff --git a/src/assets/css/workflow.scss b/src/assets/css/workflow.scss
index c1c041998..64b847edc 100644
--- a/src/assets/css/workflow.scss
+++ b/src/assets/css/workflow.scss
@@ -1389,13 +1389,10 @@ html {
         transition: transform 0.3s ease-in-out;
         transform-origin: 50% 50%;
 
-        // overflow: scroll;
         .contentList {
             position: relative;
             width: 100%;
             height: 109px;
-            // margin-bottom: 45px;
-            // background: linear-gradient(90deg, rgba(14, 121, 213, 0.14) 86%, rgba(79, 175, 255, 0) 100%);
         }
 
         .flowLevel-1 {
diff --git a/src/components/Tree/nodeWrap.vue b/src/components/Tree/nodeWrap.vue
index a36660922..9f56afa5e 100644
--- a/src/components/Tree/nodeWrap.vue
+++ b/src/components/Tree/nodeWrap.vue
@@ -3,7 +3,7 @@
     <div class="node-wrap" v-if="nodeConfig.laneLevel === 1">
       <div class="node-wrap-box">
         <div class="node-box-after">
-          <div class="nodeBoxTop">{{ spliceNameFun(nodeConfig, 18) }}</div>
+          <div class="nodeBoxTop" @click="gotoPersonnel">{{ spliceNameFun(nodeConfig, 18) }}</div>
         </div>
       </div>
     </div>
@@ -15,15 +15,15 @@
               <div class="condition-node-box">
                 <div class="auto-judge">
                   <div v-if="item.laneLevel >= 2 && item.laneLevel <= 7 && item.partyOrgLevel < 8">
-                    <div class="wgdzb" :title="getAllName(item)">{{ spliceNameFun(item, 18) }}</div>
+                    <div @click="gotoPersonnel" class="wgdzb" :title="getAllName(item)">{{ spliceNameFun(item, 18) }}</div>
                   </div>
                   <div v-if="item.partyOrgLevel === 8">
-                    <div class="lydxz" :title="getAllName(item)">
+                    <div @click="gotoPersonnel" class="lydxz" :title="getAllName(item)">
                       {{ spliceNameFun(item, 18) }}
                     </div>
                   </div>
                   <div v-if="item.partyOrgLevel === 9">
-                    <div class="dyzxh" :title="item.principalName">
+                    <div @click="gotoPersonnel" class="dyzxh" :title="item.principalName">
                       {{ spliceNameFun(item, 3) }}
                     </div>
                   </div>
@@ -44,7 +44,7 @@
                           <span>空巢老人</span>
                         </div> -->
                       </div>
-                      <div @mouseover="getHomeTypes(item.id)" slot="reference" class="lxjt" :title="item.principalName">
+                      <div @click="gotoPersonnel" @mouseover="getHomeTypes(item.id)" slot="reference" class="lxjt" :title="item.principalName">
                         {{ spliceNameFun(item, 3) }}
                         <img src="@/assets/images/home/cjr.png" alt="" />
                       </div>
@@ -143,6 +143,10 @@ export default {
         }
       });
     },
+
+    gotoPersonnel() {
+      this.$router.push("/organizational/orgPersonnel");
+    },
   },
 };
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index d759f7616..b714b6208 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -400,6 +400,16 @@ export const dataBoardRoutes = {
         },
       ],
     },
+    {
+      path: "/organizational/orgPersonnel",
+      props: true,
+      component: () => import("@/views/dataBoard/organizational/personnel/index"),
+      name: "OrgPersonnel",
+      meta: {
+        title: "居民画像",
+        isTab: false,
+      },
+    },
     {
       path: "humanData/index",
       props: true,
diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue
index 7faa7d2c1..b925ab2b6 100644
--- a/src/views/dataBoard/organizational/dangTree/index.vue
+++ b/src/views/dataBoard/organizational/dangTree/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
-    <!-- v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'" -->
-    <div class="content">
+    <!--  -->
+    <div class="content" v-on:wheel="zoomSize" :style="'transform: scale(' + nowVal / 100 + ');'">
       <div v-for="(item, index) in levelArr" :key="item" :class="[`flowLevel-${index + 1}`]">
         <div>{{ getTitleNameMapFun(item) }}</div>
       </div>
@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       loading: false,
-      levelArr: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+      levelArr: [],
       navList: [
         {
           name: "党委组织架构",
@@ -43,424 +43,14 @@ export default {
           ifActive: false,
         },
       ],
-      cardList: [
-        {
-          title: "社区党委",
-          key: "1",
-          name: "南昌路社区党委 （党委书记：解书记）",
-          children: [
-            {
-              title: "网格党支部",
-              name: "第一网格党支部(支部书记：王艺发)",
-              key: "1",
-              children: [
-                {
-                  title: "楼院党小组",
-                  name: "第一楼院党小组 （组长：韩文国）",
-                  key: "1",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第二楼院党小组 （组长：褚丽兰）",
-                  key: "2",
-                },
-              ],
-            },
-            {
-              title: "网格党支部",
-              name: "第二网格党支部 （支部书记：尤芬紫）",
-              key: "2",
-              children: [
-                {
-                  title: "楼院党小组",
-                  name: "第一楼院党小组 （组长：韩文国）",
-                  key: "1",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第二楼院党小组 （组长：褚丽兰）",
-                  key: "2",
-                },
-              ],
-            },
-            {
-              title: "网格党支部",
-              name: "第三网格党支部 （支部书记：凤桥强）",
-              key: "3",
-              children: [
-                {
-                  title: "楼院党小组",
-                  name: "第一楼院党小组 （组长：韩文国）",
-                  key: "1",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第二楼院党小组 （组长：褚丽兰）",
-                  key: "2",
-                },
-                {
-                  title: "楼院党小组",
-                  name: "第三楼院党小组 （组长：王丽丽）",
-                  key: "3",
-                },
-              ],
-            },
-          ],
-        },
-      ],
       nowVal: 100,
 
-      nodeConfig: {
-        partyOrgName: "市北区委",
-        partyOrgLevel: 1,
-        partyOrgPid: "0",
-        principalName: "栾秀杰",
-        laneLevel: 1,
-        children: [
-          {
-            partyOrgName: "市北区委",
-            partyOrgLevel: 2,
-            partyOrgPid: "0",
-            principalName: "栾秀杰",
-            laneLevel: 2,
-            children: [
-              {
-                partyOrgName: "市北区委",
-                partyOrgLevel: 3,
-                partyOrgPid: "0",
-                principalName: "栾秀杰",
-                laneLevel: 3,
-                children: [
-                  {
-                    partyOrgName: "市北区委",
-                    partyOrgLevel: 4,
-                    partyOrgPid: "0",
-                    principalName: "栾秀杰",
-                    laneLevel: 4,
-                    children: [
-                      {
-                        partyOrgName: "市北区委",
-                        partyOrgLevel: 5,
-                        partyOrgPid: "0",
-                        principalName: "栾秀杰",
-                        laneLevel: 5,
-                        children: [
-                          {
-                            partyOrgName: "市北区委",
-                            partyOrgLevel: 6,
-                            partyOrgPid: "0",
-                            principalName: "栾秀杰",
-                            laneLevel: 6,
-                            children: [
-                              {
-                                partyOrgName: "市北区委",
-                                partyOrgLevel: 7,
-                                partyOrgPid: "0",
-                                principalName: "栾秀杰",
-                                laneLevel: 7,
-                                children: [
-                                  {
-                                    partyOrgName: "市北区委",
-                                    partyOrgLevel: 8,
-                                    partyOrgPid: "0",
-                                    principalName: "栾秀杰",
-                                    laneLevel: 8,
-                                    children: [
-                                      {
-                                        partyOrgName: "市北区委",
-                                        partyOrgLevel: 9,
-                                        partyOrgPid: "0",
-                                        principalName: "栾秀杰",
-                                        laneLevel: 9,
-                                        children: [
-                                          {
-                                            partyOrgName: "市北区委",
-                                            partyOrgLevel: 10,
-                                            partyOrgPid: "0",
-                                            principalName: "栾秀杰",
-                                            laneLevel: 10,
-                                          },
-                                        ],
-                                      },
-                                    ],
-                                  },
-                                ],
-                              },
-                            ],
-                          },
-                        ],
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-
-        // title: "社区党委",
-        // name: "南昌路社区党委(党委书记：解书记)",
-        // key: "1",
-        // children: [
-        //   {
-        //     title: "网格党支部",
-        //     name: "第一网格党支部 （支部书记：王艺发）",
-        //     type: 2,
-        //     children: [
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第一楼院党小组 （组长：韩文国）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第二楼院党小组 （组长：褚丽兰）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //     ],
-        //   },
-        //   {
-        //     title: "网格党支部",
-        //     name: "第二网格党支部 （支部书记：尤芬紫）",
-        //     type: 3,
-        //     children: [
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第一楼院党小组 （组长：韩文国）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //             children: [
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "王宇",
-        //               },
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "刘冰冰",
-        //               },
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "杨飞宇",
-        //               },
-        //               {
-        //                 title: "联系家庭",
-        //                 type: 5,
-        //                 name: "齐天",
-        //               },
-        //             ],
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第二楼院党小组 （组长：褚丽兰）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //         ],
-        //       },
-        //     ],
-        //   },
-        //   {
-        //     title: "网格党支部",
-        //     name: "第三网格党支部 （支部书记：凤桥强）",
-        //     type: 3,
-        //     children: [
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第一楼院党小组 （组长：韩文国）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第二楼院党小组 （组长：褚丽兰）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "杨军",
-        //           },
-        //         ],
-        //       },
-        //       {
-        //         title: "楼院党小组",
-        //         type: 3,
-        //         name: "第三楼院党小组 （组长：王丽丽）",
-        //         children: [
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "周游",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "王阳明",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "刘艳萍",
-        //           },
-        //           {
-        //             title: "党员中心户",
-        //             type: 4,
-        //             name: "谢苗苗",
-        //           },
-        //         ],
-        //       },
-        //     ],
-        //   },
-        // ],
-      },
+      nodeConfig: {},
     };
   },
   computed: {},
   mounted() {
-    // this.getTreeData();
+    this.getTreeData();
   },
   methods: {
     //获取背景层级
diff --git a/src/views/dataBoard/organizational/personnel/components/Breadcrumb/index.vue b/src/views/dataBoard/organizational/personnel/components/Breadcrumb/index.vue
new file mode 100644
index 000000000..426e82bc2
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/components/Breadcrumb/index.vue
@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <div class="breadcrumb">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item v-for="(item,index) in list" :to="item.path" :key="index">{{ item.name }}</el-breadcrumb-item>
+      </el-breadcrumb>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Breadcrumb",
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+.breadcrumb {
+  background: url("@/assets/images/manyidu/breadcrumb_bg.png") no-repeat left top;
+  height: 50px;
+  color: #fff;
+  padding-left: 20px;
+  display: flex;
+  align-items: center;
+
+  /deep/ .el-breadcrumb__inner {
+    color: #fff!important;
+
+    &.is-link {
+      color: #A3B9DA!important;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/organizational/personnel/components/Pagination/index.vue b/src/views/dataBoard/organizational/personnel/components/Pagination/index.vue
new file mode 100644
index 000000000..9722ee858
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/components/Pagination/index.vue
@@ -0,0 +1,138 @@
+<template>
+  <div :class="{'hidden':hidden}" class="pagination-container">
+    <el-pagination
+        :background="background"
+        :current-page.sync="currentPage"
+        :page-size.sync="pageSize"
+        :layout="layout"
+        :page-sizes="pageSizes"
+        :pager-count="pagerCount"
+        :total="total"
+        v-bind="$attrs"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'Pagination',
+  props: {
+    total: {
+      required: true,
+      type: Number
+    },
+    page: {
+      type: Number,
+      default: 1
+    },
+    limit: {
+      type: Number,
+      default: 20
+    },
+    pageSizes: {
+      type: Array,
+      default() {
+        return [10, 20, 30, 50]
+      }
+    },
+    // 移动端页码按钮的数量端默认值5
+    pagerCount: {
+      type: Number,
+      default: document.body.clientWidth < 992 ? 5 : 7
+    },
+    layout: {
+      type: String,
+      default: 'total, prev, pager, next, jumper, sizes'
+    },
+    background: {
+      type: Boolean,
+      default: true
+    },
+    autoScroll: {
+      type: Boolean,
+      default: true
+    },
+    hidden: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+    };
+  },
+  computed: {
+    currentPage: {
+      get() {
+        return this.page
+      },
+      set(val) {
+        this.$emit('update:page', val)
+      }
+    },
+    pageSize: {
+      get() {
+        return this.limit
+      },
+      set(val) {
+        this.$emit('update:limit', val)
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      if (this.currentPage * val > this.total) {
+        this.currentPage = 1
+      }
+      this.$emit('pagination', { page: this.currentPage, limit: val })
+    },
+    handleCurrentChange(val) {
+      this.$emit('pagination', { page: val, limit: this.pageSize })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.pagination-container {
+  padding: 32px 16px;
+  display: flex;
+  justify-content: flex-end;
+  position: relative;
+
+  /deep/ .el-pagination__total {
+    position: absolute;
+    left: 16px;
+    top: 32px;
+    color: #A3B9DA;
+  }
+  /deep/ .el-pagination__jump {
+    color: #A3B9DA;
+  }
+  /deep/ .el-pagination.is-background .btn-next,
+  /deep/ .el-pagination.is-background .btn-prev,
+  /deep/ .el-pagination.is-background .el-pager li {
+    background: rgba(0,23,66,0.3);
+    border: 1px solid #126AC5;
+    border-radius: 2px;
+    color: #A3B9DA;
+  }
+  /deep/ .el-input__inner {
+    background: rgba(0,23,66,0.3);
+    border: 1px solid #126AC5;
+    border-radius: 2px;
+    color: #A3B9DA;
+  }
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background: #1A95FF;
+    border-radius: 2px;
+    color: #FFFFFF!important;
+  }
+}
+.pagination-container.hidden {
+  display: none;
+}
+</style>
diff --git a/src/views/dataBoard/organizational/personnel/components/Tabs/index.vue b/src/views/dataBoard/organizational/personnel/components/Tabs/index.vue
new file mode 100644
index 000000000..70597d2a8
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/components/Tabs/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="tabs">
+    <div class="tab" :class="value2 === item.value?'cur':''" v-for="(item,index) in list" @click="tabClick(index)" :key="index">
+      {{item.label}}
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Tabs",
+  props: {
+    list:{
+      type: Array,
+      default: () => []
+    },
+    value:{
+      type: [String,Number],
+      default: ''
+    }
+  },
+  data() {
+    return {
+      value2: this.value,
+    }
+  },
+  mounted() {
+    this.value2 = this.value
+  },
+  methods: {
+    tabClick(index) {
+      this.value2 = this.list[index].value
+      this.$emit('changeVal',this.value)
+      this.$emit('changeLabel',this.list[index].label)
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.tabs {
+  display: flex;
+  .tab {
+    cursor: pointer;
+    padding: 10px 11px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #96B1CE;
+    min-width: 120px;
+    background: url("@/assets/images/manyidu/tab.png") repeat-x top left;
+    margin-right: 4px;
+    text-align: center;
+    &.cur {
+      color: #FFFFFF;
+      background: url("@/assets/images/manyidu/tab_cur.png") repeat-x top left;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/organizational/personnel/components/Title/index.vue b/src/views/dataBoard/organizational/personnel/components/Title/index.vue
new file mode 100644
index 000000000..6faadb2bc
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/components/Title/index.vue
@@ -0,0 +1,63 @@
+<template>
+  <div class="title" :class="noBg?'no-bg':''">
+    <span class="text">
+      <span class="txt">{{ text }}</span>
+      <span class="text-shadow">{{ text }}</span>
+    </span>
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Title",
+  props: {
+    text: {
+      type: String,
+      default: ''
+    },
+    noBg: {
+      type: Boolean,
+      default: false
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.title {
+  background: url(../../../../../assets/images/shuju/overview/title-bg.png)
+    no-repeat 0 0 fixed;
+  padding: 8px 16px 8px 32px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .text {
+    position: relative;
+    font-size: 22px;
+    font-family: HYShuYuanHeiJ;
+    font-weight: 400;
+
+    .txt {
+      color: #1f79ff;
+      background: linear-gradient(0deg, #2dc1ff 0%, #ffffff 58.5205078125%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      position: relative;
+      z-index: 2;
+    }
+
+    .text-shadow {
+      top: 4px;
+      left: 3px;
+      position: absolute;
+      color: #020f21;
+      white-space: nowrap;
+    }
+  }
+}
+.no-bg {
+  background: none;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/organizational/personnel/index.vue b/src/views/dataBoard/organizational/personnel/index.vue
new file mode 100644
index 000000000..7cf9da62c
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/index.vue
@@ -0,0 +1,90 @@
+<template>
+  <div>
+    <div class="breadcrumb">
+      <Breadcrumb :list="breadcrumbList" />
+    </div>
+    <el-row>
+      <el-col :span="10">
+        <div class="sub-title">事项详情</div>
+        <MatterDetails />
+
+        <div class="sub-title">家庭关系</div>
+        <Family />
+      </el-col>
+      <el-col :span="13" :offset="1">
+        <div class="sub-title">居民各项业务记录</div>
+        <BusinessRecords />
+        <el-row>
+          <el-col :span="12">
+            <div class="sub-title">享受服务次数统计</div>
+            <EnjoyService />
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <div class="sub-title">积分记录</div>
+            <PointsRecord />
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import Breadcrumb from "./components/Breadcrumb/index.vue";
+import MatterDetails from "./modules/MatterDetails";
+import Family from "./modules/Family";
+import BusinessRecords from "./modules/BusinessRecords";
+import EnjoyService from "./modules/EnjoyService";
+import PointsRecord from "./modules/PointsRecord";
+
+export default {
+  name: "OrgPersonnel",
+  components: {
+    Breadcrumb,
+    MatterDetails,
+    Family,
+    BusinessRecords,
+    EnjoyService,
+    PointsRecord,
+  },
+  data() {
+    return {
+      breadcrumbList: [
+        {
+          path: "/organizational/dangTree",
+          name: "党组织架构",
+        },
+        {
+          path: "/organizational/orgPersonnel",
+          name: "居民画像",
+        },
+        {
+          path: "",
+          name: "",
+        },
+      ],
+    };
+  },
+  mounted() {
+    console.log(this.breadcrumbList, this.$route);
+
+    this.$set(this.breadcrumbList[2], "name", this.$route.query.name);
+    this.breadcrumbList[2].name = this.$route.query.name;
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.sub-title {
+  background: url("@/assets/images/manyidu/icon_fk.png") no-repeat left center;
+  font-size: 18px;
+  font-weight: 500;
+  color: #ffffff;
+  line-height: 22px;
+  padding-left: 26px;
+  margin-bottom: 20px;
+}
+.breadcrumb {
+  margin-bottom: 25px;
+}
+</style>
diff --git a/src/views/dataBoard/organizational/personnel/modules/BusinessRecords.vue b/src/views/dataBoard/organizational/personnel/modules/BusinessRecords.vue
new file mode 100644
index 000000000..69441dc63
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/modules/BusinessRecords.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="business-records">
+    <Tabs v-model="type" :list="typeList" @changeVal="typeChange" />
+    <div class="table">
+      <el-table :data="list">
+        <el-table-column label="序号" type="index" width="80" />
+        <el-table-column label="评价周期" prop="key" width="" />
+        <el-table-column label="姓名" prop="key" width="" />
+        <el-table-column label="电话" prop="key" width="" />
+        <el-table-column label="不满意类型" prop="key" width="" />
+        <el-table-column label="不满意原因" prop="key" width="" />
+        <el-table-column label="操作" width="90" align="center">
+          <template slot-scope="data">
+            <el-button type="text" @click="handleView">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <Pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Tabs from "@/views/dataBoard/satisfactionEval/components/Tabs/index.vue";
+
+export default {
+  name: "BusinessRecords",
+  components: { Tabs },
+  data() {
+    return {
+      total: 10,
+      queryParams: {
+        pageNum: 0,
+        pageSize: 10,
+      },
+      type: 1,
+      typeList: [
+        {
+          label: " 满意度",
+          value: 1,
+        },
+        {
+          label: "居民需求",
+          value: 2,
+        },
+        {
+          label: "上报事件",
+          value: 3,
+        },
+        // {
+        //   label: '事件',
+        //   value: 4
+        // }, {
+        //   label: '需求',
+        //   value: 5
+        // }, {
+        //   label: '服务',
+        //   value: 6
+        // }, {
+        //   label: '回访记录',
+        //   value: 7
+        // }
+      ],
+      list: [{}, {}, {}, {}, {}],
+    };
+  },
+  methods: {
+    typeChange() {},
+    getList() {},
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.business-records {
+  margin-bottom: 25px;
+}
+.table {
+  /deep/ .el-table td,
+  /deep/ .el-table th,
+  /deep/ .el-table tr {
+    padding: 14px !important;
+    border: none !important;
+    min-height: 52px;
+  }
+  /deep/ .el-table td,
+  /deep/ .el-table th {
+    background: none !important;
+  }
+  /deep/ .el-table td {
+    font-size: 14px;
+    font-weight: 400;
+    color: #ffffff;
+    text-shadow: 1px 2px 4px rgba(10, 32, 60, 0.51);
+  }
+
+  /deep/ .el-table tr {
+    background: none;
+    &:hover {
+      background-color: rgba(26, 149, 255, 0.3) !important;
+    }
+  }
+  /deep/ .el-table__body-wrapper tr:nth-of-type(odd) {
+    background: rgba(14, 56, 115, 0.4);
+  }
+
+  /deep/ .el-table {
+    background: none !important;
+
+    &:before {
+      background: none;
+    }
+  }
+  /deep/ .el-table__header-wrapper tr {
+    color: #a3b9da !important;
+    font-size: 14px;
+    font-weight: 400;
+    opacity: 0.76;
+    background: none;
+    &:hover {
+      background: none !important;
+    }
+  }
+  /deep/ .el-table__header-wrapper {
+    background: none !important;
+  }
+}
+</style>
diff --git a/src/views/dataBoard/organizational/personnel/modules/EnjoyService.vue b/src/views/dataBoard/organizational/personnel/modules/EnjoyService.vue
new file mode 100644
index 000000000..0e8ecee58
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/modules/EnjoyService.vue
@@ -0,0 +1,188 @@
+<template>
+  <div className="event-statistics">
+    <div id="enjoyServiceChart" style="height: 360px;"></div>
+  </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+
+export default {
+  name: "EnjoyService",
+  data() {
+    return {}
+  },
+  mounted() {
+    this.initCharts()
+  },
+  methods: {
+    initCharts() {
+      let div = document.getElementById('enjoyServiceChart');
+      this.myChart = echarts.init(div);
+
+      let xData = ['岗位找人', '技能找人', '温暖找人', '服务找人'];
+      let tq = [300, 90, 48, 39];
+      const max = Math.max(...tq)
+
+      let barArray = new Array(xData.length).fill((parseInt(max / 100) + 1) * 100)
+      var option = {
+        title: {
+          show: false,
+          text: '',
+          x: 'center',
+          top: '15px',
+          textStyle: {
+            color: '#333333',
+            fontWeight: 500,
+            fontSize: 18,
+          },
+        },
+        tooltip: {
+          trigger: 'axis',
+          backgroundColor: 'rgba(13, 64, 71, 0.50)',
+          borderColor: 'rgba(143, 225, 252, 0.60)',
+          padding: 8,
+          textStyle: {
+            color: '#fff',
+          },
+          formatter: function (params) {
+            console.log(params)
+            var res = ''
+            for (var i = 0; i < params.length; i++) {
+              if (params[i].seriesName != "") {
+                res += '<p>' + params[0].name + ':' + params[i].data + '</p>'
+              }
+            }
+            return res;
+          },
+        },
+        grid: {
+          top: '0',
+          left: '1%',
+          right: '2%',
+          bottom: '0',
+          containLabel: true
+        },
+        yAxis: [
+          {
+            type: 'category',
+            axisTick: {
+              show: false,
+            },
+            splitLine: {
+              show: false,
+            },
+            axisLine: {
+              lineStyle: {
+                color: '#323c41'
+              }
+            },
+            axisLabel: {
+              align: 'right',
+              textStyle: {
+                fontSize: 12,
+                color: '#A3B9DA'
+              }
+            },
+            boundaryGap: true,
+            data: xData,
+          }, {
+            type: 'category',
+            data: xData,
+            axisTick: {
+              show: false,
+            },
+            axisLine: {show: false},
+            axisLabel: {
+              show: false,
+            },
+            boundaryGap: true,
+
+          }
+        ],
+
+        xAxis: [
+          {
+            type: 'value',
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: 'rgba(4,187,255,0.18)',
+                type: 'dashed'
+              },
+            },
+            nameTextStyle: {
+              color: '#A3B9DA',
+              textStyle: {
+                fontSize: 12
+              },
+              align: 'center'
+            },
+            axisLabel: {
+              show: true,
+              color: '#A3B9DA',
+              textStyle: {
+                fontSize: 12
+              }
+            },
+            axisTick: {
+              show: false
+            }
+          }
+        ],
+        series: [
+          {
+            type: 'bar',
+            barWidth: 16,
+            itemStyle: {
+              // lenged文本
+              opacity: 1, // 这个是 透明度
+              color: new echarts.graphic.LinearGradient(
+                  1,
+                  0,
+                  0,
+                  0,
+                  [
+                    {
+                      offset: 0,
+                      color: '#6EDDFE' // 0% 处的颜色
+                    },
+                    {
+                      offset: 1,
+                      color: '#0B1F57' // 100% 处的颜色
+                    }
+                  ],
+                  false
+              )
+            },
+            data: tq, //data.values
+          },
+          {
+            name: '',
+            type: 'bar',
+
+            barWidth: 66,
+            barGap: '-60%',
+            data: barArray,
+            itemStyle: {
+              normal: {
+                color: 'rgba(89,130,194,0.12)'
+              }
+            },
+            zlevel: -1,
+            yAxisIndex: 1,
+          }
+        ],
+      };
+      this.myChart.setOption(option);
+      window.addEventListener("resize", () => this.myChart.resize());
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.event-statistics {
+  padding: 16px 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/organizational/personnel/modules/Family.vue b/src/views/dataBoard/organizational/personnel/modules/Family.vue
new file mode 100644
index 000000000..52af91e1a
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/modules/Family.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="family">
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+      <div>居民分类：老年人</div>
+    </div>
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+      <div>居民分类：老年人</div>
+    </div>
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+    </div>
+    <div class="tag">
+      <div>张三(户主)</div>
+      <div>入户状态：入户一致</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Family"
+}
+</script>
+
+<style scoped lang="scss">
+.family {
+  width: 464px;
+  height: 340px;
+  background: url('@/assets/images/manyidu/gx_bg.png') no-repeat center;
+  position: relative;
+  margin: 40px auto;
+}
+.tag {
+  font-size: 14px;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 22px;
+  padding: 18px 24px;
+  box-sizing: border-box;
+  position: absolute;
+  &:nth-of-type(1),
+  &:nth-of-type(2) {
+    background: url("@/assets/images/manyidu/gx_big.png") no-repeat center;
+    width: 180px;
+    height: 100px;
+  }
+  &:nth-of-type(3),
+  &:nth-of-type(4) {
+    background: url("@/assets/images/manyidu/gx_small.png") no-repeat center;
+    width: 180px;
+    height: 70px;
+    padding: 15px 24px;
+  }
+  &:nth-of-type(1) {
+    left: -98px;
+    top: 34px;
+  }
+  &:nth-of-type(2) {
+    right: -68px;
+    top: 34px;
+  }
+  &:nth-of-type(3) {
+    left: -91px;
+    bottom: 41px;
+  }
+  &:nth-of-type(4) {
+    right: -44px;
+    bottom: 41px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/organizational/personnel/modules/MatterDetails.vue b/src/views/dataBoard/organizational/personnel/modules/MatterDetails.vue
new file mode 100644
index 000000000..b965bc1e4
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/modules/MatterDetails.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="matter-details">
+    <div class="user-img">
+      <img src="@/assets/images/manyidu/dn_bg1.png" alt="">
+    </div>
+    <div class="tags">
+      <div class="tag red">满意度风险人员</div>
+      <div class="tag small">与子女同住</div>
+      <div class="tag">第三网格</div>
+      <div class="tag small">入户一致</div>
+      <div class="tag">13343999999</div>
+      <div class="tag">四季景园1号楼1单元101</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "MatterDetails"
+}
+</script>
+
+<style scoped lang="scss">
+.matter-details {
+  width: 607px;
+  height: 372px;
+  background: url("@/assets/images/manyidu/dn_bg2.png") no-repeat center bottom;
+  position: relative;
+  margin: 12px auto 60px;
+}
+.user-img {
+  position: absolute;
+  left: calc(50% - 87px);
+  top: calc(50% - 37px);
+}
+.tag {
+  position: absolute;
+  background: url("@/assets/images/manyidu/dn_big.png") center no-repeat;
+  width: 108px;
+  height: 107px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  font-weight: 400;
+  color: #FFFFFF;
+  line-height: 16px;
+  box-sizing: border-box;
+  padding: 24px;
+  text-align: center;
+  word-break: break-all;
+  &.small {
+    width: 89px;
+    height: 89px;
+    background: url("@/assets/images/manyidu/dn_small.png") center no-repeat;
+    padding: 16px;
+  }
+  &.red {
+    background: url("@/assets/images/manyidu/dn_red.png") center no-repeat;
+    color: #FE0000;
+  }
+  &:nth-of-type(1) {
+    left: 0;
+    bottom: 15px;
+  }
+
+  &:nth-of-type(2) {
+    left: 42px;
+    bottom: 185px;
+  }
+
+  &:nth-of-type(3) {
+    left: 194px;
+    bottom: 245px;
+  }
+
+  &:nth-of-type(4) {
+    left: 384px;
+    bottom: 240px;
+  }
+
+  &:nth-of-type(5) {
+    left: 499px;
+    bottom: 157px;
+  }
+
+  &:nth-of-type(6) {
+    left: 453px;
+    bottom: 10px;
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/organizational/personnel/modules/PointsRecord.vue b/src/views/dataBoard/organizational/personnel/modules/PointsRecord.vue
new file mode 100644
index 000000000..75f41e47a
--- /dev/null
+++ b/src/views/dataBoard/organizational/personnel/modules/PointsRecord.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+    <div class="enjoy-service">
+      <div class="enjoy-service-item" v-for="(item,index) in 5">
+        <div class="num">+10</div>
+        <div class="info">
+          <div class="title">便民服务-配餐服务</div>
+          <div class="time">2023-07-15 15:30:30</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "PointsRecord"
+}
+</script>
+
+<style scoped lang="scss">
+
+.enjoy-service {
+  padding-left: 26px;
+}
+.enjoy-service-item {
+  color: #FFFFFF;
+  display: flex;
+  padding: 14px 16px 14px;
+  margin-bottom: 8px;
+  background: #07266B;
+  .num {
+    font-size: 24px;
+    font-weight: 500;
+    line-height: 22px;
+  }
+  .info {
+    font-size: 14px;
+    margin-left: 40px;
+    .title {
+      font-weight: 500;
+      margin-bottom: 10px;
+    }
+    .time {
+      font-weight: 400;
+      color: #A3B9DA;
+    }
+  }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index 410f69dec..6aef83272 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="m-topnav">
-    <div class="back">
+    <div class="back" style="cursor: pointer" @click="goBack()">
       <img src="~@/assets/images/shuju/main/back.png" alt="/" />
     </div>
     <div class="title">{{ customerName }}数据智能分析平台</div>
@@ -212,6 +212,10 @@ export default {
     toIndexPage() {
       this.$router.replace("/");
     },
+
+    goBack() {
+      history.go(-1);
+    },
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
     gotoRouteHandle(menuId, idx) {
       var route = window.SITE_CONFIG["dynamicMenuRoutesShuju"].filter((item) => item.meta.menuId === menuId)[0];

From cd6051180285731c8fdd42d2e0c8e641aa4858c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Fri, 15 Sep 2023 14:30:30 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=BD=9C=E5=9C=A8?=
 =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=90=8D=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                           |  40 +++++
 .../satisfactionEval/dissatisfied/index.vue   |  15 ++
 .../dataBoard/satisfactionEval/index.vue      |   7 +-
 .../modules/PotentialPeople/index.vue         |   6 +-
 .../modules/TypesOfDissatisfaction/index.vue  |  11 --
 .../potentialPeople/index.vue                 | 151 ++++++++++++++++
 .../potentialPeople/sjwjj.vue                 | 161 ++++++++++++++++++
 .../potentialPeople/xqwmz.vue                 | 160 +++++++++++++++++
 .../potentialPeople/yxwxfw.vue                | 161 ++++++++++++++++++
 9 files changed, 696 insertions(+), 16 deletions(-)
 create mode 100644 src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue
 create mode 100644 src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue

diff --git a/src/router/index.js b/src/router/index.js
index c0373050b..9ac8ccb87 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -418,6 +418,46 @@ export const dataBoardRoutes = {
         isTab: false,
       },
     },
+    {
+      path: "satisfactionEval/potentialPeople",
+      props: true,
+      component: () => import("@/views/dataBoard/satisfactionEval/potentialPeople/index"),
+      name: "dataBoard-satisfactionEval-potentialPeople-index",
+      meta: {
+        title: "潜在不满意人数",
+        isTab: false,
+      },
+    },
+    {
+      path: "satisfactionEval/potentialPeople/yxwxfw",
+      props: true,
+      component: () => import("@/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw"),
+      name: "dataBoard-satisfactionEval-potentialPeople-yxwxfw",
+      meta: {
+        title: "应享未享服务人数",
+        isTab: false,
+      },
+    },
+    {
+      path: "satisfactionEval/potentialPeople/sjwjj",
+      props: true,
+      component: () => import("@/views/dataBoard/satisfactionEval/potentialPeople/sjwjj"),
+      name: "dataBoard-satisfactionEval-potentialPeople-sjwjj",
+      meta: {
+        title: "事件未解决上报人数",
+        isTab: false,
+      },
+    },
+    {
+      path: "satisfactionEval/potentialPeople/xqwmz",
+      props: true,
+      component: () => import("@/views/dataBoard/satisfactionEval/potentialPeople/xqwmz"),
+      name: "dataBoard-satisfactionEval-potentialPeople-xqwmz",
+      meta: {
+        title: "需求未满足人数",
+        isTab: false,
+      },
+    },
     {
       path: "organizational/index",
       props: true,
diff --git a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
index bfcdd2053..57a906fbf 100644
--- a/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
+++ b/src/views/dataBoard/satisfactionEval/dissatisfied/index.vue
@@ -204,4 +204,19 @@ export default {
     height: 32px;
   }
 }
+.orange {
+  color: #FFB73C;
+}
+.blue {
+  color: #64C1FF;
+}
+.green {
+  color: #08EBAE;
+}
+.light {
+  color: #3CF5FF;
+}
+.red {
+  color: #F95619;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/index.vue b/src/views/dataBoard/satisfactionEval/index.vue
index 94aead8d2..f0514f61c 100644
--- a/src/views/dataBoard/satisfactionEval/index.vue
+++ b/src/views/dataBoard/satisfactionEval/index.vue
@@ -34,10 +34,13 @@
         </div>
 
         <div class="bg2">
-          <Title text="潜在不满意人数"/>
+          <Title text="潜在不满意人数">
+            <div class="more" @click="goToPage('/dataBoard/satisfactionEval/potentialPeople')">
+            查看详细 <i class="el-icon-arrow-right"></i>
+            </div>
+          </Title>
           <PotentialPeople/>
         </div>
-
       </el-col>
     </el-row>
   </div>
diff --git a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue
index 5c8a0bf87..b2d785622 100644
--- a/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/PotentialPeople/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="potential-people">
-    <div class="potential-people-item">
+    <div class="potential-people-item" @click="$router.push('/dataBoard/satisfactionEval/potentialPeople/sjwjj')">
       <div class="icon">
         <img src="@/assets/images/manyidu/qz_wjj.png" alt="">
       </div>
@@ -10,7 +10,7 @@
       </div>
       <div class="num"><span class="orange">78</span>人</div>
     </div>
-    <div class="potential-people-item">
+    <div class="potential-people-item" @click="$router.push('/dataBoard/satisfactionEval/potentialPeople/xqwmz')">
       <div class="icon">
         <img src="@/assets/images/manyidu/qz_wmz.png" alt="">
       </div>
@@ -20,7 +20,7 @@
       </div>
       <div class="num"><span class="green">128</span>人</div>
     </div>
-    <div class="potential-people-item">
+    <div class="potential-people-item" @click="$router.push('/dataBoard/satisfactionEval/potentialPeople/yxwxfw')">
       <div class="icon">
         <img src="@/assets/images/manyidu/qz_wx.png" alt="">
       </div>
diff --git a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
index a9b475735..b734f3608 100644
--- a/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
+++ b/src/views/dataBoard/satisfactionEval/modules/TypesOfDissatisfaction/index.vue
@@ -77,17 +77,6 @@ export default {
           max: datamax[i],
         })
       }
-
-      function contains(arrays, obj) {
-        var i = arrays.length;
-        while (i--) {
-          if (arrays[i] === obj) {
-            return i;
-          }
-        }
-        return false;
-      }
-
       var option = {
         tooltip: {
           show: false,
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
new file mode 100644
index 000000000..7d4e09c6f
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/index.vue
@@ -0,0 +1,151 @@
+<template>
+  <div>
+    <Breadcrumb :list="breadcrumbList"/>
+    <div class="screen">
+      <el-form :model="queryParams" inline>
+        <el-select v-model="queryParams.org" size="small" placeholder="按组织">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+
+        <el-select v-model="queryParams.matterType" size="small" placeholder="按不满意类型">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-input v-model="queryParams.name" size="small" placeholder="按姓名"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按电话"></el-input>
+        <el-button size="small" class="btn" type="primary">查询</el-button>
+      </el-form>
+    </div>
+
+    <div class="table">
+      <el-table :data="list">
+        <el-table-column
+            label="序号"
+            type="index"
+            width="80"/>
+
+        <el-table-column
+            prop="name"
+            label="上报人"/>
+
+        <el-table-column
+            prop="key"
+            label="上报人电话"/>
+
+        <el-table-column
+            prop="key"
+            label="所属组织">
+        </el-table-column>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="事件未解决数"/>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="需求未满足数"/>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="应享未享数"/>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="总数"/>
+
+      </el-table>
+    </div>
+
+    <Pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
+import Pagination from '@/views/dataBoard/satisfactionEval/components/Pagination'
+import Title from "@/views/dataBoard/satisfactionEval/components/Title"
+
+
+export default {
+  name: "dissatisfied",
+  components: {Breadcrumb, Pagination,Title},
+  data() {
+    return {
+      queryParams: {
+        month: '',
+        org: '',
+        matterSource: '',
+        matterType: '',
+        name: '',
+        tel: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      breadcrumbList: [{
+        path: '/dataBoard/satisfactionEval/index',
+        name: '满意度评价'
+      }, {
+        path: '',
+        name: '潜在不满意人数'
+      }],
+      monthOptions: new Array(12).fill(0).map((_, index) => {
+        return {label: (index - 0 + 1) + '月', value: (index - 0 + 1)}
+      }),
+      list: [{}, {}, {}]
+    }
+  },
+  methods: {
+    getList() {
+
+    },
+    handleView({name,id}) {
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/assets/scss/dataBoard/table.scss";
+
+.screen {
+  margin: 25px 0 40px;
+
+  .el-select, .el-input {
+    width: 150px;
+    margin-right: 4px;
+    border: 1px solid #126AC5;
+    border-radius: 2px;
+
+    /deep/ .el-input__inner {
+      background: none;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  .btn {
+    margin-left: 46px;
+    height: 32px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
new file mode 100644
index 000000000..8397ec107
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/sjwjj.vue
@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <Breadcrumb :list="breadcrumbList"/>
+    <div class="screen">
+      <el-form :model="queryParams" inline>
+
+        <el-select v-model="queryParams.org" size="small" placeholder="按组织">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+
+        <el-select v-model="queryParams.matterSource" size="small" placeholder="按事件类型">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-input v-model="queryParams.name" size="small" placeholder="按上报人姓名"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按上报人电话"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按事件描述关键词"></el-input>
+        <el-button size="small" class="btn" type="primary">查询</el-button>
+      </el-form>
+    </div>
+    <div class="table">
+      <el-table :data="list">
+        <el-table-column
+            label="序号"
+            type="index"
+            width="80"/>
+
+        <el-table-column
+            prop="name"
+            label="上报人"/>
+
+        <el-table-column
+            prop="key"
+            label="上报人电话"/>
+
+        <el-table-column
+            prop="key"
+            label="所属组织">
+        </el-table-column>
+
+        <el-table-column
+            prop="key"
+            label="事件类型"/>
+
+        <el-table-column
+            prop="key"
+            show-overflow-tooltip
+            label="事件描述"/>
+
+        <el-table-column
+            prop="key"
+            label="最新办理状态"/>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="最近办理时间"/>
+        <el-table-column
+            prop="key"
+            sortable
+            label="事件上报时间"/>
+        <el-table-column
+            sortable
+            label="详情">
+          <template>
+            <el-button type="text">查看</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+    </div>
+
+    <Pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
+import Pagination from '@/views/dataBoard/satisfactionEval/components/Pagination'
+import Title from "@/views/dataBoard/satisfactionEval/components/Title"
+
+
+export default {
+  name: "dissatisfied",
+  components: {Breadcrumb, Pagination,Title},
+  data() {
+    return {
+      queryParams: {
+        month: '',
+        org: '',
+        matterSource: '',
+        matterType: '',
+        name: '',
+        tel: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      breadcrumbList: [{
+        path: '/dataBoard/satisfactionEval/index',
+        name: '满意度评价'
+      }, {
+        path: '',
+        name: '事件未解决人数'
+      }],
+      monthOptions: new Array(12).fill(0).map((_, index) => {
+        return {label: (index - 0 + 1) + '月', value: (index - 0 + 1)}
+      }),
+      list: [{}, {}, {}]
+    }
+  },
+  methods: {
+    getList() {
+
+    },
+    handleView({name,id}) {
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/assets/scss/dataBoard/table.scss";
+
+.screen {
+  margin: 25px 0 40px;
+
+  .el-select, .el-input {
+    width: 150px;
+    margin-right: 4px;
+    border: 1px solid #126AC5;
+    border-radius: 2px;
+
+    /deep/ .el-input__inner {
+      background: none;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  .btn {
+    margin-left: 46px;
+    height: 32px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue
new file mode 100644
index 000000000..4be79d086
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/xqwmz.vue
@@ -0,0 +1,160 @@
+<template>
+  <div>
+    <Breadcrumb :list="breadcrumbList"/>
+    <div class="screen">
+      <el-form :model="queryParams" inline>
+
+
+        <el-select v-model="queryParams.org" size="small" placeholder="按组织">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+
+        <el-select v-model="queryParams.matterSource" size="small" placeholder="按需求类型">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-input v-model="queryParams.name" size="small" placeholder="按需求人姓名"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按需求人电话"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按需求描述关键词"></el-input>
+        <el-button size="small" class="btn" type="primary">查询</el-button>
+      </el-form>
+    </div>
+
+    <div class="table">
+      <el-table :data="list">
+        <el-table-column
+            label="序号"
+            type="index"
+            width="80"/>
+
+        <el-table-column
+            prop="name"
+            label="需求人"/>
+
+        <el-table-column
+            prop="key"
+            label="需求人电话"/>
+
+        <el-table-column
+            prop="key"
+            label="所属组织">
+        </el-table-column>
+
+
+        <el-table-column
+            prop="key"
+            show-overflow-tooltip
+            label="需求描述"/>
+
+        <el-table-column
+            prop="key"
+            label="最新办理状态"/>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="最近办理时间"/>
+        <el-table-column
+            prop="key"
+            sortable
+            label="需求提交时间"/>
+        <el-table-column
+            sortable
+            label="详情">
+          <template>
+            <el-button type="text">查看</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+    </div>
+
+    <Pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
+import Pagination from '@/views/dataBoard/satisfactionEval/components/Pagination'
+import Title from "@/views/dataBoard/satisfactionEval/components/Title"
+
+
+export default {
+  name: "dissatisfied",
+  components: {Breadcrumb, Pagination,Title},
+  data() {
+    return {
+      queryParams: {
+        month: '',
+        org: '',
+        matterSource: '',
+        matterType: '',
+        name: '',
+        tel: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      breadcrumbList: [{
+        path: '/dataBoard/satisfactionEval/index',
+        name: '满意度评价'
+      }, {
+        path: '',
+        name: '需求未满足人数'
+      }],
+      monthOptions: new Array(12).fill(0).map((_, index) => {
+        return {label: (index - 0 + 1) + '月', value: (index - 0 + 1)}
+      }),
+      list: [{}, {}, {}]
+    }
+  },
+  methods: {
+    getList() {
+
+    },
+    handleView({name,id}) {
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/assets/scss/dataBoard/table.scss";
+
+.screen {
+  margin: 25px 0 40px;
+
+  .el-select, .el-input {
+    width: 150px;
+    margin-right: 4px;
+    border: 1px solid #126AC5;
+    border-radius: 2px;
+
+    /deep/ .el-input__inner {
+      background: none;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  .btn {
+    margin-left: 46px;
+    height: 32px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue b/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
new file mode 100644
index 000000000..d5e792689
--- /dev/null
+++ b/src/views/dataBoard/satisfactionEval/potentialPeople/yxwxfw.vue
@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <Breadcrumb :list="breadcrumbList"/>
+    <div class="screen">
+      <el-form :model="queryParams" inline>
+        <el-select v-model="queryParams.org" size="small" placeholder="按组织">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+
+        <el-select v-model="queryParams.matterSource" size="small" placeholder="按服务类型">
+          <el-option
+              v-for="item in monthOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+          </el-option>
+        </el-select>
+        <el-input v-model="queryParams.name" size="small" placeholder="按服务对象姓名"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按服务对象电话"></el-input>
+        <el-input v-model="queryParams.tel" size="small" placeholder="按服务描述关键词"></el-input>
+        <el-button size="small" class="btn" type="primary">查询</el-button>
+      </el-form>
+    </div>
+
+    <div class="table">
+      <el-table :data="list">
+        <el-table-column
+            label="序号"
+            type="index"
+            width="80"/>
+
+        <el-table-column
+            prop="name"
+            label="服务对象姓名"/>
+
+        <el-table-column
+            prop="key"
+            label="服务对象电话"/>
+
+        <el-table-column
+            prop="key"
+            label="所属组织">
+        </el-table-column>
+
+        <el-table-column
+            prop="key"
+            label="服务类型"/>
+
+        <el-table-column
+            prop="key"
+            show-overflow-tooltip
+            label="服务描述"/>
+
+        <el-table-column
+            prop="key"
+            label="是否符合政策条件"/>
+
+        <el-table-column
+            prop="key"
+            sortable
+            label="是否已完成服务"/>
+        <el-table-column
+            prop="key"
+            sortable
+            label="服务发起时间"/>
+        <el-table-column
+            sortable
+            label="详情">
+          <template>
+            <el-button type="text">查看</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+    </div>
+
+    <Pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import Breadcrumb from '@/views/dataBoard/satisfactionEval/components/Breadcrumb'
+import Pagination from '@/views/dataBoard/satisfactionEval/components/Pagination'
+import Title from "@/views/dataBoard/satisfactionEval/components/Title"
+
+
+export default {
+  name: "dissatisfied",
+  components: {Breadcrumb, Pagination,Title},
+  data() {
+    return {
+      queryParams: {
+        month: '',
+        org: '',
+        matterSource: '',
+        matterType: '',
+        name: '',
+        tel: '',
+        pageNum: 1,
+        pageSize: 10,
+      },
+      total: 0,
+      breadcrumbList: [{
+        path: '/dataBoard/satisfactionEval/index',
+        name: '满意度评价'
+      }, {
+        path: '',
+        name: '应享未享服务人数'
+      }],
+      monthOptions: new Array(12).fill(0).map((_, index) => {
+        return {label: (index - 0 + 1) + '月', value: (index - 0 + 1)}
+      }),
+      list: [{}, {}, {}]
+    }
+  },
+  methods: {
+    getList() {
+
+    },
+    handleView({name,id}) {
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/assets/scss/dataBoard/table.scss";
+
+.screen {
+  margin: 25px 0 40px;
+
+  .el-select, .el-input {
+    width: 150px;
+    margin-right: 4px;
+    border: 1px solid #126AC5;
+    border-radius: 2px;
+
+    /deep/ .el-input__inner {
+      background: none;
+      border: none;
+      color: #fff;
+    }
+  }
+
+  .btn {
+    margin-left: 46px;
+    height: 32px;
+  }
+}
+</style>
\ No newline at end of file

From e3661285cc3bd16ebc35f461e38a11efbf5d7ba5 Mon Sep 17 00:00:00 2001
From: SongZhen <>
Date: Fri, 15 Sep 2023 15:26:13 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  28 ++-
 src/assets/css/workflow.scss                  |   2 +-
 src/assets/scss/dataBoardMain.scss            |  20 +-
 src/js/store/index.js                         |  11 +-
 src/js/store/modules/chooseArea.js            |  22 ++
 .../organizational/dangTree/index.vue         |   6 +
 .../organizational/personnel/index.vue        |   6 +-
 src/views/dataBoardMain/main-content.vue      | 215 +++++++++---------
 src/views/dataBoardMain/main-navbar.vue       |  36 ++-
 src/views/dataBoardMain/main.vue              |   2 +-
 10 files changed, 213 insertions(+), 135 deletions(-)
 create mode 100644 src/js/store/modules/chooseArea.js

diff --git a/src/App.vue b/src/App.vue
index fa8c1ec7e..60eaf8b2e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,11 +13,11 @@ export default {
   watch: {
     "$i18n.locale": "i18nHandle",
   },
-  created () {
+  created() {
     this.i18nHandle(this.$i18n.locale);
   },
   methods: {
-    i18nHandle (val, oldVal) {
+    i18nHandle(val, oldVal) {
       localStorage.setItem("language", val);
       document.querySelector("html").setAttribute("lang", val);
       document.title = messages[val].brand.lg;
@@ -26,7 +26,7 @@ export default {
         window.location.reload();
       }
     },
-    refreshView () {
+    refreshView() {
       // In order to make the cached page re-rendered
       this.$store.dispatch("delAllCachedViews", this.$route);
 
@@ -41,7 +41,7 @@ export default {
     ...mapActions(["setClientHeight", "setSize", "setResolution", "setEnv"]),
   },
   computed: {},
-  mounted () {
+  mounted() {
     console.log("开始：：：：" + localStorage.getItem("userType"));
     if (!localStorage.getItem("userType")) {
       localStorage.setItem("userType", "oper");
@@ -155,7 +155,7 @@ export default {
     position: relative;
     max-height: 83vh;
     box-sizing: border-box;
-    padding: 0 0 16px ;
+    padding: 0 0 16px;
     .dialog-h-content {
       max-height: calc(83vh - 80px);
       box-sizing: border-box;
@@ -226,4 +226,22 @@ export default {
 * {
   @include scrollBar;
 }
+.selectPopClass {
+  border: none !important;
+  background: linear-gradient(180deg, #05326e 0%, #032a5d 100%) !important;
+  .el-select-dropdown__item {
+    color: #fff !important;
+    background: #05326e !important;
+  }
+  dropdown__item.hover,
+  .el-select-dropdown__item:hover {
+    background: #032a5d !important;
+  }
+  .popper__arrow {
+    border: none !important;
+    &::after {
+      border-bottom-color: #05326e !important;
+    }
+  }
+}
 </style>
diff --git a/src/assets/css/workflow.scss b/src/assets/css/workflow.scss
index 64b847edc..c86784239 100644
--- a/src/assets/css/workflow.scss
+++ b/src/assets/css/workflow.scss
@@ -990,7 +990,7 @@ html {
     position: absolute;
     height: 5px;
     width: 50%;
-    background-color: #00023a;
+    background-color: #00143C;
     top: -4px
 }
 
diff --git a/src/assets/scss/dataBoardMain.scss b/src/assets/scss/dataBoardMain.scss
index c2988f2e1..87919319e 100644
--- a/src/assets/scss/dataBoardMain.scss
+++ b/src/assets/scss/dataBoardMain.scss
@@ -7,8 +7,8 @@
 
 .g-pg {
     position: relative;
-    // background-image: url(../images/home/bg.png);
-    background-color: #00023a;
+    background-image: url(../images/home/bg.png);
+    // background-color: #00023a;
     background-repeat: no-repeat;
     background-size: 100% 100%;
 }
@@ -79,6 +79,22 @@
         -webkit-text-fill-color: transparent;
     }
 
+    .selectArea {
+        position: absolute;
+        left: 480px;
+        width: 120px;
+        right: 0;
+        top: 20px;
+
+        ::v-deep .el-input__inner {
+            height: 32px !important;
+            border-radius: 16px !important;
+            border: none !important;
+            color: #fff !important;
+            background: linear-gradient(180deg, #05326E 0%, #032A5D 100%) !important;
+        }
+    }
+
     .btn-back {
         position: absolute;
         top: 52px;
diff --git a/src/js/store/index.js b/src/js/store/index.js
index 8ade517b2..b873782ca 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -4,6 +4,7 @@ import cloneDeep from "lodash/cloneDeep";
 import user from "./modules/user";
 import app from "./modules/app";
 import tagsView from "./modules/tagsView";
+import chooseArea from "./modules/chooseArea";
 import categoryStr from "./modules/categoryStr";
 import { requestPost } from "@/js/dai/request";
 import { dateFormats } from "@/utils/index";
@@ -23,12 +24,12 @@ export default new Vuex.Store({
     sidebarMenuList: [],
     sidebarMenuActiveName: "",
     LevelOneMenuActiveName: "",
-    LevelTowMenuActiveName:"",
+    LevelTowMenuActiveName: "",
     sidebarActiveSubMenuList: [],
     // 内容, 是否需要刷新
     contentIsNeedRefresh: false,
     // 内容, 标签页(默认添加首页)
-    contentTabs: [{name:"home",title:"首页"}],
+    contentTabs: [{ name: "home", title: "首页" }],
     contentTabsActiveName: "",
 
     mainShuju: {
@@ -47,6 +48,7 @@ export default new Vuex.Store({
     app,
     tagsView,
     categoryStr,
+    chooseArea,
   },
   mutations: {
     // 重置vuex本地储存状态
@@ -70,10 +72,7 @@ export default new Vuex.Store({
     },
     setInterval({ commit, dispatch, state }) {
       interTimer = setInterval(() => {
-        const _t = dateFormats(
-          "YYYY-mm-dd HH:MM",
-          new Date(new Date().toLocaleDateString()).getTime()
-        );
+        const _t = dateFormats("YYYY-mm-dd HH:MM", new Date(new Date().toLocaleDateString()).getTime());
         const _tt = new Date(_t).getTime();
         console.log("230000---", _t);
         const t = dateFormats("YYYY-mm-dd HH:MM", new Date().getTime());
diff --git a/src/js/store/modules/chooseArea.js b/src/js/store/modules/chooseArea.js
new file mode 100644
index 000000000..471c3069b
--- /dev/null
+++ b/src/js/store/modules/chooseArea.js
@@ -0,0 +1,22 @@
+const state = {
+  chooseName: "金湖路社区",
+};
+
+const mutations = {
+  CHOOSE_NAME: (state, name) => {
+    state.chooseName = name;
+  },
+};
+
+const actions = {
+  chooseName({ commit }, name) {
+    commit("CHOOSE_NAME", name);
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};
diff --git a/src/views/dataBoard/organizational/dangTree/index.vue b/src/views/dataBoard/organizational/dangTree/index.vue
index b925ab2b6..2fb677319 100644
--- a/src/views/dataBoard/organizational/dangTree/index.vue
+++ b/src/views/dataBoard/organizational/dangTree/index.vue
@@ -48,8 +48,14 @@ export default {
       nodeConfig: {},
     };
   },
+  watch: {
+    "$store.state.chooseArea.chooseName"(n, v) {
+      console.log(n);
+    },
+  },
   computed: {},
   mounted() {
+    console.log(this.$store.state.chooseArea.chooseName);
     this.getTreeData();
   },
   methods: {
diff --git a/src/views/dataBoard/organizational/personnel/index.vue b/src/views/dataBoard/organizational/personnel/index.vue
index 7cf9da62c..faba037cd 100644
--- a/src/views/dataBoard/organizational/personnel/index.vue
+++ b/src/views/dataBoard/organizational/personnel/index.vue
@@ -54,13 +54,9 @@ export default {
           path: "/organizational/dangTree",
           name: "党组织架构",
         },
-        {
-          path: "/organizational/orgPersonnel",
-          name: "居民画像",
-        },
         {
           path: "",
-          name: "",
+          name: "居民画像",
         },
       ],
     };
diff --git a/src/views/dataBoardMain/main-content.vue b/src/views/dataBoardMain/main-content.vue
index bed215ca7..9724dbc5e 100644
--- a/src/views/dataBoardMain/main-content.vue
+++ b/src/views/dataBoardMain/main-content.vue
@@ -1,118 +1,107 @@
 <template>
-	<main class="g-main">
-		<!-- tab展示内容 -->
-		<template>
-			<template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
-				<iframe :src="
-            $router.currentRoute.meta.iframeURL +
-            '?token=' +
-            token +
-            '&customerId=' +
-            customerId
-          " ref="iframe" class="m-iframe" id="iframe" width="100%" height="100%" frameborder="0" scrolling="yes"
-					:style="{ height: $store.state.fixed1920.height - 100 + 'px' }" />
-			</template>
-			<keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">
-				<router-view @changeCustomerName="changeCustomerName" />
-			</keep-alive>
-		</template>
-	</main>
+  <main class="g-main">
+    <!-- tab展示内容 -->
+    <template>
+      <template v-if="tabIsIframe($router.currentRoute.meta.iframeURL)">
+        <iframe :src="$router.currentRoute.meta.iframeURL + '?token=' + token + '&customerId=' + customerId" ref="iframe" class="m-iframe" id="iframe" width="100%" height="100%" frameborder="0" scrolling="yes" :style="{ height: $store.state.fixed1920.height - 100 + 'px' }" />
+      </template>
+      <keep-alive v-show="!tabIsIframe($router.currentRoute.meta.iframeURL)">
+        <router-view ref="reloadPage" @changeCustomerName="changeCustomerName" />
+      </keep-alive>
+    </template>
+  </main>
 </template>
 <script>
-	import {
-		isURL
-	} from "@/utils/validate";
-	import Cookie from "js-cookie";
-	export default {
-		data() {
-			return {
-				iframeUrl: "",
-				token: "",
-				customerId: "",
-			};
-		},
-		watch: {
-			// "$router.currentRoute.name": function () {
-			//   console.log($router.currentRoute);
-			// },
-		},
-		created() {
-			this.token = localStorage.getItem("token");
-			this.customerId = localStorage.getItem("customerId");
-		},
-		methods: {
-			changeCustomerName(customerName) {
-				this.$emit("changeCustomerName", customerName);
-			},
-			// tabs, 是否通过iframe展示
-			tabIsIframe(url) {
-				// this.appendIframe(url)
-				// this.iframeUrl =
-				//   url +
-				//   "?token=" +
-				//   localStorage.getItem("token") +
-				//   "&customerId=" +
-				//   localStorage.getItem("customerId");
-				// return /^http[s]?:\/\/.*/.test(url);
-				return isURL(url);
-			},
-			// tabs, 选中tab
-			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
-						},
-					});
-				}
-			},
-			// tabs, 删除tab
-			tabRemoveHandle(tabName) {
-				if (tabName === "home") {
-					return false;
-				}
-				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;
-				}
-				// 当前选中tab被删除
-				if (tabName === this.$store.state.contentTabsActiveName) {
-					let tab = this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1];
-					this.$router.push({
-						name: tab.name,
-						params: {
-							...tab.params
-						},
-						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);
-					});
-			},
-			// tabs, 关闭全部
-			tabsCloseAllHandle() {
-				this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
-					(item) => item.name === "home");
-				this.$router.push({
-					name: "home"
-				});
-			},
-		},
-	};
+import { isURL } from "@/utils/validate";
+import Cookie from "js-cookie";
+export default {
+  props: ["name"],
+  data() {
+    return {
+      iframeUrl: "",
+      token: "",
+      customerId: "",
+    };
+  },
+  watch: {
+    // "$router.currentRoute.name": function () {
+    //   console.log($router.currentRoute);
+    // },
+  },
+  created() {
+    // console.log("name", this.name);
+    this.token = localStorage.getItem("token");
+    this.customerId = localStorage.getItem("customerId");
+  },
+  methods: {
+    changeCustomerName(customerName) {
+      this.$emit("changeCustomerName", customerName);
+    },
+    // tabs, 是否通过iframe展示
+    tabIsIframe(url) {
+      // this.appendIframe(url)
+      // this.iframeUrl =
+      //   url +
+      //   "?token=" +
+      //   localStorage.getItem("token") +
+      //   "&customerId=" +
+      //   localStorage.getItem("customerId");
+      // return /^http[s]?:\/\/.*/.test(url);
+      return isURL(url);
+    },
+    // tabs, 选中tab
+    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,
+          },
+        });
+      }
+    },
+    // tabs, 删除tab
+    tabRemoveHandle(tabName) {
+      if (tabName === "home") {
+        return false;
+      }
+      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;
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        let tab = this.$store.state.contentTabs[this.$store.state.contentTabs.length - 1];
+        this.$router.push({
+          name: tab.name,
+          params: {
+            ...tab.params,
+          },
+          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;
+      });
+    },
+    // tabs, 关闭全部
+    tabsCloseAllHandle() {
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter((item) => item.name === "home");
+      this.$router.push({
+        name: "home",
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" src="@/assets/scss/dataBoardMain.scss" scoped></style>
diff --git a/src/views/dataBoardMain/main-navbar.vue b/src/views/dataBoardMain/main-navbar.vue
index 6aef83272..10463e085 100644
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@@ -4,6 +4,11 @@
       <img src="~@/assets/images/shuju/main/back.png" alt="/" />
     </div>
     <div class="title">{{ customerName }}数据智能分析平台</div>
+    <div class="selectArea">
+      <el-select @change="setSelectName" v-model="value" popper-class="selectPopClass">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+      </el-select>
+    </div>
     <!-- <div class="btn-back" @click="toPage('/')">
 			<img class="z-default" src="~@/assets/images/shuju/main/back.png" />
 			<img class="z-on" src="~@/assets/images/shuju/main/back-on.png" />
@@ -162,10 +167,33 @@ export default {
       showWeek: "",
       showTime: "",
       showMonth: "",
+      value: "",
       weather: {
         weather: "晴",
         temperature: "--",
       },
+      options: [
+        {
+          value: "选项1",
+          label: "黄金糕",
+        },
+        {
+          value: "选项2",
+          label: "双皮奶",
+        },
+        {
+          value: "选项3",
+          label: "蚵仔煎",
+        },
+        {
+          value: "选项4",
+          label: "龙须面",
+        },
+        {
+          value: "选项5",
+          label: "北京烤鸭",
+        },
+      ],
     };
   },
   components: {
@@ -214,7 +242,7 @@ export default {
     },
 
     goBack() {
-      history.go(-1);
+      this.$router.push("/main/home");
     },
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
     gotoRouteHandle(menuId, idx) {
@@ -241,7 +269,11 @@ export default {
         // return this.$message.error("网络错误");
       }
     },
+
+    setSelectName(name) {
+      this.$store.dispatch("chooseArea/chooseName", name);
+    },
   },
 };
 </script>
-<style lang="scss" src="@/assets/scss/dataBoardMain.scss" scoped></style>
+<style lang="scss" scoped src="@/assets/scss/dataBoardMain.scss"></style>
diff --git a/src/views/dataBoardMain/main.vue b/src/views/dataBoardMain/main.vue
index 9ab3eb4f1..d761e9957 100644
--- a/src/views/dataBoardMain/main.vue
+++ b/src/views/dataBoardMain/main.vue
@@ -22,7 +22,7 @@
           :style="{
             minHeight: $store.state.fixed1920.height - 100 + 'px',
           }">
-          <main-content v-if="!$store.state.contentIsNeedRefresh" @changeCustomerName="changeCustomerName" />
+          <main-content v-if="!$store.state.contentIsNeedRefresh" @changeCustomerName="changeCustomerName" name="1233223" />
         </div>
       </template>
     </div>