|
|
@@ -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">姓名: {{ proDataLin.userName }}</span>
|
|
|
<span class="info">学号: {{ proDataLin.userNo }}</span>
|
|
|
+ <span class="info">测试用时: {{ useTime }}</span>
|
|
|
<span class="info"
|
|
|
>所属组织结构: <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;
|
|
|
"
|
|
|
- > 满分（100）</span
|
|
|
+ > （满分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;
|
|
|
}
|
root