修改概况界面

src/components/PlanReport.vue

@@ -276,6 +276,8 @@ export default {
       subTotal: 0,
 
       dimensionName: "",
+
+      abnormalNum: 0,
     };
   },
   mounted() {
@@ -396,6 +398,19 @@ export default {
         if (res.code == 200) {
           this.unComplete = res.data[0];
           this.completeNum = res.data[1];
+          this.isAbnormal()
+        }
+      });
+    },
+    //查询统计端的--心理健康异常的人员
+    isAbnormal() {
+      //调用接口返回信息
+      let url = `/planUser/countCompletedUserHighRisk?planId=${this.planId}`;
+      this.$http.get(url, {}, (res) => {
+        if (res.code == 200) {
+          // this.unComplete = res.data[0];
+          // this.completeNum = res.data[1];
+          this.abnormalNum = res.data;
           this.getPlanDimNun();
         }
       });
@@ -453,10 +468,10 @@ export default {
 
           this.options6 = [
             {
-              value: this.completeNum - dimensionList[3]["精神障碍"],
+              value: this.completeNum,
               name: "已完成人数",
             },
-            { value: dimensionList[3]["精神障碍"], name: "精神障碍" },
+            { value: this.abnormalNum, name: "心理健康异常" },
           ];
         }
       );

src/utils/http.js

@@ -17,8 +17,8 @@ import { router } from "@/router";
 // axios.defaults.baseURL = 'https://child.hhnao.com:8070';
 // axios.defaults.baseURL = 'https://child.hhnao.com:8070';
 //https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx01d1a44906973cf2&redirect_uri=http%3A%2F%2F192.168.18.51%3A8085&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect
-// export const basePath='http://10.113.248.4:8089'
-export const basePath = "http://43.143.198.30:8089";
+export const basePath='http://10.113.248.4:8089'
+// export const basePath = "http://43.143.198.30:8089";
 // const base_url = 'http://43.143.198.30:8089/'
 // const base_url = 'http://10.113.248.4:8090/'
 // export const basePath='http://43.143.198.30:8086'

src/views/manage/channelInfo/invite.vue

@@ -442,7 +442,7 @@ export default {
     planStatusFun(val) {
       let planStatus = val.planStatus;
       if (planStatus == "1") {
-        return `<div style="color:red">未开始</div>`;
+        return `未开始`;
         // return "未开始";
       } else if (planStatus == "2") {
         return "进行中";

src/views/manage/generalSituation.vue

@@ -6,7 +6,9 @@
         <div class="number_people_top">人数统计</div>
         <div class="number_people_yuan">
           <div class="out">
-            <span :title="userInfo.orgName" class="yuan_name">{{userInfo.orgName}}</span>
+            <span :title="userInfo.orgName" class="yuan_name">{{
+              userInfo.orgName
+            }}</span>
             <span class="yuan_num">总人数</span>
             <span class="yuan_people">{{ peopleData["总人数"] }}人</span>
           </div>
@@ -57,9 +59,33 @@
     </div>
     <div class="recently">
       <div class="recently_bottom">
-        <div class="recently_bottom_font">最近测试结果</div>
+        <div class="recently_bottom_font">最近测试结果: {{ planData.planName }}</div>
         <div class="block">
-          <div class="block_left">
+          <div class="block_left" style="">
+            <div class="chart_wrap">
+              <PieChart :options="options1" chartId="myPieChart1" chartName="完成度" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options2" chartId="myPieChart2" chartName="焦虑" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options3" chartId="myPieChart3" chartName="抑郁" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options4" chartId="myPieChart4" chartName="压力" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options5" chartId="myPieChart5" chartName="精神障碍" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart
+                :options="options6"
+                chartId="myPieChart6"
+                chartName="存在心理健康情况"
+              />
+            </div>
+          </div>
+          <!-- <div class="block_left">
             <div>
               <div class="block_table">
                 <div class="block_detail">计划名称</div>
@@ -79,9 +105,6 @@
                 <div v-else style="width: 100%; text-align: center; margin-top: 10px">
                   <div>暂无数据</div>
                 </div>
-                <!-- <div class="block_detail">测试专业</div>
-                <div class="block_detail">测试人数</div>
-                <div class="block_detail">测试时间</div> -->
               </div>
               <div v-if="planData.hasOwnProperty('planName')" class="profession">
                 {{ planData["planName"] }}计划总分等级人数
@@ -105,8 +128,8 @@
             >
               <span style="text-align: center">暂无数据</span>
             </div>
-          </div>
-          <div class="block_right">
+          </div> -->
+          <!-- <div class="block_right">
             <div class="block_avg">
               各个专业维度平均分
               <el-select
@@ -135,7 +158,7 @@
             >
               暂无数据
             </div>
-          </div>
+          </div> -->
         </div>
       </div>
     </div>
@@ -144,7 +167,11 @@
 <script>
 import { oSessionStorage } from "../../utils/utils";
 import * as echarts from "echarts";
+import PieChart from "@/components/PieChart";
 export default {
+  components: {
+    PieChart,
+  },
   data() {
     return {
       tableData: [],
@@ -171,6 +198,14 @@ export default {
 
       //各个维度平均分的数组
       avgData: [],
+      options1: [],
+      options2: [],
+      options3: [],
+      options4: [],
+      options5: [],
+      options6: [],
+
+      abnormalNum: 0,
     };
   },
   mounted() {
@@ -230,12 +265,12 @@ export default {
         {
           type: "bar",
           data: [],
-          barWidth: '15',//修改柱状图的宽度
+          barWidth: "15", //修改柱状图的宽度
           itemStyle: {
             color: "#CCFFD7",
             borderWidth: 2,
             borderColor: "#2EE053",
-            barBorderRadius:[10,10,0,0] //修改柱状图圆角
+            barBorderRadius: [10, 10, 0, 0], //修改柱状图圆角
           },
         },
       ],
@@ -312,7 +347,7 @@ export default {
       ],
     };
 
-    this.getOrg();
+    // this.getOrg();
   },
   methods: {
     //根据组织编号查询总人数
@@ -346,7 +381,6 @@ export default {
       let url = `/plan/findNewCompletedPlan?orgNo=${this.userInfo.orgNo}`;
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
-
           if (res.data != null) {
             this.planId = res.data.id;
             let list = Object.entries(res.data);
@@ -363,7 +397,9 @@ export default {
             this.planData = list2;
 
             //调用各个专业不同总分人数
-            this.isScore();
+            // this.isScore();
+            // this.getPlanDimNun();
+            this.isFin();
           }
         } else {
           // this.$toast.fail(res.msg);
@@ -371,6 +407,73 @@ export default {
         }
       });
     },
+    //查询统计端的--心理健康异常的人员
+    isAbnormal() {
+      //调用接口返回信息
+      let url = `/planUser/countCompletedUserHighRisk?planId=${this.planId}`;
+      this.$http.get(url, {}, (res) => {
+        if (res.code == 200) {
+          // this.unComplete = res.data[0];
+          // this.completeNum = res.data[1];
+          this.abnormalNum = res.data;
+          this.getPlanDimNun();
+        }
+      });
+    },
+    //管理端统计完成情况
+    isFin() {
+      //调用接口返回信息
+      let url = `/plan/countComplete?planId=${this.planId}`;
+      this.$http.get(url, {}, (res) => {
+        if (res.code == 200) {
+          this.unComplete = res.data[0];
+          this.completeNum = res.data[1];
+          this.isAbnormal();
+        }
+      });
+    },
+    //查询各个维度占比
+    getPlanDimNun() {
+      this.$http.get(
+        `userRecordScore/countNumByPlanDim?planId=${this.planId}`,
+        {},
+        (res) => {
+          let dimensionList = res.data;
+          this.options1 = [
+            { value: this.completeNum + this.unComplete, name: "已完成人数" },
+            { value: this.unComplete, name: "未完成占比" },
+          ];
+
+          this.options2 = [
+            { value: this.completeNum - dimensionList[0]["焦虑"], name: "焦虑" },
+            { value: parseInt(dimensionList[0]["焦虑"]), name: "焦虑占比" },
+          ];
+
+          this.options3 = [
+            { value: this.completeNum, name: "已完成人数" },
+            { value: parseInt(dimensionList[1]["抑郁"]), name: "抑郁占比" },
+          ];
+
+          this.options4 = [
+            { value: this.completeNum, name: "已完成人数" },
+            { value: parseInt(dimensionList[2]["压力"]), name: "压力占比" },
+          ];
+
+          this.options5 = [
+            { value: this.completeNum, name: "已完成人数" },
+            { value: parseInt(dimensionList[3]["精神障碍"]), name: "精神障碍占比" },
+          ];
+
+          this.options6 = [
+            {
+              value: this.completeNum,
+              name: "已完成人数",
+            },
+            { value: this.abnormalNum, name: "心理健康异常" },
+          ];
+        }
+      );
+    },
     //各个专业不同总分人数
     isScore() {
       let url = `/plan/countTotalNumber?planId=${this.planId}`;
@@ -531,7 +634,7 @@ export default {
           .yuan_name {
             overflow: hidden;
             text-overflow: ellipsis;
-            white-space:nowrap;
+            white-space: nowrap;
             margin-left: 20px;
             margin-top: 20px;
             color: #000000;
@@ -631,6 +734,7 @@ export default {
       .recently_bottom_font {
         padding: 10px;
         font-weight: 700;
+        background-color: #ffffff;
       }
       .block {
         width: 100%;
@@ -639,11 +743,17 @@ export default {
         .block_left {
           display: flex;
           padding-left: 10px;
-          flex-direction: column;
+          flex-direction: row;
           // padding: 10px;
           flex: 6;
           //   background-color: #000000;
           height: 100%;
+          align-items: center;
+          background-color: #ffffff;
+          .chart_wrap {
+            flex: 1;
+            // height: 450px;
+          }
           .block_table {
             display: flex;
             background-color: #ffffff;