修改区别用户--及新开浏览器进行重新登录--及用户下载功能

package.json

@@ -22,6 +22,7 @@
     "jsencrypt": "^3.0.0-rc.1",
     "jsmind": "^0.8.5",
     "md5": "^2.3.0",
+    "screenfull": "^5.2.0",
     "vant": "^2.8.4",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.3",

src/components/ComparePlanUser.vue

@@ -131,7 +131,8 @@
           <div class="compare_class">
             <div class="compare_user1" style="position: relative">
               <div class="compare_user1_out">
-                <img src="../assets/report/man.png" />
+                <img v-show="userGender1=='1'" src="../assets/report/man1.png" />
+                <img v-show="userGender1=='0'" src="../assets/report/woman1.png" />
                 <div class="compare_user1_info">
                   <div v-if="multipleSelection.length == 2">
                     姓名：{{ multipleSelection[0].userName }}
@@ -150,7 +151,8 @@
             </div>
             <div class="compare_user2">
               <div class="compare_user1_out">
-                <img src="../assets/report/man.png" />
+                <img v-show="userGender2=='1'" src="../assets/report/man1.png" />
+                <img v-show="userGender2=='0'" src="../assets/report/woman1.png" />
                 <div class="compare_user1_info">
                   <div v-if="multipleSelection.length == 2">
                     姓名：{{ multipleSelection[1].userName }}
@@ -427,6 +429,8 @@ export default {
       optionTT: {},
 
       userData1: {},
+      userGender1:"1",
+      userGender2:'1',
       orgName1: "",
       orgName2: "",
       //用户1的测试用时
@@ -691,6 +695,7 @@ export default {
         if (res && res.code == 200) {
           this.useTime1 = res.data.usedTime;
           this.orgName1 = res.data.user.orgName;
+          this.userGender1=res.data.user.gender
           let a = res.data.report;
 
           let listTmp2 =[]
@@ -703,6 +708,7 @@ export default {
             return !(item.dimensionName=='躯体化'||item.dimensionName=='焦虑'||item.dimensionName=='抑郁'||item.dimensionName=='总分')
           })
           this.userData1 = listTmp2.concat(listTmp3)
+
           if (this.userData2.length == 0) {
             this.formatterDataW(a, false, 1);
           } else {
@@ -720,6 +726,7 @@ export default {
         if (res && res.code == 200) {
           this.useTime2 = res.data.usedTime;
           this.orgName2 = res.data.user.orgName;
+          this.userGender2=res.data.user.gender
           let a = res.data.report.filter((item) => {
             return item.isIcon == "1";
           });

src/components/CompareUser.vue

@@ -158,7 +158,8 @@
           <div class="compare_class">
             <div class="compare_user1">
               <div class="compare_user1_out">
-                <img src="../assets/report/man.png" />
+                <img v-show="userInfo.gender=='1'" src="../assets/report/man1.png" />
+                <img v-show="userInfo.gender=='0'" src="../assets/report/woman1.png" />
                 <div class="compare_user1_info">
                   <div>姓名：{{ userInfo.userName }}</div>
 
@@ -173,7 +174,8 @@
             </div>
             <div class="compare_user2">
               <div class="compare_user1_out">
-                <img src="../assets/report/man.png" />
+                <img v-show="userInfo.gender=='1'" src="../assets/report/man1.png" />
+                <img v-show="userInfo.gender=='0'" src="../assets/report/woman1.png" />
                 <div class="compare_user1_info">
                   <div>姓名：{{ userInfo.userName }}</div>
                   <div>学号：{{ userInfo.userNo }}</div>

src/components/GroupCompare.vue

@@ -60,12 +60,12 @@
                 <tr>
                   <th class="first">序号</th>
                   <th>班级名称</th>
-                  <th>抑郁占比</th>
+                  <th>占比</th>
                 </tr>
                 <tr v-for="(item, index) in yiyuList10" :key="item.name">
                   <td class="first">{{ index + 1 }}</td>
                   <td>{{ item.name }}</td>
-                  <td>{{ item.score }}%</td>
+                  <td :style="{ color: item.color }">{{ item.score }}%</td>
                 </tr>
               </table>
             </div>
@@ -91,12 +91,12 @@
                 <tr>
                   <th class="first">序号</th>
                   <th>班级名称</th>
-                  <th>焦虑占比</th>
+                  <th>占比</th>
                 </tr>
                 <tr v-for="(item, index) in jlList10" :key="item.name">
                   <td class="first">{{ index + 1 }}</td>
                   <td>{{ item.name }}</td>
-                  <td>{{ item.score }}%</td>
+                  <td :style="{ color: item.color }">{{ item.score }}%</td>
                 </tr>
               </table>
             </div>
@@ -122,12 +122,12 @@
                 <tr>
                   <th class="first">序号</th>
                   <th>班级名称</th>
-                  <th>压力占比</th>
+                  <th>占比</th>
                 </tr>
                 <tr v-for="(item, index) in qthList10" :key="item.name">
                   <td class="first">{{ index + 1 }}</td>
                   <td>{{ item.name }}</td>
-                  <td>{{ item.score }}%</td>
+                  <td :style='{color:item.color}'>{{ item.score }}%</td>
                 </tr>
               </table>
             </div>
@@ -154,12 +154,12 @@
                 <tr>
                   <th class="first">序号</th>
                   <th>班级名称</th>
-                  <th>视觉整合能力占比</th>
+                  <th>占比</th>
                 </tr>
                 <tr v-for="(item, index) in sjList10" :key="item.name">
                   <td class="first">{{ index + 1 }}</td>
                   <td>{{ item.name }}</td>
-                  <td>{{ item.score }}%</td>
+                  <td :style='{color:item.color}'>{{ item.score }}%</td>
                 </tr>
               </table>
             </div>
@@ -204,14 +204,26 @@ export default {
       qthList10: [],
       //视觉整合能力前10
       sjList10: [],
+      colorList: [
+        "#7B0000",
+        "#AE0000",
+        "#E30000",
+        "#FF3C15",
+        "#FF5D15",
+        "#FF7815",
+        "#FF9600",
+        "#FFBD1F",
+        "#EBC42A",
+        "#E0D062",
+      ],
     };
   },
   methods: {
     open(val) {
       //将年级清空
       //将首选项改为第一个
-      this.groupType='1';
-      this.groupGrade=''
+      this.groupType = "1";
+      this.groupGrade = "";
 
       this.planInfo = val;
       //获取到当前计划信息
@@ -409,15 +421,45 @@ export default {
           //获取第二个参数
           // let nameList = [];
           // let scoreList = [];
-          this.yiyuList10 = [];
+          //先把分数记录下来
+          //然后去掉数据为0的
+          //然后去重
+          //例如 list 20.00  10.00
+
+          let list = [];
           for (let i = 0; i < res.data.length; i++) {
             let obj = {
               name: res.data[i].name,
               score: (parseFloat(res.data[i].num) * 100).toFixed(2),
+              color: "#2C3E50",
             };
-            this.yiyuList10.push(obj);
+            list.push(obj);
           }
-          // this.optionYiYu = { name: nameList, score: scoreList };
+          let listTmp1 = list.filter((item) => {
+            return item.score != "0.00";
+          });
+          let scoreListTmp = [];
+          for (let i = 0; i < listTmp1.length; i++) {
+            //
+            if (scoreListTmp.indexOf(listTmp1[i].score) == -1) {
+              scoreListTmp.push(listTmp1[i].score);
+            }
+          }
+
+          for (let i = 0; i < list.length; i++) {
+            //
+            for (let j = 0; j < scoreListTmp.length; j++) {
+              if (scoreListTmp[j] == list[i].score) {
+                list[i].color = this.colorList[j];
+              }
+            }
+          }
+
+          this.yiyuList10 = list;
+          //依次给个颜色
+
+          //将0.00过滤出来
+          //将去重的过滤出来
         }
       });
     },
@@ -435,17 +477,45 @@ export default {
           //获取第二个参数
           // let nameList = [];
           // let scoreList = [];
-          this.jlList10 = [];
+
+          let list = [];
           for (let i = 0; i < res.data.length; i++) {
             let obj = {
               name: res.data[i].name,
               score: (parseFloat(res.data[i].num) * 100).toFixed(2),
+              color: "#2C3E50",
             };
-            this.jlList10.push(obj);
+            list.push(obj);
+          }
+          let listTmp1 = list.filter((item) => {
+            return item.score != "0.00";
+          });
+          let scoreListTmp = [];
+          for (let i = 0; i < listTmp1.length; i++) {
+            //
+            if (scoreListTmp.indexOf(listTmp1[i].score) == -1) {
+              scoreListTmp.push(listTmp1[i].score);
+            }
+          }
+          for (let i = 0; i < list.length; i++) {
+            //
+            for (let j = 0; j < scoreListTmp.length; j++) {
+              if (scoreListTmp[j] == list[i].score) {
+                list[i].color = this.colorList[j];
+              }
+            }
           }
+          this.jlList10 = list;
+          // this.jlList10 = [];
+          // for (let i = 0; i < res.data.length; i++) {
+          //   let obj = {
+          //     name: res.data[i].name,
+          //     score: (parseFloat(res.data[i].num) * 100).toFixed(2),
+          //   };
+          //   this.jlList10.push(obj);
+          // }
           // this.optionYiYu = { name: nameList, score: scoreList };
         }
-        console.log(res);
       });
     },
     //查询躯体化前10数据
@@ -460,17 +530,37 @@ export default {
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
           //获取第二个参数
-          // let nameList = [];
-          // let scoreList = [];
-          this.qthList10 = [];
+
+          let list = [];
           for (let i = 0; i < res.data.length; i++) {
             let obj = {
               name: res.data[i].name,
               score: (parseFloat(res.data[i].num) * 100).toFixed(2),
+              color: "#2C3E50",
             };
-            this.qthList10.push(obj);
+            list.push(obj);
           }
-          // this.optionYiYu = { name: nameList, score: scoreList };
+          let listTmp1 = list.filter((item) => {
+            return item.score != "0.00";
+          });
+          let scoreListTmp = [];
+          for (let i = 0; i < listTmp1.length; i++) {
+            //
+            if (scoreListTmp.indexOf(listTmp1[i].score) == -1) {
+              scoreListTmp.push(listTmp1[i].score);
+            }
+          }
+          console.log("scoreListTmp")
+          console.log(scoreListTmp)
+          for (let i = 0; i < list.length; i++) {
+            //
+            for (let j = 0; j < scoreListTmp.length; j++) {
+              if (scoreListTmp[j] == list[i].score) {
+                list[i].color = this.colorList[j];
+              }
+            }
+          }
+          this.qthList10 = list;
         }
       });
     },
@@ -484,18 +574,36 @@ export default {
       }
       this.$http.get(url, {}, (res) => {
         if (res.code == 200) {
-          //获取第二个参数
-          // let nameList = [];
-          // let scoreList = [];
-          this.sjList10 = [];
+          let list = [];
           for (let i = 0; i < res.data.length; i++) {
             let obj = {
               name: res.data[i].name,
               score: (parseFloat(res.data[i].num) * 100).toFixed(2),
+              color: "#2C3E50",
             };
-            this.sjList10.push(obj);
+            list.push(obj);
           }
-          // this.optionYiYu = { name: nameList, score: scoreList };
+          let listTmp1 = list.filter((item) => {
+            return item.score != "0.00";
+          });
+          let scoreListTmp = [];
+          for (let i = 0; i < listTmp1.length; i++) {
+            //
+            if (scoreListTmp.indexOf(listTmp1[i].score) == -1) {
+              scoreListTmp.push(listTmp1[i].score);
+            }
+          }
+          for (let i = 0; i < list.length; i++) {
+            //
+            for (let j = 0; j < scoreListTmp.length; j++) {
+              if (scoreListTmp[j] == list[i].score) {
+                list[i].color = this.colorList[j];
+              }
+            }
+          }
+          this.sjList10 = list;
+       
+         
         }
       });
     },
@@ -514,7 +622,7 @@ export default {
           if (list.length > 0) {
             for (let i = 0; i < list.length; i++) {
               let obj = {
-                label: list[i]==-1?'教师组':`${list[i]}级`  ,
+                label: list[i] == -1 ? "教师组" : `${list[i]}级`,
                 value: list[i],
               };
               this.gradeOption.push(obj);
@@ -534,6 +642,7 @@ export default {
   .yiyu_left {
     display: flex;
     flex: 8;
+    padding-right:40px
   }
   .yiyu_right {
     flex: 4;
@@ -570,7 +679,7 @@ table {
 
   th,
   td {
-    padding: 2px 4px;
+    padding: 3px 4px;
     border: none;
     border: 1px solid #dddddd;
     margin: 0;

src/components/PlanReport.vue

@@ -988,6 +988,7 @@ export default {
       this.doubtfulSearchList();
       //获取满分人员列表
       this.fullmarkSearchList();
+      
     },
     //查询计划下年级
     queryGrade() {

src/components/Report.vue

@@ -188,7 +188,8 @@
               <div style="padding: 20px 40px">
                 <div>
                   <div class="report_info_out">
-                    <img src="../assets/report/man.png" />
+                    <img v-show="proDataLin.gender=='1'" src="../assets/report/man1.png" />
+                    <img v-show="proDataLin.gender=='0'" src="../assets/report/woman1.png" />
                     <div class="report_info_user">
                       <span class="info">姓名:&nbsp;&nbsp;{{ proDataLin.userName }}</span>
                       <span class="info">学号:&nbsp;&nbsp;{{ proDataLin.userNo }}</span>

src/components/ZhuChart.vue

@@ -81,7 +81,7 @@ export default {
         grid: {
           left: "3%",
           right: "4%",
-          bottom: "3%",
+          bottom: "10%",
           containLabel: true,
         },
         xAxis: [
@@ -89,10 +89,10 @@ export default {
             type: "category",
             data: data.name,
 
-            // axisLabel: {
-            //   interval: 0, //代表需要全部显示
-            //   rotate: "90", //代表倾斜45 可以节省空间
-            // },
+            axisLabel: {
+              // interval: 0, //代表需要全部显示
+              rotate: "-70", //代表倾斜45 可以节省空间
+            },
           },
         ],
         yAxis: [
@@ -106,19 +106,22 @@ export default {
             type: "slider",
             xAxisIndex: 0,
             filterMode: "none",
+            bottom:20
           },
 
           {
             type: "inside",
             xAxisIndex: 0,
             filterMode: "none",
+            bottom:20
           },
         ],
         series: [
           {
             name: this.name,
             type: "bar",
-            barWidth: "60%",
+            // barWidth: "60%",\
+            barMaxWidth:40,
             data: data.score,
             itemStyle: {
               color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [

src/router/index.js

@@ -1,20 +1,34 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-import {routers} from './router'
+import Vue from "vue";
+import Router from "vue-router";
+import { routers } from "./router";
+import { oSessionStorage } from "../utils/utils";
 
-Vue.use(Router)
+Vue.use(Router);
 const RouterConfig = {
-    mode: 'history',
-    // base: process.env.BASE_URL,
-    // base: 'child_pc',
-    base: 'pc',
-    // base: '',
-    routes: routers
-}
+  mode: "history",
+  // base: process.env.BASE_URL,
+  // base: 'child_pc',
+  base: "pc",
+  // base: '',
+  routes: routers,
+};
 
-export const router = new Router(RouterConfig)
-
-router.beforeEach((to,from,next) => {
-    next()
-})
+export const router = new Router(RouterConfig);
 
+router.beforeEach((to, from, next) => {
+  //如果跳转的是登录页则不必理会
+  //如果跳的是其他页面--要看用户是否登录了
+  //如果登陆了则正常跳转
+  if (to.name == "loginNew") {
+    //
+    next();
+  } else {
+    //判断当前用户是否登录
+    if (oSessionStorage.getItem("userInfo")) {
+      next();
+    } else {
+    //   next();
+      router.push({path:'/'});
+    }
+  }
+});

src/views/manage/channelManagement/channelManagement.vue

@@ -179,7 +179,7 @@
                 ></i>
                 &nbsp;&nbsp;
                 <i
-                v-clipboard:copy="scope.row.extractCode"
+                  v-clipboard:copy="scope.row.extractCode"
                   v-clipboard:success="copySuc"
                   v-clipboard:error="copyFail"
                   title="复制文本"
@@ -189,7 +189,6 @@
                     scope.row.extractCode != null &&
                     scope.row.extractCode != ''
                   "
-                
                   class="el-icon-copy-document"
                 ></i>
                 <i
@@ -212,7 +211,6 @@
                     scope.row.extractCode != null &&
                     scope.row.extractCode != ''
                   "
-               
                   class="el-icon-copy-document"
                 ></i>
               </div>
@@ -222,7 +220,10 @@
             <template slot-scope="scope">
               <div
                 class="detail_button_out"
-                v-if="(userInfo.roleType=='5'&&scope.row.planStatus == '3')||(scope.row.planStatus == '3' && scope.row.enable == '1')"
+                v-if="
+                  (userInfo.roleType == '5' && scope.row.planStatus == '3') ||
+                  (scope.row.planStatus == '3' && scope.row.enable == '1')
+                "
               >
                 <div class="detail_button" @click="addUser(scope.row)">
                   <img src="../../../assets/img/table/search.png" />
@@ -230,12 +231,18 @@
                 </div>
                 <div class="detail_button" @click="downloadButton(scope.row)">
                   <img src="../../../assets/img/table/xiafa1.png" />
+                  <!-- <img src="../../../assets/img/table/xiafaz.gif" /> -->
                   <span> 下载报告</span>
                 </div>
               </div>
               <div
                 class="detail_button_out_dis"
-                v-if="!((userInfo.roleType=='5'&&scope.row.planStatus == '3')||(scope.row.planStatus == '3' && scope.row.enable == '1'))"
+                v-if="
+                  !(
+                    (userInfo.roleType == '5' && scope.row.planStatus == '3') ||
+                    (scope.row.planStatus == '3' && scope.row.enable == '1')
+                  )
+                "
               >
                 <div class="detail_button_dis" :title="titleFormatter(scope.row)">
                   <img src="../../../assets/img/table/search_dis.png" />
@@ -305,7 +312,7 @@
                 <el-option
                   v-for="item in gradeList"
                   :key="item.id"
-                  :label="item + '级'"
+                  :label="item == -1 ? '教师组' : item + '级'"
                   :value="item"
                 ></el-option>
               </el-select>
@@ -356,9 +363,47 @@
             </el-button>
           </div>
         </div>
+        <div style="margin-left:10%" v-show="downList.length>0">
+          待下载列表
+        </div>
+        <el-table :data="downList" style="width: 80%; margin-left: 10%" max-height="250" v-show="downList.length>0">
+          <el-table-column type="index" align="center" label="序号"> </el-table-column>
+          <el-table-column prop="createTime" align="center" label="生成时间">
+          </el-table-column>
 
+          <el-table-column fixed="right" align="center" label="操作" width="60px">
+            <template slot-scope="scope">
+              <el-button @click="downNewFun(scope.row)" type="text" size="small">
+                下载
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
         <span slot="footer" class="dialog-footer"> </span>
       </el-dialog>
+
+      <el-dialog
+        class="dig_update ts_li"
+        :visible.sync="resetVisible"
+        width="30%"
+        center
+        style="border-radius: 40px"
+      >
+        <div slot="title">
+          <div class="demo-ruleForm">
+            <p class="dig_title">提示</p>
+
+            <p>正在下载中，请勿操作</p>
+
+            <div class="dig_button">
+              <el-button type="info" round @click="cancle()">关闭</el-button>
+              <!-- <el-button type="success" round @click="submitForm('ruleForm')"
+                >提交</el-button
+              > -->
+            </div>
+          </div>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -468,6 +513,8 @@ export default {
         background: "rgba(0, 0, 0, 0.7)",
       },
       loadingInstance: null,
+      downList: [],
+      timeFlag: null,
     };
   },
   created() {},
@@ -482,31 +529,31 @@ export default {
     this.searchTarget();
   },
   methods: {
-    copySuc(){
-    this.$message.success("复制成功")
-},
+    copySuc() {
+      this.$message.success("复制成功");
+    },
 
-copyFail(){
-    this.$message.success("复制失败")
-},
+    copyFail() {
+      this.$message.success("复制失败");
+    },
     onCopy(row) {
       if (navigator.clipboard && window.isSecureContext) {
         navigator.clipboard.writeText(row.extractCode).then(() => {
           this.$message.success("复制成功");
         });
-      }else {
-        const textArea = document.createElement('textarea')
-        textArea.value = val
+      } else {
+        const textArea = document.createElement("textarea");
+        textArea.value = val;
         // 使text area不在viewport，同时设置不可见
-        document.body.appendChild(textArea)
-        textArea.focus()
-        textArea.select()
-        this.$message.success('复制成功')
+        document.body.appendChild(textArea);
+        textArea.focus();
+        textArea.select();
+        this.$message.success("复制成功");
         return new Promise((res, rej) => {
           // 执行复制命令并移除文本框
-          document.execCommand('copy') ? res() : rej()
-          textArea.remove()
-        })
+          document.execCommand("copy") ? res() : rej();
+          textArea.remove();
+        });
       }
     },
     titleFormatter(val) {
@@ -521,6 +568,7 @@ copyFail(){
       }
     },
     handleClose() {
+      clearInterval(this.timeFlag);
       this.downloadVisible = false;
     },
     //根据计划查询院
@@ -550,6 +598,7 @@ copyFail(){
     },
     //下载报告
     downloadFun() {
+      //在这里调用接口
       //判断当前选择是院还是届--还是班级
       let params = {};
       if (this.dimensionality == 0) {
@@ -579,24 +628,21 @@ copyFail(){
           classIds: this.orgName,
         };
       }
+      this.downloadVisible = false;
+      this.resetVisible = true;
+      //需要传输
 
-      this.loadingInstance = Loading.service(this.optionsLoad);
       this.$http.post(`/generate/report/v2`, params, (res) => {
         if (res && res.code == 200) {
           // this.currentDownFun(res.data);
           let a = document.createElement("a");
           document.body.appendChild(a);
-          a.setAttribute("href", basePath + `/plan/download?path=${res.data}`);
+          a.setAttribute("href", basePath + `/plan/download?recordId=${res.data.id}`);
           a.click();
           this.$nextTick(() => {
             // 以服务的方式调用的 Loading 需要异步关闭
-            this.loadingInstance.close();
+            this.resetVisible = false;
           });
-          // this.currentDownFun(res.data)
-          // this.grade = res.data[0];
-          // this.gradeList = res.data;
-          // this.orgName = [res.data[0].orgNo];
-          // this.orgList = res.data;
         } else {
           this.$message.error(res.msg);
         }
@@ -630,17 +676,18 @@ copyFail(){
         flag: 2,
         classIds: orgNameList,
       };
-      Loading.service(options);
+      this.downloadVisible = false;
+      this.resetVisible = true;
       // Loading.service(options);
       this.$http.post(`/plan/generate/report/v2`, params, (res) => {
         if (res && res.code == 200) {
           let a = document.createElement("a");
           document.body.appendChild(a);
-          a.setAttribute("href", basePath + `/plan/download?path=${res.data}`);
+          a.setAttribute("href", basePath + `/plan/download?recordId=${res.data.id}`);
           a.click();
           this.$nextTick(() => {
             // 以服务的方式调用的 Loading 需要异步关闭
-            this.loadingInstance.close();
+            this.resetVisible = false;
           });
           // this.currentDownFun(res.data);
         } else {
@@ -648,6 +695,18 @@ copyFail(){
         }
       });
     },
+    downNewFun(val) {
+      //返回这个路径要如何用
+      let a = document.createElement("a");
+      document.body.appendChild(a);
+      a.setAttribute("href", basePath + `/plan/download?recordId=${val.id}`);
+      a.click();
+      //开始调用刷新按钮
+      clearInterval(this.timeFlag);
+      this.timeFlag = setInterval(() => {
+        this.getPlanFileList();
+      }, 1000);
+    },
     //组织架构选择--
     getOrgList() {
       this.$http.get(`/planOrg/findAllByPlanId?planId=${this.planId}`, {}, (res) => {
@@ -661,11 +720,13 @@ copyFail(){
     },
     //下载标志
     downloadButton(row) {
+      //在这里记录一下---数据
+      //当查看报告时--如果显示的是
       if (this.userInfo.roleType != 5) {
         if (row.enable == "0") {
           //提示暂未授权
           this.$message({
-            message: "暂未授权",
+            message: "正在下载中",
             type: "warning",
           });
           return;
@@ -676,6 +737,22 @@ copyFail(){
       this.getOrgList();
       this.queryCourt();
       this.queryGrade();
+      this.getPlanFileList();
+      //调用接口
+      //查询下载计划的列表
+    },
+    //查询计划列表
+    getPlanFileList() {
+      this.$http.get(`/downRecord/findDownRecord?planId=${this.planId}`, {}, (res) => {
+        //  this.$toast.success({message:'成功'});
+        if (res && res.code == 200) {
+          //将值赋值给list
+          this.downList = res.data;
+          // this.channelList = res.data;
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
     },
     forMaPlan(val) {
       if (val.planStatus == "1") {
@@ -958,6 +1035,9 @@ copyFail(){
 };
 </script>
 <style scoped>
+.ts_li >>> .el-dialog__body {
+  padding: 0px !important;
+}
 .form-plan >>> .el-form-item__label {
   width: 100px !important;
 }

src/views/manage/generalSituation.vue

@@ -535,8 +535,30 @@ export default {
     };
 
     this.queryDetailScore();
+
+    //当屏幕变化自适应大小
+    window.addEventListener("resize", this.echartsAllSize);
+  },
+  destroyed(){
+    window.removeEventListener("resize", this.echartsAllSize);
   },
   methods: {
+    //设置图标自适应
+    echartsAllSize(){
+      let flag = false;
+      setTimeout(() => {
+        flag = true;
+        if (flag) {
+          //设置变化的大小
+          console.log("大小变化了---------------------");
+          let myChart = this.$echarts.init(this.$refs.echarts_zhu);
+          myChart.resize();
+
+          let myChart1 = this.$echarts.init( this.$refs.echarts_lei);
+          myChart1.resize();
+        }
+      }, 1000);
+    },
     queryDetail() {
       this.$refs.register.open(this.planData);
     },

src/views/manage/individualTendency.vue

@@ -216,14 +216,14 @@ export default {
     },
     //查询4个维度的值
     async query4Score() {
-      let list = ["抑郁", "焦虑", "躯体化", "视觉能力整合"];
+      let list = ["抑郁", "焦虑", "躯体化", "视觉整合能力"];
       //抑郁集合
       let listDepressed = [];
       //焦虑组合
       let listAnxiety = [];
       //压力集合
       let listStress = [];
-      //视觉能力整合
+      //视觉整合能力
       let listSj = [];
       for (let i = 0; i < list.length; i++) {
         //抑郁集合
@@ -239,7 +239,7 @@ export default {
           listStress = await this.queryDetailScore(list[i]);
         }
         //视觉能力集合
-        if (list[i] == "视觉能力整合") {
+        if (list[i] == "视觉整合能力") {
           listSj = await this.queryDetailScore(list[i]);
         }
       }

src/views/manage/manageMain.vue

@@ -122,6 +122,10 @@
           </el-col>
 
           <el-col :span="12" class="just-right">
+            <div style="display: flex; align-items: center; margin-right: 20px">
+            <img v-show="isFullscreen"  src="../../assets/img/home/suo.png" alt="" style='cursor:pointer;width:20px' @click='fullScreenFun'>
+            <img v-show="!isFullscreen" src="../../assets/img/home/quan.png" alt="" style='cursor:pointer;width:20px' @click='fullScreenFun'>
+            </div>
             <div class="user_out" @mouseenter="mouseenterFun" @mouseleave="mouseLeaveFun">
               <img class="user_out_img" src="../../assets/menu/userAdmin.png" />
               <div class="user_out_des">{{ userInfo.userName }}老师</div>
@@ -217,6 +221,7 @@ import vueQr from "vue-qr";
 import { mapGetters, mapActions } from "vuex";
 import { oSessionStorage } from "@/utils/utils";
 import register from "@/components/Register";
+import screenfull from "screenfull";
 export default {
   name: "manageMain",
   components: {
@@ -284,6 +289,8 @@ export default {
     };
 
     return {
+      //是否全屏的标志
+      isFullscreen:false,
       isTmpPath: "",
       //是否显示退出菜单
       isShowMenu: false,
@@ -670,14 +677,39 @@ export default {
       //  that.$forceUpdate()
       that.selectMenu(e);
     });
+
+    //开始设置全屏的监听方法
+    screenfull.on("change", this.change);
     //得到用户信息，根据角色信息判断哪个显示哪个不显示
   },
+  destroyed(){
+    screenfull.off("change", this.change);
+  },
   methods: {
     ...mapActions({
       // setSacleListName:"setSacleListName",
       // setMenuActive:"setMenuActive"
     }),
 
+    fullScreenFun(){
+      console.log(screenfull)
+      // debugger;
+
+      if(!screenfull.isEnabled){
+        this.$message.error('该浏览不支持缩放')
+      }
+      if( this.isFullscreen){
+        screenfull.exit()
+      }else{
+        screenfull.request()
+      }
+      // screenfull.toggle()
+      // screenfull.request()
+    },
+    change(){
+      this.isFullscreen =screenfull.isFullscreen
+    },
+
     changeMenu: function () {
       this.isCollapse = !this.isCollapse;
     },

src/views/manage/tendency.vue

@@ -464,14 +464,14 @@ export default {
     },
     //查询4个维度的值
     async query4Score() {
-      let list = ["抑郁", "焦虑", "躯体化", "视觉能力整合"];
+      let list = ["抑郁", "焦虑", "躯体化", "视觉整合能力"];
       //抑郁集合
       let listDepressed = [];
       //焦虑组合
       let listAnxiety = [];
       //压力集合
-      let listStress = [];
-      //视觉能力整合
+      let listStress = [];              
+      //视觉整合能力
       let listSj = [];
       for (let i = 0; i < list.length; i++) {
         //抑郁集合
@@ -487,7 +487,7 @@ export default {
           listStress = await this.queryDetailScore(list[i]);
         }
         //视觉能力集合
-        if (list[i] == "视觉能力整合") {
+        if (list[i] == "视觉整合能力") {
           listSj = await this.queryDetailScore(list[i]);
         }
       }