修改样式

src/components/ComparePlanProfession.vue

@@ -29,7 +29,7 @@
               item
             }}</el-radio>
           </el-radio-group>
-          <div ref="echarts_plan" style="width: 70vw; height: 100vh"></div>
+          <div ref="echarts_plan" style="width: 70vw; height: 50vh"></div>
         </div>
       </div>
     </el-dialog>
@@ -82,6 +82,7 @@ export default {
       yAxis: {
         type: "value",
         boundaryGap: [0, 0.01],
+        minInterval: 1,
       },
       series: [
         {
@@ -128,17 +129,20 @@ export default {
       yAxis: {
         type: "value",
         boundaryGap: [0, 0.01],
+        minInterval: 1,
       },
       series: [
         {
           name: "专业1",
           type: "bar",
           data: [0, 23489, 29034, 104970, 131744, 0],
+         
         },
         {
           name: "专业2",
           type: "bar",
           data: [19325, 23438, 31000, 121594, 134141, 681807],
+          barWidth: '15',//修改柱状图的宽度
         },
       ],
     };
@@ -375,6 +379,7 @@ export default {
           name: prolistFinName[i],
           type: "bar",
           data: formatterPro[i],
+          barWidth: '15',//修改柱状图的宽度
         };
         series.push(obj);
       }

src/components/PlanReport.vue

@@ -7,6 +7,7 @@
       style="border-radius: 40px"
     >
       <div slot="title">
+        <p style="text-align: center; margin-bottom: 20px; font-weight: 700">{{planName}}报告</p>
         <div style="display: flex; margin-top: 40px">
           <div ref="echarts_bing" style="width: 100%; height: 600px; flex: 1"></div>
           <div ref="echarts_zhu" style="width: 100%; height: 600px; flex: 1"></div>
@@ -75,6 +76,8 @@ import * as echarts from "echarts";
 export default {
   data() {
     return {
+      //获取计划名称
+       planName:'',
       planId: {},
       dialogVisible: false,
       echarts_bing: "",
@@ -168,6 +171,7 @@ export default {
   methods: {
     open(val) {
       this.planId = val.id;
+      this.planName=val.planName
       this.dialogVisible = true;
       this.isFin();
       this.isScore();

src/components/Report.vue

@@ -168,7 +168,7 @@
                       class="report_des_out"
                       v-show="reportDataAll.length - 1 != index"
                     >
-                      <div class="score">分数：{{ item.dimensionScore }}</div>
+                      <div class="score">分数：{{ item.dimensionScore }}<span style="font-size: 16px;color: rgb(153, 153, 153);letter-spacing:0px">&nbsp;&nbsp;满分（100）</span></div>
                       <div class="score">结论：{{ item.dimensionSymptom }}</div>
                       <!-- <div class="score">分析：</div> -->
                       <div class="scoreAsy">
@@ -345,7 +345,6 @@ export default {
           console.log("res");
           console.log(res);
           this.reportDataAll = res.data.report;
-          debugger;
           let a = res.data.report.filter((item) => {
             return item.isIcon == "1";
           });
@@ -641,7 +640,7 @@ export default {
 
 .kply {
   width: 100%;
-  margin-top: 100px;
+  margin-top: 20px;
   // background-color: #FAFAFA;
 
   .kply_inner {
@@ -656,7 +655,7 @@ export default {
     border-radius: 40px;
 
     .report_totol_score {
-      margin-top: 60px;
+      margin-top: 20px;
       display: flex;
       flex-direction: row;
       // justify-content: space-between;
@@ -689,7 +688,7 @@ export default {
       }
 
       .totol_result_des {
-        font-size: 20px;
+        font-size: 18px;
         margin-left: 50px;
         letter-spacing: 3px;
         line-height: 30px;
@@ -731,7 +730,7 @@ export default {
 
     .des_zhishu {
       color: #222222;
-      font-size: 24px;
+      font-size: 20px;
       letter-spacing: 3px;
     }
 
@@ -743,9 +742,9 @@ export default {
 
       .score {
         color: #48d68e;
-        font-size: 20px;
+        font-size: 16px;
         line-height: 30px;
-        letter-spacing: 3px;
+        letter-spacing: 2px;
       }
 
       .des {
@@ -760,15 +759,15 @@ export default {
         .scoreAsyTitle {
        
           color: #48d68e;
-          font-size: 20px;
+          font-size: 16px;
           line-height: 30px;
-          letter-spacing: 3px;
+          letter-spacing: 2px;
         }
         .scoreAsyDes {
           flex: 1;
-          font-size: 20px;
+          font-size: 16px;
           line-height: 30px;
-          letter-spacing: 3px;
+          letter-spacing: 2px;
         }
       }
     }

src/views/manage/generalSituation.vue

@@ -6,7 +6,7 @@
         <div class="number_people_top">人数统计</div>
         <div class="number_people_yuan">
           <div class="out">
-            <span class="yuan_name">科技学院</span>
+            <span :title="userInfo.orgName" class="yuan_name">{{userInfo.orgName}}</span>
             <span class="yuan_num">总人数</span>
             <span class="yuan_people">{{ peopleData["总人数"] }}人</span>
           </div>
@@ -21,7 +21,7 @@
       </div>
       <div class="plan">
         <div class="plan_inner">
-          <span class="plan_top">计划状态</span>
+          <span class="plan_top">近期测试</span>
           <div class="table_header">
             <div class="detail">测试名称</div>
             <div class="detail">创建时间</div>
@@ -175,6 +175,8 @@ export default {
   },
   mounted() {
     this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
+    console.log("userInfo")
+    console.log(this.userInfo)
     //查询最新人数统计
     this.queryAllPeople();
     //查询最新计划
@@ -541,6 +543,9 @@ export default {
           display: flex;
           flex-direction: column;
           .yuan_name {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space:nowrap;
             margin-left: 20px;
             margin-top: 20px;
             color: #000000;

src/views/manage/manageMain.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container style="height: 100vh; overflow: hidden">
-    <el-aside style="width: auto;overflow: hidden">
+    <el-aside style="width: auto; overflow: hidden">
       <el-menu
         :unique-opened="true"
         ref="menu"
@@ -26,8 +26,8 @@
           "
           src="../../assets/img/commons/jhTop1.png"
         /> -->
-        <p class="aab">心理健康测评
-        </p>
+        <p class="aac">郑州大学大学生心理健康测评</p>
+        <!-- <p class="aab"></p> -->
         <!-- <img
           v-show="!isCollapse"
           style="
@@ -366,8 +366,8 @@ export default {
     if (oSessionStorage.getItem("userInfo")) {
       this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
       this.userType = this.userInfo.roleType;
-      console.log(this.userInfo)
-      console.log(this.userType)
+      console.log(this.userInfo);
+      console.log(this.userType);
       //假如是代理用户则 //代理用户菜单不显示
       if (this.userType == "3") {
         this.menuList = [
@@ -1083,20 +1083,39 @@ export default {
     font-weight: 700;
   }
 }
-.aab{
-  color: #48D68E;
+.aab {
+  color: #48d68e;
   margin-left: 20px;
+  margin-top: 10px;
+  font-weight: 700;
+  font-size: 24px;
+  -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);
+  /* for Opera */
+}
+.aac {
+  padding-left:20px;
+  padding-right:20px;
+  text-align: center;
+  color: #48d68e;
+  // margin-left: 20px;
   margin-top: 40px;
-            font-weight: 700;
-            font-size: 24px;
-            -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);
-            /* for Opera */
+  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);
+  /* for Opera */
 }
 </style>