Skip to content

P
pica.cloud.web-education-admin
提交 b0017aa5 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

空数据处理 全局样式问题

上级 4512573f
隐藏空白字符变更
内嵌 并排
正在显示 包含 200 行增加 和 81 行删除
src/style/common.scss
浏览文件 @ b0017aa5
...@@ -260,9 +260,9 @@ html,body{ ...@@ -260,9 +260,9 @@ html,body{
width: 100%; width: 100%;
display: flex; display: flex;
img { img {
position: relative; position: relative;
margin: 38px auto; margin: 38px auto;
height: 24px; height: 24px;
width: 106px; width: 106px;
} }
} }
\ No newline at end of file \ No newline at end of file
src/views/learning/item-crowd-analysis.vue
浏览文件 @ b0017aa5
...@@ -9,12 +9,20 @@ ...@@ -9,12 +9,20 @@
<p>"没有相关数据，请重新选择查询范围"</p> <p>"没有相关数据，请重新选择查询范围"</p>
</div> </div>
<div class="chart" v-show="showData"> <div class="chart" v-show="showData">
<div > <div v-if="showEducation === true">
<div class="item" id="education" ref="education"></div> <div class="item" id="education" ref="education"></div>
</div> </div>
<div > <div v-if="showEducation === false" class="empty-left">
<div class="title">人员学历分布</div>
<img src="../../assets/image/noData.png" />
</div>
<div v-if="showJob === true">
<div class="item item-right" id="job" ref="job"></div> <div class="item item-right" id="job" ref="job"></div>
</div> </div>
<div v-if="showJob === false" class="empty-left item-right">
<div class="title">人员职务分布</div>
<img src="../../assets/image/noData.png" />
</div>
</div> </div>
<div class="chart" v-show="showData"> <div class="chart" v-show="showData">
<div class="item"> <div class="item">
...@@ -31,7 +39,13 @@ ...@@ -31,7 +39,13 @@
</div> </div>
</div> </div>
</div> </div>
<div class="item item-right" id="age" ref="age"></div> <div v-if="showAge === true">
<div class="item item-right" id="age" ref="age"></div>
</div>
<div v-if="showAge === false" class="empty-left item-right">
<div class="title">人员年龄分布</div>
<img src="../../assets/image/noData.png" />
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -97,6 +111,10 @@ export default { ...@@ -97,6 +111,10 @@ export default {
}, },
downloadId: null, downloadId: null,
timeInfoChild: {}, timeInfoChild: {},
showEducation: true,
showJob: true,
showAge: true,
}; };
}, },
watch: { watch: {
...@@ -127,8 +145,6 @@ export default { ...@@ -127,8 +145,6 @@ export default {
}); });
}); });
this.$on("reset", () => { this.$on("reset", () => {
this.showData = false;
this.crowdData = {};
}); });
this.$on("static", () => { this.$on("static", () => {
vm.getStatic(); vm.getStatic();
...@@ -236,9 +252,9 @@ export default { ...@@ -236,9 +252,9 @@ export default {
sexData[0].num = sexList[1].value; sexData[0].num = sexList[1].value;
sexData[1].num = sexList[2].value; sexData[1].num = sexList[2].value;
sexData[2].num = sexList[0].value; sexData[2].num = sexList[0].value;
sexData[0].rate = Math.floor(sexList[1].value / sum *10000) / 100; sexData[0].rate = (sexList[1].value / sum *100).toFixed(1);
sexData[1].rate = Math.floor(sexList[2].value / sum *10000) / 100; sexData[1].rate = (sexList[2].value / sum *100).toFixed(1);
sexData[2].rate = Math.floor(sexList[0].value / sum *10000) / 100; sexData[2].rate = (sexList[0].value / sum *100).toFixed(1);
} }
// console.log('this.$refs.ring0',this.$refs.ring0[0]); // console.log('this.$refs.ring0',this.$refs.ring0[0]);
...@@ -257,7 +273,12 @@ export default { ...@@ -257,7 +273,12 @@ export default {
vm.sexData = sexData; vm.sexData = sexData;
}, },
educationDivision(data) { educationDivision(data) {
// console.log('this.$refs.education',this.$refs.education) if(data.length == 0) {
vm.showEducation = false;
return;
} else {
vm.showEducation = true;
}
let educationList = data; let educationList = data;
let legendData = []; let legendData = [];
let seriesData = []; let seriesData = [];
...@@ -280,6 +301,12 @@ export default { ...@@ -280,6 +301,12 @@ export default {
},20); },20);
}, },
jobDivision(data) { jobDivision(data) {
if(data.length == 0) {
vm.showJob = false;
return;
} else {
vm.showJob = true;
}
let titleList = data; let titleList = data;
let legendData = []; let legendData = [];
let seriesData = []; let seriesData = [];
...@@ -301,6 +328,12 @@ export default { ...@@ -301,6 +328,12 @@ export default {
},20); },20);
}, },
ageDivision(data) { ageDivision(data) {
if(data.length == 0) {
vm.showAge = false;
return;
} else {
vm.showAge = true;
}
let xAxisData = []; let xAxisData = [];
let seriesData = []; let seriesData = [];
let ageList = data; let ageList = data;
...@@ -332,6 +365,9 @@ export default { ...@@ -332,6 +365,9 @@ export default {
// background: #fff; // background: #fff;
overflow: hidden; overflow: hidden;
// padding: 10px; // padding: 10px;
.el-radio-button__inner:hover {
color: #449284;
}
.header-title { .header-title {
padding: 10px 12px; padding: 10px 12px;
font-size: 12px; font-size: 12px;
...@@ -361,6 +397,32 @@ export default { ...@@ -361,6 +397,32 @@ export default {
margin: 20px auto 0 auto; margin: 20px auto 0 auto;
width: 1124px; width: 1124px;
overflow-x: hidden; overflow-x: hidden;
.empty-left {
position: relative;
float: left;
margin-right: 20px;
padding: 0;
width: 552px;
height: 360px;
display: flex;
background: #ffffff;
.title {
position: relative;
margin-top: 20px;
margin-left: 20px;
font-size: 18px;
font-weight: bold;
}
img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
height: 24px;
width: 106px;
}
}
.item { .item {
position: relative; position: relative;
float: left; float: left;
......
src/views/learning/item-data-all.vue
浏览文件 @ b0017aa5
...@@ -191,43 +191,84 @@ ...@@ -191,43 +191,84 @@
<el-tab-pane label="未获证" name="2"></el-tab-pane> <el-tab-pane label="未获证" name="2"></el-tab-pane>
<el-tab-pane label="未参与" name="3"></el-tab-pane> <el-tab-pane label="未参与" name="3"></el-tab-pane>
</el-tabs> </el-tabs>
<el-table :data="tableData" class="person-table"> <div v-if="downloadId == null">
<el-table-column v-if="tableType == '1'" prop="rankNo" label="排名" align="center"></el-table-column> <el-table :data="tableData" class="person-table">
<el-table-column prop="doctorName" label="姓名" align="center"></el-table-column> <el-table-column v-if="tableType == '1'" prop="rankNo" label="排名" align="center"></el-table-column>
<el-table-column prop="sex" label="性别" align="center"> <el-table-column prop="doctorName" label="姓名" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="sex" label="性别" align="center">
<span>{{ scope.row.sex | sexValue}}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.sex | sexValue}}</span>
</el-table-column> </template>
<el-table-column prop="departmentName" label="科室" align="center"></el-table-column> </el-table-column>
<el-table-column prop="joinFlag" label="是否参与项目" align="center"> <el-table-column prop="departmentName" label="科室" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="joinFlag" label="是否参与项目" align="center">
<span>{{ scope.row.joinFlag | joinFlagValue}}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.joinFlag | joinFlagValue}}</span>
</el-table-column> </template>
<el-table-column prop="finishFlag" label="是否完成项目" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column prop="finishFlag" label="是否完成项目" align="center">
<span>{{ scope.row.finishFlag | finishFlagValue}}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.finishFlag | finishFlagValue}}</span>
</el-table-column> </template>
<el-table-column v-if="certFlag != 1" prop="certGrade" label="证书级别" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column v-if="certFlag != 1" prop="certGrade" label="证书级别" align="center">
<span>{{ scope.row.certGrade | certGradeValue}}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.certGrade | certGradeValue}}</span>
</el-table-column> </template>
<el-table-column prop="finishDate" label="获证日期" align="center"></el-table-column> </el-table-column>
<el-table-column prop="score" label="成绩" align="center"></el-table-column> <el-table-column prop="finishDate" label="获证日期" align="center"></el-table-column>
<el-table-column prop="learnTime" min-width="150" label="学习时长" align="center"> <el-table-column prop="score" label="成绩" align="center"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="learnTime" min-width="150" label="学习时长" align="center">
<span>{{ scope.row.learnTime | learnTimeValue}}</span> <template slot-scope="scope">
</template> <span>{{ scope.row.learnTime | learnTimeValue}}</span>
</el-table-column> </template>
<div slot="empty"> </el-table-column>
<div class="table-empty"> <div slot="empty">
<img src="../../assets/image/noData.png" /> <div class="table-empty">
<img src="../../assets/image/noData.png" />
</div>
</div> </div>
</div> </el-table>
</el-table> </div>
<div v-if="downloadId != null" class="front-table">
<el-table :data="tableData.slice((formTable.pageNo-1)*formTable.pageSize,formTable.pageNo*formTable.pageSize)" class="person-table">
<el-table-column v-if="tableType == '1'" prop="rankNo" label="排名" align="center"></el-table-column>
<el-table-column prop="doctorName" label="姓名" align="center"></el-table-column>
<el-table-column prop="sex" label="性别" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sex | sexValue}}</span>
</template>
</el-table-column>
<el-table-column prop="departmentName" label="科室" align="center"></el-table-column>
<el-table-column prop="joinFlag" label="是否参与项目" align="center">
<template slot-scope="scope">
<span>{{ scope.row.joinFlag | joinFlagValue}}</span>
</template>
</el-table-column>
<el-table-column prop="finishFlag" label="是否完成项目" align="center">
<template slot-scope="scope">
<span>{{ scope.row.finishFlag | finishFlagValue}}</span>
</template>
</el-table-column>
<el-table-column v-if="certFlag != 1" prop="certGrade" label="证书级别" align="center">
<template slot-scope="scope">
<span>{{ scope.row.certGrade | certGradeValue}}</span>
</template>
</el-table-column>
<el-table-column prop="finishDate" label="获证日期" align="center"></el-table-column>
<el-table-column prop="score" label="成绩" align="center"></el-table-column>
<el-table-column prop="learnTime" min-width="150" label="学习时长" align="center">
<template slot-scope="scope">
<span>{{ scope.row.learnTime | learnTimeValue}}</span>
</template>
</el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/noData.png" />
</div>
</div>
</el-table>
</div>
<div class="chart-remarks">注：本报表数据来源仅包括有摸底考的课程培训。</div> <div class="chart-remarks">注：本报表数据来源仅包括有摸底考的课程培训。</div>
<div class="pagination"> <div class="pagination">
<el-pagination <el-pagination
...@@ -446,9 +487,6 @@ export default { ...@@ -446,9 +487,6 @@ export default {
req.hospitalIdList = hospitalCutList[0].hospitalId; req.hospitalIdList = hospitalCutList[0].hospitalId;
} }
openLoading(vm); openLoading(vm);
if(req.regionId == "000") {
req.regionId = "310";
}
// console.log("0 req", req); // console.log("0 req", req);
vm.POST("stats/report/generalPersonal/"+vm.tableType, req).then(res => { vm.POST("stats/report/generalPersonal/"+vm.tableType, req).then(res => {
closeLoading(vm); closeLoading(vm);
...@@ -477,9 +515,6 @@ export default { ...@@ -477,9 +515,6 @@ export default {
timeFlag: vm.formInline.timeFlag, timeFlag: vm.formInline.timeFlag,
}; };
openLoading(vm); openLoading(vm);
if(req.regionId == "000") {
req.regionId = "310";
}
// console.log("0 req", req); // console.log("0 req", req);
vm.POST("stats/report/general_pc", req).then(res => { vm.POST("stats/report/general_pc", req).then(res => {
closeLoading(vm); closeLoading(vm);
...@@ -587,9 +622,7 @@ export default { ...@@ -587,9 +622,7 @@ export default {
shouldKey: "应参与人数", shouldKey: "应参与人数",
shouldNum: "0", shouldNum: "0",
content: [ content: [
"获证率：已完成人数/应参与人数*100%", "获证率：已获证人数/应参与人数*100%",
"应参与人数：筛选范围下，所圈选人员数量",
"已获证人数：筛选范围下，在应参与人员中，已获证的人员数量"
] ]
} }
]; ];
...@@ -603,7 +636,16 @@ export default { ...@@ -603,7 +636,16 @@ export default {
return; return;
} }
cardData[2].title = vm.certFlag == 0 ? '完成率' : '获证率'; cardData[2].title = vm.certFlag == 0 ? '完成率' : '获证率';
cardData[2].hasKey = vm.certFlag == 0 ? '已经完成人数' : '已获证人数', cardData[2].hasKey = vm.certFlag == 0 ? '已经完成人数' : '已获证人数';
if(vm.certFlag == 0) {
cardData[2].content = [
"完成率：已完成人数/应参与人数*100%",
]
} else {
cardData[2].content = [
"获证率：已获证人数/应参与人数*100%",
]
}
cardData[1].value = data.doctorRate*100 + '%'; cardData[1].value = data.doctorRate*100 + '%';
cardData[1].hasNum = data.joinCount; cardData[1].hasNum = data.joinCount;
...@@ -766,9 +808,6 @@ export default { ...@@ -766,9 +808,6 @@ export default {
timeFlag: vm.formInline.timeFlag, timeFlag: vm.formInline.timeFlag,
}; };
openLoading(vm); openLoading(vm);
if(req.regionId == "000") {
req.regionId = "310";
}
vm.POST("stats/report/studyRank/"+value, req).then(res => { vm.POST("stats/report/studyRank/"+value, req).then(res => {
closeLoading(vm); closeLoading(vm);
vm.setCertificateChart(res.data.studyRank); vm.setCertificateChart(res.data.studyRank);
...@@ -841,12 +880,16 @@ export default { ...@@ -841,12 +880,16 @@ export default {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
vm.formTable.pageSize = val; vm.formTable.pageSize = val;
vm.formTable.pageNo = 1; vm.formTable.pageNo = 1;
vm.searchPerson(1); if(vm.downloadId == null) {
vm.searchPerson(1);
}
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
vm.formTable.pageNo = val; vm.formTable.pageNo = val;
vm.searchPerson(1); if(vm.downloadId == null) {
vm.searchPerson(1);
}
}, },
} }
}; };
...@@ -874,6 +917,9 @@ export default { ...@@ -874,6 +917,9 @@ export default {
width: 106px; width: 106px;
} }
} }
.el-radio-button__inner:hover {
color: #449284;
}
.box-list { .box-list {
position: relative; position: relative;
padding: 30px 30px 0 30px; padding: 30px 30px 0 30px;
......
src/views/learning/item-examination-analysis.vue
浏览文件 @ b0017aa5
...@@ -415,8 +415,8 @@ export default { ...@@ -415,8 +415,8 @@ export default {
.examination-analysis { .examination-analysis {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
.weight { .el-radio-button__inner:hover {
font-weight: bold; color: #449284;
} }
.el-card { .el-card {
border-width: 0px; border-width: 0px;
......
src/views/learning/item-learning-effect.vue
浏览文件 @ b0017aa5
...@@ -107,9 +107,6 @@ export default { ...@@ -107,9 +107,6 @@ export default {
timeFlag: vm.formInline.timeFlag timeFlag: vm.formInline.timeFlag
}; };
openLoading(vm); openLoading(vm);
// if(req.regionId == "000") {
// req.regionId = "000";
// }
// console.log("0 req", req); // console.log("0 req", req);
vm.POST("stats/report/studyEffect", req).then(res => { vm.POST("stats/report/studyEffect", req).then(res => {
closeLoading(vm); closeLoading(vm);
......
src/views/learning/item-list.vue
浏览文件 @ b0017aa5
...@@ -284,7 +284,7 @@ export default { ...@@ -284,7 +284,7 @@ export default {
// organizationData: "", // organizationData: "",
}, },
tags: [], tags: [],
activeName: "fifth", activeName: "zero",
organizationNum: 0, organizationNum: 0,
dialogVisible: false, dialogVisible: false,
dialogUpdate: false, dialogUpdate: false,
...@@ -322,6 +322,7 @@ export default { ...@@ -322,6 +322,7 @@ export default {
hospitalCntList: [], hospitalCntList: [],
maxDate: '', maxDate: '',
minDate: '', minDate: '',
allRegionId: '',
pickerOptions0: { pickerOptions0: {
disabledDate: time => { disabledDate: time => {
// 在科学计数法中，为了使公式简便，可以用带“E”的格式表示。例如1.03乘10的8次方，可简写为“1.03e8”的形式 // 在科学计数法中，为了使公式简便，可以用带“E”的格式表示。例如1.03乘10的8次方，可简写为“1.03e8”的形式
...@@ -532,6 +533,7 @@ export default { ...@@ -532,6 +533,7 @@ export default {
if (res.code == "000000") { if (res.code == "000000") {
vm.formInline.region = []; vm.formInline.region = [];
vm.formInline.region[0] = res.data.list[0].id; vm.formInline.region[0] = res.data.list[0].id;
vm.allRegionId = res.data.list[0].id;
vm.optionsRegion = operationData.setRegionOptionNew( vm.optionsRegion = operationData.setRegionOptionNew(
res.data.list res.data.list
); );
...@@ -687,20 +689,29 @@ export default { ...@@ -687,20 +689,29 @@ export default {
date: "", date: "",
organization: [], organization: [],
checked: false, checked: false,
timeFlag: 1,
during: null,
pageNo: 1, pageNo: 1,
pageSize: 20, pageSize: 20,
} }
); );
vm.formInline.region[0] = vm.allRegionId;
vm.areaLen = 0;
vm.tags = []; vm.tags = [];
if (this.activeName == "first") {
this.$refs.childPart.$emit("reset"); setTimeout(function(){
} else if (this.activeName == "second") { vm.search();
this.$refs.childCrowd.$emit("reset"); },20)
} else if (this.activeName == "third") {
this.$refs.childCourse.$emit("reset"); // if (this.activeName == "first") {
} else if (this.activeName == "fourth") { // this.$refs.childPart.$emit("reset");
this.$refs.childExam.$emit("reset"); // } else if (this.activeName == "second") {
} // this.$refs.childCrowd.$emit("reset");
// } else if (this.activeName == "third") {
// this.$refs.childCourse.$emit("reset");
// } else if (this.activeName == "fourth") {
// this.$refs.childExam.$emit("reset");
// }
}, },
exportExcel() { exportExcel() {
if(vm.downloadId == null) { if(vm.downloadId == null) {
...@@ -918,7 +929,10 @@ export default { ...@@ -918,7 +929,10 @@ export default {
position: absolute; position: absolute;
} }
.el-tabs__item.is-active { .el-tabs__item.is-active {
color: #409eff; color: #449284;
}
.el-tabs__item:hover {
color: #449284;
} }
.el-tabs__header { .el-tabs__header {
width: 100%; width: 100%;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或