修改密码显示

src/components/ComparePlanProfession.vue

@@ -197,19 +197,19 @@
             <td :class="{ warn: isRed(3, 2) }" v-html="getOtherRate('压力', 2, 2)"></td>
           </tr>
           <tr>
-            <td class="first">精神障碍人数</td>
-            <td>{{ dimensionList1[3]["精神障碍"] }}</td>
-            <td>{{ dimensionList2[3]["精神障碍"] }}</td>
+            <td class="first">视觉整合能力人数</td>
+            <td>{{ dimensionList1[3]["视觉整合能力"] }}</td>
+            <td>{{ dimensionList2[3]["视觉整合能力"] }}</td>
           </tr>
           <tr>
-            <td class="first">精神障碍占比</td>
+            <td class="first">视觉整合能力占比</td>
             <td
               :class="{ warn: isRed(4, 1) }"
-              v-html="getOtherRate('精神障碍', 1, 3)"
+              v-html="getOtherRate('视觉整合能力', 1, 3)"
             ></td>
             <td
               :class="{ warn: isRed(4, 2) }"
-              v-html="getOtherRate('精神障碍', 2, 3)"
+              v-html="getOtherRate('视觉整合能力', 2, 3)"
             ></td>
           </tr>
           <tr>
@@ -336,7 +336,7 @@ export default {
             ["焦虑占比", 83.1, 73.4],
             ["抑郁占比", 86.4, 65.2],
             ["压力占比", 72.4, 53.9],
-            ["精神障碍占比", 72.4, 53.9],
+            ["视觉整合能力占比", 72.4, 53.9],
             ["健康异常占比", 72.4, 53.9],
           ],
         },
@@ -571,7 +571,7 @@ export default {
             (dimension[2]["压力"] / this[`completeNum${i}`]) * 100
           );
           this.options.dataset.source[5][i] = parseInt(
-            (dimension[3]["精神障碍"] / this[`completeNum${i}`]) * 100
+            (dimension[3]["视觉整合能力"] / this[`completeNum${i}`]) * 100
           );
           this.isAbnormal(id, n, i);
         }
@@ -825,7 +825,7 @@ export default {
 
     th,
     td {
-      padding: 6px 8px;
+      padding: 2px 4px;
       border: none;
       border: 1px solid #dddddd;
       margin: 0;

src/components/Report1.vue

@@ -10,7 +10,9 @@
       >
         <div slot="title">
           <div label-width="150px" class="demo-ruleForm">
-            <p v-if="isView" class="dig_title">{{ proDataLin.userName }}的{{proDataLin.planName}}计划</p>
+            <p v-if="isView" class="dig_title">
+              {{ proDataLin.userName }}的{{ proDataLin.planName }}计划
+            </p>
             <p v-if="!isView" class="dig_title">编辑计划</p>
             <div slot=""></div>
             <div slot="footer"></div>
@@ -30,74 +32,24 @@
                   width=""
                 >
                 </el-table-column>
-                <!-- <el-table-column prop="userNo" label="学号" align="center" width="">
-                  </el-table-column> -->
 
                 <el-table-column
                   show-overflow-tooltip
-                  prop="completedTime"
-                  label="测试完成时间"
+                  prop="planEndTime"
+                  label="计划结束时间"
                   align="center"
                   width=""
                 >
                 </el-table-column>
-                <el-table-column label="测试进度" align="center" width="">
-                  <template slot-scope="scope">
-                    <div class="progress_cla">
-                      <el-progress
-                        text-color="#000000"
-                        :text-inside="true"
-                        :stroke-width="26"
-                        :percentage="
-                          parseInt(
-                            parseFloat(
-                              scope.row.userCompletedNum / scope.row.userContentNum
-                            ) * 100
-                          )
-                        "
-                      ></el-progress>
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="isComplete"
-                  :formatter="forMatCom"
-                  label="状态"
-                  align="center"
-                  width=""
-                >
-                  <template slot-scope="scope">
-                    <div
-                      style="display: flex; justify-content: center; align-items: center"
-                      v-if="scope.row.isComplete == '1'"
-                    >
-                      <img
-                        style="width: 16px"
-                        src="../assets/img/home/isCom.png"
-                        alt=""
-                      />&nbsp;&nbsp;
-                      <div style="color: #00955e">已完成</div>
-                    </div>
-                    <div
-                      style="display: flex; justify-content: center; align-items: center"
-                      v-if="scope.row.isComplete == '0'"
-                    >
-                      <img
-                        style="width: 16px"
-                        src="../assets/img/home/isNo.png"
-                        alt=""
-                      />&nbsp;&nbsp;
-                      <div style="color: #d52121">未完成</div>
-                    </div>
-                  </template>
-                </el-table-column>
+      
+             
                 <el-table-column label="操作" width="350px" align="center">
                   <template slot-scope="scope">
                     <div
                       class="detail_button_out"
-                      v-if="scope.row.hasOwnProperty('contentList')"
+                      v-if="scope.row.hasOwnProperty('contentEntities')"
                     >
-                      <div v-for="item in scope.row.contentList" :key="item.id">
+                      <div v-for="item in scope.row.contentEntities" :key="item.id">
                         <div
                           v-if="item.isDisplayed == 1"
                           style="
@@ -707,11 +659,13 @@ export default {
     },
     //进来调用已选列表接口
     searchList() {
-      let url = `/plan/findAllByUserNo?pageSize=${this.pageSize}&pageNum=${this.pageNum}&userNo=${this.proDataLin.userNo}`;
+      let url = `/plan/findPlanById?id=${this.proDataLin.planId}`;
       this.$http.get(url, {}, (res) => {
+        debugger;
         if (res && res.code == 200) {
-          this.tableData = res.data.content;
-          this.total = res.data.totalElements;
+          this.tableData = [];
+          this.tableData.push(res.data);
+          //   this.total = res.data.totalElements;
         } else {
           // this.$toast.fail(res.msg);
           this.$message.error(res.msg);

src/views/manage/channelManagement/channelManagement.vue

@@ -138,51 +138,72 @@
               </div>
             </template>
           </el-table-column>
+          <!-- extractCode -->
+          <el-table-column label="报告密码" align="center" width="">
+            <template slot-scope="scope">
+              <div style="display: flex; align-items: center;justify-content: center;">
+                <span v-show="scope.row.isShow">{{ scope.row.extractCode }}&nbsp;&nbsp;</span>
+                <div
+                  style="
+                    display: inline-block;
+                    vertical-align: middle;
+                    width: auto;
+                    height: 0px;
+                    line-height: 9px;
+                  "
+                  v-show="!scope.row.isShow"
+                >
+                  ******&nbsp;&nbsp;
+                </div>
+                <i
+                  v-show="
+                    scope.row.isShow &&
+                    scope.row.extractCode != null &&
+                    scope.row.extractCode != ''
+                  "
+                  @click="scope.row.isShow = !scope.row.isShow"
+                  class="el-icon-view"
+                ></i>
+                <i
+                  v-show="
+                    !scope.row.isShow &&
+                    scope.row.extractCode != null &&
+                    scope.row.extractCode != ''
+                  "
+                  @click="scope.row.isShow = !scope.row.isShow"
+                  class="el-icon-view"
+                ></i>
+              </div>
+            </template>
+          </el-table-column>
           <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_out"
+                v-if="scope.row.planStatus == '3' && scope.row.enable == '1'"
+              >
                 <div class="detail_button" @click="addUser(scope.row)">
                   <img src="../../../assets/img/table/search.png" />
                   <span> 查看报告</span>
                 </div>
-                <div
-             
-                  class="detail_button"
-                  @click="downloadButton(scope.row)"
-                >
+                <div class="detail_button" @click="downloadButton(scope.row)">
                   <img src="../../../assets/img/table/xiafa1.png" />
                   <span> 下载报告</span>
                 </div>
               </div>
-
-              <!-- <el-popconfirm
-                v-if="scope.row.state != 0"
-                title="确定删除吗？"
-                placement="top"
-                @confirm="deleteUser(scope.$index, scope.row)"
-              >
-                <el-button
-                  size="small"
-                  style="margin-left: 10px"
-                  type="text"
-                  slot="reference"
-                  >删除</el-button
-                >
-              </el-popconfirm>
-              <el-popconfirm
-                v-if="scope.row.state != 0"
-                title="密码将重置为123456"
-                placement="top"
-                @confirm="resetUser(scope.$index, scope.row)"
+              <div
+                class="detail_button_out_dis"
+                v-if="!(scope.row.planStatus == '3' && scope.row.enable == '1')"
               >
-                <el-button
-                  size="small"
-                  style="margin-left: 10px"
-                  type="text"
-                  slot="reference"
-                  >重置密码</el-button
-                >
-              </el-popconfirm> -->
+                <div class="detail_button_dis" :title="titleFormatter(scope.row)">
+                  <img src="../../../assets/img/table/search_dis.png" />
+                  <span> 查看报告</span>
+                </div>
+                <div class="detail_button_dis" :title="titleFormatter(scope.row)">
+                  <img src="../../../assets/img/table/xiafa1_dis.png" />
+                  <span> 下载报告</span>
+                </div>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -419,6 +440,17 @@ export default {
     this.searchTarget();
   },
   methods: {
+    titleFormatter(val) {
+      if (val.planStatus == "1") {
+        return "计划未开始";
+      } else if (val.planStatus == "2") {
+        return "计划进行中";
+      }
+
+      if (val.enable == "0") {
+        return "当前计划未授权";
+      }
+    },
     handleClose() {
       this.downloadVisible = false;
     },
@@ -535,7 +567,6 @@ export default {
         if (res && res.code == 200) {
           let a = document.createElement("a");
           document.body.appendChild(a);
-          console.log(basePath + `/plan/download?path=${res.data}`);
           a.setAttribute("href", basePath + `/plan/download?path=${res.data}`);
           a.click();
           this.$nextTick(() => {
@@ -561,14 +592,14 @@ export default {
     },
     //下载标志
     downloadButton(row) {
-      if(this.userInfo.roleType!=5){
-        if(row.enable=='0'){
+      if (this.userInfo.roleType != 5) {
+        if (row.enable == "0") {
           //提示暂未授权
           this.$message({
             message: "暂未授权",
             type: "warning",
           });
-          return 
+          return;
         }
       }
       this.planId = row.id;
@@ -641,9 +672,6 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val;
       this.searchTarget();
-      // console.log(`每页 ${val} 条`);
-      //将首页重置为1时---且总条数变化
-      //设置为当前总条数
     },
     //获取组织架构方法--------------------开始-----------------------
     getChannel() {
@@ -658,11 +686,8 @@ export default {
               let resAdd = this.addPro(res.data);
               this.ppData = JSON.parse(JSON.stringify(resAdd));
               let forRes = this.arrToTree(resAdd);
-              // console.log('格式化的结构')
-              // console.log(forRes)
+
               let resultRes = this.deleteChildren(forRes);
-              console.log("格式化的结构且去掉children");
-              console.log(resultRes);
               this.groupData = resultRes[0].children;
             } else {
               this.groupData = [];
@@ -736,7 +761,6 @@ export default {
       this.centerDialogVisible = true;
     },
     addUser(val) {
-
       if (this.userInfo.roleType != "5") {
         if (val.enable == "0") {
           this.$message({
@@ -818,12 +842,6 @@ export default {
       if (this.group != "") {
         gp = this.group[this.group.length - 1];
       }
-      console.log(this.planStatus);
-      //格式化时间
-      console.log("this.planTime");
-      console.log(time);
-      console.log(this.planName);
-      console.log(gp);
 
       let url = `/plan/findListByPage?pageSize=${this.pageSize}&pageNum=${this.pageNum}${
         gp == "" ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${gp}`
@@ -831,12 +849,12 @@ export default {
         this.planStatus == "" ? "" : `&planStatus=${this.planStatus}`
       }${this.planName == "" ? "" : `&planName=${this.planName}`}`;
       this.$http.get(url, {}, (res) => {
-        console.log(res);
         if (res && res.code == 200) {
-          console.log("----------");
-          console.log(res.data.content);
-
-          this.tableData = res.data.content;
+          let aa = [];
+          for (let i = 0; i < res.data.content.length; i++) {
+            aa.push({ ...res.data.content[i], isShow: false });
+          }
+          this.tableData = aa;
           this.total = res.data.totalElements;
         } else {
           // this.$toast.fail(res.msg);
@@ -971,6 +989,26 @@ export default {
   }
 }
 
+.detail_button_out_dis {
+  display: flex;
+  justify-content: flex-start;
+  .detail_button_dis {
+    margin-left: 20px;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    letter-spacing: 2px;
+    img {
+      width: 15px;
+      margin-right: 5px;
+    }
+    span {
+      color: #d1d1d1;
+      // font-weight: 600;
+    }
+  }
+}
+
 //弹出框样式
 
 .dig_update /deep/.el-cascader {

src/views/manage/channelManagement/contract.vue

@@ -116,19 +116,19 @@
                 <div class="detail_button_out" v-if="isUser">
                   <div class="detail_button" @click="addUser(scope.row)">
                     <img src="../../../assets/img/table/search.png" />
-                    <span> 个人报告列表 </span>
+                    <span> 个人报告对比 </span>
                   </div>
                 </div>
                 <div class="detail_button_out" v-if="!isUser">
                   <div class="detail_button" @click="planReport(scope.row)">
                     <img src="../../../assets/img/table/search.png" />
-                    <span> 专业报告对比 </span>
+                    <span> 报告对比 </span>
                   </div>
                 </div>
                 <div class="detail_button_out" v-if="!isUser">
                   <div class="detail_button" @click="planUser(scope.row)">
                     <img src="../../../assets/img/table/search.png" />
-                    <span> 个人报告列表 </span>
+                    <span> 个人报告对比 </span>
                   </div>
                 </div>
               </div>
@@ -228,25 +228,48 @@
               <div
                 style="display: flex; align-items: center; justify-content: flex-start"
               >
-                <div class="detail_button_out" v-if="isUser">
-                  <div class="detail_button" @click="addUser(scope.row)">
-                    <img src="../../../assets/img/table/search.png" />
-                    <span> 个人报告列表 </span>
-                  </div>
-                </div>
                 <div
                   class="detail_button_out"
-                  v-if="!isUser && scope.row.planStatus == '3'"
+                  v-if="!isUser && scope.row.planStatus == '3'&&scope.row.enable=='1'"
                 >
                   <div class="detail_button" @click="compareReport(scope.row)">
                     <img src="../../../assets/img/table/search.png" />
-                    <span> 专业报告对比 </span>
+                    <span>报告对比 </span>
                   </div>
                 </div>
-                <div class="detail_button_out" v-if="!isUser">
+                <div
+                  class="detail_button_out_dis"
+                  v-if="!(!isUser && 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" />
+                    <span>报告对比 </span>
+                  </div>
+                </div>
+                <div
+                  class="detail_button_out"
+                  v-if="!isUser && scope.row.planStatus == '3'&&scope.row.enable=='1'"
+                >
                   <div class="detail_button" @click="planUser(scope.row)">
                     <img src="../../../assets/img/table/search.png" />
-                    <span> 个人报告列表 </span>
+                    <span> 个人报告对比</span>
+                  </div>
+                </div>
+                <div
+                  class="detail_button_out_dis"
+                  v-if="!(!isUser && 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" />
+                    <span> 个人报告对比</span>
                   </div>
                 </div>
               </div>
@@ -383,6 +406,17 @@ export default {
     this.isClikcObj(false);
   },
   methods: {
+    titleFormatter(val) {
+      if (val.planStatus == "1") {
+        return "计划未开始";
+      } else if (val.planStatus == "2") {
+        return "计划进行中";
+      }
+
+      if (val.enable == "0") {
+        return "当前计划未授权";
+      }
+    },
     isClikcObj(val) {
       this.isUser = val;
 
@@ -829,6 +863,30 @@ export default {
   }
 }
 
+.detail_button_out_dis {
+  flex: 1;
+  display: flex;
+  // justify-content: space-around;
+  justify-content: flex-start;
+
+  .detail_button_dis {
+    display: flex;
+    align-items: center;
+    cursor: not-allowed;
+    letter-spacing: 2px;
+
+    img {
+      width: 15px;
+      margin-right: 5px;
+    }
+
+    span {
+      color: #d1d1d1;
+      // font-weight: 600;
+    }
+  }
+}
+
 //弹出框样式
 
 .dig_update /deep/.el-cascader {