diff --git a/package.json b/package.json
index f42ceb2..1806e00 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,8 @@
     "vue-count-to": "^1.0.13",
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "vue-carousel-3d": "^1.0.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.4",
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 095d17d..f4b58a7 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -1,33 +1,41 @@
-import request from '@/utils/request'
-
-export function save(data) {
-  return request({
-    url: '/api/admin/admin/save',
-    method: 'post',
-    data
-  })
-}
-
-export function listuser() {
-  return request({
-    url: '/api/admin/admin',
-    method: 'get'
-  })
+import request from '@/utils/request'
+
+export function save(data) {
+  return request({
+    url: '/api/admin/admin/save',
+    method: 'post',
+    data
+  })
+}
+
+export function listuser() {
+  return request({
+    url: '/api/admin/admin',
+    method: 'get'
+  })
 }
-
-export function del(data) {
-  return request({
-    url: '/api/admin/admin/delete',
-    method: 'post',
-    data
-  })
+
+export function showuser(params) {
+  return request({
+    url: '/api/admin/admin/show',
+    method: 'get',
+    params
+  })
 }
 
-export function setRoles(data) {
-  return request({
-    url: '/api/admin/admin/set-roles',
-    method: 'post',
-    data
-  })
+export function del(data) {
+  return request({
+    url: '/api/admin/admin/delete',
+    method: 'post',
+    data
+  })
 }
-
+
+export function setRoles(data) {
+  return request({
+    url: '/api/admin/admin/set-roles',
+    method: 'post',
+    data
+  })
+}
+
diff --git a/src/assets/bigScreen/china.png b/src/assets/bigScreen/china.png
new file mode 100644
index 0000000..dba790e
Binary files /dev/null and b/src/assets/bigScreen/china.png differ
diff --git a/src/assets/bigScreen/points-a.png b/src/assets/bigScreen/points-a.png
new file mode 100644
index 0000000..5df5234
Binary files /dev/null and b/src/assets/bigScreen/points-a.png differ
diff --git a/src/assets/bigScreen/points.png b/src/assets/bigScreen/points.png
new file mode 100644
index 0000000..d2c3748
Binary files /dev/null and b/src/assets/bigScreen/points.png differ
diff --git a/src/assets/bigScreen/title.png b/src/assets/bigScreen/title.png
index 657ef24..00d6f8e 100644
Binary files a/src/assets/bigScreen/title.png and b/src/assets/bigScreen/title.png differ
diff --git a/src/icons/svg/fullscreen1.svg b/src/icons/svg/fullscreen1.svg
new file mode 100644
index 0000000..dc4f86a
--- /dev/null
+++ b/src/icons/svg/fullscreen1.svg
@@ -0,0 +1 @@
+<svg t="1726198816247" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4258" width="200" height="200"><path d="M285.866667 810.666667H384v42.666666H213.333333v-170.666666h42.666667v98.133333l128-128 29.866667 29.866667-128 128z m494.933333 0l-128-128 29.866667-29.866667 128 128V682.666667h42.666666v170.666666h-170.666666v-42.666666h98.133333zM285.866667 256l128 128-29.866667 29.866667-128-128V384H213.333333V213.333333h170.666667v42.666667H285.866667z m494.933333 0H682.666667V213.333333h170.666666v170.666667h-42.666666V285.866667l-128 128-29.866667-29.866667 128-128z" fill="#86afc6" p-id="4259" class="custom-cursor-on-hover"></path></svg>
diff --git a/src/styles/bigscreen.scss b/src/styles/bigscreen.scss
index 428da9c..e5e661e 100644
--- a/src/styles/bigscreen.scss
+++ b/src/styles/bigscreen.scss
@@ -45,6 +45,9 @@ $card-color: rgba(6, 34, 108, 0.37);
 .flex-1 {
   flex: 1;
 }
+.flex-0 {
+  flex: 0;
+}
 $flex-jc: (
   start: flex-start,
   end: flex-end,
diff --git a/src/views/bigSreen/component/CenterBottom.vue b/src/views/bigSreen/component/CenterBottom.vue
new file mode 100644
index 0000000..203548e
--- /dev/null
+++ b/src/views/bigSreen/component/CenterBottom.vue
@@ -0,0 +1,170 @@
+<template>
+  <div class="bottom">
+    <div class="bs-card d-flex flex-column">
+      <div class="bs-card__title jc-between">
+        <p class="bs-card__title--text">医疗陪护</p>
+
+        <div class="color-white">
+          <span class="color-word">1</span>
+          <span>/</span>
+          <span>{{ yiliaopeihu.length }}</span>
+        </div>
+      </div>
+
+      <div class="bs-card__body flex-1" @click="previewImgs = yiliaopeihu.map(i => i.file),isShowPreview = true">
+        <el-image fit="cover" class="el-img" :src="yiliaopeihu[0] ? yiliaopeihu[0].file : ''" alt="" />
+        <div class="img-title">{{ yiliaopeihu[0] ? yiliaopeihu[0].label : '' }}</div>
+      </div>
+    </div>
+    <div class="bs-card d-flex flex-column">
+      <div class="bs-card__title jc-between">
+        <p class="bs-card__title--text">物业项目</p>
+
+        <div class="color-white">
+          <span class="color-word">1</span>
+          <span>/</span>
+          <span>{{ xiangmu.length }}</span>
+        </div>
+      </div>
+
+      <div class="bs-card__body flex-1" @click="previewImgs = xiangmu.map(i => i.file),isShowPreview = true">
+        <el-image fit="cover" class="el-img" :src="xiangmu[0] ? xiangmu[0].file : ''" alt="" />
+        <div class="img-title">{{ xiangmu[0] ? xiangmu[0].label : '' }}</div>
+      </div>
+    </div>
+    <div class="bs-card d-flex flex-column">
+      <div class="bs-card__title jc-between">
+        <p class="bs-card__title--text">分公司/站点</p>
+
+        <div class="color-white">
+          <span class="color-word">1</span>
+          <span>/</span>
+          <span>{{ fengongsi.length }}</span>
+        </div>
+      </div>
+
+      <div class="bs-card__body flex-1" @click="previewImgs = fengongsi.map(i => i.file),isShowPreview = true">
+        <el-image fit="cover" class="el-img" :src="fengongsi[0] ? fengongsi[0].file : ''" alt="" />
+        <div class="img-title">{{ fengongsi[0] ? fengongsi[0].label : '' }}</div>
+      </div>
+    </div>
+    <div class="bs-card d-flex flex-column">
+      <div class="bs-card__title jc-between">
+        <p class="bs-card__title--text">活动集锦</p>
+
+        <div class="color-white">
+          <span class="color-word">1</span>
+          <span>/</span>
+          <span>{{ huodongjijin.length }}</span>
+        </div>
+      </div>
+
+      <div class="bs-card__body flex-1" @click="previewImgs = huodongjijin.map(i => i.file),isShowPreview = true">
+        <el-image fit="cover" class="el-img" :src="huodongjijin[0] ? huodongjijin[0].file : ''" alt="" />
+        <div class="img-title">{{ huodongjijin[0] ? huodongjijin[0].label : '' }}</div>
+      </div>
+    </div>
+
+    <ImgPreview v-model="isShowPreview" :imgs="previewImgs"></ImgPreview>
+  </div>
+</template>
+
+<script>
+import { getList } from "@/api/bigScreen"
+import ImgPreview from "@/views/bigSreen/component/ImgPreview.vue";
+export default {
+  components: {
+    ImgPreview
+  },
+  data() {
+    return {
+      pics: [
+        'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg',
+        'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
+      ],
+
+      yiliaopeihu: [],
+      xiangmu: [],
+      fengongsi: [],
+      huodongjijin: [],
+
+      previewImgs: [],
+      isShowPreview: false,
+    }
+  },
+  methods: {
+    async getData () {
+      try {
+        const res = await Promise.all([
+          getList({
+            type: 'yiliaopeihu'
+          },false),
+          getList({
+            type: 'xiangmu'
+          },false),
+          getList({
+            type: 'fengongsi'
+          },false),
+          getList({
+            type: 'huodongjijin'
+          },false)
+        ])
+        const [yiliaopeihu,xiangmu,fengongsi,huodongjijin] = res;
+        this.yiliaopeihu = JSON.parse(yiliaopeihu?.data[0]?.value);
+        this.xiangmu = JSON.parse(xiangmu?.data[0]?.value);
+        this.fengongsi = JSON.parse(fengongsi?.data[0]?.value);
+        this.huodongjijin = JSON.parse(huodongjijin?.data[0]?.value);
+      } catch (err) {
+        console.warn(err)
+      }
+    }
+  },
+  computed: {},
+  created() {
+    this.getData()
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.bottom {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 22px;
+  .bs-card {
+    width: 332px;
+    height: 203px;
+    padding: 10px 25px;
+
+    &__body {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 10px;
+      position: relative;
+
+      & > img,& > .el-img {
+        object-fit: cover;
+        height: 128px;
+        width: 372px;
+      }
+
+      .img-title {
+        width: 100%;
+        line-height: 29px;
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        font-size: 16px;
+        color: #ffffff;
+        text-align: center;
+        background-color: rgba(1, 16, 57, 0.8);
+      }
+    }
+  }
+}
+::v-deep .el-image-viewer__mask {
+  transform: scale(2);
+}
+</style>
diff --git a/src/views/bigSreen/component/CenterLeft.vue b/src/views/bigSreen/component/CenterLeft.vue
index 35d2f19..040d206 100644
--- a/src/views/bigSreen/component/CenterLeft.vue
+++ b/src/views/bigSreen/component/CenterLeft.vue
@@ -1,233 +1,411 @@
 <template>
-  <div class="center-left">
-    <div class="bs-card business-buy">
-      <div class="bs-card__title jc-between">
-        <p class="bs-card__title--text">
-          康养服务
-        </p>
-        <p>
-          <span class="color-word">658</span>
-          <span class="color-white">人次/年</span>
-        </p>
-      </div>
+  <div class="center-left bs-card">
+    <div class="bs-card__title jc-between">
+      <p class="bs-card__title--text">康养服务</p>
+      <p>
+        <span style="font-size: 20px; color: #59d4fc; font-weight: 500"
+          >人次/年</span
+        >
+      </p>
+    </div>
 
-      <div class="business-buy__body">
-        <div>
-          <div id="property-line-chart"></div>
+    <div class="bs-card__body">
+      <div class="show-data">
+        <div class="show-data-item" v-for="item in totalData">
+          <div class="show-data-item__num">{{ item.value }}</div>
+          <div class="show-data-item__label">{{ item.name }}</div>
         </div>
       </div>
+      <div id="property-bar-chart"></div>
     </div>
 
-    <div class="bs-card property">
-      <div id="property-pie-chart"></div>
+    <div class="bs-card__title" style="margin-top: 45px">
+      <p class="bs-card__title--text">公益/商业服务</p>
+    </div>
+    <div class="bs-card__body">
+      <div id="property-line-chart"></div>
     </div>
   </div>
 </template>
 
 <script>
 import { getList } from "@/api/bigScreen";
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
+import echarts from "echarts";
+require("echarts/theme/macarons"); // echarts theme
 export default {
   data() {
-    return {}
+    return {
+      totalData: [],
+    };
   },
   methods: {
-    async getChartData () {
+    async getChartData() {
       try {
-        const res = (await getList({
-          type: 'kangyangfuwu'
-        },false))?.data
-        this.pieChartData = JSON.parse(res?.find(i => i.key === 'piechart')?.value)
-        this.initPieChart()
+        const res = (
+          await getList(
+            {
+              type: "kangyangfuwu",
+            },
+            false
+          )
+        )?.data;
+        this.totalData = JSON.parse(res?.find((i) => i.key === "data")?.value);
+        this.lineChartData = JSON.parse(
+          res?.find((i) => i.key === "linechart")?.value
+        );
+        this.initLineChart();
 
-        this.chartData = JSON.parse(res?.find(i => i.key === 'barchart')?.value)
+        this.chartData = JSON.parse(
+          res?.find((i) => i.key === "barchart")?.value
+        );
         this.initChart();
       } catch (err) {
-        console.error(err)
+        console.error(err);
       }
     },
 
     initChart() {
-      this.chart = echarts.init(document.querySelector('#property-line-chart'), 'macarons');
+      this.chart = echarts.init(
+        document.querySelector("#property-bar-chart"),
+        "macarons"
+      );
       this.setOptions(this.chartData);
     },
-    initPieChart () {
-      this.chartPie = echarts.init(document.querySelector('#property-pie-chart'));
-      this.setPieOptions(this.pieChartData);
+    initLineChart() {
+      this.chartLine = echarts.init(
+        document.querySelector("#property-line-chart")
+      );
+      this.setLineOptions(this.lineChartData);
     },
     setOptions(chartdata) {
-      let color = ['#c95038','#e1884a','#ebb34c','#316922','#71dc7a','#6bb7be','#2050e0','#9952f6']
+      let color = [
+        "#c95038",
+        "#e1884a",
+        "#ebb34c",
+        "#316922",
+        "#71dc7a",
+        "#6bb7be",
+        "#2050e0",
+        "#9952f6",
+      ];
       this.chart.setOption({
         tooltip: {
-          trigger: 'axis',
+          trigger: "axis",
           axisPointer: {
-            type: 'shadow'
-          }
+            type: "shadow",
+          },
         },
         grid: {
           top: 10,
-          left: '2%',
-          right: '3%',
-          bottom: '3%',
-          containLabel: true
+          left: "2%",
+          right: "5.4%",
+          bottom: "3%",
+          containLabel: true,
         },
         xAxis: {
-          type: 'value',
+          type: "value",
           splitLine: {
             show: true,
             lineStyle: {
-              color: '#384b8f', // 设置 X 轴间隔线颜色为红色
-            }
-          }
-
+              color: "#384b8f", // 设置 X 轴间隔线颜色为红色
+            },
+          },
         },
         yAxis: {
-          type: 'category',
-          data: this.chartData.map(i => i.label),
+          type: "category",
+          data: this.chartData.map((i) => i.label),
           axisLabel: {
             textStyle: {
-              color: "#fff"
-            }
-          }
+              color: "#fff",
+            },
+          },
         },
         series: [
           {
-            name: '人数',
-            type: 'bar',
-            data: this.chartData.map(i => i.value),
+            name: "人数",
+            type: "bar",
+            data: this.chartData.map((i) => i.value),
             label: {
               show: true,
-              position: 'insideRight',
-              color: '#fff',
-              fontWeight: 'bold',
-              formatter: '{c}'
+              position: "insideRight",
+              color: "#fff",
+              fontWeight: "bold",
+              formatter: "{c}",
             },
             itemStyle: {
               color: (params) => {
-                return color[params.dataIndex]
+                return color[params.dataIndex];
               },
-              barBorderRadius: [0,4,4,0],
+              barBorderRadius: [0, 4, 4, 0],
             },
-          }
-        ]
-      })
+          },
+        ],
+      });
     },
 
-    setPieOptions () {
-      let color = [new echarts.graphic.LinearGradient(0.5, 0, 0.5, 1, [
-        {
-          offset: 0,
-          color: '#202aed'
-        },
-        {
-          offset: 1,
-          color: '#3b82f0'
-        }
-      ]),new echarts.graphic.LinearGradient(0.5, 0, 0.5, 1, [
-        {
-          offset: 0,
-          color: '#84d7ee'
+    setLineOptions() {
+      this.chartLine.setOption({
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            lineStyle: {
+              color: "#384b8f",
+            },
+          },
         },
-        {
-          offset: 1,
-          color: '#6fe7fa'
-        }
-      ])]
-      this.chartPie.setOption({
-        title: {
-          show: false,
+        legend: {
+          top: 0,
+          textStyle: {
+            fontSize: 14,
+            color: "#F1F1F3",
+          },
         },
-        tooltip: {
-          trigger: 'item'
+        grid: {
+          top: "50px",
+          left: "2%",
+          right: "4%",
+          bottom: "0",
+          containLabel: true,
         },
+        xAxis: [
+          {
+            type: "category",
+            boundaryGap: false,
+            axisLine: {
+              lineStyle: {
+                color: '#395e9c',
+              },
+            },
+            axisLabel: {
+              textStyle: {
+                color: '#395e9c',
+              },
+            },
+            data: this.lineChartData?.years || [],
+          },
+        ],
+        yAxis: [
+          {
+            type: "value",
+            axisTick: {
+              show: false,
+            },
+            axisLine: {
+              lineStyle: {
+                color: "#384b8f",
+                type: "dashed"
+              },
+            },
+            axisLabel: {
+              margin: 10,
+              textStyle: {
+                color: "#fff",
+                fontSize: 14,
+              },
+            },
+            splitLine: {
+              lineStyle: {
+                color: "#384b8f",
+              },
+            },
+          },
+        ],
         series: [
           {
-            type: 'pie',
-            radius: '64%',
-            center: ['50%', '50%'],
-            data: this.pieChartData.map((i, index) => ({
-              value: isNaN(Number(i.value)) ? 0 : Number(i.value),
-              name: i.label,
-              itemStyle: {
-                color: color[index],
+            name: "政府",
+            type: "line",
+            smooth: true,
+            symbol: "circle",
+            symbolSize: 8,
+            lineStyle: {
+              normal: {
+                width: 4,
+              },
+            },
+            areaStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  1,
+                  1,
+                  0,
+                  [
+                    {
+                      offset: 0,
+                      color: "rgba(0,0,0,0)",
+                    },
+                    {
+                      offset: 0.8,
+                      color: "rgba(226, 172, 113, 0.4)",
+                    },
+                  ],
+                  false
+                ),
+                shadowColor: "rgba(0, 0, 0, 0.1)",
                 shadowBlur: 10,
-              }
-            })),
-            roseType: 'radius',
-            label: {
-              color: '#fff',
-              formatter: '{b} \n {d}%'
+              },
             },
-            labelLine: {
-              lineStyle: {
-                color: '#71e8fc'
+            itemStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  0,
+                  0,
+                  1,
+                  [
+                    {
+                      offset: 0,
+                      color: "#e0a26e",
+                    },
+                    {
+                      offset: 0.8,
+                      color: "#872d4a",
+                    },
+                  ],
+                  false
+                ),
               },
-              smooth: 0.2,
-              length: 10,
-              length2: 20
             },
-
-
-            animationType: 'scale',
-            animationEasing: 'elasticOut',
-            animationDelay: function (idx) {
-              return Math.random() * 200;
-            }
-          }
-        ]
-      })
-    }
+            data: this.lineChartData?.data["政府"],
+          },
+          {
+            name: "商业",
+            type: "line",
+            smooth: true,
+            symbol: "circle",
+            symbolSize: 8,
+            lineStyle: {
+              normal: {
+                width: 4,
+              },
+            },
+            areaStyle: {
+              normal: {
+                color: new echarts.graphic.LinearGradient(
+                  0,
+                  1,
+                  1,
+                  0,
+                  [
+                    {
+                      offset: 0,
+                      color: "rgba(0,0,0,0)",
+                    },
+                    {
+                      offset: 0.8,
+                      color: "rgba(96, 191, 250, 0.4)",
+                    },
+                  ],
+                  false
+                ),
+                shadowColor: "rgba(0, 0, 0, 0.1)",
+                shadowBlur: 10,
+              },
+            },
+            itemStyle: {
+              normal: {
+                color: "rgb(96, 191, 250)",
+              },
+            },
+            data: this.lineChartData?.data["商业"],
+          },
+        ],
+      });
+    },
   },
   computed: {},
   mounted() {
-    this.getChartData()
-  }
-}
+    this.getChartData();
+  },
+};
 </script>
 
 <style scoped lang="scss">
 .center-left {
+  flex-shrink: 0;
+  width: 383px;
+  height: 100%;
   display: flex;
   flex-direction: column;
-  justify-content: space-between;
 
+  .show-data {
+    margin-top: 35px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    $itemColors: linear-gradient(0deg, #d91e19 0%, #d95f39 99%, #d95f39 100%),
+      linear-gradient(0deg, #e67725 0%, #ff9d62 100%),
+      linear-gradient(0deg, #f6aa2c 0%, #f8db36 100%, #f8db36 100%),
+      linear-gradient(0deg, #f6aa2c 0%, #f8db36 100%, #f8db36 100%),
+      linear-gradient(0deg, #d91e19 0%, #d95f39 99%, #d95f39 100%),
+      linear-gradient(0deg, #e67725 0%, #ff9d62 100%),
+      linear-gradient(0deg, #f6aa2c 0%, #f8db36 100%, #f8db36 100%),
+      linear-gradient(0deg, #f6aa2c 0%, #f8db36 100%, #f8db36 100%);
+    @for $index from 1 through length($itemColors) {
+      &-item:nth-child(#{$index}) {
+        & > div:nth-child(1) {
+          background: nth($itemColors, $index);
+        }
+      }
+    }
+    &-item {
+      flex: 1;
+      text-align: center;
+      box-shadow: inset 0 0 6px 4px #1a3674;
+
+      &__num {
+        border-radius: 5px 5px 0 0;
+        font-size: 34px;
+        color: #ffffff;
+        font-weight: bold;
+      }
+      &__label {
+        border-radius: 0 0 5px 5px;
+        font-size: 16px;
+        line-height: 54px;
+        color: #ffffff;
+      }
+    }
+    .show-data-item + .show-data-item {
+      margin-left: 5px;
+    }
+  }
   .business-buy {
     height: 382px;
 
     &__body {
+      .digital {
+        width: 205px;
+        height: 188px;
+        margin: auto;
+        position: relative;
+        & > img {
+          width: 205px;
+          height: 188px;
+          display: block;
+        }
 
-       .digital {
-         width: 205px;
-         height: 188px;
-         margin: auto;
-         position: relative;
-         & > img {
-           width: 205px;
-           height: 188px;
-           display: block;
-         }
-
-         &-item {
-           font-size: 20px;
-           color: #31abe3;
-           font-weight: bold;
-           z-index: 2;
-           position: absolute;
-         }
-         &-item:nth-child(1) {
-           top: 46%;
-           right: -36%;
-         }
-         &-item:nth-child(2) {
-           left: 50%;
-           bottom: 10%;
-         }
-         &-item:nth-child(3) {
-           left: -20%;
-           bottom: 0;
-         }
-       }
+        &-item {
+          font-size: 20px;
+          color: #31abe3;
+          font-weight: bold;
+          z-index: 2;
+          position: absolute;
+        }
+        &-item:nth-child(1) {
+          top: 46%;
+          right: -36%;
+        }
+        &-item:nth-child(2) {
+          left: 50%;
+          bottom: 10%;
+        }
+        &-item:nth-child(3) {
+          left: -20%;
+          bottom: 0;
+        }
+      }
 
       .progress {
         width: 100%;
@@ -287,12 +465,14 @@ export default {
   }
 }
 
-#property-line-chart {
-  height: 335px;
+#property-bar-chart {
+  height: 355px;
   width: 100%;
+  margin-top: 30px;
 }
-#property-pie-chart {
+#property-line-chart {
+  margin-top: 20px;
   width: 100%;
-  height: 100%;
+  height: 190px;
 }
 </style>
diff --git a/src/views/bigSreen/component/CenterTop.vue b/src/views/bigSreen/component/CenterTop.vue
new file mode 100644
index 0000000..c108d55
--- /dev/null
+++ b/src/views/bigSreen/component/CenterTop.vue
@@ -0,0 +1,657 @@
+<template>
+  <div class="center-top">
+    <div class="left d-flex flex-column">
+      <div class="top">
+        <div class="bs-card">
+          <div class="card-text">
+            <p class="color-word">照护</p>
+            <p>
+              <span class="color-white fw-b" style="font-size: 42px">{{
+                total.zhaohu
+              }}</span>
+              <span class="color-word" style="padding-left: 5px">万人次/年</span>
+            </p>
+          </div>
+        </div>
+        <div class="bs-card">
+          <div class="card-text">
+            <p class="color-word">服务覆盖人数</p>
+            <p>
+              <span class="color-white fw-b" style="font-size: 42px">{{
+                total.fuwufugairenshu
+              }}</span>
+              <span class="color-word" style="padding-left: 5px">万人</span>
+            </p>
+          </div>
+        </div>
+        <div class="bs-card">
+          <div class="card-text">
+            <p class="color-word">总服务时长</p>
+            <p>
+              <span class="color-white fw-b" style="font-size: 42px">{{
+                total.zongfuwushichang
+              }}</span>
+              <span class="color-word" style="padding-left: 5px">万小时</span>
+            </p>
+          </div>
+        </div>
+      </div>
+
+      <div
+        class="bottom flex-1"
+        @mouseenter="isMouseHover = true"
+        @mouseleave="isMouseHover = false"
+      >
+        <transition name="fade">
+          <video
+            :src="videos[videoIndex] ? videos[videoIndex].file : ''"
+            ref="video"
+            loop
+            v-show="type === 'video'"
+            :style="isPaused ? 'filter: brightness(75%);' : ''"
+            @click="playVideo"
+          ></video>
+        </transition>
+        <transition name="fade">
+          <div class="carousel-img" v-show="type === 'img'">
+            <div class="data-panel">
+              <div class="data-panel__title">
+                <i class="el-icon-arrow-left" @click="areaClick('prev')"></i>
+                <div>{{ activeArea.name }}-{{ (activeArea && activeArea.data) ? activeArea.data.length : 0 }}个</div>
+                <i class="el-icon-arrow-right" @click="areaClick('next')"></i>
+              </div>
+
+              <dv-scroll-board
+                ref="scrollBoard"
+                :key="scrollBoardKey"
+                :config="areaConfig"
+                style="width: 100%; height: 400px; margin-top: 16px"
+              />
+            </div>
+            <dv-flyline-chart
+              dev
+              :config="flyingConfig"
+              style="width: 100%; height: 100%"
+            />
+          </div>
+        </transition>
+
+        <transition name="fade">
+          <div
+            class="video-btn"
+            v-show="(isPaused || isMouseHover) && type === 'video'"
+            @click="playVideo"
+          >
+            <svg viewBox="0 0 100 100">
+              <defs>
+                <linearGradient id="yellow" x1="50%" x2="50%" y1="0%" y2="100%">
+                  <stop offset="0%" stop-color="#eacab1"></stop>
+                  <stop offset="40%" stop-color="#bf9271"></stop>
+                </linearGradient>
+                <linearGradient
+                  id="yellow1"
+                  x1="50%"
+                  x2="50%"
+                  y1="0%"
+                  y2="100%"
+                >
+                  <stop offset="0%" stop-color="#e0c0a8"></stop>
+                  <stop offset="40%" stop-color="#caa182"></stop>
+                </linearGradient>
+              </defs>
+              <path
+                d="M 50 50 m 0 47a 47 47 0 1 1 0 -94a 47 47 0 1 1 0 94"
+                stroke="url(#yellow)"
+                stroke-width="4"
+                style="
+                  stroke-dasharray: 260.1482px, 295.31px;
+                  stroke-dashoffset: -4.9137px;
+                "
+                fill="none"
+              ></path>
+              <path
+                :d="
+                  isPaused
+                    ? 'M 38.6 30 l 0 40 l 34.6 -20 Z'
+                    : 'M 38.6 30 l 0 40 M 61.4 30 l 0 40'
+                "
+                ref="icon"
+                fill="none"
+                class="icon"
+                stroke="url(#yellow1)"
+                stroke-width="4"
+              ></path>
+            </svg>
+          </div>
+        </transition>
+
+        <div
+          class="video-change"
+          v-show="type === 'video' && (isPaused || isMouseHover)"
+        >
+          <button
+            type="button"
+            class="el-carousel__arrow el-carousel__arrow--left"
+            @click="
+              (isPaused = true), (videoIndex = (videoIndex + 1) % videos.length)
+            "
+          >
+            <i class="el-icon-arrow-left custom-cursor-on-hover"></i>
+          </button>
+          <button
+            type="button"
+            class="el-carousel__arrow el-carousel__arrow--right"
+            @click="
+              (isPaused = true),
+                (videoIndex = (videoIndex - 1 + videos.length) % videos.length)
+            "
+          >
+            <i class="el-icon-arrow-right custom-cursor-on-hover"></i>
+          </button>
+        </div>
+
+        <div class="type-change">
+          <div class="type-change-item" @click="type = 'img'">
+            <i class="el-icon-picture type-change-item__icon"></i>
+            <div class="type-change-item__num">{{ imgs.length }}</div>
+          </div>
+          <div class="type-change-item" @click="type = 'video'">
+            <i class="el-icon-video-camera-solid type-change-item__icon"></i>
+            <div class="type-change-item__num">{{ videos.length }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="right" style="height: 100%">
+      <div class="bs-card">
+        <div class="bs-card__title">
+          <p class="bs-card__title--text">今日数量</p>
+        </div>
+
+        <div class="bs-card__body" style="margin-top: 18px">
+          <div class="today">
+            <div
+              class="today-item"
+              v-for="(item, index) in toDayNums"
+              :style="{ 'grid-area': `d${index}` }"
+              @click="activeToday = item"
+            >
+              <div class="today-item__value">{{ item.val }}</div>
+              <div class="today-item__name">{{ item.name }}</div>
+            </div>
+          </div>
+
+          <dv-scroll-board
+            ref="scrollBoard"
+            :key="scrollBoardKey"
+            :config="listConfig"
+            style="width: 516px; height: 389px; margin-top: 34px"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getList } from "@/api/bigScreen";
+import gsap from "gsap";
+
+export default {
+  data() {
+    return {
+      total: {
+        zhaohu: 0,
+        fuwufugairenshu: 0,
+        zongfuwushichang: 0,
+      },
+
+      toDayNums: [
+        {
+          key: "changhuxian",
+          name: "长护险",
+          val: 129,
+        },
+        {
+          key: "jujiayuanzhu",
+          name: "居家援助",
+          val: 128,
+        },
+        {
+          key: "canlianjujiatuoyang",
+          name: "残联居家托养",
+          val: 168,
+        },
+
+        {
+          key: "huifangjicha",
+          name: "回访稽查",
+          val: 163,
+        },
+      ],
+      scrollBoardKey: 0,
+      timer: null,
+
+      isPaused: true,
+      isMouseHover: false,
+
+      type: "img", //video img
+
+      videoIndex: 0,
+      videos: [],
+      imgs: [],
+      areas: [],
+      activeIndex: 0,
+      activeArea: {},
+
+      activeToday: {},
+    };
+  },
+  methods: {
+    async getTotal() {
+      const res = (
+        await getList(
+          {
+            type: "total",
+          },
+          false
+        )
+      ).data;
+      this.total.zhaohu = res.find((i) => i.key === "zhaohu")?.value;
+      this.total.fuwufugairenshu = res.find(
+        (i) => i.key === "fuwufugairenshu"
+      )?.value;
+      this.total.zongfuwushichang = res.find(
+        (i) => i.key === "zongfuwushichang"
+      )?.value;
+    },
+
+    areaClick(type='next') {
+      if(type === 'next') {
+        this.activeIndex=++this.activeIndex%this.areas.length;
+        this.activeArea = this.areas[this.activeIndex];
+      } else {
+        this.activeIndex > 0 ? (--this.activeIndex) : (this.activeIndex = this.areas.length-1);
+      }
+    },
+    async getAreas() {
+      try {
+        this.areas = (
+          await getList(
+            {
+              type: "areas",
+            },
+            false
+          )
+        ).data?.map(area => (JSON.parse(area.value)));
+        this.activeArea = this.areas[0];
+      } catch (err) {
+        console.error(err)
+      }
+
+    },
+
+    async getList () {
+      try {
+        const res = (await getList({
+          type: 'media'
+        },false))?.data
+
+        this.videos = JSON.parse(res.find(i => i.key === 'video')?.value)
+      } catch (err) {
+        console.error(err)
+      }
+    },
+
+    async getData() {
+      const res = (
+        await getList(
+          {
+            type: "today",
+          },
+          false
+        )
+      )?.data;
+      this.toDayNums.forEach((i) => {
+        i.val = isNaN(Number(res.find((j) => j.key === i.key)?.value))
+          ? 0
+          : Number(res.find((j) => j.key === i.key)?.value);
+      });
+      try {
+        this.listConfig.data = JSON.parse(
+          res.find((i) => i.key === "list")?.value ?? "[]"
+        ).map((i) => [
+          i.name,
+          i.people,
+          `<span style="color: #03b1fa;">${i.time}</span>`,
+        ]);
+        this.scrollBoardKey++;
+      } catch (err) {
+        console.error(err);
+      }
+    },
+
+    playVideo() {
+      if (this.type === "img") return;
+
+      gsap.set(this.$refs["icon"], {
+        strokeDasharray: "6.148px, 442.31px",
+        strokeDashoffset: "100.9137px",
+      });
+      gsap.to(this.$refs["icon"], {
+        strokeDasharray: "126.148px, 442.31px",
+        strokeDashoffset: "19.9137px",
+      });
+
+      if (this.$refs["video"].paused) {
+        this.isPaused = false;
+        this.$refs["video"].play();
+      } else {
+        this.isPaused = true;
+        this.$refs["video"].pause();
+      }
+    },
+
+    keywordRegister(e) {
+      if (e.code === "Space") {
+        this.playVideo();
+      }
+    },
+  },
+  computed: {
+    flyingConfig() {
+      return {
+        points: this.areas?.map(area => ({
+          position: area.point,
+          text: area.name
+        }))?.filter(i => i.text !== this.activeArea?.name) || [],
+        centerPoint: this.activeArea?.point,
+        bgImgUrl: require("@/assets/bigScreen/china.png"),
+        pointsImg: {
+          url: require("@/assets/bigScreen/points.png"),
+        },
+        centerPointImg: {
+          url: require("@/assets/bigScreen/points-a.png")
+        },
+        orbitColor: "#0000",
+        lineWidth: 0,
+      }
+    },
+    areaConfig() {
+      return {
+        oddRowBGC: "#0a1b5632",
+        evenRowBGC: "#0a1b5632",
+        rowNum: 8,
+        data: this.activeArea?.data?.map(i => [i]) || [],
+      }
+    },
+    listConfig() {
+      return {
+        headerBGC: "#0a1b5632",
+        oddRowBGC: "#0a1b5632",
+        evenRowBGC: "#0a1b5632",
+        indexHeader: "序号",
+        index: true,
+        rowNum: 8,
+        align: ["center", "left", "center", "center"],
+        columnWidth: [52],
+        header: ["服务名称", "人员", "时间"],
+        data: Array.from({ length: 10 }, () => [
+          "稽查回访",
+          "人员a",
+          '<span style="color: #03b1fa;">13:55</span>',
+        ]),
+      }
+    }
+  },
+  created() {
+    this.getTotal();
+    this.getData();
+    this.getList();
+    this.getAreas();
+  },
+  mounted() {
+    document.body.addEventListener("keypress", this.keywordRegister);
+  },
+  beforeDestroy() {
+    document.body.removeEventListener("keypress", this.keywordRegister);
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.center-top {
+  display: flex;
+  justify-content: space-between;
+
+  .left {
+    flex: 1;
+    .top {
+      height: 123px;
+      display: flex;
+
+      .bs-card {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 20px 14px;
+
+        .card-text {
+          flex: 1;
+          padding-left: 10px;
+          font-size: 20px;
+        }
+      }
+      .bs-card + .bs-card {
+        margin-left: 20px;
+      }
+    }
+    .bottom {
+      margin-top: 30px;
+      flex: 1;
+      border-radius: 15px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 6px;
+      box-sizing: border-box;
+      background: conic-gradient(
+        #5470ec,
+        #506bec,
+        #77cbf1,
+        #3d58ca,
+        #3b56ca,
+        #6fbbf0,
+        #6aa3f2
+      );
+      position: relative;
+
+      video,
+      .carousel-img {
+        background: rgb(6, 23, 70);
+        object-fit: cover;
+        position: absolute;
+        transition: all 0.2s;
+        left: 6px;
+        bottom: 6px;
+        height: calc(100% - 12px);
+        width: calc(100% - 12px);
+
+        .data-panel {
+          position: absolute;
+          width: 338px;
+          height: 98%;
+          left: 8px;
+          top: 1%;
+          border-radius: 10px;
+          background-color: #031e6099;
+
+          &__title {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            font-size: 31px;
+            color: #e67d33;
+            font-weight: 600;
+            padding: 0 28px;
+            margin-top: 20px;
+
+            & > i {
+              cursor: pointer;
+              font-weight: 600;
+              font-size: 24px;
+              color: #4f7bf5;
+            }
+          }
+        }
+      }
+      .carousel-img > ::v-deep .el-carousel__container {
+        height: 100%;
+      }
+      ::v-deep .el-carousel__arrow {
+        width: 56px;
+        height: 56px;
+        font-size: 25px;
+        color: #fff;
+      }
+      .carousel-item-img {
+        width: 100%;
+        height: 100%;
+        object-fit: cover;
+      }
+      //.video-btn {
+      //  cursor: pointer;
+      //  width: 230px;
+      //  height: 230px;
+      //  position: absolute;
+      //  top: calc(50% - 115px);
+      //  left: calc(50% - 115px);
+      //}
+      .video-btn {
+        border-radius: 100%;
+        background-color: #e7e6e630;
+        cursor: pointer;
+        width: 195px;
+        height: 195px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        position: absolute;
+        top: calc(50% - 97.5px);
+        left: calc(50% - 97.5px);
+
+        &::after {
+          content: "";
+          width: 143px;
+          height: 143px;
+          background: #fffd;
+          border-radius: 100%;
+          position: absolute;
+          top: calc(50% - 71.5px);
+          left: calc(50% - 71.5px);
+        }
+
+        svg {
+          width: 72px;
+          height: 72px;
+          position: relative;
+          z-index: 2;
+
+          .icon {
+            stroke-dasharray: 126.148px, 442.31px;
+            stroke-dashoffset: 19.9137px;
+          }
+        }
+      }
+      .type-change {
+        border-radius: 19px;
+        background: #ffffff19;
+        padding: 9px 15px;
+        display: flex;
+        z-index: 333;
+        align-items: center;
+        position: absolute;
+        bottom: 14px;
+        right: 30px;
+
+        &-item {
+          cursor: pointer;
+          font-size: 24px;
+          line-height: 24px;
+          display: flex;
+          align-items: center;
+
+          &__icon {
+            color: #fff;
+          }
+          &__num {
+            color: #fff;
+            margin-left: 10px;
+          }
+
+          &:nth-child(1) {
+            margin-right: 30px;
+            position: relative;
+
+            &::after {
+              content: "";
+              height: 100%;
+              width: 2px;
+              background: #ffffff;
+              opacity: 0.2;
+              position: absolute;
+              top: 0;
+              right: -16px;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  .right {
+    width: 552px;
+    margin-left: 30px;
+
+    $todayColors: #db4edd, #00cf92, #59d4fc, #fff, #fe7629;
+    .today {
+      display: grid;
+      grid-column-gap: 14px;
+      grid-row-gap: 10px;
+      grid-template-areas:
+        "d0 d0 d1 d1 d2 d2"
+        "d3 d3 d3 d3 d3 d3";
+      text-align: center;
+
+      @for $index from 1 through length($todayColors) {
+        &-item:nth-child(#{$index}) {
+          .today-item__name {
+            color: nth($todayColors, $index);
+          }
+        }
+      }
+      &-item {
+        height: 80px;
+        border-radius: 5px;
+        background-color: rgba(85, 199, 149, 0);
+        box-shadow: inset 0 0 4px 2px #1a3676;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+
+        &__value {
+          line-height: 1;
+          font-size: 42px;
+          color: #ffffff;
+          font-weight: bold;
+        }
+        &__name {
+          font-size: 14px;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/bigSreen/component/ImgPreview.vue b/src/views/bigSreen/component/ImgPreview.vue
new file mode 100644
index 0000000..06c8dbf
--- /dev/null
+++ b/src/views/bigSreen/component/ImgPreview.vue
@@ -0,0 +1,66 @@
+<template>
+  <transition name="fade">
+    <div v-show="value" class="img-preview">
+      <div class="mask" @click.prevent.stop="$emit('input',false)"></div>
+      <div class="img-container">
+        <div style="background: #0d2067;height: 100%;width: 100%">
+
+        </div>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: Boolean,
+      default: false,
+      required: true
+    },
+    imgs: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {}
+  },
+  methods: {},
+  computed: {},
+}
+</script>
+
+<style scoped lang="scss">
+.img-preview {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: fixed;
+  z-index: 999;
+  inset: 0 0 0 0;
+
+  .mask {
+    background: #00000033;
+    position: fixed;
+    z-index: 999;
+    inset: 0 0 0 0;
+  }
+  .img-container {
+    width: 1517px;
+    height: 839px;
+    border-radius: 10px;
+    box-sizing: border-box;
+    background: conic-gradient(
+        #de8d51,
+        #90b0b0,
+        #b9723d,
+        #7ac5e3
+    );
+    position: relative;
+    z-index: 1000;
+    padding: 5px;
+  }
+}
+</style>
diff --git a/src/views/bigSreen/component/top.vue b/src/views/bigSreen/component/top.vue
index e9348fb..785ad7e 100644
--- a/src/views/bigSreen/component/top.vue
+++ b/src/views/bigSreen/component/top.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="top">
+    <div class="time">{{ time }}</div>
     <img class="title-img" :src="require('@/assets/bigScreen/title.png')" alt="">
+    <div class="fullscreen" @click="fullscreen">
+      <SvgIcon icon-class="fullscreen1"></SvgIcon>
+    </div>
 
     <div class="line">
       <img :src="require('@/assets/bigScreen/line.png')" alt="">
@@ -9,26 +13,68 @@
 </template>
 
 <script>
+import SvgIcon from "@/components/SvgIcon/index.vue";
 export default {
+  components: {
+    SvgIcon
+  },
   data() {
-    return {}
+    return {
+      timer: null,
+      time: this.$moment().format('YYYY年MM月DD日 HH:mm:ss')
+    }
+  },
+  methods: {
+    fullscreen() {
+      if (!document.fullscreenElement) {
+        // 请求全屏
+        document.documentElement.requestFullscreen()
+      } else {
+        // 退出全屏
+        document.exitFullscreen()
+      }
+    }
   },
-  methods: {},
   computed: {},
+  created() {
+    this.timer = setInterval(() => {
+      this.time = this.$moment().format('YYYY年MM月DD日 HH:mm:ss')
+    },1000)
+  },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  }
 }
 </script>
 
 <style scoped lang="scss">
 .top {
-  flex: 0;
-  height: calc(28px + 72px + 18px);
+  height: calc(24px + 72px + 19px);
   position: relative;
 }
+.time {
+  font-size: 18px;
+  letter-spacing: 1px;
+  color: #8dc7db;
+  transform: translateY(-50%);
+  position: absolute;
+  left: 38px;
+  top: calc(6px + 36px);
+}
+.fullscreen {
+  color: #8dc7db;
+  font-weight: 600;
+  font-size: 38px;
+  transform: translateY(-50%);
+  position: absolute;
+  right: 38px;
+  top: calc(6px + 36px);
+}
 .title-img {
   height: 72px;
-  width: 477px;
   margin: 6px auto 0;
   display: block;
+  object-fit: contain;
 }
 .line {
   left: 0;
@@ -57,6 +103,7 @@ export default {
   }
   & > img {
     height: 100%;
+
   }
 }
 </style>
diff --git a/src/views/bigSreen/index.vue b/src/views/bigSreen/index.vue
index f067f0f..612dddd 100644
--- a/src/views/bigSreen/index.vue
+++ b/src/views/bigSreen/index.vue
@@ -1,15 +1,19 @@
 <template>
   <div id="big-screen">
     <div ref="appRef" class="container">
-      <top></top>
+      <top class="top"></top>
 
-      <div class="center">
-        <CenterLeft style="grid-area: left"></CenterLeft>
-        <Center style="grid-area: center;"></Center>
-        <CenterRight style="grid-area: right;"></CenterRight>
+      <div class="center d-flex">
+        <CenterLeft></CenterLeft>
+        <div style="margin-left: 30px;" class="flex-1 d-flex flex-column">
+          <CenterTop class="flex-1"></CenterTop>
+          <CenterBottom></CenterBottom>
+        </div>
+<!--        <Center style="grid-area: center;"></Center>-->
+<!--        <CenterRight style="grid-area: right;"></CenterRight>-->
       </div>
 
-      <Bottom></Bottom>
+<!--      <Bottom></Bottom>-->
     </div>
   </div>
 </template>
@@ -20,6 +24,8 @@ import top from './component/top.vue'
 import CenterLeft from "./component/CenterLeft.vue";
 import Center from "./component/Center.vue";
 import CenterRight from "./component/CenterRight.vue";
+import CenterTop from "./component/CenterTop.vue";
+import CenterBottom from './component/CenterBottom.vue'
 import Bottom from "./component/Bottom.vue";
 export default {
   mixins: [drawMixin],
@@ -28,7 +34,9 @@ export default {
     CenterLeft,
     Center,
     CenterRight,
-    Bottom
+    Bottom,
+    CenterTop,
+    CenterBottom
   },
   data() {
     return {}
@@ -54,22 +62,17 @@ export default {
     width: 1920px;
     height: 1080px;
     transform-origin: 0 0;
-    display: flex;
-    flex-direction: column;
 
     position: relative;
     top: 50%;
     left: 50%;
 
+    .top {
+    }
     .center {
-      flex: 0;
-      height: 648px;
-      display: grid;
-      grid-template-areas: "left left left left left center center center center center center center center center center center center right right right right right right right";
-      grid-template-columns: repeat(24, 1fr);
-      grid-column-gap: 30px;
+      height: 914px;
+      margin-top: 30px;
       padding: 0 30px;
-      margin-top: 25px;
     }
   }
 }
diff --git a/src/views/system/data.vue b/src/views/system/data.vue
index b8ce940..9c6a41c 100644
--- a/src/views/system/data.vue
+++ b/src/views/system/data.vue
@@ -90,7 +90,7 @@
 
 <script>
 import { save } from "@/api/system/user"
-import { listuser } from "@/api/system/user"
+import { listuser,showuser } from "@/api/system/user"
 import { getList as getProductTypes } from "@/api/productType"
 import { getparameter } from "@/api/system/dictionary"
 import { getList as getAdminType,save as saveType,destroy as destroyType } from "@/api/system/adminProductType"
@@ -103,6 +103,9 @@ export default {
     LxHeader
   },
   mounted() {
+    this.$nextTick(() => {
+      this.switchTab()
+    })
   },
   data() {
     return {
@@ -110,10 +113,11 @@ export default {
       users:[],
       productTypes:[],
       cities:[],
-      activeUser:'',
+      activeUser:'1',
       checkAll: false,
       checkedTypes:[],
       isIndeterminate: true,
+      userVillages: [],
 
       originalArea:[],
       originalType:[],
@@ -139,14 +143,23 @@ export default {
       ++this.newElTreeTag;
       this.getAdminAreas();
       this.getAdminTypes();
-      this.checkNewTreeNodes();
+      this.getActiveUser().then(_ => this.checkNewTreeNodes());
     },
 
+    getActiveUser() {
+      return new Promise((resolve, reject) => {
+        showuser({
+          id: this.activeUser
+        }).then(res => {
+          this.userVillages = res.village
+          resolve()
+        }).catch(err => reject(err))
+      })
+    },
     checkNewTreeNodes (level = 0) {
-      let user = this.users.find(i => i.id == this.activeUser)
-      if(user && user.village) {
-        this.defaultExpanded = user.village.filter(i => i.level !== 5).map(i => Number(i.village_code))
-        this.defaultChecked = user.village.filter(i => i.level === 5).map(i => Number(i.village_code))
+      if(this.userVillages) {
+        this.defaultExpanded = this.userVillages.filter(i => i.level !== 5).map(i => Number(i.village_code))
+        this.defaultChecked = this.userVillages.filter(i => i.level === 5).map(i => Number(i.village_code))
       }
     },
 
@@ -290,9 +303,7 @@ export default {
   created(){
     this.initLoad()
     this.getCity()
-    this.getUsers().then(_ => {
-      this.getList()
-    })
+    this.getUsers()
     this.getProductTypes()
   },
 };