修改样式--

src/components/BingChart.vue

@@ -91,7 +91,7 @@ export default {
               show: true,
               position: "outside", //将文字显示在行内 outside  inside
               textStyle: {
-                fontSize: 18, //设置图内显示文字的大小
+                fontSize: 16, //设置图内显示文字的大小
                 color: "#000000", //设置饼状图文字的颜色
               },
             },

src/components/BingChart2.vue

@@ -51,7 +51,7 @@ export default {
           left: "center",
           top:'0px',
           textStyle: {
-              fontSize: "20",
+              fontSize: 16,
               color: "#000000",
            
               foontWeight: "600",
@@ -79,14 +79,16 @@ export default {
               show:true,
               position:'outside',//将文字显示在行内
               textStyle:{ 
-                fontSize:18,//设置图内显示文字的大小
+                fontSize:16,//设置图内显示文字的大小
                 color:'#000000'//设置饼状图文字的颜色
               }
             },
+            //
             // name:100-parseInt(pieData[0].value/(pieData[0].value+ pieData[1].value)*100)   + "%"+pieData[1].name,itemStyle:{color:'#FFAE00'
+            //pieData[0].value  :1
             data: [
-              { value: pieData[0].value, name:pieData[0].value+'人已完成',itemStyle:{color:'#5470C6',fontSize:'20'}},
-              { value:pieData[0].value+ pieData[1].value==0?'0%' :pieData[1].value, name:100-parseInt(pieData[0].value/(pieData[0].value+ pieData[1].value)*100)   + "%"+pieData[1].name,itemStyle:{color:'#FFAE00',fontSize:'20'}},
+              { value: pieData[0].value==0?1:pieData[0].value-pieData[1].value, name:pieData[0].value==0?'100%心理健康': 100- parseInt(pieData[1].value/(pieData[0].value)*100) +'%心理健康',itemStyle:{color:'#5470C6',fontSize:'20'}},
+              { value:pieData[1].value, name:pieData[0].value==0?'0%中重度焦虑':parseInt(pieData[1].value/(pieData[0].value)*100)   + "%"+pieData[1].name,itemStyle:{color:'#FFAE00',fontSize:'20'}},
             ],
           },
         ],

src/components/ComparePlanProfession.vue

@@ -4,7 +4,7 @@
       <p class="title">专业报告对比</p>
     </div>
     <div class="c_wrap">
-      <el-form :inline="true" class="demo-form-inline" >
+      <el-form :inline="true" class="demo-form-inline">
         <el-form-item label="首选项" class="plan_lang_p">
           <el-select v-model="firstParams" @change="firstParamsHandle">
             <el-option label="计划" :value="1"></el-option>
@@ -230,7 +230,6 @@
 <script>
 import * as echarts from "echarts";
 import { oSessionStorage } from "../utils/utils";
-
 export default {
   data() {
     return {
@@ -317,7 +316,7 @@ export default {
       this.organizationsList2 = res.data;
       if (res.data.length > 1) {
         this.compareOptionsOrg1 = res.data[0];
-        this.compareOptionsOrg2 = res.data[0];
+        this.compareOptionsOrg2 = res.data[1];
         this.compareOptions.orgInfo1 = res.data[0].id;
         this.compareOptions.orgInfo2 = res.data[1].id;
       } else {
@@ -341,8 +340,21 @@ export default {
             ["健康异常占比", 72.4, 53.9],
           ],
         },
-        xAxis: { type: "category" },
-        yAxis: {},
+        xAxis: {
+          // name: "%",
+          type: "category",
+          axisLabel: {
+            interval: 0,
+          },
+        },
+        yAxis: {
+          name: "占比（%）",
+
+          // axisLine: {
+          //   show: true,
+          //   lineStyle: {},
+          // },
+        },
         series: [
           {
             type: "bar",
@@ -353,7 +365,25 @@ export default {
                 { offset: 1, color: "#644BFD" },
               ]),
               borderRadius: [18, 18, 18, 18],
+              // background:{
+              //     color:'rgba(0,0,0,0.1)',
+              //     image:'../assets/img/home/bg_p.png'
+              //   },
               barWidth: 40,
+              // normal:{
+              //   background:{
+              //     color:'rgba(0,0,0,0.1)',
+              //     image:'../assets/img/home/bg_p.png'
+              //   }
+              // }
+            },
+            label: {
+              show: true,
+              position: "top",
+              color: "#006FFF",
+              formatter: function (params) {
+                return parseInt(params.data[1]) + "%";
+              },
             },
           },
           {
@@ -367,6 +397,15 @@ export default {
               borderRadius: [18, 18, 18, 18],
               barWidth: 40,
             },
+            label: {
+              show: true,
+              position: "top",
+              color: "#FE7A28",
+              formatter: function (params) {
+                console.log(params);
+                return parseInt(params.data[2]) + "%";
+              },
+            },
           },
         ],
       };
@@ -707,7 +746,7 @@ export default {
                 (this[`unComplete${i}`] + this[`completeNum${i}`])) *
                 100
             );
-      return rate > 0 ? `${rate}%` :  `${rate}%`;
+      return rate > 0 ? `${rate}%` : `${rate}%`;
     },
 
     // 其他占比计算
@@ -730,16 +769,16 @@ export default {
 };
 </script>
 <style scoped>
-.plan_lang>>>.el-input{
+.plan_lang >>> .el-input {
   width: 260px !important;
 }
-.plan_lang>>>.el-input__inner{
+.plan_lang >>> .el-input__inner {
   width: 260px !important;
 }
-.plan_lang_p>>>.el-input{
+.plan_lang_p >>> .el-input {
   width: 100px !important;
 }
-.plan_lang_p>>>.el-input__inner{
+.plan_lang_p >>> .el-input__inner {
   width: 100px !important;
 }
 </style>

src/components/ComparePlanUser.vue

@@ -54,7 +54,7 @@
                   src="../assets/img/home/isCom.png"
                   alt=""
                 />  
-                <div style="color: #333333">已完成</div>
+                <div style="color: #00955e">已完成</div>
               </div>
               <!-- <div
                 style="display: flex; justify-content: center; align-items: center"

src/components/PlanReport.vue

@@ -10,7 +10,7 @@
         <p
           style="
             text-align: center;
-            font-size: 22px;
+            font-size: 20px;
             margin-bottom: 20px;
             font-weight: 700;
           "
@@ -29,19 +29,24 @@
                 总人数：&nbsp;&nbsp;{{ this.completeNum + this.unComplete }}人
               </div>
             </div>
-            <BingChart :options="options1" chartId="myPieChart1" chartName="完成度" />
-            <div class="report_top_bingBo">
+            <div class="report_top_bingBo" style="margin-top: 20px">
               <div class="isComStyle">
                 已完成<span>{{ this.completeNum }}人</span>
               </div>
               <div class="isUnComStyle">
-                未完成:<span>{{ this.unComplete }}人</span>
+                未完成<span>{{ this.unComplete }}人</span>
               </div>
             </div>
+            <BingChart
+              :options="options1"
+              chartId="myPieChart1"
+              chartName="完成度"
+              v-show="this.unComplete != 0"
+            />
           </div>
-          <div style="flex: 6" class="report_top_right_out">
+          <div style="flex: 8" class="report_top_right_out" v-show="this.unComplete != 0">
             <div class="report_top_right">
-              <div style="font-size: 20px; letter-spacing: 1px">未完成人员列表</div>
+              <div style="font-size: 16px; letter-spacing: 1px">未完成人员列表</div>
               <div></div>
             </div>
 
@@ -81,6 +86,12 @@
             >
             </el-pagination>
           </div>
+          <div style="flex: 4" class="report_top_right_out" v-show="this.unComplete == 0">
+            <img width="auto" src="../assets/img/report/task.png" />
+          </div>
+          <div style="flex: 4" class="report_top_right_out" v-show="this.unComplete == 0">
+            &nbsp;
+          </div>
         </div>
         <div class="report_ge_title" style="margin-top: 40px; margin-bottom: 20px">
           <div class="blue_t"></div>
@@ -93,17 +104,22 @@
                 已完成人数：&nbsp;&nbsp;{{ this.completeNum }}人
               </div>
             </div>
-            <BingChart :options="options6" chartId="myPieChart6" chartName="完成度" />
-            <div class="report_top_bingBo">
+            <div class="report_top_bingBo" style="margin-top: 20px">
               <div class="isComStyle">
                 心理健康<span>{{ this.completeNum - this.abnormalNum }}人</span>
               </div>
               <div class="isUnComStyle">
-                心理异常:<span>{{ this.abnormalNum }}人</span>
+                心理异常<span>{{ this.abnormalNum }}人</span>
               </div>
             </div>
+            <BingChart :options="options6" chartId="myPieChart6" chartName="完成度" />
           </div>
-          <div style="flex: 6" class="report_top_right_out">
+          <div style="flex: 8" class="report_top_right_out">
+            <div class="report_top_bingBo">
+              <div class="isComStyle" style="font-size: 16px;">
+                心理异常人次统计
+              </div>
+            </div>
             <div style="height: 100%; width: 100%" ref="echarts_zhu"></div>
           </div>
         </div>
@@ -212,7 +228,7 @@
         <div class="radio_group_style">
           <el-radio-group
             v-model="tabName"
-            style="margin-top: 40px; margin-bottom: 20px"
+            style="margin-top: 20px; margin-bottom: 20px"
             @input="tabFun"
           >
             <el-radio-button
@@ -223,7 +239,6 @@
             >
           </el-radio-group>
         </div>
-
         <div style="display: flex; flex-direction: row">
           <el-radio-group
             v-model="subValue"
@@ -232,7 +247,7 @@
               width: 100%;
               flex: 3;
               display: flex;
-              flex-direction: column;
+              flex-direction: row;
               justify-content: left;
             "
           >
@@ -243,36 +258,31 @@
               style="margin-top: 20px"
             ></el-radio>
           </el-radio-group>
-          <div class="chart_wrap" style="flex: 4">
-            <BingChart2
-              :options="options7"
-              chartId="myPieChart7"
-              chartName="心理健康异常"
-            />
-          </div>
+        </div>
+        <div style="display: flex; flex-direction: row">
           <div
             style="
-              flex: 3;
+              flex: 4;
               width: 100%;
               display: flex;
               flex-direction: row;
-              align-items: center;
+              margin-top: 20px;
               justify-content: center;
               margin-bottom: 40px;
             "
           >
             <div style="flex: 1">
-              <div style="display: flex; font-size: 20px">
-                <div style="display: flex; flex: 1; flex-direction: column">
-                  <div style="text-align: center; margin: 4px; border: 1px solid #dddddd">
-                    {{ tabNameCurrent }}
+              <div style="display: flex; font-size: 16px; flex-direction: column">
+                <div style="display: flex; flex: 1; flex-direction: row">
+                  <div style="text-align: center; margin: 4px; font-size: 16px">
+                    {{ tabNameCurrent }}:
                   </div>
                   <div
                     :title="subValue"
                     style="
+                      font-size: 16px;
                       text-align: center;
                       margin: 4px;
-                      border: 1px solid #dddddd;
                       display: flex;
                       cursor: pointer;
                       overflow: hidden;
@@ -283,31 +293,32 @@
                   >
                     {{ subValue }}
                   </div>
+                  <div style="margin: 4px; font-size: 16px">{{ subAll }}人</div>
                 </div>
-                <div style="display: flex; flex: 1; flex-direction: column">
-                  <div style="text-align: center; margin: 4px; border: 1px solid #dddddd">
-                    已完成
+                <div style="display: flex; flex: 1; flex-direction: row">
+                  <div style="text-align: center; margin: 4px; font-size: 16px">
+                    心理健康
                   </div>
                   <div
                     style="
                       background-color: #5470c6;
-
+                      font-size: 16px;
                       padding: 0 20px;
                       margin: 4px;
                       color: #ffffff;
                       text-align: center;
-                      border: 1px solid #dddddd;
+                      min-width: 80px;
                     "
                   >
                     {{ subAll }}人
                   </div>
                 </div>
-                <div style="display: flex; flex: 1; flex-direction: column">
+                <div style="display: flex; flex: 1; flex-direction: row">
                   <div
                     style="
+                      font-size: 16px;
                       text-align: center;
                       margin: 4px;
-                      border: 1px solid #dddddd;
                       overflow: hidden;
                       -webkit-line-clamp: 1;
                       display: -webkit-box;
@@ -319,44 +330,28 @@
                   <div
                     style="
                       background-color: #ffae00;
-
                       padding: 0 20px;
+                      font-size: 16px;
                       margin: 4px;
-
                       color: #ffffff;
                       text-align: center;
-                      border: 1px solid #dddddd;
+                      min-width: 80px;
                     "
                   >
                     {{ subSingle }}人
                   </div>
                 </div>
               </div>
-              <!-- this.dime=='躯体化'?'压力':this.dime -->
-              <!-- <div style="display: flex; font-size: 20px">
-                <div>
-                  <div>{{ tabNameCurrent }}</div>
-                  <div>{{ subValue }}</div>
-                </div>
-
-                <div>
-                  <div>
-                    中重度{{ dime == "躯体化" ? "压力" : dime }}
-                  </div>
-                  <span
-                    style="
-                      background-color: #ffae00;
-                      display: flex;
-                      padding: 0 20px;
-                      margin-left: 20px;
-                      color: #ffffff;
-                    "
-                    >{{ subSingle }}人</span
-                  >
-                </div>
-              </div> -->
             </div>
           </div>
+          <div class="chart_wrap" style="flex: 4">
+            <BingChart2
+              :options="options7"
+              chartId="myPieChart7"
+              chartName="心理健康异常"
+            />
+          </div>
+          <div class="chart_wrap" style="flex: 4">&nbsp;</div>
         </div>
         <div class="finish_class">
           <el-table
@@ -508,7 +503,7 @@ export default {
           var relVal = "";
           let na = params[0].name;
           for (var i = 0, l = params.length; i < l; i++) {
-            relVal += params[i].marker + na + " : " + params[i].value + "%";
+            relVal += params[i].marker + na + " : " + params[i].value + "人次";
           }
           return relVal;
         },
@@ -544,7 +539,8 @@ export default {
       //   type: "inside", //放大缩小x轴数值
       // },
       yAxis: {
-        max: 100,
+        name: "人次",
+        // max: 100,
         type: "value",
         boundaryGap: [0, 0.01],
         minInterval: 1,
@@ -586,7 +582,7 @@ export default {
             position: "top",
             color: "#006FFF",
             formatter: function (params) {
-              return parseInt(params.value) + "%";
+              return parseInt(params.value) + "人次";
             },
           },
         },
@@ -805,26 +801,10 @@ export default {
           // scoreList.push(
           //   parseInt(((this.completeNum - this.abnormalNum) / this.completeNum) * 100)
           // );
-          scoreList.push(
-            this.completeNum == 0
-              ? 0
-              : parseInt((dimensionList[1]["抑郁"] / this.completeNum) * 100)
-          );
-          scoreList.push(
-            this.completeNum == 0
-              ? 0
-              : parseInt((dimensionList[2]["压力"] / this.completeNum) * 100)
-          );
-          scoreList.push(
-            this.completeNum == 0
-              ? 0
-              : parseInt((dimensionList[0]["焦虑"] / this.completeNum) * 100)
-          );
-          scoreList.push(
-            this.completeNum == 0
-              ? 0
-              : parseInt((dimensionList[3]["精神障碍"] / this.completeNum) * 100)
-          );
+          scoreList.push(dimensionList[1]["抑郁"]);
+          scoreList.push(dimensionList[2]["压力"]);
+          scoreList.push(dimensionList[0]["焦虑"]);
+          scoreList.push(dimensionList[3]["精神障碍"]);
 
           this.echarts_zhu = this.$refs.echarts_zhu;
           this.option_zhu.xAxis.data = nameList;
@@ -1161,21 +1141,21 @@ export default {
     display: flex;
     justify-content: space-around;
     .isComStyle {
-      font-size: 20px;
+      font-size: 16px;
       span {
         background-color: #5470c6;
         padding: 5px 20px;
-        font-size: 20px;
+        font-size: 16px;
         margin-left: 14px;
         color: #ffffff;
       }
     }
     .isUnComStyle {
-      font-size: 20px;
+      font-size: 16px;
       span {
         background-color: #ffae00;
         padding: 5px 20px;
-        font-size: 20px;
+        font-size: 16px;
         margin-left: 14px;
         color: #ffffff;
       }
@@ -1194,7 +1174,7 @@ export default {
     margin-right: 5px;
   }
   .com {
-    font-size: 22px;
+    font-size: 18px;
     font-weight: 700;
   }
 }

src/components/PlanUserStatus.vue

@@ -49,7 +49,7 @@
                         src="../assets/img/home/isCom.png"
                         alt=""
                       />  
-                      <div style="color: #333333">已完成</div>
+                      <div style="color: #00955e">已完成</div>
                     </div>
                     <!-- <div
                 style="display: flex; justify-content: center; align-items: center"

src/components/Report.vue

@@ -10,7 +10,7 @@
       >
         <div slot="title">
           <div label-width="150px" class="demo-ruleForm">
-            <p v-if="isView" class="dig_title">个人报告查看</p>
+            <p v-if="isView" class="dig_title">{{proDataLin.userName}}计划列表</p>
             <p v-if="!isView" class="dig_title">编辑计划</p>
             <div slot=""></div>
             <div slot="footer"></div>
@@ -32,9 +32,9 @@
                 </el-table-column>
                 <!-- <el-table-column prop="userNo" label="学号" align="center" width="">
                 </el-table-column> -->
-           
+
                 <el-table-column
-                show-overflow-tooltip
+                  show-overflow-tooltip
                   prop="completedTime"
                   label="测试完成时间"
                   align="center"
@@ -49,10 +49,11 @@
                         :text-inside="true"
                         :stroke-width="26"
                         :percentage="
-                        parseInt(parseFloat(
-                            scope.row.userCompletedNum / scope.row.userContentNum
-                          ) * 100)
-                          
+                          parseInt(
+                            parseFloat(
+                              scope.row.userCompletedNum / scope.row.userContentNum
+                            ) * 100
+                          )
                         "
                       ></el-progress>
                     </div>
@@ -75,7 +76,7 @@
                         src="../assets/img/home/isCom.png"
                         alt=""
                       />&nbsp;&nbsp;
-                      <div style="color: #333333">已完成</div>
+                      <div style="color: #00955e">已完成</div>
                     </div>
                     <div
                       style="display: flex; justify-content: center; align-items: center"
@@ -97,22 +98,25 @@
                       v-if="scope.row.hasOwnProperty('contentList')"
                     >
                       <div v-for="item in scope.row.contentList" :key="item.id">
-                        <div v-if="item.isDisplayed == 1" style="color:#00bf78;display:flex;justify-content: flex-start;align-items: center;cursor:pointer" @click="radioClick(item)">
-                          <img style="width: 15px;margin-left:10px" src="../assets/img/table/search.png" />
-                          {{item.name}}
+                        <div
+                          v-if="item.isDisplayed == 1"
+                          style="
+                            color: #00bf78;
+                            display: flex;
+                            justify-content: flex-start;
+                            align-items: center;
+                            cursor: pointer;
+                          "
+                          @click="radioClick(item)"
+                        >
+                          <img
+                            style="width: 15px; margin-left: 10px"
+                            src="../assets/img/table/search.png"
+                          />
+                          {{ item.name }}
                         </div>
                       </div>
-                      <!-- <div class="detail_button" @click="queryRport(scope.row)">
-                        <img style="width: 15px" src="../assets/img/table/search.png" />
-                        <span>查看报告</span>
-                      </div> -->
                     </div>
-                    <!-- <div class="detail_button_out" v-if="scope.row.isComplete == '1'">
-                      <div class="detail_button" @click="queryRport(scope.row)">
-                        <img style="width: 15px" src="../assets/img/table/search.png" />
-                        <span>查看报告</span>
-                      </div>
-                    </div> -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -185,7 +189,7 @@
         style="border-radius: 40px"
       >
         <div slot="title" style="border-radius: 40px">
-          <p style="text-align: center; font-weight: 700">查看报告</p>
+          <p style="text-align: center; font-weight: 700;font-size:20px">{{proDataLin.userName}}的报告</p>
           <div class="kply">
             <div class="kply_inner">
               <div style="padding: 20px 40px">
@@ -197,7 +201,7 @@
                       <span class="info">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
                       <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
-                        >所属组织结构:&nbsp;&nbsp;<span style="color: #00bf78">{{
+                        >所属组织结构:&nbsp;&nbsp;<span style="">{{
                           orgName
                         }}</span></span
                       >
@@ -266,7 +270,8 @@
                     </div>
                   </div>
 
-                  <div  v-show="currentFlag != 'SHAPE_RANDOM'"
+                  <div
+                    v-show="currentFlag != 'SHAPE_RANDOM'"
                     v-for="(item, index) in reportDataAll"
                     :key="index"
                     style="padding-top: 20px"
@@ -833,6 +838,7 @@ input[aria-hidden="true"] {
   padding-top: 20px;
   padding-bottom: 40px;
   .dig_title {
+    font-size: 20px;
     margin-bottom: 30px;
     text-align: center;
     font-weight: 700;

src/utils/http.js

@@ -20,9 +20,9 @@ import { router } from "@/router";
 //本地
 // export const basePath='http://10.113.248.4:8089'
 //30
-// export const basePath = "http://43.143.198.30:8089";
+export const basePath = "http://43.143.198.30:8089";
 //
-export const basePath = "http://129.211.221.44:8089";
+// export const basePath = "http://129.211.221.44: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

@@ -102,7 +102,7 @@
                   src="../../../assets/img/home/isCom.png"
                   alt=""
                 />  
-                <div style="color: #333333">已完成</div>
+                <div style="color: #00955e">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"

src/views/manage/channelManagement/channelManagement.vue

@@ -112,7 +112,7 @@
                   src="../../../assets/img/home/isCom.png"
                   alt=""
                 />  
-                <div style="color: #333333">已完成</div>
+                <div style="color: #00955e">已完成</div>
               </div>
               <div
                 style="display: flex; justify-content: center; align-items: center"

src/views/manage/generalSituation.vue

@@ -1,5 +1,47 @@
+
+
+
+
+<style>
+.parent {
+  display: flex;
+  
+}
+.sub1 {
+  display: flex;
+  flex: 1;
+  background: #f6cb00;
+  overflow: hidden;
+  /* overflow: hidden; */
+}
+
+.sub2 {
+  flex: 1;
+  background: red;
+}
+.sub3 {
+  display: flex;
+  flex: 1;
+  background: #f6cb00;
+
+}
+</style>
 <template>
   <div class="pp">
+    <!-- <div class="parent">
+      <div class="sub1">
+         1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa11111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
+      <div class="sub2">2</div>
+    </div>
+    <div class="parent"  style="display: flex; margin-top: 80px">
+      <div class="sub3">
+         <div style="flex:1;overflow:hidden">
+          1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa11111111111111111111111111aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+         </div>
+      </div>
+      <div class="sub2">2</div>
+    </div> -->
+
     <!-- <img style="width:90%;" src="../../assets/report/home2.png" /> -->
     <div class="general_situation">
       <div class="number_people">
@@ -8,14 +50,26 @@
           src="../../assets/img/home/bg_p.png"
           alt=""
         />
-        <div class="number_people_top">人数统计</div>
+        <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"
+              >都开始了获得了大厦及伦敦峰会就是咯啊支持下自行车踩踩踩踩踩踩踩踩踩踩踩踩啊</span
+            > -->
+            <!-- <div style="display: flex;width:100%">
+              <div :title="userInfo.orgName" class="yuan_name"
+              >1211232312321321321321321111111111111111111111111111111111111111111111111111111111111111111111113</div
+            >
+            </div> -->
 
-            <span class="yuan_people">{{ peopleData["总人数"] }}人</span>
+            <span class="yuan_people">
+              <span class="people_t">人数:</span>
+              <span class="people_n">{{ peopleData["总人数"] }}</span
+              ><span class="people_r">人</span></span
+            >
           </div>
         </div>
       </div>
@@ -27,6 +81,7 @@
             <div class="detail">创建时间</div>
             <div class="detail">结束时间</div>
             <div class="detail">状态</div>
+            <div class="detail">是否授权</div>
           </div>
           <div class="table_a">
             <div v-if="tableData.length == 0">
@@ -57,7 +112,7 @@
                       src="../../assets/img/home/isCom.png"
                       alt=""
                     />&nbsp;&nbsp;
-                    <div style="color: #333333">已完成</div>
+                    <div style="color: #00955e">已完成</div>
                   </div>
                   <div
                     style="display: flex; justify-content: center; align-items: center"
@@ -82,6 +137,23 @@
                     <div style="color: #d52121">未开始</div>
                   </div>
                 </div>
+                <div class="detail">
+                  <!-- {{ planStatusFun(item) }} -->
+                  <div
+                    style="display: flex; justify-content: center; align-items: center"
+                    v-if="item.enable == '1'"
+                  >
+             
+                    <div style="color: #00955e">已授权</div>
+                  </div>
+                  <div
+                    style="display: flex; justify-content: center; align-items: center"
+                    v-if="item.enable == '0'"
+                  >
+                   
+                    <div style="color: #d52121">未授权</div>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -101,7 +173,7 @@
         <div class="block_ren">
           <div class="re">最近测评结果</div>
           <!-- 当没有测试计划是则不显示 -->
-          <div class="detail"  v-show="planData.hasOwnProperty('planName')">
+          <div class="detail" v-show="planData.hasOwnProperty('planName')">
             <img
               @click="queryDetail"
               style="width: 80px; cursor: pointer"
@@ -171,7 +243,11 @@
             >
           </div>
 
-          <div v-if="planData.hasOwnProperty('planName')" class="block_lei" ref="echarts_lei"></div>
+          <div
+            v-if="planData.hasOwnProperty('planName')"
+            class="block_lei"
+            ref="echarts_lei"
+          ></div>
           <div
             v-else
             style="
@@ -237,6 +313,7 @@ export default {
   },
   mounted() {
     this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
+
     //查询最新人数统计
     this.queryAllPeople();
     //查询最新计划
@@ -260,21 +337,15 @@ export default {
           // }
         },
         formatter: function (params) {
-          var relVal = '';
+          var relVal = "";
           let na = params[0].name;
           for (var i = 0, l = params.length; i < l; i++) {
-            relVal +=
-         
-              params[i].marker +
-              na +
-              " : " +
-              params[i].value +
-              "%";
+            relVal += params[i].marker + na + " : " + params[i].value + "%";
           }
           return relVal;
         },
         // formatter: "{b} : {c} % ",
-        
+
         // formatter: function (params,trigger) {
 
         //   return '{a} <br/>{b} : {c} <br/>百分比 : {d}%'
@@ -290,6 +361,9 @@ export default {
       xAxis: {
         type: "category",
         data: [],
+        axisLabel: {
+          interval: 0,
+        },
         // axisLabel: {
         //   width: 40, //设置内容宽度
         // //   overflow:'break',
@@ -305,7 +379,7 @@ export default {
       //   type: "inside", //放大缩小x轴数值
       // },
       yAxis: {
-        max: 100,
+        // max: 100,
         type: "value",
         boundaryGap: [0, 0.01],
         minInterval: 1,
@@ -407,7 +481,6 @@ export default {
           interval: 0,
           // rotate:'-90',
           formatter: function (value) {
-  
             // return ''
             // return value
             return value.substring(0, 4) + "...";
@@ -476,6 +549,7 @@ export default {
       let url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}&orgNo=${this.userInfo.orgNo}`;
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
+          debugger;
           this.tableData = res.data.content;
           //   this.total = res.data.totalElements;
         } else {
@@ -555,14 +629,32 @@ export default {
           nameList.push("焦虑");
           nameList.push("精神障碍");
           let scoreList = [];
-          scoreList.push(this.completeNum==0?0:
-            parseInt(((this.completeNum - this.abnormalNum) / this.completeNum) * 100)
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt(((this.completeNum - this.abnormalNum) / this.completeNum) * 100)
+          );
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[1]["抑郁"] / this.completeNum) * 100)
+          );
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[2]["压力"] / this.completeNum) * 100)
+          );
+          scoreList.push(
+            this.completeNum == 0
+              ? 0
+              : parseInt((dimensionList[0]["焦虑"] / this.completeNum) * 100)
           );
-          scoreList.push(this.completeNum==0?0:parseInt((dimensionList[1]["抑郁"] / this.completeNum) * 100));
-          scoreList.push(this.completeNum==0?0:parseInt((dimensionList[2]["压力"] / this.completeNum) * 100));
-          scoreList.push(this.completeNum==0?0:parseInt((dimensionList[0]["焦虑"] / this.completeNum) * 100));
           scoreList.push(
-            parseInt(this.completeNum==0?0:(dimensionList[3]["精神障碍"] / this.completeNum) * 100)
+            parseInt(
+              this.completeNum == 0
+                ? 0
+                : (dimensionList[3]["精神障碍"] / this.completeNum) * 100
+            )
           );
           this.echarts_zhu = this.$refs.echarts_zhu;
           this.option.xAxis.data = nameList;
@@ -762,6 +854,11 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+@font-face {
+  font-family: "Electronic";
+  src: url("../../assets/font/sjxk.ttf") format("truetype");
+}
+
 .computer::-webkit-scrollbar {
   width: 6px;
 }
@@ -810,6 +907,7 @@ export default {
       background-size: cover;
       border-radius: 20px;
       flex: 5;
+      overflow: hidden;
       // background-color: #48d68e;
       display: flex;
       flex-direction: column;
@@ -823,7 +921,7 @@ export default {
         font-weight: 700;
       }
       .number_people_yuan {
-        display: flex;
+        // display: flex;
         color: #ffffff;
         .out {
           border-radius: 20px;
@@ -831,25 +929,70 @@ export default {
           // background-color: #7fe2b0;
           display: flex;
           flex-direction: column;
+          flex: 1;
           .yuan_name {
-            width: 80%;
-            margin-left: 20px;
+            height: 80px;
+            flex: 1;
+            margin-right: 100px;
+            // flex: 1;
+            // background-color: #0d3bb1;
+            // margin-left: 20px;
             margin-top: 10px;
             color: #ffffff;
             letter-spacing: 3px;
-            font-size: 26px;
+            font-size: 34px;
+            font-family: Electronic;
             // flex:1,;
+            // width: 200px;
+            // width: 100%;
+
+            // word-wrap: break-word;
             overflow: hidden;
-            -webkit-line-clamp: 1;
+            text-overflow: ellipsis;
             display: -webkit-box;
+
             -webkit-box-orient: vertical;
+
+            -webkit-line-clamp: 2;
+
+            // word-wrap: break-word;
+            // text-overflow: ellipsis;
+            // display: -webkit-box;
+            // /* autoprefixer: off */
+            // -webkit-box-orient: vertical;
+            // /* autoprefixer: on */
+            // -webkit-line-clamp: 2;
           }
           .yuan_people {
+            text-align: right;
             margin-left: 20px;
             margin-top: 10px;
-            color: #ffffff;
-            font-size: 60px;
-            letter-spacing: 3px;
+            margin-right: 20px;
+            // color: #ffffff;
+            // font-size: 60px;
+            // letter-spacing: 3px;
+            // text-decoration:underline;
+            .people_t {
+              color: #ffffff;
+              font-size: 20px;
+              letter-spacing: 3px;
+            }
+            .people_n {
+              background-image: linear-gradient(0deg, #0d3bb1 0%, #00c0ff 100%);
+              background-clip: text;
+              -webkit-background-clip: text;
+              -webkit-text-fill-color: transparent;
+              color: #ffffff;
+              font-size: 60px;
+              letter-spacing: 3px;
+              text-decoration: underline;
+              text-decoration-color: #ffffff;
+            }
+            .people_r {
+              color: #ffffff;
+              font-size: 60px;
+              letter-spacing: 3px;
+            }
           }
         }
         .computer {
@@ -1008,7 +1151,7 @@ export default {
             // justify-content: center;
             text-align: center;
             // flex: 1;
-            
+
             -webkit-line-clamp: 1;
             display: -webkit-box;
             -webkit-box-orient: vertical;

src/views/manage/manageMain.vue

@@ -1200,14 +1200,15 @@ export default {
   margin-top: 40px;
   font-weight: 700;
   font-size: 20px;
-  -webkit-transform: skew(-10deg);
   letter-spacing: 2px;
-  /* for Chrome||Safari */
-  -ms-transform: skew(-10deg);
-  /* for IE */
-  -moz-transform: skew(-10deg);
-  /* for Firefox */
-  -o-transform: skew(-10deg);
+  // -webkit-transform: skew(-10deg);
+  
+  // /* for Chrome||Safari */
+  // -ms-transform: skew(-10deg);
+  // /* for IE */
+  // -moz-transform: skew(-10deg);
+  // /* for Firefox */
+  // -o-transform: skew(-10deg);
   /* for Opera */
 }
 </style>