提交

ruoyi-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 重点人群核酸比对检测系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 重点人群核酸比对检测系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载

ruoyi-ui/.env.production

@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 重点人群核酸比对检测系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 重点人群核酸比对检测系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

ruoyi-ui/.env.staging

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 重点人群核酸比对检测系统
 
 NODE_ENV = production
 
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 重点人群核酸比对检测系统/测试环境
 VUE_APP_BASE_API = '/stage-api'

ruoyi-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.3",
-  "description": "若依管理系统",
+  "description": "重点人群核酸比对检测系统",
   "author": "若依",
   "license": "MIT",
   "scripts": {

ruoyi-ui/src/api/index.js

@@ -0,0 +1,110 @@
+import request from '@/utils/request'
+
+
+// 圆环列表
+export function treeselect(query) {
+  return request({
+    url: '/sts/smsts/' + query ,
+    method: 'get'
+  })
+}
+
+// 圆环列表上部
+
+export function listTsde(query) {
+  return request({
+    url: '/boman-web-core/index/stsByCzrkHomePage' ,
+    method: 'get'
+  })
+}
+
+
+
+// 查询设备信息列表
+export function listDevice(query) {
+  return request({
+    url: '/sts/per/school/smmx',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 折线图
+export function listzhex(query) {
+  return request({
+    url: '/boman-web-core/index/hjczLine',
+    method: 'get',
+    params: query
+  })
+}
+
+// 雷达图
+export function listleida(query) {
+  return request({
+    url: '/sts/echarts1 ',
+    method: 'get',
+    params: query
+  })
+}
+// 底部圆环数据
+export function listdbyh(query) {
+  return request({
+    url: '/sts/echarts2 ',
+    method: 'get',
+    params: query
+  })
+}
+// 柱状图数据
+export function listzhuzh(query) {
+  return request({
+    url: '/sts/echarts3 ',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询设备信息详细
+export function getDevice(id) {
+  return request({
+    url: '/school/device/' + id,
+    method: 'get'
+  })
+}
+
+// 新增设备信息
+export function addDevice(data) {
+  return request({
+    url: '/school/device',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备信息
+export function updateDevice(data) {
+  return request({
+    url: '/school/device',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备信息
+export function delDevice(id) {
+  return request({
+    url: '/school/device/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportPost(query) {
+  return request({
+    url: '/sts/per/school/smmx/export',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui/src/assets/styles/variables.scss

@@ -4,14 +4,15 @@ $light-blue:#3A71A8;
 $red:#C03639;
 $pink: #E65D6E;
 $green: #30B08F;
-$tiffany: #4AB7BD;
+$tiffany: #4AB7BD;  
 $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
 $base-menu-color:#bfcbd9;
 $base-menu-color-active:#f4f4f5;
-$base-menu-background:#304156;
+// $base-menu-background:#304156;
+$base-menu-background:#fff;
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);

ruoyi-ui/src/layout/components/Navbar.vue

@@ -6,7 +6,7 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <!-- <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
         
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -23,7 +23,7 @@
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
 
-      </template>
+      </template> -->
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '若依管理系统',
+      title: '重点人群核酸比对检测系统',
       logo: logoImg
     }
   }

ruoyi-ui/src/settings.js

@@ -1,4 +1,5 @@
 module.exports = {
+    urls: `http://192.168.101.168:9001`,
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
    */

ruoyi-ui/src/views/dashboard/BarChart.vue

@@ -23,6 +23,18 @@ export default {
     height: {
       type: String,
       default: '300px'
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
     }
   },
   data() {
@@ -44,59 +56,111 @@ export default {
   },
   methods: {
     initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
       this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+    },
+      setOptions({ y, x ,data } = {}) {
+        console.log(y,x,data,56)
+       this.chart.setOption({
+         tooltip: {
+           trigger: 'axis',
+           axisPointer: { // 坐标轴指示器，坐标轴触发有效
+             type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+           }
+         },
 
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        grid: {
-          top: 10,
-          left: '2%',
-          right: '2%',
-          bottom: '3%',
-          containLabel: true
-        },
-        xAxis: [{
-          type: 'category',
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
-          axisTick: {
-            alignWithLabel: true
-          }
-        }],
-        yAxis: [{
-          type: 'value',
-          axisTick: {
-            show: false
-          }
-        }],
-        series: [{
-          name: 'pageA',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [79, 52, 200, 334, 390, 330, 220],
-          animationDuration
-        }, {
-          name: 'pageB',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [80, 52, 200, 334, 390, 330, 220],
-          animationDuration
-        }, {
-          name: 'pageC',
-          type: 'bar',
-          stack: 'vistors',
-          barWidth: '60%',
-          data: [30, 52, 200, 334, 390, 330, 220],
-          animationDuration
-        }]
-      })
-    }
+         grid: {
+           top: 10,
+           left: '2%',
+           right: '2%',
+           bottom: '3%',
+           containLabel: true
+         },
+         xAxis: [{
+           type: 'category',
+           // data: y,
+           data: ['五保户', '低保户', '贫困户', '党员', '退伍军人' ],
+           axisTick: {
+             alignWithLabel: true
+           },
+           axisLine: {   //  控制x轴线的样式
+                              lineStyle: {
+                                   type: 'solid',
+                                  color: '#9BA2B0',
+                                   width:'1' }
+                                }
+         }],
+         yAxis: [{
+           type: 'value',
+           axisTick: {
+             show: false
+           },
+            axisLine: {
+                               lineStyle: {
+                                    type: 'solid',
+                                     color: '#9BA2B0',
+                                   width:'1'
+                               }
+                              }
+         }],
+         series: [
+            {
+                 name: '五保户',
+                 type: 'bar',
+                 barWidth:"30%",
+                 data: [6, 3, 5, 2, 1],
+                 itemStyle: {
+                             normal: {
+                 　　　　　　　　//这里是重点
+                                 color: function(params) {
+                                 	//注意，如果颜色太少的话，后面颜色不会自动循环，最好多定义几个颜色
+                                     var colorList = ['#65C6F3','#FFC05C', '#9286F7', '#FB8462', '#84A6F1'];
+                                     return colorList[params.dataIndex]
+                                 }
+                             }
+                    }
+               }
+    // {
+    //   // data: [
+    //   //   {
+    //   //     value: 120,
+    //   //     itemStyle: {
+    //   //       color: '#5AD9F7'
+    //   //     }
+    //   //   },
+    //   //   {
+    //   //     value: 200,
+    //   //     itemStyle: {
+    //   //       color: '#FFC05C'
+    //   //     }
+    //   //   },
+    //   //   {
+    //   //     value: 150,
+    //   //     itemStyle: {
+    //   //       color: '#9286F7'
+    //   //     }
+    //   //   },
+    //   //   {
+    //   //     value: 80,
+    //   //     itemStyle: {
+    //   //       color: '#FB8462 '
+    //   //     }
+    //   //   },
+    //   //   {
+    //   //     name: '退伍军人',
+    //   //     value: 80,
+    //   //     itemStyle: {
+    //   //       color: "#84A6F1"
+    //   //     }
+    //   //   }
+
+    //   // ],
+    //   type: 'bar'
+    // }
+  ]
+       })
+      }
   }
 }
 </script>

ruoyi-ui/src/views/dashboard/LineChart.vue

@@ -60,11 +60,13 @@ export default {
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons')
       this.setOptions(this.chartData)
+
     },
-    setOptions({ expectedData, actualData } = {}) {
+    setOptions({ czjs, czxz,hjjs,hjxz,time } = {}) {
+      // console.log(x,y[0].data,45)
       this.chart.setOption({
         xAxis: {
-          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          data: time,
           boundaryGap: false,
           axisTick: {
             show: false
@@ -90,10 +92,10 @@ export default {
           }
         },
         legend: {
-          data: ['expected', 'actual']
+          data: ''
         },
         series: [{
-          name: 'expected', itemStyle: {
+          name: '五保户', itemStyle: {
             normal: {
               color: '#FF005A',
               lineStyle: {
@@ -104,12 +106,12 @@ export default {
           },
           smooth: true,
           type: 'line',
-          data: expectedData,
+          data: czjs,
           animationDuration: 2800,
           animationEasing: 'cubicInOut'
         },
         {
-          name: 'actual',
+          name: '低保户',
           smooth: true,
           type: 'line',
           itemStyle: {
@@ -124,10 +126,71 @@ export default {
               }
             }
           },
-          data: actualData,
+          data:czxz,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        },
+        {
+          name: '贫困户',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#47d737',
+              lineStyle: {
+                color: '#47d737',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data:hjxz,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        },
+        {
+          name: '党员',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#fe4809',
+              lineStyle: {
+                color: '#fe4809',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data:hjjs,
           animationDuration: 2800,
           animationEasing: 'quadraticOut'
-        }]
+        },
+        {
+          name: '退伍军人',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#fe4809',
+              lineStyle: {
+                color: '#fe4809',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data:hjjs,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        },
+        ]
       })
     }
   }

ruoyi-ui/src/views/dashboard/PanelGroup.vue

@@ -3,52 +3,57 @@
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
         <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+          <!-- <svg-icon icon-class="peoples" class-name="card-panel-icon" /> -->
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            访客
+            总扫码人次数
           </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="total" :duration="2600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('messages')">
         <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
+          <!-- <svg-icon icon-class="message" class-name="card-panel-icon" /> -->
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            消息
+            绿码
           </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="greenCode" :duration="3000" class="card-panel-num" />
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('purchases')">
         <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
+          <!-- <svg-icon icon-class="money" class-name="card-panel-icon" /> -->
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            金额
+            红码：
+            <count-to :start-val="0" :end-val="redCode" :duration="3200" class="card-panel-num" /> <br>
+            灰码：
+            <count-to :start-val="0" :end-val="gaeyCode" :duration="3200" class="card-panel-num" /> <br>
+            未申请：
+            <count-to :start-val="0" :end-val="notapplied" :duration="3200" class="card-panel-num" />
           </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
+
         </div>
       </div>
     </el-col>
     <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
       <div class="card-panel" @click="handleSetLineChartData('shoppings')">
         <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+          <!-- <svg-icon icon-class="shopping" class-name="card-panel-icon" /> -->
         </div>
         <div class="card-panel-description">
           <div class="card-panel-text">
-            订单
+            体温异常
           </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+          <count-to :start-val="0" :end-val="emperature" :duration="3600" class="card-panel-num" />
         </div>
       </div>
     </el-col>
@@ -56,126 +61,146 @@
 </template>
 
 <script>
-import CountTo from 'vue-count-to'
-
-export default {
-  components: {
-    CountTo
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.$emit('handleSetLineChartData', type)
+  import CountTo from 'vue-count-to'
+
+  export default {
+    components: {
+      CountTo
+    },
+    data(){
+      return{
+        total:102405,
+        greenCode:81258,
+        redCode:25,
+        gaeyCode:39,
+        notapplied:83,
+        emperature:36974
+      }
+    },
+    methods: {
+      handleSetLineChartData(type) {
+        this.$emit('handleSetLineChartData', type)
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  margin-top: 18px;
+  .panel-group {
+    margin-top: 18px;
 
-  .card-panel-col {
-    margin-bottom: 32px;
-  }
+    .card-panel-col {
+      margin-bottom: 32px;
+    }
 
-  .card-panel {
-    height: 108px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
-
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 12px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+
+        .icon-people {
+          background: url('../../assets/images/icon_htgl_smrs_selected.png') no-repeat;
+          background-size: 100% 100%;
+        }
+
+        .icon-message {
+          background: url('../../assets/images/icon_htgl_mzc_selected.png') no-repeat;
+          background-size: 100% 100%;
+        }
+
+        .icon-money {
+          background: url('../../assets/images/icon_htgl_myc_selected.png') no-repeat;
+          background-size: 100% 100%;
+        }
+
+        .icon-shopping {
+          background: url('../../assets/images/icon_htgl_wdyc_selected.png') no-repeat;
+          background-size: 100% 100%;
+        }
       }
 
       .icon-people {
-        background: #40c9c6;
+        background: url('../../assets/images/icon_htgl_smrs_normal.png') no-repeat;
+        background-size: 100% 100%;
       }
 
       .icon-message {
-        background: #36a3f7;
+        background: url('../../assets/images/icon_htgl_mzc_normal.png') no-repeat;
+        background-size: 100% 100%;
       }
 
       .icon-money {
-        background: #f4516c;
+        background: url('../../assets/images/icon_htgl_myc_normal.png') no-repeat;
+        background-size: 100% 100%;
       }
 
       .icon-shopping {
-        background: #34bfa3
+        background: url('../../assets/images/icon_htgl_wdyc_normal.png') no-repeat;
+        background-size: 100% 100%;
       }
-    }
-
-    .icon-people {
-      color: #40c9c6;
-    }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
-    }
-
-    .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
 
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        width: 80px;
+        height: 80px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
 
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
       }
 
-      .card-panel-num {
-        font-size: 20px;
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 12px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+          color: #000;
+        }
       }
     }
   }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
 
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
+  @media (max-width:550px) {
+    .card-panel-description {
+      display: none;
+    }
 
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
+    .card-panel-icon-wrapper {
       float: none !important;
+      width: 100%;
+      height: 100%;
+      margin: 0 !important;
+
+      .svg-icon {
+        display: block;
+        margin: 14px auto !important;
+        float: none !important;
+      }
     }
   }
-}
 </style>

ruoyi-ui/src/views/dashboard/PanelGroupfour.vue

@@ -0,0 +1,167 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+
+
+</template>
+
+<script>
+import echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from './mixins/resize';
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    };
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+
+    console.log(this.chartData,58)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+
+    },
+
+    setOptions({ czzrs , czbfb,zrs } = {}) {
+      this.chart.setOption({
+        color: [new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
+               offset: 0,
+               color: '#F69F24'
+           },
+           {
+               offset: 1,
+               color: '#F69F24'
+           }]), new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
+               offset: 0,
+               color: '#FFE1B7'
+           },
+           {
+               offset: 0.9,
+               color: '#FFE1B7'
+           }]),],
+            tooltip: {
+                  trigger: 'item'
+              },
+              legend: {
+                  top: '10%',
+                  left: 'center',
+                  data:[]
+              },
+              // 设置环形中间的数据
+                  graphic: [{
+                      type: 'text',
+                      left: 'center',
+                      top: '47%',
+                      z: 10,
+                      style: {
+                          fill: '#F69F24',
+                          text: czbfb,
+                          font: '12px Microsoft YaHei'
+                      },
+                      textStyle: {
+                              color: "#F69F24",
+                              fontSize: 12,
+                              align: "center"
+                            }
+                  }],
+              series: [
+                  {
+                      name: '人口数据',
+                      type: 'pie',
+                      radius: ['50%', '70%'],
+                      center: ['center', '50%'],
+                      avoidLabelOverlap: false,
+                      // label: {
+                      //     show: false,
+                      //     position: 'center'
+                      // },
+                      // emphasis: {
+                      //     label: {
+                      //         show: true,
+                      //         fontSize: '17',
+                      //         fontWeight: '400',
+                      //         color:'#2497D5'
+                      //     }
+                      // },
+                      // labelLine: {
+                      //     show: true
+                      // },
+                      itemStyle: {
+                                  normal: {
+                                      label: {
+                                          show: false
+                                      },
+                                      labelLine: {
+                                          show: false
+                                      }
+                                  },
+                                  emphasis: {
+                                      label: {
+                                          show: false,
+                                          position: 'outer',
+                                          textStyle: {
+                                              fontSize: '15',
+                                              fontWeight: 'bold',
+                                              color: 'white'
+                                          }
+                                      }
+                                  }
+                              },
+                      data: [
+                        {value: czzrs, name: '常住总人数'},
+                        {value: zrs, name: '总人数'}
+
+                      ]
+                  }
+              ]
+      })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/dashboard/PanelGroupone.vue

@@ -0,0 +1,167 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+
+
+</template>
+
+<script>
+import echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from './mixins/resize';
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    };
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+
+    console.log(this.chartData,58)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+
+    },
+
+    setOptions({ hongmrs, hongmrszb,jrsmrc } = {}) {
+      this.chart.setOption({
+        color: [new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
+               offset: 0,
+               color: '#F52F2F'
+           },
+           {
+               offset: 1,
+               color: '#F52F2F'
+           }]), new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
+               offset: 0,
+               color: '#FFCECE'
+           },
+           {
+               offset: 0.9,
+               color: '#FFCECE'
+           }]),],
+            tooltip: {
+                  trigger: 'item'
+              },
+              legend: {
+                  top: '10%',
+                  left: 'center',
+                  data:[]
+              },
+              // 设置环形中间的数据
+                  graphic: [{
+                      type: 'text',
+                      left: 'center',
+                      top: '46%',
+                      z: 10,
+                      style: {
+                          fill: '#F52F2F',
+                          text: hongmrszb,
+                          font: '16px Microsoft YaHei'
+                      },
+                      textStyle: {
+                              color: "#F52F2F",
+                              fontSize: 17,
+                              align: "center"
+                            }
+                  }],
+              series: [
+                  {
+                      name: '红码',
+                      type: 'pie',
+                      radius: ['50%', '70%'],
+                      center: ['center', '50%'],
+                      avoidLabelOverlap: false,
+                      // label: {
+                      //     show: false,
+                      //     position: 'center'
+                      // },
+                      // emphasis: {
+                      //     label: {
+                      //         show: true,
+                      //         fontSize: '17',
+                      //         fontWeight: '400',
+                      //         color:'#2497D5'
+                      //     }
+                      // },
+                      // labelLine: {
+                      //     show: true
+                      // },
+                      itemStyle: {
+                                  normal: {
+                                      label: {
+                                          show: false
+                                      },
+                                      labelLine: {
+                                          show: false
+                                      }
+                                  },
+                                  emphasis: {
+                                      label: {
+                                          show: false,
+                                          position: 'outer',
+                                          textStyle: {
+                                              fontSize: '15',
+                                              fontWeight: 'bold',
+                                              color: 'white'
+                                          }
+                                      }
+                                  }
+                              },
+                      data: [
+                        {value: hongmrs, name: '红码人数'},
+                          {value: jrsmrc, name: '扫码人数'}
+
+                      ]
+                  }
+              ]
+      })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/dashboard/PanelGroups.vue

@@ -0,0 +1,167 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+
+
+</template>
+
+<script>
+import echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from './mixins/resize';
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    };
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+
+    console.log(this.chartData,58)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+
+    },
+
+    setOptions({ lmrs, lmrszb,jrsmrc } = {}) {
+      this.chart.setOption({
+        color: [new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
+               offset: 0,
+               color: '#50BD04'
+           },
+           {
+               offset: 1,
+               color: '#50BD04'
+           }]), new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
+               offset: 0,
+               color: '#C8E1B6'
+           },
+           {
+               offset: 0.9,
+               color: '#C8E1B6'
+           }]),],
+            tooltip: {
+                  trigger: 'item'
+              },
+              legend: {
+                  top: '10%',
+                  left: 'center',
+                  data:[]
+              },
+              // 设置环形中间的数据
+                  graphic: [{
+                      type: 'text',
+                      left: 'center',
+                      top: '46%',
+                      z: 10,
+                      style: {
+                          fill: '#50BD04',
+                          text: lmrszb,
+                          font: '16px Microsoft YaHei'
+                      },
+                      textStyle: {
+                              color: "#50BD04",
+                              fontSize: 17,
+                              align: "center"
+                            }
+                  }],
+              series: [
+                  {
+                      name: '绿码',
+                      type: 'pie',
+                      radius: ['50%', '70%'],
+                      center: ['center', '50%'],
+                      avoidLabelOverlap: false,
+                      // label: {
+                      //     show: false,
+                      //     position: 'center'
+                      // },
+                      // emphasis: {
+                      //     label: {
+                      //         show: true,
+                      //         fontSize: '17',
+                      //         fontWeight: '400',
+                      //         color:'#2497D5'
+                      //     }
+                      // },
+                      // labelLine: {
+                      //     show: true
+                      // },
+                      itemStyle: {
+                                  normal: {
+                                      label: {
+                                          show: false
+                                      },
+                                      labelLine: {
+                                          show: false
+                                      }
+                                  },
+                                  emphasis: {
+                                      label: {
+                                          show: false,
+                                          position: 'outer',
+                                          textStyle: {
+                                              fontSize: '15',
+                                              fontWeight: 'bold',
+                                              color: 'white'
+                                          }
+                                      }
+                                  }
+                              },
+                      data: [
+                        {value: lmrs, name: '绿码人数'},
+                          {value:jrsmrc, name: '扫码人数'}
+
+                      ]
+                  }
+              ]
+      })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/dashboard/PanelGroupther.vue

@@ -0,0 +1,167 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+
+
+</template>
+
+<script>
+import echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from './mixins/resize';
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    };
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+
+    console.log(this.chartData,58)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+
+    },
+
+    setOptions({ hjzrs, hjbfb,zrs } = {}) {
+      this.chart.setOption({
+        color: [new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
+               offset: 0,
+               color: '#9836C1'
+           },
+           {
+               offset: 1,
+               color: '#9836C1'
+           }]), new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
+               offset: 0,
+               color: '#EBC8FA'
+           },
+           {
+               offset: 0.9,
+               color: '#EBC8FA'
+           }]),],
+            tooltip: {
+                  trigger: 'item'
+              },
+              legend: {
+                  top: '10%',
+                  left: 'center',
+                  data:[]
+              },
+              // 设置环形中间的数据
+                  graphic: [{
+                      type: 'text',
+                      left: 'center',
+                      top: '46%',
+                      z: 10,
+                      style: {
+                          fill: '#9836C1',
+                          text: hjbfb,
+                          font: '12px Microsoft YaHei'
+                      },
+                      textStyle: {
+                              color: "#9836C1",
+                              fontSize: 12,
+                              align: "center"
+                            }
+                  }],
+              series: [
+                  {
+                      name: '人口信息',
+                      type: 'pie',
+                      radius: ['50%', '70%'],
+                      center: ['center', '50%'],
+                      avoidLabelOverlap: false,
+                      // label: {
+                      //     show: false,
+                      //     position: 'center'
+                      // },
+                      // emphasis: {
+                      //     label: {
+                      //         show: true,
+                      //         fontSize: '17',
+                      //         fontWeight: '400',
+                      //         color:'#2497D5'
+                      //     }
+                      // },
+                      // labelLine: {
+                      //     show: true
+                      // },
+                      itemStyle: {
+                                  normal: {
+                                      label: {
+                                          show: false
+                                      },
+                                      labelLine: {
+                                          show: false
+                                      }
+                                  },
+                                  emphasis: {
+                                      label: {
+                                          show: false,
+                                          position: 'outer',
+                                          textStyle: {
+                                              fontSize: '15',
+                                              fontWeight: 'bold',
+                                              color: 'white'
+                                          }
+                                      }
+                                  }
+                              },
+                      data: [
+                        {value: hjzrs, name: '户籍人数'},
+                        {value: zrs, name: '总人数'}
+
+                      ]
+                  }
+              ]
+      })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/dashboard/PanelGrouptwo.vue

@@ -0,0 +1,167 @@
+<template>
+  <div :class="className" :style="{ height: height, width: width }" />
+
+
+</template>
+
+<script>
+import echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from './mixins/resize';
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '150px'
+    },
+    height: {
+      type: String,
+      default: '150px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      chart: null
+    };
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.initChart();
+    });
+
+    console.log(this.chartData,58)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+
+    },
+
+    setOptions({ huimrs, huimrszb ,jrsmrc } = {}) {
+      this.chart.setOption({
+        color: [new echarts.graphic.LinearGradient(1, 0, 0, 0, [{
+               offset: 0,
+               color: '#9A9A9A'
+           },
+           {
+               offset: 1,
+               color: '#9A9A9A'
+           }]), new echarts.graphic.LinearGradient(1, 1, 0, 0, [{
+               offset: 0,
+               color: '#DFDFDF'
+           },
+           {
+               offset: 0.9,
+               color: '#DFDFDF'
+           }]),],
+            tooltip: {
+                  trigger: 'item'
+              },
+              legend: {
+                  top: '10%',
+                  left: 'center',
+                  data:[]
+              },
+              // 设置环形中间的数据
+                  graphic: [{
+                      type: 'text',
+                      left: 'center',
+                      top: '46%',
+                      z: 10,
+                      style: {
+                          fill: '#9A9A9A',
+                          text: huimrszb ,
+                          font: '16px Microsoft YaHei'
+                      },
+                      textStyle: {
+                              color: "#9A9A9A",
+                              fontSize: 17,
+                              align: "center"
+                            }
+                  }],
+              series: [
+                  {
+                      name: '灰码',
+                      type: 'pie',
+                      radius: ['50%', '70%'],
+                      center: ['center', '50%'],
+                      avoidLabelOverlap: false,
+                      // label: {
+                      //     show: false,
+                      //     position: 'center'
+                      // },
+                      // emphasis: {
+                      //     label: {
+                      //         show: true,
+                      //         fontSize: '17',
+                      //         fontWeight: '400',
+                      //         color:'#2497D5'
+                      //     }
+                      // },
+                      // labelLine: {
+                      //     show: true
+                      // },
+                      itemStyle: {
+                                  normal: {
+                                      label: {
+                                          show: false
+                                      },
+                                      labelLine: {
+                                          show: false
+                                      }
+                                  },
+                                  emphasis: {
+                                      label: {
+                                          show: false,
+                                          position: 'outer',
+                                          textStyle: {
+                                              fontSize: '15',
+                                              fontWeight: 'bold',
+                                              color: 'white'
+                                          }
+                                      }
+                                  }
+                              },
+                      data: [
+                        {value: huimrs, name: '灰码人数'},
+                          {value: jrsmrc, name: '扫码人数'}
+
+                      ]
+                  }
+              ]
+      })
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/dashboard/PieChart.vue

@@ -21,6 +21,18 @@ export default {
     height: {
       type: String,
       default: '300px'
+    },
+    chartData: {
+      type: Array,
+      required: true
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
     }
   },
   data() {
@@ -42,38 +54,91 @@ export default {
   },
   methods: {
     initChart() {
+      this.chart = echarts.init(this.$el, 'macarons');
       this.chart = echarts.init(this.$el, 'macarons')
-
+      this.setOptions(this.chartData)
+    },
+    setOptions(data) {
       this.chart.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          left: 'center',
-          bottom: '10',
-          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
-        },
-        series: [
-          {
-            name: 'WEEKLY WRITE ARTICLES',
-            type: 'pie',
-            roseType: 'radius',
-            radius: [15, 95],
-            center: ['50%', '38%'],
-            data: [
-              { value: 320, name: 'Industries' },
-              { value: 240, name: 'Technology' },
-              { value: 149, name: 'Forex' },
-              { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
-            ],
-            animationEasing: 'cubicInOut',
-            animationDuration: 2600
-          }
-        ]
+        // tooltip: {
+        //   trigger: 'item',
+        //   formatter: '{a} <br/>{b} : {c} ({d}%)'
+        // },
+        // legend: {
+        //   left: 'center',
+        //   bottom: '10',
+        //   data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+        // },
+        // series: [
+        //   {
+        //     name: 'WEEKLY WRITE ARTICLES',
+        //     type: 'pie',
+        //     roseType: 'radius',
+        //     radius: ["40", "70%"],
+        //     avoidLabelOverlap: false,
+        //     center: ['50%', '38%'],
+        //     data: [
+        //       { value: 320, name: 'Industries' },
+        //       { value: 240, name: 'Technology' },
+        //       { value: 149, name: 'Forex' },
+        //       { value: 100, name: 'Gold' },
+        //       { value: 59, name: 'Forecasts' }
+        //     ],
+        //     // animationEasing: 'cubicInOut',
+        //     animationDuration: 2600
+        //   }
+        // ]
+
+         tooltip: {
+            trigger: 'item'
+          },
+          color:['#65C6F3', '#FEC46C','#A195FB','#F98463','#88A9F3'],
+          legend: {
+            bottom: 10,
+            left: 'center',
+
+          },
+          series: [
+            {
+              name: 'Access From',
+              type: 'pie',
+              radius: ['40%', '70%'],
+              avoidLabelOverlap: false,
+               center: ['50%', '38%'],
+              itemStyle: {
+                  borderRadius: 10,
+                  borderColor: '#fff',
+                  borderWidth: 2
+
+              },
+              label: {
+                show: false,
+                position: 'center'
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: '18',
+                  fontWeight: '400',
+                  color:"#333"
+                }
+              },
+              labelLine: {
+                show: true
+              },
+              // data:data,
+              data: [
+                { value: 6, name: '五保户' },
+                { value: 3, name: '低保户' },
+                { value: 5, name: '贫困户' },
+                { value: 2, name: '党员' },
+                { value: 1, name: '退伍军人' }
+              ]
+            }
+          ]
       })
     }
+
   }
 }
 </script>

ruoyi-ui/src/views/dashboard/RaddarChart.vue

@@ -23,6 +23,18 @@ export default {
     height: {
       type: String,
       default: '300px'
+    },
+    chartData: {
+      type: Object,
+      required: true
+    }
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
     }
   },
   data() {
@@ -43,74 +55,234 @@ export default {
     this.chart = null
   },
   methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
+    listy(){
 
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        radar: {
-          radius: '66%',
-          center: ['50%', '42%'],
-          splitNumber: 8,
-          splitArea: {
-            areaStyle: {
-              color: 'rgba(127,95,132,.3)',
-              opacity: 1,
-              shadowBlur: 45,
-              shadowColor: 'rgba(0,0,0,.5)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 15
-            }
-          },
-          indicator: [
-            { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
-            { name: 'Development', max: 20000 },
-            { name: 'Marketing', max: 20000 }
-          ]
-        },
-        legend: {
-          left: 'center',
-          bottom: '10',
-          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
-        },
-        series: [{
-          type: 'radar',
-          symbolSize: 0,
-          areaStyle: {
-            normal: {
-              shadowBlur: 13,
-              shadowColor: 'rgba(0,0,0,.2)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 10,
-              opacity: 1
+    },
+      initChart() {
+        this.chart = echarts.init(this.$el, 'macarons');
+        this.setOptions(this.chartData)
+      },
+      setOptions({ x,y } = {}) {
+        console.log(x,y,98)
+        const dats = y
+        this.chart.setOption({
+          color: ['#4163d1', '#6be442', '#fbbc29', '#e32b3b','#1898d3'],
+            title: {
+              text: ''
+            },
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: { // 坐标轴指示器，坐标轴触发有效
+              type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
             }
           },
-          data: [
-            {
-              value: [5000, 7000, 12000, 11000, 15000, 14000],
-              name: 'Allocated Budget'
+          radar: {
+            name:{
+               formatter:'{value}',
+                              // 字体样式
+                // 字体样式
+                textStyle:{
+                    fontSize:12,
+                    color:'#333'
+                }
             },
-            {
-              value: [4000, 9000, 15000, 15000, 13000, 11000],
-              name: 'Expected Spending'
+            radius: "66%",
+            //图外名称
+
+            center: ['50%', '42%'],
+            splitNumber: 4,
+            shape: 'circle',
+            splitArea: {
+              // areaStyle: {
+              //   color: 'rgba(127,95,132,.3)',
+              //   opacity: 1,
+              //   shadowBlur: 45,
+              //   shadowColor: 'rgba(0,0,0,.5)',
+              //   shadowOffsetX: 0,
+              //   shadowOffsetY: 15
+              // }
+              areaStyle: {
+                        color: ['#94aadc', '#a9b9df', '#d5d9e2', '#eaecf0'],
+                        shadowColor: 'rgba(0, 0, 0, 0)',
+                        shadowBlur: 45
+                      },
+
+
             },
-            {
-              value: [5500, 11000, 12000, 15000, 12000, 12000],
-              name: 'Actual Spending'
-            }
-          ],
-          animationDuration: animationDuration
-        }]
-      })
-    }
+            axisLine: {
+              show: true,
+                  lineStyle: {
+                    color: '#fff'
+                  }
+                },
+            indicator: [
+              { name: '总人数', max: 2500 },
+              { name: "绿码人数", max: 2500 },
+              { name: '红码人数', max: 2500 },
+              { name: '灰码人数', max: 2500 },
+              { name: '未申请', max: 2500 }
+              // { name: 'Marketing', max: 20000 }
+            ]
+          },
+          legend: {
+            left: 'center',
+            bottom: '10',
+            // data: ['周一', '周二', '周三','周四','周五'],
+
+          },
+          series: [{
+            type: 'radar',
+            symbolSize: 3,
+
+            data: [
+              {
+                value: y[0].value,
+                name: '周一',
+              },
+              {
+                value: y[1].value,
+                name: '周二',
+              },
+              {
+                value: y[2].value,
+                name: '周三',
+              },
+              {
+                value: y[3].value,
+                name: '周四',
+              },
+              {
+                value: [960, 120, 186, 189, 852, 357],
+                name: '周五',
+              }
+            ],
+            // data:dats,
+            animationDuration: animationDuration
+          }]
+        })
+      }
+      // this.chart.setOption({
+      //   color: ['#67F9D8', '#FFE434', '#56A3F1', '#FF917C'],
+      //     title: {
+      //       text: 'Customized Radar Chart'
+      //     },
+      //     legend: {},
+      //     radar: [
+      //       {
+      //         indicator: [
+      //           { text: 'Indicator1' },
+      //           { text: 'Indicator2' },
+      //           { text: 'Indicator3' },
+      //           { text: 'Indicator4' },
+      //           { text: 'Indicator5' }
+      //         ],
+      //         center: ['50%', '50%'],
+      //         radius: 120,
+      //         startAngle: 90,
+      //         splitNumber: 4,
+      //         shape: 'circle',
+      //         axisName: {
+      //           formatter: '【{value}】',
+      //           color: '#428BD4'
+      //         },
+      //         splitArea: {
+      //           areaStyle: {
+      //             color: ['#77EADF', '#26C3BE', '#d5d9b2', '#eaecf0'],
+      //             shadowColor: 'rgba(0, 0, 0, 0.2)',
+      //             shadowBlur: 10
+      //           }
+      //         },
+      //         axisLine: {
+      //           lineStyle: {
+      //             color: 'rgba(211, 253, 250, 0.8)'
+      //           }
+      //         },
+      //         splitLine: {
+      //           lineStyle: {
+      //             color: 'rgba(211, 253, 250, 0.8)'
+      //           }
+      //         }
+      //       },
+      //       // {
+      //       //   indicator: [
+      //       //     { text: 'Indicator1', max: 150 },
+      //       //     { text: 'Indicator2', max: 150 },
+      //       //     { text: 'Indicator3', max: 150 },
+      //       //     { text: 'Indicator4', max: 120 },
+      //       //     { text: 'Indicator5', max: 108 },
+      //       //     { text: 'Indicator6', max: 72 }
+      //       //   ],
+      //       //   center: ['75%', '50%'],
+      //       //   radius: 120,
+      //       //   axisName: {
+      //       //     color: '#fff',
+      //       //     backgroundColor: '#666',
+      //       //     borderRadius: 3,
+      //       //     padding: [3, 5]
+      //       //   }
+      //       // }
+      //     ],
+      //     series: [
+      //       {
+      //         type: 'radar',
+      //         emphasis: {
+      //           lineStyle: {
+      //             width: 4
+      //           }
+      //         },
+      //         data: [
+      //           {
+      //             value: [100, 8, 0.4, -80, 2000],
+      //             name: 'Data A'
+      //           },
+      //           {
+      //             value: [60, 5, 0.3, -100, 1500],
+      //             name: 'Data B',
+      //             areaStyle: {
+      //               color: 'rgba(255, 228, 52, 0.6)'
+      //             }
+      //           }
+      //         ]
+      //       },
+      //       // {
+      //       //   type: 'radar',
+      //       //   radarIndex: 1,
+      //       //   data: [
+      //       //     {
+      //       //       value: [120, 118, 130, 100, 99, 70],
+      //       //       name: 'Data C',
+      //       //       symbol: 'rect',
+      //       //       symbolSize: 12,
+      //       //       lineStyle: {
+      //       //         type: 'dashed'
+      //       //       },
+      //       //       label: {
+      //       //         show: true,
+      //       //         formatter: function (params) {
+      //       //           return params.value;
+      //       //         }
+      //       //       }
+      //       //     },
+      //       //     {
+      //       //       value: [100, 93, 50, 90, 70, 60],
+      //       //       name: 'Data D',
+      //       //       areaStyle: {
+      //       //         color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
+      //       //           {
+      //       //             color: 'rgba(255, 145, 124, 0.1)',
+      //       //             offset: 0
+      //       //           },
+      //       //           {
+      //       //             color: 'rgba(255, 145, 124, 0.9)',
+      //       //             offset: 1
+      //       //           }
+      //       //         ])
+      //       //       }
+      //       //     }
+      //       //   ]
+      //       // }
+      //     ]
+      // })
   }
 }
 </script>

ruoyi-ui/src/views/dashboard/RatioIndex.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

ruoyi-ui/src/views/index.vue

@@ -1,912 +1,610 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          领取阿里云通用云产品1888优惠券
-          <br />
-          <el-link
-            href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
-            type="primary"
-            target="_blank"
-            >https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
-          >
-          <br />
-          领取腾讯云通用云产品2860优惠券
-          <br />
-          <el-link
-            href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
-            type="primary"
-            target="_blank"
-            >https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
-          >
-          <br />
-          阿里云服务器折扣区
-          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          >
-          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
-          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
-            >>☛☛点我进入☚☚</el-link
-          ><br />
-          <h4 class="text-danger">
-            云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
-          </h4>
-        </blockquote>
-
-        <hr />
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b> <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-cloudy"
-            plain
-            @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
-            >访问码云</el-button
-          >
-          <el-button
-            size="mini"
-            icon="el-icon-s-home"
-            plain
-            @click="goTarget('http://ruoyi.vip')"
-            >访问主页</el-button
-          >
-        </p>
-      </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
+  <div class="dashboard-editor-container">
+    <!-- <div class="header">
+      <p @click="day(1)" :class="[dayList == 1 ? 'heade_cod' : '']">天</p>
+      <p>{{ '\xa0\xa0' }}|{{ '\xa0\xa0' }}</p>
+      <p @click="day(2)" :class="[dayList == 2 ? 'heade_cod' : '']">周</p>
+      <p>{{ '\xa0\xa0' }}|{{ '\xa0\xa0' }}</p>
+      <p @click="day(3)" :class="[dayList == 3 ? 'heade_cod' : '']">月</p>
+    </div> -->
+    <el-row style=" margin-top: 20px;">
+      <el-col :xs="24" :sm="24">
         <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
+          <div class="njues">
+            <!-- <keep-alive :include="cachedViews">
+                <router-view :key="key" /> -->
+                <div style=" text-align: center; " class="hedse_radt" @click="wbhde">
+                  <div class="hedse_radtone">
+                    <p>五保户</p>
+                    <p>6<span>人</span></p>
+                  </div>
+                </div>
+              <!-- </keep-alive> -->
+            <div style=" text-align: center; " class="hedse_radts hedse_radt" @click="dbhde">
+              <div class="hedse_radtone">
+                <p>低保户</p>
+                <p>3<span>人</span></p>
+              </div>
+            </div>
+            <div style=" text-align: center; " class="hedse_radtss hedse_radt" @click="pkde">
+              <div class="hedse_radtone">
+                <p>贫困户</p>
+                <p>5<span>人</span></p>
+              </div>
+            </div>
+            <div style=" text-align: center; " class="hedse_radt hedse_radtsss" @click="dyde">
+              <div class="hedse_radtone">
+                <p>党员</p>
+                <p>2<span>人</span></p>
+              </div>
+            </div>
+            <div style=" text-align: center; " class="hedse_radt hedse_radtssss" @click="twjrde">
+              <div class="hedse_radtone">
+                <p>退伍军人</p>
+                <p>1<span>人</span></p>
+              </div>
+            </div>
+
+          </div>
         </el-row>
       </el-col>
     </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i> 官网：<el-link
-                href="http://www.ruoyi.vip"
-                target="_blank"
-                >http://www.ruoyi.vip</el-link
-              >
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i> QQ群：<s>满937441</s> <s>满887144332</s>
-              <s>满180251782</s> <s>满104180207</s> <s>满186866453</s> <s>满201396349</s>
-              <s>满101456076</s> <s>满101539465</s> <s>满264312783</s> <s>满167385320</s> 
-              <s>满139821253</s> <a href="https://jq.qq.com/?_wv=1027&k=96Dkdq0k" target="_blank">
-                104748341</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i> 微信：<a
-                href="javascript:;"
-                >/ *若依</a
-              >
-            </p>
-            <p>
-              <i class="el-icon-money"></i> 支付宝：<a
-                href="javascript:;"
-                class="支付宝信息"
-                >/ *若依</a
-              >
-            </p>
-          </div>
-        </el-card>
+   <el-row :gutter="30"  style="margin-left: 0; margin-right: 0;">
+     <el-col :xs="24" :sm="14" style="padding-left: 0;">
+       <div class="chart-wrapper dp_zhud" style="  padding: 30px; ">
+         <p class="dp_zhudtitle">人员类型统计柱状图 </p>
+         <bar-chart :chart-data="panelChartDatazhuzh" />
+       </div>
+     </el-col>
+     <el-col   :xs="24" :sm="10" style="padding-right: 0;" >
+       <div class="chart-wrapper dp_zhud"  style=" padding: 30px; ">
+          <p class="dp_zhudtitle">人员类型比率 </p>
+         <pie-chart :chart-data="panelChartDatayuanh" />
+       </div>
+     </el-col>
+   </el-row>
+   <!-- <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+     <line-chart :chart-data="lineChartData"  v-if="nhye"/></el-row> -->
+
+    <!-- 列表 -->
+
+<!-- v-if="panelChartDatas.dqdw == '潜山市'" -->
+    <div class="tabsty" >
+      <div class="tabbuut">
+        <p>各乡镇人口信息表</p>
+        <!-- <el-button  size="small" @click="handleExport" type="primary">导出</el-button> -->
+      </div>
+      <!-- panelChartDatas.townDatas -->
+      <!-- tableData -->
+      <el-table v-loading="loading" :data="tableData"
+        style="width: 100%;"  stripe  height="280" :show-overflow-tooltip="true">
+        <el-table-column prop="zhen" label="乡镇"  align="center"/>
+        <el-table-column prop="cun" label="村"  align="center" width="180"/>
+        <!-- <el-table-column prop="zu" label="组"  align="center"/> -->
+        <el-table-column prop="czzrs" label="五保户人口"  align="center"/>
+        <el-table-column prop="hjzrs" label="低保户人口"  align="center"/>
+        <el-table-column prop="hjxz" label="贫困户人口"  align="center"/>
+        <el-table-column prop="czxz" label="党员人口"  align="center"/>
+        <el-table-column prop="hjjs" label="退伍军人人口"  align="center"/>
+
+
+      </el-table>
+<!--
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
+    </div>
+
+    <!-- <panel-group @handleSetLineChartData="handleSetLineChartData" /> -->
+
+
+
+
+
+    <!-- <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper"><raddar-chart :chart-data="panelChartDataleid"/></div>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.8.3 - 2022-06-27">
-              <ol>
-                <li>新增缓存列表菜单功能</li>
-                <li>代码生成树表新增(展开/折叠)</li>
-                <li>Excel注解支持color字体颜色</li>
-                <li>新增Anonymous匿名访问不鉴权注解</li>
-                <li>用户头像上传限制只能为图片格式</li>
-                <li>接口使用泛型使其看到响应属性字段</li>
-                <li>检查定时任务bean所在包名是否为白名单配置</li>
-                <li>添加页签openPage支持传递参数</li>
-                <li>用户缓存信息添加部门ancestors祖级列表</li>
-                <li>升级element-ui到最新版本2.15.8</li>
-                <li>升级oshi到最新版本6.1.6</li>
-                <li>升级druid到最新版本1.2.11</li>
-                <li>升级fastjson到最新版2.0.8</li>
-                <li>升级spring-boot到最新版本2.5.14</li>
-                <li>降级jsencrypt版本兼容IE浏览器</li>
-                <li>删除多余的salt字段</li>
-                <li>新增获取不带后缀文件名称方法</li>
-                <li>新增获取配置文件中的属性值方法</li>
-                <li>新增内容编码/解码方便插件集成使用</li>
-                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-                <li>优化设置分页参数默认值</li>
-                <li>优化对空字符串参数处理的过滤</li>
-                <li>优化显示顺序orderNum类型为整型</li>
-                <li>优化表单构建按钮不显示正则校验</li>
-                <li>优化字典数据回显样式下拉框显示值</li>
-                <li>优化R响应成功状态码与全局保持一致</li>
-                <li>优化druid开启wall过滤器出现的异常问题</li>
-                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
-                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
-                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
-                <li>修复字典数据显示不全问题</li>
-                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>
-                  修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
-                </li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper"><pie-chart :chart-data="panelChartDatayuanh" /></div>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img
-              src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
-              alt="donate"
-              width="100%"
-            />
-            <span style="display: inline-block; height: 30px; line-height: 30px"
-              >你可以请作者喝杯咖啡表示鼓励</span
-            >
-          </div>
-        </el-card>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper" ><bar-chart :chart-data="panelChartDatazhuzh" /></div>
       </el-col>
-    </el-row>
+    </el-row> -->
   </div>
 </template>
 
 <script>
+import {treeselect,listDevice, exportPost,listzhex,listleida,listdbyh, listzhuzh,listTsde} from "@/api/index";
+import PanelGroup from './dashboard/PanelGroup';
+import PanelGroups from './dashboard/PanelGroups';
+import PanelGroupone from './dashboard/PanelGroupone';
+import PanelGrouptwo from './dashboard/PanelGrouptwo';
+import PanelGroupther from './dashboard/PanelGroupther';
+import PanelGroupfour from './dashboard/PanelGroupfour';
+import LineChart from './dashboard/LineChart';
+import RaddarChart from './dashboard/RaddarChart';
+import PieChart from './dashboard/PieChart';
+import BarChart from './dashboard/BarChart';
+const lineChartData = {
+  newVisitis: {
+    expectedData: [80, 120, 111, 104, 105, 100, 105],
+    actualData: [120, 140, 130, 110, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+};
+
 export default {
-  name: "Index",
+  name: 'Index',
+  components: {
+    PanelGroup,
+    PanelGroups,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart,
+    PanelGroupone,
+    PanelGrouptwo,
+    PanelGroupther,
+    PanelGroupfour
+  },
   data() {
     return {
-      // 版本号
-      version: "3.8.3",
+      lineChartData: {},
+      dayList: 1, //判断天周月
+      taye: 'newVisitis', //根据点击天周月变换，折线图数据变换
+      panelChartData: {},
+      panelChartDatas:{},
+      panelChartDataleid:{},
+      panelChartDatayuanh:[],
+      tableData: [
+         {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 388, hjjs: 0, czbfb: "4.02%", cun: 14,zhen: "槎水镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 203, hjjs: 0, czbfb: "2.66%", cun: 6,zhen: "痘姆乡"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 355, hjjs: 0, czbfb: "2.68%", cun: 14,zhen: "官庄镇"},
+        {hjzrs: 3, hjxz: 5, hjbfb: "0.00%", czxz: 2, czzrs: 6, zu: 175, hjjs: 1, czbfb: "2.05%", cun: 6,zhen: "黄柏镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 171, hjjs: 0, czbfb: "2.16%", cun: 7,zhen: "黄泥镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 476, hjjs: 0, czbfb: "6.77%", cun: 14,zhen: "黄铺镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 226, hjjs: 0, czbfb: "2.31%", cun: 9,zhen: "龙潭乡"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 497, hjjs: 0, czbfb: "22.50%", cun: 19,zhen: "梅城镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 368, hjjs: 0, czbfb: "4.82%", cun: 14,zhen: "水吼镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 266, hjjs: 0, czbfb: "2.44%", cun: 11,zhen: "塔畈乡"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 115, hjjs: 0, czbfb: "2.47%", cun: 6,zhen: "天柱山镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 415, hjjs: 0, czbfb: "6.86%", cun: 17,zhen: "王河镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 119, hjjs: 0, czbfb: "1.90%", cun: 6,zhen: "五庙乡"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 217, hjjs: 0, czbfb: "2.32%", cun: 6,zhen: "油坝乡"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 522, hjjs: 0, czbfb: "6.19%", cun: 14,zhen: "余井镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 639, hjjs: 0, czbfb: "10.34%", cun: 18,zhen: "源潭镇"},
+        {hjzrs: 0, hjxz: 0, hjbfb: "0.00%", czxz: 0, czzrs: 0, zu: 102, hjjs: 0, czbfb: "2.72%", cun: 3,zhen: "开发区"}
+      ], //表格数据
+      // 总条数
+      total: 10,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      // 遮罩层
+      loading: false,
+      deviceIpOptions:{},
+      panelChartDatazhuzh:{},
+      nhye:false
     };
   },
-  methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
+  computed: {
+    tagsView: {
+      get() {
+        return this.$store.state.settings.tagsView
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'tagsView',
+          value: val
+        })
+      }
     },
+
   },
+  mounted(){
+   // this.yuanhaun(1)
+   // this.tableList()
+
+
+   // 折线
+   // this.zhexianList()
+
+   // 雷达
+   // this.leidaList()
+   // 底部圆环
+   // this.dbyhList()
+   // 柱状图
+   // this.zhuzhList()
+
+   //户籍列表
+   // this.lisdtwe()
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type];
+    },
+    // 月 周 天 点击
+    day(index) {
+      this.dayList = index;
+      this.yuanhaun(index)
+      if (index == 1) {
+        // 天
+        this.taye = 'newVisitis';
+        this.lineChartData = lineChartData[this.taye];
+      } else if (index == 2) {
+        // 周
+        this.taye = 'messages';
+        this.lineChartData = lineChartData[this.taye];
+      } else {
+        // 月
+        this.taye = 'purchases';
+        this.lineChartData = lineChartData[this.taye];
+      }
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      // this.ids = selection.map(item => item.id)
+      // this.single = selection.length !== 1
+      // this.multiple = !selection.length
+    },
+    // 表格点击事件
+    tabclick(val){
+      console.log(val)
+      this.$router.push({
+        path:'./school/temperatures',
+        query:{
+          val:val,
+        }
+      })
+      },
+    // 圆环数据
+    yuanhaun(val){
+      treeselect(val).then(response => {
+        this.deviceIpOptions = response.data;
+        this.panelChartDatas = this.deviceIpOptions
+      });
+    },
+    // 列表数据
+   tableList(){
+     listDevice().then(response => {
+       this.tableData = response.data;
+       // this.panelChartDatas = this.deviceIpOptions
+
+     });
+   },
+   // 户籍列表
+   lisdtwe(){
+      listTsde().then(response => {
+        this.deviceIpOptions = response.data;
+        this.panelChartDatas = this.deviceIpOptions
+      });
+   },
+   // 折线图数据
+   zhexianList(){
+     listzhex().then(response => {
+       this.lineChartData = response.data;
+       this.nhye = true
+       // this.panelChartDatas = this.deviceIpOptions
+     });
+   },
+   // 雷达图
+   leidaList(){
+     listleida().then(response => {
+       this.panelChartDataleid = response.data;
+       // this.panelChartDatas = this.deviceIpOptions
+     });
+   },
+   // 底部圆环数据
+   dbyhList(){
+     listdbyh().then(response => {
+       this.panelChartDatayuanh = response.data;
+       // this.panelChartDatas = this.deviceIpOptions
+     });
+   },
+   // 柱状图数据
+   zhuzhList(){
+     listzhuzh().then(response => {
+       this.panelChartDatazhuzh = response.data;
+       // this.panelChartDatas = this.deviceIpOptions
+     });
+   },
+
+   /** 导出按钮操作 */
+   handleExport() {
+     const queryParams = this.queryParams;
+     this.$confirm('是否确认导出?', "警告", {
+         confirmButtonText: "确定",
+         cancelButtonText: "取消",
+         type: "warning"
+       }).then(function() {
+         return exportPost();
+       }).then(response => {
+         this.download(response.msg);
+       })
+   },
+   // 五保户点击
+   wbhde(){
+     this.$router.push({path: "/business/contraindication"});
+     // console.log(this.$store.state.tagsView.visitedViews[0])
+     // console.log(  this.$store.state.settings.tagsView,4  )
+   },
+   dbhde(){
+     this.$router.push({path: "/business/vaccinationSite"});
+   },
+   pkde(){
+     this.$router.push({path: "/business/vaccineName"});
+   },
+   dyde(){
+     this.$router.push({path: "/business/keyIndustry"});
+   },
+   twjrde(){
+     this.$router.push({path: "/business/ucleic"});
+   },
+
+  }
 };
 </script>
 
-<style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
+<style lang="scss">
+.tabsty {
+  .el-table .el-table__header-wrapper th {
+    background-color: #EEF5F8;
+    color: #343434;
+    border:0 !important;
   }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
+  .el-table--striped .el-table__body tr.el-table__row--striped td {
+    background-color: #f9f9f9;
   }
-  .col-item {
-    margin-bottom: 20px;
+  .el-table--group,
+  .el-table--border {
+    // border-color: #0CA0FF;
+    border: 1px solid #0CA0FF;
   }
+}
+</style>
 
-  ul {
-    padding: 0;
-    margin: 0;
-  }
+<style lang="scss" scoped>
 
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
+.header {
+  display: flex;
+  text-align: left;
+  justify-content: flex-end;
+  margin-bottom: 12px;
+  p {
+    font-size: 18px;
+    font-family: PingFang SC;
+    font-weight: 700;
+    color: #666666;
+    cursor: pointer;
+  }
+  p:nth-child(1)::before {
+    width: 1px;
+    background-color: #666;
+  }
+  .heade_cod {
+    color: #00a8ec;
+  }
+  .el-table--border {
+    border: 1px solid #0ca0ff !important;
+  }
+}
+p {
+  margin: 0;
+}
+.njues{
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+}
 
-  ul {
-    list-style-type: none;
+.hedse_radt {
+  height: 130px;
+  padding-top: 4px;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-content: center;
+  width: 19%;
+  padding-left: 26px;
+  padding-bottom: 36px;
+  background:url("../assets/images/opic_rylb_wb.png") no-repeat ;
+  background-size: 100%, 100%;
+  .p {
+    position: absolute;
+    right: -28px;
+    width: 1px;
+    height: 70px;
+    background-color: #c7cbd7;
+    top: 22%;
   }
+  .hedse_radtone {
+    // margin-bottom: 30px;
+    // padding:  0 26px;
+    // text-align: left;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    p:nth-child(1) {
+      font-size: 15px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #343434;
+      text-align: left;
+      color: #fff;
+    }
+    p:nth-child(2) {
+
+     font-size: 28px;
+     font-family: PingFang SC;
+     font-weight: bold;
+     color: #fff;
+      text-align: right;
+      padding-right: 13px;
+      // width: 100%;
+      span{
+        font-size: 20px !important;
+        font-weight: 400;
+      }
+    }
 
-  h4 {
-    margin-top: 0px;
   }
+  .hedse_radttwo {
+    display: flex;
+    // padding: 0 26px;
+    // justify-content: space-between;
+    justify-content: space-around;
+    flex: 1;
+    div{
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+    }
+    p:nth-child(1) {
+      font-size: 15px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #343434;
+    }
+    p:nth-child(2) {
+      font-size: 48px;
+      font-family: PingFang SC;
+      font-weight: bold;
+      color: #fff;
+    }
+  }
+}
+.hedse_radts{
+    background:url("../assets/images/opic_rylb_db.png") no-repeat ;
+    background-size: 100%, 100%;
+  }
+  .hedse_radtss{
+    background:url("../assets/images/opic_rylb_pk.png") no-repeat ;
+    background-size: 100%, 100%;
+  }
+  .hedse_radtsss{
+    background:url("../assets/images/opic_rylb_dy.png") no-repeat ;
+    background-size: 100%, 100%;
+  }
+  .hedse_radtssss{
+    background:url("../assets/images/opic_rylb_tw.png") no-repeat ;
+    background-size: 100%, 100%;
+  }
+.nav_raet {
+  // padding-top: 24px;
+  margin-left: 60px;
+  p:nth-child(1) {
+    font-size: 15px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #343434;
+  }
+  p:nth-child(2) {
+    font-size: 20px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #50bd04;
+  }
+}
+.dashboard-editor-container {
+  padding: 32px;
+  padding-top: 12px;
+  background-color: rgb(240, 242, 245);
+  position: relative;
 
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
   }
+}
 
-  p {
-    margin-top: 10px;
+@media (max-width: 1024px) {
+  .chart-wrapper {
+    padding: 8px;
+  }
+}
 
-    b {
-      font-weight: 700;
-    }
+// 表格央视
+.tabsty {
+  background-color: #fff;
+  width: 100%;
+  margin-top: 16px;
+  padding: 0 30px;
+  padding-top: 23px;
+  padding-bottom: 40px;
+  margin-bottom: 36px;
+}
+.tabbuut {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 15px;
+  p:nth-child(1) {
+    font-size: 16px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #343434;
   }
+}
+.nav_raetone{
+  // flex: 1;
+  display: flex ;
+  // flex-direction: column;
+  justify-content: space-between;
+  align-content: center;
+  // height: 100%;
+  text-align: right;
+  // padding-top: 18px;
+  margin-right: 30px;
+  box-sizing:border-box;
+  -moz-box-sizing:border-box; /* Firefox */
+  -webkit-box-sizing:border-box;
+  padding-left: 20px;
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
+  p:nth-child(1) {
+    font-size: 15px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #343434;
+  }
+  p:nth-child(2) {
+    font-size: 20px;
+    font-family: PingFang SC;
+    font-weight: bold;
+    color: #50bd04;
   }
 }
-</style>
 
+.p {
+      position: absolute;
+      right: -18px;
+      width: 1px;
+      height: 70px;
+      background-color: #c7cbd7;
+      top: 22%;
+    }
+
+    .dp_zhud{
+
+      .dp_zhudtitle{
+        margin-bottom: 10px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #343434;
+      }
+    }
+</style>

ruoyi-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">重点人群核酸比对检测系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

ruoyi-ui/src/views/register.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">重点人群核酸比对检测系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />

ruoyi-ui/vue.config.js

@@ -1,5 +1,6 @@
 'use strict'
 const path = require('path')
+const defaultSettings = require('./src/settings.js')
 
 function resolve(dir) {
   return path.join(__dirname, dir)
@@ -7,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '重点人群核酸比对检测系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -35,7 +36,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: defaultSettings.urls,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''