Merge branch 'master' of http://101.43.129.26:10880/psychological_camera/cpdm_manage

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">个人报告查看</p>
             <p v-if="!isView" class="dig_title">编辑计划</p>
             <div slot=""></div>
             <div slot="footer"></div>
@@ -42,7 +42,14 @@
                 </el-table-column>
                 <el-table-column
                   prop="createTime"
-                  label="创建时间"
+                  label="计划创建时间"
+                  align="center"
+                  width=""
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="completedTime"
+                  label="测试完成时间"
                   align="center"
                   width=""
                 >
@@ -51,7 +58,7 @@
                   <template slot-scope="scope">
                     <div class="detail_button_out" v-if="scope.row.isComplete == '1'">
                       <div class="detail_button" @click="queryRport(scope.row)">
-                        <img style="width: 20px" src="../assets/img/table/search.png" />
+                        <img style="width: 15px" src="../assets/img/table/search.png" />
                         <span>查看报告</span>
                       </div>
                     </div>
@@ -90,7 +97,10 @@
             <div slot=""></div>
             <div slot="footer"></div>
 
-            <div class="table-content">
+            <div
+              class="table-content"
+              style="display: flex; justify-content: space-around"
+            >
               <!-- 修改文本 -->
               <!-- <el-radio-group v-model="radio1" ref="radio_group" @input="radioChange">
                 <el-radio
@@ -101,6 +111,8 @@
                 ></el-radio>
               </el-radio-group> -->
               <el-button
+                type="success"
+                style="border-radius: 20px"
                 v-for="item in topPicList"
                 :key="item.name"
                 @click="radioClick(item)"
@@ -118,7 +130,7 @@
       <el-dialog
         :visible.sync="userVisible"
         append-to-body
-        width="81%"
+        width="82%"
         style="border-radius: 40px"
       >
         <div slot="title" style="border-radius: 40px">
@@ -132,6 +144,7 @@
                     <div class="report_info_user">
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
                       <span class="info">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>
+                      <span class="info">测试用时:&nbsp;&nbsp;{{ useTime }}</span>
                       <span class="info"
                         >所属组织结构:&nbsp;&nbsp;<span style="color: #00bf78">{{
                           orgName
@@ -148,13 +161,17 @@
                       </div>
                     </div>
                     <div class="totol_result_des" v-if="reportData.length > 0">
-                      结论：{{ reportData[reportData.length - 1].dimensionSymptom }}，{{
-                        reportData[reportData.length - 1].dimensionImprovement
+                      结论：{{ reportData[0].dimensionSymptom }}，{{
+                        reportData[0].dimensionImprovement
                       }}
                     </div>
                   </div>
                   <div class="out_p">
-                    <div v-show="currentFlag!='SHAPE_RANDOM'" class="echrts_sty" ref="echarts_ld"></div>
+                    <div
+                      v-show="currentFlag != 'SHAPE_RANDOM'"
+                      class="echrts_sty"
+                      ref="echarts_ld"
+                    ></div>
                     <div class="report_echarts_out">
                       <!-- justify-content: space-around; -->
                       <div
@@ -170,7 +187,9 @@
                       >
                         <div
                           class="progress_out"
-                          :style="{width:currentFlag!='SHAPE_RANDOM'?'100%':'50%'}"
+                          :style="{
+                            width: currentFlag != 'SHAPE_RANDOM' ? '100%' : '50%',
+                          }"
                           v-for="(item, index) in echarts_name_list"
                           :key="index"
                         >
@@ -204,22 +223,46 @@
                     <div class="des_zhishu">
                       {{ item.dimensionName }}
                     </div>
-                    <div
-                      class="report_des_out"
-                   
-                    >
+                    <div class="report_des_out">
                       <div class="score">
-                        分数：{{ item.dimensionScore
-                        }}<span
+                        分数：
+                        <span v-if="item.dimensionSymptom == '重度'||item.dimensionSymptom == '高风险'" style="color: red">
+                          {{ item.dimensionScore }}</span
+                        >
+                        <span v-if="item.dimensionSymptom == '无症状或轻度'||item.dimensionSymptom == '无或轻风险'">
+                          {{ item.dimensionScore }}</span
+                        >
+                        <span
+                          v-if="item.dimensionSymptom == '中度' ||item.dimensionSymptom == '中风险'"
+                          style="color: #efb17a"
+                        >
+                          {{ item.dimensionScore }}</span
+                        >
+                        <span
                           style="
                             font-size: 16px;
                             color: rgb(153, 153, 153);
                             letter-spacing: 0px;
                           "
-                          >&nbsp;&nbsp;满分（100）</span
+                          >&nbsp;&nbsp;（满分100）</span
                         >
                       </div>
-                      <div class="score">结论：{{ item.dimensionSymptom }}</div>
+
+                      <div class="score">结论：
+                        <span v-if="item.dimensionSymptom == '重度'||item.dimensionSymptom == '高风险'" style="color: red">
+                          {{ item.dimensionSymptom }}</span
+                        >
+                        <span v-if="item.dimensionSymptom == '无症状或轻度'||item.dimensionSymptom == '无或轻风险'">
+                          {{ item.dimensionSymptom }}</span
+                        >
+                        <span
+                          v-if="item.dimensionSymptom == '中度' ||item.dimensionSymptom == '中风险'"
+                          style="color: #efb17a"
+                        >
+                          {{ item.dimensionSymptom }}</span
+                        >
+           
+                      </div>
                       <!-- <div class="score">分析：</div> -->
                       <div class="scoreAsy">
                         <span class="scoreAsyTitle">分析：</span
@@ -310,7 +353,8 @@ export default {
       //该用户的需要做的题目的列表
       topPicList: [],
       radio1: "",
-      currentFlag:''
+      currentFlag: "",
+      useTime: "",
     };
   },
   mounted() {
@@ -318,8 +362,7 @@ export default {
     this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
   },
   methods: {
-    isRadioFun(val) {
-    },
+    isRadioFun(val) {},
     forMatCom(val) {
       if (val.isComplete == "0") {
         return "未完成";
@@ -353,7 +396,7 @@ export default {
         userNo: this.proDataLin.userNo,
         flag: val.flag,
       };
-      this.currentFlag =  val.flag
+      this.currentFlag = val.flag;
       this.userVisible = true;
       this.reportDetail(params);
     },
@@ -362,13 +405,13 @@ export default {
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
           // this.reportData = res.data;
-          this.reportDataAll = res.data.filter((item) => {
+          this.reportDataAll = res.data.dimensionScore.filter((item) => {
             return item.dimensionName != "总分";
           });
+          this.useTime = res.data.usedTime;
+          this.orgName = res.data.dimensionScore[0].orgName;
 
-          this.orgName = res.data[0].orgName;
-
-          this.reportData = res.data;
+          this.reportData = res.data.dimensionScore;
           // let a =[res.data[0].]
           //修改文本
 
@@ -475,6 +518,8 @@ export default {
       let url = `/plan/findAllByUserNo?pageSize=${this.pageSize}&pageNum=${this.pageNum}&userNo=${this.proDataLin.userNo}`;
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
+          debugger
+
           this.tableData = res.data.content;
           this.total = res.data.totalElements;
         } else {
@@ -639,13 +684,13 @@ input[aria-hidden="true"] {
 }
 </style>
 <style lang="less" scoped>
-.out /deep/.el-dialog {
-  border-radius: 20px !important;
-  // background-color: #f7f7f7 !important;
-}
-.out/deep/ .el-dialog__header {
-  padding: 0px 0px 0px !important;
-}
+// .out /deep/.el-dialog {
+//   border-radius: 20px !important;
+//   // background-color: #f7f7f7 !important;
+// }
+// .out/deep/ .el-dialog__header {
+//   padding: 0px 0px 0px !important;
+// }
 
 .progress_out/deep/ .el-progress-bar__inner {
   background-image: linear-gradient(to right, #ff4e00, #ffffff);
@@ -656,11 +701,11 @@ input[aria-hidden="true"] {
   line-height: 40px;
   width: 100%;
 }
-.dig_update /deep/.el-dialog {
-  border-radius: 20px !important;
-  box-shadow: none !important;
-  background: transparent !important;
-}
+// .dig_update /deep/.el-dialog {
+//   border-radius: 20px !important;
+//   box-shadow: none !important;
+//   background: transparent !important;
+// }
 .demo-ruleForm /deep/ .el-form-item {
   // margin-right: 10px;
   vertical-align: top;
@@ -854,6 +899,7 @@ input[aria-hidden="true"] {
     font-size: 20px;
     .info {
       margin-bottom: 10px;
+      font-size: 18px;
     }
     // font-weight: 700;
   }

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/channelInfo.vue

@@ -85,7 +85,7 @@
             width=""
           >
           </el-table-column>
-          <el-table-column prop="userNo" label="账号" align="center" width="">
+          <el-table-column prop="userNo" label="账号" align="center">
           </el-table-column>
           <el-table-column
             prop="gender"
@@ -97,16 +97,16 @@
           </el-table-column>
           <el-table-column prop="orgName" label="所属组织架构" align="center" width="">
           </el-table-column>
-          <el-table-column label="操作" width="510px" align="center">
+          <el-table-column label="操作" width="400px" align="center">
             <template slot-scope="scope">
               <div class="detail_button_out">
                 <div class="detail_button" @click="viewUser(scope.row)">
                   <img src="../../../assets/img/table/search.png" />
-                  <span> 查看个人详情 </span>
+                  <span> 查看 </span>
                 </div>
                 <div class="detail_button" @click="editUser(scope.row)">
                   <img src="../../../assets/img/table/edit.png" />
-                  <span>编辑个人详情 </span>
+                  <span>编辑 </span>
                 </div>
                 <!-- 弹出提示框 提示是否确认重置-->
                 <div class="detail_button" @click="resetUser(false, scope.row)">
@@ -186,7 +186,7 @@
             </div>
           </div>
           <div class="user_out">
-            <div class="user_out_sub">学号</div>
+            <div class="user_out_sub">账号</div>
             <div class="user_out_subNext">
               {{ view.studentNumber }}
             </div>
@@ -676,8 +676,10 @@ export default {
 }
 .detail_button_out {
   display: flex;
-  justify-content: space-around;
+  justify-content: flex-start;
   .detail_button {
+    // width: 100%;
+    margin-left:20px;
     display: flex;
     align-items: center;
     cursor: pointer;

src/views/manage/channelInfo/channelUserManage.vue

@@ -98,7 +98,7 @@
               <div class="detail_button_out">
                 <div class="detail_button" @click="selectPlan(scope.row)">
                   <img src="../../../assets/img/table/search.png" />
-                  <span> 选择计划 </span>
+                  <span> 个人报告查看 </span>
                 </div>
               </div>
               <!-- <el-popconfirm

src/views/manage/channelInfo/invite.vue

@@ -97,7 +97,7 @@
             :formatter="planStatusFun"
           >
           </el-table-column>
-          <el-table-column label="操作" width="510px" align="center">
+          <el-table-column label="操作" width="450px" align="center">
             <template slot-scope="scope">
               <div class="detail_button_out">
                 <div class="detail_button" @click="viewPlan(scope.row)">
@@ -724,9 +724,10 @@ export default {
 }
 .detail_button_out {
   display: flex;
-  justify-content: space-around;
+  justify-content: flex-start;
   .detail_button {
     display: flex;
+    margin-left: 20px;
     align-items: center;
     cursor: pointer;
     letter-spacing: 2px;

src/views/manage/channelManagement/channelManagement.vue

@@ -60,18 +60,31 @@
           <!-- <el-table-column prop="name" label="姓名" align="center" width=""  show-overflow-tooltip>
           </el-table-column> -->
           <el-table-column
-            show-overflow-tooltip
+            :show-overflow-tooltip="true"
             prop="planName"
             label="计划名称"
             align="center"
-            width=""
+            min-width="200px"
           >
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" :show-overflow-tooltip="true" align="center" width="">
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            :show-overflow-tooltip="true"
+            align="center"
+            width=""
+          >
           </el-table-column>
-          <el-table-column prop="planEndTime" label="结束时间" :show-overflow-tooltip="true" align="center" width="">
+          <el-table-column
+            prop="planEndTime"
+            label="结束时间"
+            :show-overflow-tooltip="true"
+            align="center"
+            width=""
+          >
           </el-table-column>
           <el-table-column
+            :show-overflow-tooltip="true"
             prop="planOrgName"
             label="所属组织架构"
             align="center"
@@ -90,14 +103,18 @@
             width=""
           >
           </el-table-column>
-          <el-table-column label="操作" width="300px" align="center">
+          <el-table-column label="操作" width="250px" align="center">
             <template slot-scope="scope">
               <div class="detail_button_out" v-if="scope.row.planStatus == '3'">
                 <div class="detail_button" @click="addUser(scope.row)">
                   <img src="../../../assets/img/table/search.png" />
-                  <span> 完成及得分情况</span>
+                  <span> 查看报告</span>
                 </div>
-                <div  v-if="scope.row.enable == '1'" class="detail_button" @click="downloadButton(scope.row)">
+                <div
+                  v-if="scope.row.enable == '1'"
+                  class="detail_button"
+                  @click="downloadButton(scope.row)"
+                >
                   <img src="../../../assets/img/table/search.png" />
                   <span> 下载报告</span>
                 </div>
@@ -153,91 +170,96 @@
     </div>
     <PlanReport ref="register" @search="searchTarget" />
     <!-- 弹出框---选择问题需要下载的组织架构 -->
-    <el-dialog
-      title=""
-      :visible.sync="downloadVisible"
-      width="40%"
-      :before-close="handleClose"
-      center
-    >
-      <div slot="title">
-        <p style="text-align: center; margin-bottom: 20px; font-weight: 700">报告下载</p>
-        <el-form :inline="true" class="demo-form-inline" style="margin-top: 20px">
-          <el-form-item label="选择下载范围">
-            <el-select v-model="dimensionality" placeholder="请选择下载范围">
-              <el-option
-                v-for="item in dimensionalityOption"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-
-        <!-- <el-form :inline="true" v-show="dimensionality=='0'" class="demo-form-inline" style="margin-top: 20px">
-          <el-form-item label="选择院">
-            <el-select multiple v-model="orgName" placeholder="请选择院">
-              <el-option
-                v-for="item in orgList"
-                :key="item.id"
-                :label="item.orgName"
-                :value="item.orgNo"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form> -->
-        <el-form
-          :inline="true"
-          v-show="dimensionality == '1'"
-          class="demo-form-inline"
-          style="margin-top: 20px"
-        >
-          <el-form-item label="选择届">
-            <el-select v-model="grade" placeholder="请选择届">
-              <el-option
-                v-for="item in gradeList"
-                :key="item.id"
-                :label="item"
-                :value="item"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-
-        <el-form
-          :inline="true"
-          v-show="dimensionality == '2'"
-          class="demo-form-inline"
-          style="margin-top: 20px"
-        >
-          <el-form-item label="选择班级">
-            <el-select multiple v-model="orgName" placeholder="请选择班级">
-              <el-option
-                v-for="item in orgList"
-                :key="item.id"
-                :label="item.orgName"
-                :value="item.orgNo"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <el-button v-show="dimensionality == '0'" @click="downloadFun">
-          全院下载
-        </el-button>
-        <el-button v-show="dimensionality == '1'" @click="downloadFun">
-          下载已选年级
-        </el-button>
-        <el-button v-show="dimensionality == '2'" @click="downloadFun">
-          下载已选班级
-        </el-button>
-        <el-button v-show="dimensionality == '2'" @click="downloadAllFun">
-          下载全部班级
-        </el-button>
-      </div>
+    <div class="radius_dia">
+      <el-dialog
+        title=""
+        :visible.sync="downloadVisible"
+        width="40%"
+        :before-close="handleClose"
+        center
+      >
+        <div slot="title">
+          <p style="text-align: center; margin-bottom: 20px; font-weight: 700">
+            报告下载
+          </p>
+          <el-form
+            :inline="true"
+            class="demo-form-inline form-plan"
+            style="
+              margin-top: 20px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+            "
+          >
+            <el-form-item label="选择下载范围">
+              <el-select v-model="dimensionality" placeholder="请选择下载范围">
+                <el-option
+                  v-for="item in dimensionalityOption"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="选择届" v-show="dimensionality == '1'">
+              <el-select v-model="grade" placeholder="请选择届">
+                <el-option
+                  v-for="item in gradeList"
+                  :key="item.id"
+                  :label="item"
+                  :value="item"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="选择班级" v-show="dimensionality == '2'">
+              <el-select multiple v-model="orgName" placeholder="请选择班级">
+                <el-option
+                  v-for="item in orgList"
+                  :key="item.id"
+                  :label="item.orgName"
+                  :value="item.orgNo"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+          <el-button
+            type="success"
+            style="border-radius: 20px"
+            v-show="dimensionality == '0'"
+            @click="downloadFun"
+          >
+            全院下载
+          </el-button>
+          <el-button
+            type="success"
+            style="border-radius: 20px"
+            v-show="dimensionality == '1'"
+            @click="downloadFun"
+          >
+            下载已选年级
+          </el-button>
+          <el-button
+            type="success"
+            style="border-radius: 20px"
+            v-show="dimensionality == '2'"
+            @click="downloadFun"
+          >
+            下载已选班级
+          </el-button>
+          <el-button
+            type="success"
+            style="border-radius: 20px"
+            v-show="dimensionality == '2'"
+            @click="downloadAllFun"
+          >
+            下载全部班级
+          </el-button>
+        </div>
 
-      <span slot="footer" class="dialog-footer"> </span>
-    </el-dialog>
+        <span slot="footer" class="dialog-footer"> </span>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -353,7 +375,7 @@ export default {
   },
   methods: {
     handleClose() {
-      this.downloadVisible=false;
+      this.downloadVisible = false;
     },
     //根据计划查询院
     queryCourt() {
@@ -742,10 +764,9 @@ export default {
       this.$http.get(url, {}, (res) => {
         console.log(res);
         if (res && res.code == 200) {
-          console.log('----------');
+          console.log("----------");
           console.log(res.data.content);
 
-   
           this.tableData = res.data.content;
           this.total = res.data.totalElements;
         } else {
@@ -780,7 +801,14 @@ export default {
   },
 };
 </script>
-
+<style scoped>
+.form-plan >>> .el-form-item__label {
+  width: 100px !important;
+}
+.radius_dia>>>.el-dialog {
+  border-radius: 20px !important;
+}
+</style>
 <style lang="less" scoped>
 @import "../../../styles/theme.less";
 .pag_class {
@@ -856,8 +884,9 @@ export default {
 }
 .detail_button_out {
   display: flex;
-  justify-content: space-around;
+  justify-content: flex-start;
   .detail_button {
+    margin-left: 20px;
     display: flex;
     align-items: center;
     cursor: pointer;

src/views/manage/generalSituation.vue

@@ -59,9 +59,15 @@
     </div>
     <div class="recently">
       <div class="recently_bottom">
-        <div class="recently_bottom_font">最近测试结果: {{ planData.planName }}</div>
+        <div class="recently_bottom_font">
+          最近测试结果: {{ planData.planName }} &nbsp;&nbsp;&nbsp;&nbsp;<span
+            style="cursor: pointer; color: #00bf78"
+            @click="queryDetail"
+            >查看详情</span
+          >
+        </div>
         <div class="block">
-          <div class="block_left" style="">
+          <!-- <div class="block_left" style="">
             <div class="chart_wrap">
               <PieChart :options="options1" chartId="myPieChart1" chartName="完成度" />
             </div>
@@ -84,7 +90,56 @@
                 chartName="存在心理健康情况"
               />
             </div>
+          </div> -->
+          <div class="block_left" style="">
+            <div class="chart_wrap">
+              <PieChart :options="options1" chartId="myPieChart10" chartName="完成度" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options2" chartId="myPieChart11" chartName="焦虑" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options3" chartId="myPieChart12" 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" 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="myPieChart13" chartName="压力" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart :options="options5" chartId="myPieChart14" chartName="精神障碍" />
+            </div>
+            <div class="chart_wrap">
+              <PieChart
+                :options="options6"
+                chartId="myPieChart15"
+                chartName="存在心理健康情况"
+              />
+            </div>
           </div>
+
           <!-- <div class="block_left">
             <div>
               <div class="block_table">
@@ -162,15 +217,18 @@
         </div>
       </div>
     </div>
+    <PlanReport ref="register"  />
   </div>
 </template>
 <script>
 import { oSessionStorage } from "../../utils/utils";
 import * as echarts from "echarts";
 import PieChart from "@/components/PieChart";
+import PlanReport from "@/components/PlanReport";
 export default {
   components: {
     PieChart,
+    PlanReport,
   },
   data() {
     return {
@@ -350,6 +408,10 @@ export default {
     // this.getOrg();
   },
   methods: {
+    queryDetail() {
+      console.log(this.planData)
+      this.$refs.register.open(this.planData);
+    },
     //根据组织编号查询总人数
     queryAllPeople() {
       let url = `/user/countUserByOrgNo?orgNo=${this.userInfo.orgNo}`;
@@ -390,7 +452,8 @@ export default {
                 key == "planName" ||
                 key == "planOrgName" ||
                 key == "createDate" ||
-                key == "userNum"
+                key == "userNum"||
+                key == "id"
               );
             });
             let list2 = Object.fromEntries(list1);
@@ -739,6 +802,8 @@ export default {
         width: 100%;
         height: 100%;
         display: flex;
+        flex-direction: column;
+        align-items: center;
         .block_left {
           display: flex;
           padding-left: 10px;
@@ -747,6 +812,7 @@ export default {
           flex: 6;
           //   background-color: #000000;
           height: 100%;
+          width: 100%;
           align-items: center;
           background-color: #ffffff;
           .chart_wrap {