From 8de6c6900cc15d091b5a2b39a63ecb3f58fd729a Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Sat, 14 Nov 2020 22:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=92=8C=E6=96=B0=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 129 +--------
 ruoyi-ui/package.json                         |   2 +-
 ruoyi-ui/ruoyi-ui.iml                         |   6 +-
 .../src/components/HeaderSearch/index.vue     |   2 +-
 .../layout/components/TagsView/ScrollPane.vue |   2 +-
 .../src/views/benyi/assessment/history.vue    |  25 ++
 .../src/views/benyi/calendarshow/index123.vue |   2 +-
 .../src/views/dashboard/RadarChart_jk.vue     | 274 ++++++++++++++++++
 .../src/views/dashboard/RadarChart_kx.vue     | 274 ++++++++++++++++++
 .../src/views/dashboard/RadarChart_sh.vue     | 274 ++++++++++++++++++
 .../src/views/dashboard/RadarChart_ys.vue     | 274 ++++++++++++++++++
 .../src/views/dashboard/RadarChart_yy.vue     | 274 ++++++++++++++++++
 ruoyi-ui/vue.config.js                        |   2 +-
 ruoyi/src/main/resources/application.yml      |   2 +-
 ruoyi/src/main/resources/logback.xml          |   2 +-
 15 files changed, 1415 insertions(+), 129 deletions(-)
 create mode 100644 ruoyi-ui/src/views/dashboard/RadarChart_jk.vue
 create mode 100644 ruoyi-ui/src/views/dashboard/RadarChart_kx.vue
 create mode 100644 ruoyi-ui/src/views/dashboard/RadarChart_sh.vue
 create mode 100644 ruoyi-ui/src/views/dashboard/RadarChart_ys.vue
 create mode 100644 ruoyi-ui/src/views/dashboard/RadarChart_yy.vue

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d7d1ce10d..bb2310ead 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/public/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/components/BenYi/Doc/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/components/BenYi/Doc/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ruoyi-ui/src/layout/components/Navbar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-ui/src/layout/components/Navbar.vue" afterDir="false" />
-    </list>
-    <ignored path="$PROJECT_DIR$/ruoyi-ui/node_modules/" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <list default="true" id="67083fd5-67d0-4b58-9beb-0b0decab008a" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -22,73 +16,15 @@
     <option name="width" value="1260" />
     <option name="height" value="710" />
   </component>
+  <component name="ProjectId" id="1kGjsBAP1kBtqebJLRHtQsEJqkC" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="PackagesPane" />
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="benyi" type="b2602c69:ProjectViewProjectNode" />
-              <item name="benyi" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="ruoyi" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-    </panes>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
   </component>
   <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1592562925554" />
@@ -98,18 +34,6 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -124,47 +48,12 @@
       <workItem from="1592562464381" duration="132000" />
       <workItem from="1592562689854" duration="303000" />
       <workItem from="1593334102655" duration="17000" />
+      <workItem from="1605334027471" duration="69000" />
     </task>
     <servers />
   </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="511000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-7" y="-7" width="1294" height="694" extended-state="6" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26213592" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Image Layers" order="2" />
-      <window_info id="Designer" order="3" />
-      <window_info id="UI Designer" order="4" />
-      <window_info id="Capture Tool" order="5" />
-      <window_info id="Favorites" order="6" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="8" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Terminal" order="10" />
-      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Palette" order="3" />
-      <window_info anchor="right" id="Theme Preview" order="4" />
-      <window_info anchor="right" id="Maven" order="5" />
-      <window_info anchor="right" id="Capture Analysis" order="6" />
-      <window_info anchor="right" id="Palette&#9;" order="7" />
-      <window_info anchor="right" id="Database" order="8" />
-    </layout>
-  </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="2" />
   </component>
   <component name="masterDetails">
     <states>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index da7474e99..f5941faef 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -58,6 +58,7 @@
     "js-beautify": "^1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",
+    "node-sass": "^4.14.1",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
@@ -100,7 +101,6 @@
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "^4.9.0",
     "plop": "2.3.0",
     "runjs": "^4.3.2",
     "sass-loader": "^7.1.0",
diff --git a/ruoyi-ui/ruoyi-ui.iml b/ruoyi-ui/ruoyi-ui.iml
index 8021953ed..c90834f2d 100644
--- a/ruoyi-ui/ruoyi-ui.iml
+++ b/ruoyi-ui/ruoyi-ui.iml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
+<module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index 8974171cb..44168ec4f 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -159,7 +159,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;
diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
index 8be9c0170..fb3d26126 100644
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -73,7 +73,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep {
     .el-scrollbar__bar {
       bottom: 0px;
     }
diff --git a/ruoyi-ui/src/views/benyi/assessment/history.vue b/ruoyi-ui/src/views/benyi/assessment/history.vue
index d3039c4ac..fb7593765 100644
--- a/ruoyi-ui/src/views/benyi/assessment/history.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/history.vue
@@ -15,6 +15,21 @@
         <div>
           <radar-chart :psMsg="item.dictValue" />
         </div>
+        <div>
+          <radar-chart_jk :psMsg="item.dictValue" />
+        </div>
+        <div>
+          <radar-chart_yy :psMsg="item.dictValue" />
+        </div>
+        <div>
+          <radar-chart_sh :psMsg="item.dictValue" />
+        </div>
+        <div>
+          <radar-chart_kx :psMsg="item.dictValue" />
+        </div>
+        <div>
+          <radar-chart_ys :psMsg="item.dictValue" />
+        </div>
         <div class="block">
           <h2 class="block-item-title flex align-center">评估建议</h2>
           <!-- <ul class="block-content">
@@ -69,11 +84,21 @@ import {
 import { getChildByAssessment } from "@/api/benyi/child";
 import { getAssessmentDictData } from "@/api/benyi/assessmentchild";
 import RadarChart from "@/views/dashboard/RadarChart";
+import RadarChart_jk from "@/views/dashboard/RadarChart_jk";
+import RadarChart_yy from "@/views/dashboard/RadarChart_yy";
+import RadarChart_sh from "@/views/dashboard/RadarChart_sh";
+import RadarChart_kx from "@/views/dashboard/RadarChart_kx";
+import RadarChart_ys from "@/views/dashboard/RadarChart_ys";
 
 export default {
   name: "Assessmentstudent",
   components: {
     RadarChart,
+    RadarChart_jk,
+    RadarChart_yy,
+    RadarChart_sh,
+    RadarChart_kx,
+    RadarChart_ys,
   },
   data() {
     return {
diff --git a/ruoyi-ui/src/views/benyi/calendarshow/index123.vue b/ruoyi-ui/src/views/benyi/calendarshow/index123.vue
index b50213d4f..240380e74 100644
--- a/ruoyi-ui/src/views/benyi/calendarshow/index123.vue
+++ b/ruoyi-ui/src/views/benyi/calendarshow/index123.vue
@@ -211,7 +211,7 @@ $color: #45b984;
   .full-calendar {
     padding: 20px;
     height: calc(100% - 30px);
-    /deep/ {
+    ::v-deep {
       .fc-unthemed thead,
       .fc-unthemed .fc-content,
       .fc-unthemed th,
diff --git a/ruoyi-ui/src/views/dashboard/RadarChart_jk.vue b/ruoyi-ui/src/views/dashboard/RadarChart_jk.vue
new file mode 100644
index 000000000..c7f3f8a74
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/RadarChart_jk.vue
@@ -0,0 +1,274 @@
+<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";
+import { getAssessmentStatistics } from "@/api/benyi/assessmentcontent";
+
+const animationDuration = 3000;
+
+export default {
+  values: [],
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    psMsg: {
+      type: String,
+      default: "",
+    }, //接收psMsg值  适用范围
+  },
+  data() {
+    return {
+      chart: null,
+      childId: "",
+    };
+  },
+  mounted() {
+    var childId = this.$route.params && this.$route.params.id;
+    this.childId = childId;
+    // console.log("child-chart:" + childId);
+    // console.log("psMsg:" + this.psMsg);
+    // this.$nextTick(() => {
+    //   this.initChart();
+    // });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    async getData() {
+      await getAssessmentStatistics(this.childId, this.psMsg).then(
+        (response) => {
+          console.log(response);
+          let value = [];
+          let len = response.statistics;
+          for (var j = 0; j < len.length; j++) {
+            console.log(len[j]);
+            if (len[j] == "NaN") {
+              value.push(0);
+            } else {
+              value.push(len[j]);
+            }
+          }
+          this.values = value;
+          //console.log(this.names);
+          //console.log(this.values);
+        }
+      );
+    },
+    async initChart() {
+      await this.getData();
+      this.chart = echarts.init(this.$el, "macarons");
+
+      if (this.psMsg == "3") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["60-72个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [72, 72, 72, 72, 72],
+                  name: "60-72个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "2") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["48-60个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [60, 60, 60, 60, 60],
+                  name: "48-60个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "1") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["36-48个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [48, 48, 48, 48, 48],
+                  name: "36-48个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/RadarChart_kx.vue b/ruoyi-ui/src/views/dashboard/RadarChart_kx.vue
new file mode 100644
index 000000000..c7f3f8a74
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/RadarChart_kx.vue
@@ -0,0 +1,274 @@
+<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";
+import { getAssessmentStatistics } from "@/api/benyi/assessmentcontent";
+
+const animationDuration = 3000;
+
+export default {
+  values: [],
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    psMsg: {
+      type: String,
+      default: "",
+    }, //接收psMsg值  适用范围
+  },
+  data() {
+    return {
+      chart: null,
+      childId: "",
+    };
+  },
+  mounted() {
+    var childId = this.$route.params && this.$route.params.id;
+    this.childId = childId;
+    // console.log("child-chart:" + childId);
+    // console.log("psMsg:" + this.psMsg);
+    // this.$nextTick(() => {
+    //   this.initChart();
+    // });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    async getData() {
+      await getAssessmentStatistics(this.childId, this.psMsg).then(
+        (response) => {
+          console.log(response);
+          let value = [];
+          let len = response.statistics;
+          for (var j = 0; j < len.length; j++) {
+            console.log(len[j]);
+            if (len[j] == "NaN") {
+              value.push(0);
+            } else {
+              value.push(len[j]);
+            }
+          }
+          this.values = value;
+          //console.log(this.names);
+          //console.log(this.values);
+        }
+      );
+    },
+    async initChart() {
+      await this.getData();
+      this.chart = echarts.init(this.$el, "macarons");
+
+      if (this.psMsg == "3") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["60-72个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [72, 72, 72, 72, 72],
+                  name: "60-72个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "2") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["48-60个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [60, 60, 60, 60, 60],
+                  name: "48-60个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "1") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["36-48个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [48, 48, 48, 48, 48],
+                  name: "36-48个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/RadarChart_sh.vue b/ruoyi-ui/src/views/dashboard/RadarChart_sh.vue
new file mode 100644
index 000000000..c7f3f8a74
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/RadarChart_sh.vue
@@ -0,0 +1,274 @@
+<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";
+import { getAssessmentStatistics } from "@/api/benyi/assessmentcontent";
+
+const animationDuration = 3000;
+
+export default {
+  values: [],
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    psMsg: {
+      type: String,
+      default: "",
+    }, //接收psMsg值  适用范围
+  },
+  data() {
+    return {
+      chart: null,
+      childId: "",
+    };
+  },
+  mounted() {
+    var childId = this.$route.params && this.$route.params.id;
+    this.childId = childId;
+    // console.log("child-chart:" + childId);
+    // console.log("psMsg:" + this.psMsg);
+    // this.$nextTick(() => {
+    //   this.initChart();
+    // });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    async getData() {
+      await getAssessmentStatistics(this.childId, this.psMsg).then(
+        (response) => {
+          console.log(response);
+          let value = [];
+          let len = response.statistics;
+          for (var j = 0; j < len.length; j++) {
+            console.log(len[j]);
+            if (len[j] == "NaN") {
+              value.push(0);
+            } else {
+              value.push(len[j]);
+            }
+          }
+          this.values = value;
+          //console.log(this.names);
+          //console.log(this.values);
+        }
+      );
+    },
+    async initChart() {
+      await this.getData();
+      this.chart = echarts.init(this.$el, "macarons");
+
+      if (this.psMsg == "3") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["60-72个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [72, 72, 72, 72, 72],
+                  name: "60-72个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "2") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["48-60个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [60, 60, 60, 60, 60],
+                  name: "48-60个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "1") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["36-48个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [48, 48, 48, 48, 48],
+                  name: "36-48个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/RadarChart_ys.vue b/ruoyi-ui/src/views/dashboard/RadarChart_ys.vue
new file mode 100644
index 000000000..c7f3f8a74
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/RadarChart_ys.vue
@@ -0,0 +1,274 @@
+<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";
+import { getAssessmentStatistics } from "@/api/benyi/assessmentcontent";
+
+const animationDuration = 3000;
+
+export default {
+  values: [],
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    psMsg: {
+      type: String,
+      default: "",
+    }, //接收psMsg值  适用范围
+  },
+  data() {
+    return {
+      chart: null,
+      childId: "",
+    };
+  },
+  mounted() {
+    var childId = this.$route.params && this.$route.params.id;
+    this.childId = childId;
+    // console.log("child-chart:" + childId);
+    // console.log("psMsg:" + this.psMsg);
+    // this.$nextTick(() => {
+    //   this.initChart();
+    // });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    async getData() {
+      await getAssessmentStatistics(this.childId, this.psMsg).then(
+        (response) => {
+          console.log(response);
+          let value = [];
+          let len = response.statistics;
+          for (var j = 0; j < len.length; j++) {
+            console.log(len[j]);
+            if (len[j] == "NaN") {
+              value.push(0);
+            } else {
+              value.push(len[j]);
+            }
+          }
+          this.values = value;
+          //console.log(this.names);
+          //console.log(this.values);
+        }
+      );
+    },
+    async initChart() {
+      await this.getData();
+      this.chart = echarts.init(this.$el, "macarons");
+
+      if (this.psMsg == "3") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["60-72个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [72, 72, 72, 72, 72],
+                  name: "60-72个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "2") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["48-60个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [60, 60, 60, 60, 60],
+                  name: "48-60个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "1") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["36-48个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [48, 48, 48, 48, 48],
+                  name: "36-48个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/dashboard/RadarChart_yy.vue b/ruoyi-ui/src/views/dashboard/RadarChart_yy.vue
new file mode 100644
index 000000000..c7f3f8a74
--- /dev/null
+++ b/ruoyi-ui/src/views/dashboard/RadarChart_yy.vue
@@ -0,0 +1,274 @@
+<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";
+import { getAssessmentStatistics } from "@/api/benyi/assessmentcontent";
+
+const animationDuration = 3000;
+
+export default {
+  values: [],
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: "chart",
+    },
+    width: {
+      type: String,
+      default: "100%",
+    },
+    height: {
+      type: String,
+      default: "300px",
+    },
+    psMsg: {
+      type: String,
+      default: "",
+    }, //接收psMsg值  适用范围
+  },
+  data() {
+    return {
+      chart: null,
+      childId: "",
+    };
+  },
+  mounted() {
+    var childId = this.$route.params && this.$route.params.id;
+    this.childId = childId;
+    // console.log("child-chart:" + childId);
+    // console.log("psMsg:" + this.psMsg);
+    // this.$nextTick(() => {
+    //   this.initChart();
+    // });
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return;
+    }
+    this.chart.dispose();
+    this.chart = null;
+  },
+  methods: {
+    async getData() {
+      await getAssessmentStatistics(this.childId, this.psMsg).then(
+        (response) => {
+          console.log(response);
+          let value = [];
+          let len = response.statistics;
+          for (var j = 0; j < len.length; j++) {
+            console.log(len[j]);
+            if (len[j] == "NaN") {
+              value.push(0);
+            } else {
+              value.push(len[j]);
+            }
+          }
+          this.values = value;
+          //console.log(this.names);
+          //console.log(this.values);
+        }
+      );
+    },
+    async initChart() {
+      await this.getData();
+      this.chart = echarts.init(this.$el, "macarons");
+
+      if (this.psMsg == "3") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["60-72个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [72, 72, 72, 72, 72],
+                  name: "60-72个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "2") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["48-60个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [60, 60, 60, 60, 60],
+                  name: "48-60个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      } else if (this.psMsg == "1") {
+        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: "健康", max: 100 },
+              { name: "语言", max: 100 },
+              { name: "社会", max: 100 },
+              { name: "科学", max: 100 },
+              { name: "艺术", max: 100 },
+            ],
+          },
+          legend: {
+            left: "center",
+            bottom: "10",
+            data: ["36-48个月幼儿测评范围值", "幼儿实际测评值"],
+          },
+          series: [
+            {
+              type: "radar",
+              symbolSize: 0,
+              areaStyle: {
+                normal: {
+                  shadowBlur: 13,
+                  shadowColor: "rgba(0,0,0,.2)",
+                  shadowOffsetX: 0,
+                  shadowOffsetY: 10,
+                  opacity: 1,
+                },
+              },
+              data: [
+                {
+                  value: [48, 48, 48, 48, 48],
+                  name: "36-48个月幼儿测评范围值",
+                },
+                {
+                  value: this.values,
+                  name: "幼儿实际测评值",
+                },
+              ],
+              animationDuration: animationDuration,
+            },
+          ],
+        });
+      }
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 57d7f1bb3..57a1186bb 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -33,7 +33,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:8083`,
         // target: `http://120.53.14.147:9995`,
         changeOrigin: true,
         pathRewrite: {
diff --git a/ruoyi/src/main/resources/application.yml b/ruoyi/src/main/resources/application.yml
index 68790d28b..7d550727e 100644
--- a/ruoyi/src/main/resources/application.yml
+++ b/ruoyi/src/main/resources/application.yml
@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8083
   servlet:
     # 应用的访问路径
     context-path: /
diff --git a/ruoyi/src/main/resources/logback.xml b/ruoyi/src/main/resources/logback.xml
index d69a57207..47a7d98c6 100644
--- a/ruoyi/src/main/resources/logback.xml
+++ b/ruoyi/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/Users/zhanglipeng/Documents/ruoyi/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />