修改用户报告--查看个人报告

src/components/Report.vue

@@ -30,7 +30,32 @@
                   width=""
                 >
                 </el-table-column>
-                <el-table-column prop="userNo" label="学号" align="center" width="">
+                <!-- <el-table-column prop="userNo" label="学号" align="center" width="">
+                </el-table-column> -->
+           
+                <el-table-column
+                show-overflow-tooltip
+                  prop="completedTime"
+                  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="#ffffff"
+                        :text-inside="true"
+                        :stroke-width="26"
+                        :percentage="
+                          parseInt(
+                            scope.row.userCompletedNum / scope.row.userContentNum
+                          ) * 100
+                        "
+                      ></el-progress>
+                    </div>
+                  </template>
                 </el-table-column>
                 <el-table-column
                   prop="isComplete"
@@ -39,8 +64,8 @@
                   align="center"
                   width=""
                 >
-                <template slot-scope="scope">
-                  <div
+                  <template slot-scope="scope">
+                    <div
                       style="display: flex; justify-content: center; align-items: center"
                       v-if="scope.row.isComplete == '1'"
                     >
@@ -51,17 +76,6 @@
                       />&nbsp;&nbsp;
                       <div style="color: #333333">已完成</div>
                     </div>
-                    <!-- <div
-                style="display: flex; justify-content: center; align-items: center"
-                v-if="view.status == '进行中'"
-              >
-                <img
-                  style="width: 16px"
-                  src="../../../assets/img/home/isRun.png"
-                  alt=""
-                />&nbsp;&nbsp;
-                <div style="color: #f6cb00">进行中</div>
-              </div> -->
                     <div
                       style="display: flex; justify-content: center; align-items: center"
                       v-if="scope.row.isComplete == '0'"
@@ -73,37 +87,31 @@
                       />&nbsp;&nbsp;
                       <div style="color: #d52121">未开始</div>
                     </div>
-                    <!-- <div v-if="scope.row.isComplete == '0'" style="color: #ff7800">
-                      未开始
-                    </div>
-
-                    <div v-if="scope.row.isComplete == '1'" style="color: #333333">
-                      已完成
-                    </div> -->
                   </template>
                 </el-table-column>
-                <!-- <el-table-column
-                  prop="createTime"
-                  label="计划创建时间"
-                  align="center"
-                  width=""
-                >
-                </el-table-column> -->
-                <el-table-column
-                  prop="completedTime"
-                  label="测试完成时间"
-                  align="center"
-                  width=""
-                >
-                </el-table-column>
-                <el-table-column label="操作" width="auto" align="center">
+                <el-table-column label="操作" width="350px" align="center">
                   <template slot-scope="scope">
-                    <div class="detail_button_out" v-if="scope.row.isComplete == '1'">
+                    <div
+                      class="detail_button_out"
+                      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>
+                      </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>
+                    </div> -->
                   </template>
                 </el-table-column>
               </el-table>
@@ -268,14 +276,28 @@
                     <div class="report_des_out">
                       <div class="score">
                         分数：
-                        <span v-if="item.dimensionSymptom == '重度'||item.dimensionSymptom == '高风险'" style="color: red">
+                        <span
+                          v-if="
+                            item.dimensionSymptom == '重度' ||
+                            item.dimensionSymptom == '高风险'
+                          "
+                          style="color: red"
+                        >
                           {{ item.dimensionScore }}</span
                         >
-                        <span v-if="item.dimensionSymptom == '无症状或轻度'||item.dimensionSymptom == '无或轻风险'">
+                        <span
+                          v-if="
+                            item.dimensionSymptom == '无症状或轻度' ||
+                            item.dimensionSymptom == '无或轻风险'
+                          "
+                        >
                           {{ item.dimensionScore }}</span
                         >
                         <span
-                          v-if="item.dimensionSymptom == '中度' ||item.dimensionSymptom == '中风险'"
+                          v-if="
+                            item.dimensionSymptom == '中度' ||
+                            item.dimensionSymptom == '中风险'
+                          "
                           style="color: #efb17a"
                         >
                           {{ item.dimensionScore }}</span
@@ -290,20 +312,34 @@
                         >
                       </div>
 
-                      <div class="score">结论：
-                        <span v-if="item.dimensionSymptom == '重度'||item.dimensionSymptom == '高风险'" style="color: red">
+                      <div class="score">
+                        结论：
+                        <span
+                          v-if="
+                            item.dimensionSymptom == '重度' ||
+                            item.dimensionSymptom == '高风险'
+                          "
+                          style="color: red"
+                        >
                           {{ item.dimensionSymptom }}</span
                         >
-                        <span v-if="item.dimensionSymptom == '无症状或轻度'||item.dimensionSymptom == '无或轻风险'">
+                        <span
+                          v-if="
+                            item.dimensionSymptom == '无症状或轻度' ||
+                            item.dimensionSymptom == '无或轻风险'
+                          "
+                        >
                           {{ item.dimensionSymptom }}</span
                         >
                         <span
-                          v-if="item.dimensionSymptom == '中度' ||item.dimensionSymptom == '中风险'"
+                          v-if="
+                            item.dimensionSymptom == '中度' ||
+                            item.dimensionSymptom == '中风险'
+                          "
                           style="color: #efb17a"
                         >
                           {{ item.dimensionSymptom }}</span
                         >
-           
                       </div>
                       <!-- <div class="score">分析：</div> -->
                       <div class="scoreAsy">
@@ -560,8 +596,6 @@ 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) {
-
-
           this.tableData = res.data.content;
           this.total = res.data.totalElements;
         } else {
@@ -713,6 +747,11 @@ export default {
   },
 };
 </script>
+<style scoped>
+.progress_cla >>> .el-progress-bar__inner {
+  background-color: #00bf78;
+}
+</style>
 <style>
 input[aria-hidden="true"] {
   display: none !important;