Skip to content

P
pica-learning-report
提交 f5ce68d8 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-optimization-0105' into release 

* dev-optimization-0105:
  1、接口超时提示优化 2、所有页面增加加载loading 3、部分样式优化
上级 e9df8e6b d307d61d
隐藏空白字符变更
内嵌 并排
正在显示 包含 89 行增加 和 763 行删除
components/bussiness/pop-tips.vue
浏览文件 @ f5ce68d8
...@@ -59,20 +59,20 @@ export default { ...@@ -59,20 +59,20 @@ export default {
height: 100%; height: 100%;
left: 0; left: 0;
top: 0; top: 0;
z-index: 1000000015; z-index: 1000000017;
font-size: 20px; font-size: 20px;
.mask { .mask {
position: absolute; position: absolute;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.5);
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 1000000016; z-index: 1000000018;
} }
.content { .content {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
z-index: 1000000017; z-index: 1000000019;
width: 300px; width: 300px;
// height: 185px; // height: 185px;
margin: -150px 0 0 -150px; margin: -150px 0 0 -150px;
......
components/common/common-loading.vue
浏览文件 @ f5ce68d8
...@@ -34,20 +34,20 @@ ...@@ -34,20 +34,20 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.common-loader { .common-loader {
&-mask { .loader-mask {
position: fixed; position: fixed;
top: 0; top: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;
right: 0; right: 0;
z-index: 100; z-index: 1000000020;
background: rgba(0, 0, 0, 0.5); background: rgba(0, 0, 0, 0.1);
} }
svg { svg {
position: absolute; position: fixed;
top: 280px; top: 300px;
left: 172px; left: 172px;
z-index: 101; z-index: 1000000021;
} }
} }
......
components/common/common-title-mini.vue
浏览文件 @ f5ce68d8
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
position: fixed; position: fixed;
width: 100%; width: 100%;
left: 0; left: 0;
top: 74px; top: 73px;
z-index: 1; z-index: 1;
height: 44px; height: 44px;
line-height: 44px; line-height: 44px;
......
components/common/common-title-with-dropdown.vue
浏览文件 @ f5ce68d8
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
position: fixed; position: fixed;
width: 100%; width: 100%;
left: 0; left: 0;
top: 74px; top: 73px;
z-index: 1001; z-index: 1001;
height: 44px; height: 44px;
line-height: 44px; line-height: 44px;
......
pages/examscore.vue
浏览文件 @ f5ce68d8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<CommonTitleWithDropdown :dataList="dropdownList" :title="title" :needRightBtn="needRightBtn" @selectSortItem="selectSortItem"></CommonTitleWithDropdown> <CommonTitleWithDropdown :dataList="dropdownList" :title="title" :needRightBtn="needRightBtn" @selectSortItem="selectSortItem"></CommonTitleWithDropdown>
<ExamScoreList class="pdt-50" :dataList="dataList"></ExamScoreList> <ExamScoreList class="pdt-50" :dataList="dataList"></ExamScoreList>
<CommonNoMore v-if="dataList.length >= 10" class="mt-10"></CommonNoMore> <CommonNoMore v-if="dataList.length >= 10" class="mt-10"></CommonNoMore>
<Loading v-show="isShowLoading"></Loading>
</section> </section>
</template> </template>
<script> <script>
...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header"; ...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header";
import CommonTitleWithDropdown from "@/components/common/common-title-with-dropdown"; import CommonTitleWithDropdown from "@/components/common/common-title-with-dropdown";
import CommonNoMore from "@/components/common/common-no-more"; import CommonNoMore from "@/components/common/common-no-more";
import ExamScoreList from "@/components/bussiness/exam-score-list"; import ExamScoreList from "@/components/bussiness/exam-score-list";
import Loading from "@/components/common/common-loading";
export default { export default {
components: {
CommonHeader,
CommonTitleWithDropdown,
CommonNoMore,
ExamScoreList,
Loading
},
data() { data() {
return { return {
isShowLoading: true,
title: "共0条数据", title: "共0条数据",
needRightBtn: true, needRightBtn: true,
token: "", token: "",
...@@ -50,15 +60,8 @@ export default { ...@@ -50,15 +60,8 @@ export default {
desc: '10分', desc: '10分',
type: 3 type: 3
}], }],
}; };
}, },
components: {
CommonHeader,
CommonTitleWithDropdown,
CommonNoMore,
ExamScoreList
},
created() { created() {
if (process.client) { if (process.client) {
if(this.$route && this.$route.query) { if(this.$route && this.$route.query) {
...@@ -80,6 +83,7 @@ export default { ...@@ -80,6 +83,7 @@ export default {
async getGeneralExam(queryData) { async getGeneralExam(queryData) {
await getGeneralExam(queryData).then(res => { await getGeneralExam(queryData).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.allData = res.data; this.allData = res.data;
this.dataList = res.data.examScoreList; this.dataList = res.data.examScoreList;
this.title = `共${this.dataList.length}条数据`; this.title = `共${this.dataList.length}条数据`;
...@@ -101,7 +105,7 @@ export default { ...@@ -101,7 +105,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pdt-50 { .pdt-50 {
padding-top: 49px; padding-top: 50px;
} }
.mt-10 { .mt-10 {
margin-top: 10px !important; margin-top: 10px !important;
......
pages/examtimes.vue
浏览文件 @ f5ce68d8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<CommonTitleMini :title="title" :needRightBtn="needRightBtn"></CommonTitleMini> <CommonTitleMini :title="title" :needRightBtn="needRightBtn"></CommonTitleMini>
<ExamTimesList class="pdt-50" :dataList="dataList"></ExamTimesList> <ExamTimesList class="pdt-50" :dataList="dataList"></ExamTimesList>
<CommonNoMore v-if="dataList.length >= 10" class="mt-10"></CommonNoMore> <CommonNoMore v-if="dataList.length >= 10" class="mt-10"></CommonNoMore>
<Loading v-show="isShowLoading"></Loading>
</section> </section>
</template> </template>
<script> <script>
...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header"; ...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header";
import CommonTitleMini from "@/components/common/common-title-mini"; import CommonTitleMini from "@/components/common/common-title-mini";
import CommonNoMore from "@/components/common/common-no-more"; import CommonNoMore from "@/components/common/common-no-more";
import ExamTimesList from "@/components/bussiness/exam-times-list"; import ExamTimesList from "@/components/bussiness/exam-times-list";
import Loading from "@/components/common/common-loading";
export default { export default {
components: {
CommonHeader,
CommonTitleMini,
CommonNoMore,
ExamTimesList,
Loading
},
data() { data() {
return { return {
isShowLoading: true,
title: "共0条数据", title: "共0条数据",
needRightBtn: false, needRightBtn: false,
token: "", token: "",
...@@ -41,13 +51,6 @@ export default { ...@@ -41,13 +51,6 @@ export default {
dataList: [] dataList: []
}; };
}, },
components: {
CommonHeader,
CommonTitleMini,
CommonNoMore,
ExamTimesList
},
created() { created() {
if (process.client) { if (process.client) {
if(this.$route && this.$route.query) { if(this.$route && this.$route.query) {
...@@ -69,6 +72,7 @@ export default { ...@@ -69,6 +72,7 @@ export default {
async getGeneralExam(queryData) { async getGeneralExam(queryData) {
await getGeneralExam(queryData).then(res => { await getGeneralExam(queryData).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.dataList = res.data.examTimesList; this.dataList = res.data.examTimesList;
this.title = `共${this.dataList.length}条数据` this.title = `共${this.dataList.length}条数据`
} }
...@@ -79,7 +83,7 @@ export default { ...@@ -79,7 +83,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pdt-50 { .pdt-50 {
padding-top: 49px; padding-top: 50px;
} }
.mt-10 { .mt-10 {
margin-top: 10px !important; margin-top: 10px !important;
......
pages/index-old.vue 已删除 100644 → 0
浏览文件 @ e9df8e6b
<template>
<section class="container">
<CommonHeader :title="projectInfo.projectName | shortName"></CommonHeader>
<CommonAreaSelect
@areaClick="areaTabClick"
@orgClick="orgTabClick"
:areaName="areaName"
:orgName="orgName"
:showArea="isShowArea"
:showOrg="isShowOrg">
</CommonAreaSelect>
<CommonTaps :projectInfo="projectInfo" @tabClicked="tabClicked"></CommonTaps>
<!-- 总体概况 -->
<article v-show="cIndex === 0">
<CommonSwiperItem
:isSingleOrg="isSingleOrg"
:percentData="allData.percentData || {}"
:certFlag="projectInfo.certFlag"
@tipsClick="tipsSwiperClick"
></CommonSwiperItem>
<div v-show="!isSingleOrg">
<CommonTitle v-if="projectInfo.certFlag" title="证书分布情况"></CommonTitle>
<ChartPie v-if="projectInfo.certFlag" :certFlag="projectInfo.certFlag" id="certPieId2" :pieData="(allData && allData.certData)"></ChartPie>
<CommonTitle v-if="projectInfo.certFlag" title="证书级别按学历分布情况"></CommonTitle>
<ChartColumnStack v-if="projectInfo.certFlag" :certFlag="projectInfo.certFlag" :echartsData="echartsData"></ChartColumnStack>
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="项目情况排名"></CommonTitle>
<RankingList :certFlag="projectInfo.certFlag" :rankList="studyRankList.slice(0, 5)"></RankingList>
<ShowAll v-show="studyRankList.length > 5" @action="gotoPage('/rankedu', true)"></ShowAll>
<CommonSplitLine></CommonSplitLine>
<CommonTitleWithWhat @tipsClick="tipsRankingItemClick" title="完成天数排名"></CommonTitleWithWhat>
<RankingItemDays :rankList="costRankList.slice(0, 5)"></RankingItemDays>
<ShowAll v-show="costRankList.length > 5" @action="gotoPage('/rankdays')"></ShowAll>
</div>
<div v-show="isSingleOrg">
<CommonTitle title="培训机构情况"></CommonTitle>
<OrgDoctorList
@orgDoctorTabChange="orgDoctorTabChange"
:certUserList="orgDoctorTabData.certUserList"
:noCertUserList="orgDoctorTabData.noCertUserList"
:noJoinList="orgDoctorTabData.noJoinList"
:certFlag="projectInfo.certFlag"
:containOfficialFlag="projectInfo.containOfficialFlag"
></OrgDoctorList>
</div>
<CommonBottomInfo></CommonBottomInfo>
</article>
<!-- 人群分析 -->
<article v-show="cIndex === 1">
<CommonTitleWithBtn title="人员学历情况" @btnClick="analysisEduClick"></CommonTitleWithBtn>
<ChartPieEdu :dataList="analysisEduData"></ChartPieEdu>
<CommonSplitLine></CommonSplitLine>
<CommonTitleWithBtn title="人员职称情况" @btnClick="analysisTitleClick"></CommonTitleWithBtn>
<ChartPieTitle :dataList="analysisTitleData"></ChartPieTitle>
<CommonBottomInfo></CommonBottomInfo>
</article>
<!-- 课程分析 -->
<article ref="courseAnalysitRef" v-show="(cIndex === 2) && (projectInfo.existCourse == 1)" style="padding-top: 8px;">
<CourseTimesStat :totalSize="courseInfo.totalSize" :maxDuration="courseInfo.pCourseTotalTime" :avgDuration="courseInfo.pCourseAvg" :processDataObj="processDataObj"></CourseTimesStat>
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="课程列表"></CommonTitle>
<CourseTimesList :dataList="courseInfo.pCourseList"></CourseTimesList>
<CommonBottomInfo :class="{'fixed-bottom-info': needFixedBottomInfo}"></CommonBottomInfo>
</article>
<!-- 考试分析 -->
<article v-show="(cIndex === 3) && (projectInfo.existExam == 1)">
<CommonCard :cardList="examCardList"></CommonCard>
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="完成项目考试次数情况"></CommonTitle>
<ChartColumnVerticalTimes :dataList="(generalExamData.examTimesList || []).slice(0, 5)" id="chartCourseTimesId" :colors="colors"></ChartColumnVerticalTimes>
<ShowAll @action="gotoPage('/examtimes')" class="mt-10"></ShowAll>
<!-- <ShowAll v-show="generalExamData && generalExamData.examTimesList.length > 5" @action="gotoPage('/examtimes')" class="mt-10"></ShowAll> -->
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="完成项目考试分数情况"></CommonTitle>
<ChartColumnVerticalScore id="chartCourseScoreId" :dataList="generalExamData.examScoreList"></ChartColumnVerticalScore>
<ShowAll @action="gotoPage('/examscore')" class="mt-10"></ShowAll>
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="考试列表"></CommonTitle>
<ExamList :dataList="examInfoList"></ExamList>
<CommonBottomInfo></CommonBottomInfo>
</article>
<!-- 学习效果分析 -->
<article v-show="(cIndex === 4) && (projectInfo.existEffect == 1)">
<CommonCard :needBG="needBG" :cardList="effectCardList"></CommonCard>
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="不同学历培训前后正确率对比"></CommonTitle>
<ChartColumnVerticalTC :dataList="studyEffect.educationEffectList" id="chartColumnVerticalTC"></ChartColumnVerticalTC>
<CommonSplitLine style="margin-top: 10px;"></CommonSplitLine>
<CommonTitle title="培训前后知识点掌握情况"></CommonTitle>
<ChartColumnHorizontalTC :dataList="studyEffect.knowledgeEffectList" id="ChartColumnVerticalTC2"></ChartColumnHorizontalTC>
<ShowAll @action="gotoPage('/klgpoint')" class="mt-10"></ShowAll>
<CommonBottomInfo></CommonBottomInfo>
</article>
<PicaArea
v-show="isShowArea"
@confirm="areaConfirm"
@cancel="areaCancel"
:projectId="projectId"
:token="token"
></PicaArea>
<PicaOrg v-show="isShowOrg" @confirm="orgConfirm" @cancel="orgCancel"></PicaOrg>
<CommonLoading v-show="false"></CommonLoading>
<PopTips :tipsContent="tipsContent" @clickTips="clickTips" v-show="isShowTips"></PopTips>
</section>
</template>
<script>
const cookies = require("cookie-universal")();
import { goPageByNative } from "@/utils";
import { mapGetters, mapActions } from "vuex";
import {
getProvinceList,
getUserAnalysis,
getHospitalsCNT,
getGeneralPersonal,
getGeneralCourse,
getGeneralExam,
getProjectInfo,
getGeneralExamList,
getStudyEffect
} from "@/service";
import CommonHeader from "@/components/common/common-header";
import CommonTitle from "@/components/common/common-title";
import CommonTitleWithWhat from "@/components/common/common-title-with-what";
import CommonTitleWithBtn from "@/components/common/common-title-with-btn";
import CommonLoading from "@/components/common/common-loading";
import CommonTaps from "@/components/common/common-tabs";
import CommonSwiperItem from "@/components/common/common-swiper-item";
import CommonSplitLine from "@/components/common/common-split-line";
import RankingList from "@/components/bussiness/ranking-item";
import ShowAll from "@/components/common/common-show-all";
import CommonBottomInfo from "@/components/common/common-bottom-info";
import RankingItemDays from "@/components/bussiness/ranking-item-days";
import ChartPie from "@/components/bussiness/charts/chart-pie";
import ChartPieEdu from "@/components/bussiness/charts/chart-pie-edu";
import ChartPieTitle from "@/components/bussiness/charts/chart-pie-title";
import ChartColumnStack from "@/components/bussiness/charts/chart-column-stack";
import ChartColumnVerticalTimes from "@/components/bussiness/charts/chart-column-vertical-times";
import ChartColumnVerticalScore from "@/components/bussiness/charts/chart-column-vertical-score";
import ChartColumnVerticalTC from "@/components/bussiness/charts/chart-column-vertical-tc";
import ChartColumnHorizontalTC from "@/components/bussiness/charts/chart-column-horizontal-tc";
import PicaArea from "@/components/common/pica-area";
import PicaOrg from "@/components/common/pica-org";
import CommonAreaSelect from "@/components/common/common-area-select";
import ProcessBar from "@/components/common/pica-process";
import CourseTimesStat from "@/components/bussiness/course-times-stat";
import CourseTimesList from "@/components/bussiness/course-times-list";
import OrgDoctorList from "@/components/bussiness/org-doctor-list";
import ExamList from "@/components/bussiness/exam-list";
import PopTips from "@/components/bussiness/pop-tips";
import CommonCard from "@/components/common/common-card";
import { getGeneralData } from "@/service/index";
export default {
components: {
CommonHeader,
CommonTitle,
CommonLoading,
CommonTaps,
CommonSwiperItem,
CommonSplitLine,
RankingList,
ChartPie,
ChartPieEdu,
ChartPieTitle,
ShowAll,
CommonBottomInfo,
RankingItemDays,
ChartColumnStack,
PicaArea,
PicaOrg,
CommonAreaSelect,
ProcessBar,
CourseTimesStat,
CourseTimesList,
CommonCard,
ExamList,
// ChartColumnVertical,
ChartColumnVerticalTC,
ChartColumnHorizontalTC,
CommonTitleWithBtn,
OrgDoctorList,
ChartColumnVerticalTimes,
ChartColumnVerticalScore,
PopTips,
CommonTitleWithWhat,
},
data() {
return {
isShowArea: false,
isShowOrg: false,
isShowTips: false,
isShowRankingItemTips: false,
tipsContent: '',
areaName: '全部',
orgName: '全部机构',
cIndex: 0,
colors: ["#39AF9A", "#FF9A4B", "#abb7bb", "#76d2d2"],
needBG: true,
effectCardList: [
{
count: 65,
unitName: "%",
description: "培训前正确率"
},
{
count: 80,
unitName: "%",
description: "培训后正确率"
}
],
allData: {},
studyRankList: [],
costRankList: [],
projectId: "",
token:
// "C7AEA346BC6A4EE0B2F1F76CBD511AC9" ||
"79A005DB585C45C389ED1DD0C76E3633" ||
"A220943B006347799F277CC524EBB662",
isOrgStat: false,
// 区域选择通用接口参数
queryParams: {
projectId: 374,
regionId: ""
},
// 查询概况数据
queryGDParams: {
beginDate: "",
endDate: "",
hospitalIdList: [],
originalFlag: 2, // 默认值2：1.查看原始数据 2.查看调整后的数据
projectId: 374,
regionId: "",
timeFlag: 1,
pageNo: 0,
pageSize: 0,
sourceType: 1,
pageCfg: {
type: 1
}
},
echartsData: null,
analysisData: {
eduList: { join: [], finish: []},
titleList: { join: [], finish: []},
},
analysisEduData: [],
analysisTitleData: [],
CNTParams: {
projectId: 374,
regionId: ""
},
hospitalCnt: 2,
isSingleOrg: false,
orgDoctorTabData: {
certUserList: [],
noCertUserList: [],
noJoinList: []
},
projectInfo: {
projectName: '项目名称',
certFlag: 0, // 项目证书情况 0：无证；1：单证书；2：多证书
existCourse: 2, // 是否显示课程分析 1：显示 2：不显示
existEffect: 2, // 是否显示学习效果分析 1：显示 2：不显示
existExam: 2, // 是否显示考试分析 1：显示 2：不显示
roleType: 0, // 0：普通人 1：内部管理员 2：项目负责人 3：次级负责人
status: 0, // 是否显示查看原始数据 1：显示 2：不显示
containOfficialFlag: 0 // 0: 无正式考考试 1: 有正式考考试
},
courseInfo: {
pCourseTotalTime: 0,
pCourseAvg: 0,
pCourseList: []
},
generalExamData: {
beforeExamCount: 4,
afterExamCount: 4,
examTitleCount: 800,
examTimesList: [],
examScoreList: [],
fiveExamScoreList: [],
tenExamScoreList: []
},
examCardList: [],
examInfoList: [],
studyEffect: {
beforeRate: 0,
afterRate: 0,
educationEffectList: [],
knowledgeEffectList: []
},
processDataObj: {
},
needFixedBottomInfo: false,
};
},
filters: {
shortName: function (value, length = 15, append = '...') {
if (value && value.length > length) {
return value.substring(0, length) + append
} else {
return value
}
}
},
computed: {
...mapGetters({
orgList: "orgList",
areaDegree: "areaDegree"
}),
},
asyncData() {
return {};
},
created() {
if (process.client) {
this.projectId = (this.$route && this.$route.query && this.$route.query.projectId) || 374;
this.queryGDParams.projectId = this.projectId;
this.CNTParams.projectId = this.projectId;
this.queryParams.projectId = this.projectId;
if (this.$rocNative.isWeb) {
this.setUserToken(this.token);
cookies.set("lreporttoken", this.token);
this.setProjectId(this.projectId);
} else {
this.getUserInfo();
}
}
// this.$store.dispatch('searchHospital', { name: '测试' });
},
mounted() {
if (this.$rocNative.isWeb) {
this.getProjectInfo(this.queryParams);
}
},
methods: {
// 获取可区域高度
getViewportHeight() {
var doc = document;
var docE = doc.documentElement;
var body = doc.body;
return docE && docE.clientHeight || body && body.offsetHeight || window.innerHeight || 0;
// return {
// 'width': docE && docE.clientWidth || body && body.offsetWidth || window.innerWidth || 0,
// 'height': docE && docE.clientHeight || body && body.offsetHeight || window.innerHeight || 0
// };
},
// 切换机构人员列表中的tabs
orgDoctorTabChange(index) {
this.queryGDParams.pageCfg.type = index + 1;
this.getGeneralPersonal(this.queryGDParams);
},
// 查询用户信息和权限
getProjectInfo(params) {
getProjectInfo({ projectId: this.projectId }).then(res => {
if (res.code === "000000") {
this.projectInfo = res.data;
getProvinceList(params).then(res => {
if (res.code === "000000") {
this.queryGDParams.regionId = (res.data && res.data.list[0] && res.data.list[0].id) || '';
this.CNTParams.regionId = (res.data && res.data.list[0] && res.data.list[0].id) || '';
this.setProvinceList(res.data.list);
this.getHospitalsCNT(this.CNTParams);
}
});
}
});
},
// 异步延迟调用其它Tabs接口（除了数据概述）
otherInterface() {
setTimeout(() => {
this.getUserAnalysis(this.queryGDParams);
this.projectInfo.existCourse == 1 && this.getGeneralCourse(this.queryGDParams);
this.projectInfo.existExam == 1 && this.getGeneralExam(this.queryGDParams);
this.projectInfo.existEffect == 1 && this.getStudyEffect(this.queryGDParams);
}, 100);
},
// 根据地区查询地区下是否有机构
getHospitalsCNT(params) {
getHospitalsCNT(params).then(res => {
if (res.code === "000000") {
this.hospitalCnt = res.data.hospitalCnt;
this.isSingleOrg = res.data.hospitalCnt === 1;
if (this.isSingleOrg) {
// 只有一个机构，则调用另外一个接口（机构下人员）
this.queryGDParams.hospitalIdList = [];
this.queryGDParams.hospitalIdList.push(res.data.list[0].hospitalId);
this.getGeneralPersonal(this.queryGDParams);
} else {
this.getGeneralData(this.queryGDParams);
}
this.otherInterface();
}
});
},
// 请求单个机构下的数据(总体概述的数据)
getGeneralPersonal(params) {
getGeneralPersonal(params).then(res => {
if (res.code === "000000") {
this.allData = res.data;
this.studyRankList = this.allData.studyRank || [];
this.costRankList = this.allData.costRank || [];
if (params.pageCfg.type === 1) {
this.orgDoctorTabData.certUserList = res.data.personData;
} else if (params.pageCfg.type === 2) {
this.orgDoctorTabData.noCertUserList = res.data.personData;
} else {
this.orgDoctorTabData.noJoinList = res.data.personData;
}
}
});
},
// 请求多个机构下的数据
getGeneralData(queryData) {
getGeneralData(queryData).then(res => {
if (res.code === "000000") {
this.allData = res.data;
this.studyRankList = this.allData.studyRank || []
this.costRankList = this.allData.costRank || [];
this.echartsData = res.data.eduData;
}
});
},
// 人群分析
getUserAnalysis(queryData) {
getUserAnalysis(queryData).then(res => {
if (res.code === "000000") {
this.analysisData = res.data;
this.analysisEduData = res.data.eduList.join;
this.analysisTitleData = res.data.titleList.join;
}
});
},
// 考试分析
getGeneralExam(queryData) {
// 上面三个图标数据
getGeneralExam(queryData).then(res => {
if (res.code === "000000") {
this.generalExamData = res.data;
this.setExamTimesList(res.data.examTimesList)
this.setExamScoreList(res.data.examScoreList)
this.examCardList = [
{
count: res.data.afterExamCount,
unitName: "门",
description: "正式考试数"
},
{
count: res.data.beforeExamCount,
unitName: "门",
description: "模拟考试数"
},
{
count: res.data.examTitleCount,
unitName: "道",
description: "所有考题数"
}
];
}
});
// 下面一个列表数据
getGeneralExamList(queryData).then(res => {
if (res.code === "000000") {
this.examInfoList = res.data.examInfoList || []
}
});
},
// 课程数据
getGeneralCourse(params) {
getGeneralCourse(params).then(res => {
if (res.code === "000000") {
this.processDataObj = {
maxDuration: res.data.pCourseTotalTime,
avgDuration: res.data.pCourseAvg
}
this.processDataObj.maxDuration = res.data.pCourseTotalTime;
this.processDataObj.avgDuration = res.data.pCourseAvg;
this.courseInfo = res.data;
let viewportHeight = this.getViewportHeight();
let courseLength = res.data.pCourseList.length;
// 上面的高度 468 每一条数据的高度 60
if(viewportHeight > (468 + (courseLength - 1) * 60)) {
this.needFixedBottomInfo = true;
}
}
});
},
// 学习效果分析
getStudyEffect(params) {
getStudyEffect(params).then(res => {
if (res.code === "000000") {
this.studyEffect = res.data;
this.effectCardList[0].count = (res.data.beforeRate * 100).toFixed(1);
this.effectCardList[1].count = (res.data.afterRate * 100).toFixed(1);
}
});
},
// Tabs切换
tabClicked(index) {
this.cIndex = index;
},
// 清空参数
clearParams() {
this.orgName = '全部机构';
this.queryGDParams.hospitalIdList = [];
},
// 确认选择区域
areaConfirm(selData) {
this.clearParams();
this.queryGDParams.regionId = selData.regionId;
this.CNTParams.regionId = selData.regionId;
this.getHospitalsCNT(this.CNTParams);
this.isShowArea = false;
this.setAreaDegree(selData.areaDegree);
if(selData.townName || selData.countyName || selData.cityName || selData.provinceName) {
this.areaName = this.shortName(selData.townName || selData.countyName || selData.cityName || selData.provinceName, 6)
}
},
// 取消选择区域
areaCancel() {
this.isShowArea = false;
},
// 确认选择机构
orgConfirm(selData) {
let hospitalIds = [];
let hospitalNames = [];
let orgName = '';
selData.forEach(org => {
if (org.selected) {
hospitalIds.push(org.hospitalId);
hospitalNames.push(org.hospitalName);
}
});
// 如果没有选择机构，则重新获取所有数据
this.isShowOrg = false;
this.orgName = this.shortName(hospitalNames[0] || '全部机构', 6);
if(hospitalIds.length == 0) {
this.getHospitalsCNT(this.CNTParams);
return;
}
this.queryGDParams.hospitalIdList = hospitalIds;
if (hospitalIds.length === 1) {
// this.hospitalCnt = 1
this.isSingleOrg = true;
this.getGeneralPersonal(this.queryGDParams);
} else {
this.isSingleOrg = false;
this.getGeneralData(this.queryGDParams);
}
this.otherInterface();
},
// 取消选择机构
orgCancel() {
this.isShowOrg = false;
},
// 弹出选择区域控件
areaTabClick() {
if(this.isShowOrg) {
this.isShowOrg = false;
}
this.isShowArea = !this.isShowArea;
},
// 弹出选择机构控件
orgTabClick() {
if(this.areaDegree !== 3 && this.areaDegree !== 4) {
this.$toast('选择区/县后才可选择机构');
return;
}
if(this.orgList.length === 0) {
this.$toast('此区域下无机构');
return;
}
this.isShowOrg = !this.isShowOrg;
},
// 通用跳转页面
gotoPage(subUrl, hasCert) {
let subUrlAndParams = `${subUrl}?token=${this.token}&projectId=${this.queryGDParams.projectId}&regionId=${this.queryGDParams.regionId}&hospitalIdList=${this.queryGDParams.hospitalIdList.join(',')}`
if(hasCert) {
subUrlAndParams += `&certFlag=${this.projectInfo.certFlag}`
}
if (this.$rocNative.isWeb) {
this.$router.push(subUrlAndParams);
} else {
let nativeUrl = `/lreport_ssr${subUrlAndParams}`
goPageByNative(this, nativeUrl);
}
},
// 人员学历情况切换按钮
analysisEduClick(index) {
this.analysisEduData = this.analysisData.eduList[
index ? "finish" : "join"
] || [];
this.$forceUpdate();
},
// 人员职称情况切换按钮
analysisTitleClick(index) {
this.analysisTitleData = this.analysisData.titleList[
index ? "finish" : "join"
] || [];
this.$forceUpdate();
},
// 与原生交互，获取用户信息
getUserInfo() {
this.$rocNative.getUserInfo &&
this.$rocNative.getUserInfo().then(params => {
this.token = params.userToken;
// cookies.remove("token");
cookies.set("lreporttoken", this.token);
this.setUserToken(this.token);
this.setProjectId(this.projectId);
this.getProjectInfo(this.queryParams);
});
},
// 弹出提示信息一
tipsRankingItemClick() {
this.tipsContent = '在线项目完成天数=完成项目时间-开始参与项目时间'
this.isShowTips = true
},
// 弹出提示信息二
tipsSwiperClick(tipsContent) {
this.tipsContent = tipsContent; //'是已获证人数/应参与人数*100%'
this.isShowTips = true
},
// 关闭提示信息
clickTips() {
this.isShowTips = false
},
// 文本截断
shortName: function (value, length = 15, append = '...') {
if (value && value.length > length) {
return value.substring(0, length) + append
} else {
return value
}
},
// 映射Store中的Actions
...mapActions({
setProjectId: "setProjectId",
setRegionId: "setRegionId",
setUserToken: "setUserToken",
setProvinceList: "setProvinceList",
setExamTimesList: "setExamTimesList",
setExamScoreList: "setExamScoreList",
setAreaDegree: "setAreaDegree"
})
}
};
</script>
<style lang="less" scoped>
.container {
margin: 0 auto;
font-size: 17px;
h1 {
font-size: 36px;
text-align: center;
}
.m1 {
width: 100%;
> div {
width: 100%;
}
}
.mt-10 {
margin-top: 0;
}
.fixed-bottom-info {
position: fixed;
bottom: 0;
left: 0;
}
}
</style>
pages/index.vue
浏览文件 @ f5ce68d8
...@@ -86,6 +86,7 @@ ...@@ -86,6 +86,7 @@
<PicaOrg v-show="isShowOrg" @confirm="orgConfirm" @cancel="orgCancel"></PicaOrg> <PicaOrg v-show="isShowOrg" @confirm="orgConfirm" @cancel="orgCancel"></PicaOrg>
<CommonLoading v-show="false"></CommonLoading> <CommonLoading v-show="false"></CommonLoading>
<PopTips :tipsContent="tipsContent" @clickTips="clickTips" v-show="isShowTips"></PopTips> <PopTips :tipsContent="tipsContent" @clickTips="clickTips" v-show="isShowTips"></PopTips>
<Loading v-show="isShowLoading"></Loading>
</section> </section>
</template> </template>
...@@ -141,6 +142,8 @@ import OrgDoctorList from "@/components/bussiness/org-doctor-list"; ...@@ -141,6 +142,8 @@ import OrgDoctorList from "@/components/bussiness/org-doctor-list";
import ExamList from "@/components/bussiness/exam-list"; import ExamList from "@/components/bussiness/exam-list";
import PopTips from "@/components/bussiness/pop-tips"; import PopTips from "@/components/bussiness/pop-tips";
import CommonCard from "@/components/common/common-card"; import CommonCard from "@/components/common/common-card";
import Loading from "@/components/common/common-loading";
import { import {
getGeneralData getGeneralData
} from "@/service/index"; } from "@/service/index";
...@@ -178,9 +181,11 @@ export default { ...@@ -178,9 +181,11 @@ export default {
ChartColumnVerticalScore, ChartColumnVerticalScore,
PopTips, PopTips,
CommonTitleWithWhat, CommonTitleWithWhat,
Loading
}, },
data() { data() {
return { return {
isShowLoading: true,
isScroll: false, isScroll: false,
isShowArea: false, isShowArea: false,
isShowOrg: false, isShowOrg: false,
...@@ -455,6 +460,7 @@ export default { ...@@ -455,6 +460,7 @@ export default {
getGeneralPersonal(params) { getGeneralPersonal(params) {
getGeneralPersonal(params).then(res => { getGeneralPersonal(params).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.allData = res.data; this.allData = res.data;
this.studyRankList = this.allData.studyRank || []; this.studyRankList = this.allData.studyRank || [];
this.costRankList = this.allData.costRank || []; this.costRankList = this.allData.costRank || [];
...@@ -473,6 +479,7 @@ export default { ...@@ -473,6 +479,7 @@ export default {
getGeneralData(queryData) { getGeneralData(queryData) {
getGeneralData(queryData).then(res => { getGeneralData(queryData).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.allData = res.data; this.allData = res.data;
this.studyRankList = this.allData.studyRank || [] this.studyRankList = this.allData.studyRank || []
this.costRankList = this.allData.costRank || []; this.costRankList = this.allData.costRank || [];
......
pages/klgpoint.vue
浏览文件 @ f5ce68d8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<TitleKLGPoint :title="title"></TitleKLGPoint> <TitleKLGPoint :title="title"></TitleKLGPoint>
<TipsInfo :content="tipsContent"></TipsInfo> <TipsInfo :content="tipsContent"></TipsInfo>
<ChartColumnHorizontalTCLong :dataList="knowledgeEffectList" class="mt-10"></ChartColumnHorizontalTCLong> <ChartColumnHorizontalTCLong :dataList="knowledgeEffectList" class="mt-10"></ChartColumnHorizontalTCLong>
<Loading v-show="isShowLoading"></Loading>
</section> </section>
</template> </template>
<script> <script>
...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header"; ...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header";
import TitleKLGPoint from "@/components/bussiness/title-klg-point"; import TitleKLGPoint from "@/components/bussiness/title-klg-point";
import TipsInfo from '@/components/bussiness/tips-info' import TipsInfo from '@/components/bussiness/tips-info'
import ChartColumnHorizontalTCLong from "@/components/bussiness/charts/chart-column-horizontal-tc-long"; import ChartColumnHorizontalTCLong from "@/components/bussiness/charts/chart-column-horizontal-tc-long";
import Loading from "@/components/common/common-loading";
export default { export default {
components: {
CommonHeader,
TitleKLGPoint,
ChartColumnHorizontalTCLong,
TipsInfo,
Loading
},
data() { data() {
return { return {
isShowLoading: true,
title: "共0个知识点", title: "共0个知识点",
token: '', token: '',
queryGDParams: { queryGDParams: {
...@@ -40,12 +50,6 @@ export default { ...@@ -40,12 +50,6 @@ export default {
knowledgeEffectList: [], knowledgeEffectList: [],
}; };
}, },
components: {
CommonHeader,
TitleKLGPoint,
ChartColumnHorizontalTCLong,
TipsInfo
},
created() { created() {
if (process.client) { if (process.client) {
...@@ -65,6 +69,7 @@ export default { ...@@ -65,6 +69,7 @@ export default {
async getStudyEffect(params) { async getStudyEffect(params) {
await getStudyEffect(params).then(res => { await getStudyEffect(params).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.knowledgeEffectList = res.data.knowledgeEffectList || []; this.knowledgeEffectList = res.data.knowledgeEffectList || [];
this.title = `共${this.knowledgeEffectList.length}个知识点`; this.title = `共${this.knowledgeEffectList.length}个知识点`;
} }
......
pages/rankdays.vue
浏览文件 @ f5ce68d8
<template> <template>
<section> <section>
<CommonHeader title="完成天数排名"></CommonHeader> <CommonHeader title="完成天数排名"></CommonHeader>
<CommonTitleMiniWithDropdown :title="listTitle" @selectSortItem="selectSortItem"></CommonTitleMiniWithDropdown> <CommonTitleWithDropdown :title="listTitle" @selectSortItem="selectSortItem"></CommonTitleWithDropdown>
<RankingItemDays class="pdt-50" :rankList="rankList"></RankingItemDays> <RankingItemDays class="pdt-50" :rankList="rankList"></RankingItemDays>
<CommonNoMore v-if="rankList.length >= 10" class="mt-10"></CommonNoMore> <CommonNoMore v-if="rankList.length >= 10" class="mt-10"></CommonNoMore>
<Loading v-show="isShowLoading"></Loading>
</section> </section>
</template> </template>
<script> <script>
...@@ -11,13 +12,22 @@ const cookies = require("cookie-universal")(); ...@@ -11,13 +12,22 @@ const cookies = require("cookie-universal")();
import { getStudyTimeData } from "@/service"; import { getStudyTimeData } from "@/service";
import CommonHeader from "@/components/common/common-header"; import CommonHeader from "@/components/common/common-header";
import CommonTitleMiniWithDropdown from "@/components/common/common-title-with-dropdown"; import CommonTitleWithDropdown from "@/components/common/common-title-with-dropdown";
import RankingItemDays from "@/components/bussiness/ranking-item-days"; import RankingItemDays from "@/components/bussiness/ranking-item-days";
import CommonNoMore from "@/components/common/common-no-more"; import CommonNoMore from "@/components/common/common-no-more";
import Loading from "@/components/common/common-loading";
export default { export default {
components: {
CommonHeader,
CommonTitleWithDropdown,
RankingItemDays,
CommonNoMore,
Loading
},
data() { data() {
return { return {
isShowLoading: true,
listTitle: '共0条数据', listTitle: '共0条数据',
rankList: [], rankList: [],
queryGDParams: { queryGDParams: {
...@@ -37,12 +47,6 @@ export default { ...@@ -37,12 +47,6 @@ export default {
}, },
}; };
}, },
components: {
CommonHeader,
CommonTitleMiniWithDropdown,
RankingItemDays,
CommonNoMore
},
created() { created() {
if (process.client) { if (process.client) {
...@@ -62,6 +66,7 @@ export default { ...@@ -62,6 +66,7 @@ export default {
async getStudyTimeData(params) { async getStudyTimeData(params) {
await getStudyTimeData(params).then(res => { await getStudyTimeData(params).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.rankList = res.data.costRank; this.rankList = res.data.costRank;
// this.listTitle = `共${this.rankList.length}个省` // this.listTitle = `共${this.rankList.length}个省`
this.listTitle = `共${this.rankList.length}条数据` this.listTitle = `共${this.rankList.length}条数据`
...@@ -78,7 +83,7 @@ export default { ...@@ -78,7 +83,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pdt-50 { .pdt-50 {
padding-top: 49px; padding-top: 50px;
} }
.mt-10 { .mt-10 {
margin-top: 10px !important; margin-top: 10px !important;
......
pages/rankedu.vue
浏览文件 @ f5ce68d8
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<CommonTitleWithDropdown :dataList="dropdownList" :title="title" :needRightBtn="needRightBtn" @selectSortItem="selectSortItem"></CommonTitleWithDropdown> <CommonTitleWithDropdown :dataList="dropdownList" :title="title" :needRightBtn="needRightBtn" @selectSortItem="selectSortItem"></CommonTitleWithDropdown>
<RankingList class="pdt-50" :certFlag="certFlag" :rankList="rankList"></RankingList> <RankingList class="pdt-50" :certFlag="certFlag" :rankList="rankList"></RankingList>
<CommonNoMore v-if="rankList.length >= 10" class="mt-10"></CommonNoMore> <CommonNoMore v-if="rankList.length >= 10" class="mt-10"></CommonNoMore>
<Loading v-show="isShowLoading"></Loading>
</section> </section>
</template> </template>
<script> <script>
...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header"; ...@@ -14,10 +15,19 @@ import CommonHeader from "@/components/common/common-header";
import CommonTitleWithDropdown from "@/components/common/common-title-with-dropdown"; import CommonTitleWithDropdown from "@/components/common/common-title-with-dropdown";
import CommonNoMore from "@/components/common/common-no-more"; import CommonNoMore from "@/components/common/common-no-more";
import RankingList from "@/components/bussiness/ranking-item"; import RankingList from "@/components/bussiness/ranking-item";
import Loading from "@/components/common/common-loading";
export default { export default {
components: {
CommonHeader,
CommonTitleWithDropdown,
CommonNoMore,
RankingList,
Loading
},
data() { data() {
return { return {
isShowLoading: true,
title: '共0条数据', title: '共0条数据',
rankList: [], rankList: [],
needRightBtn: true, needRightBtn: true,
...@@ -49,12 +59,6 @@ export default { ...@@ -49,12 +59,6 @@ export default {
certFlag: 0 certFlag: 0
}; };
}, },
components: {
CommonHeader,
CommonTitleWithDropdown,
CommonNoMore,
RankingList
},
created() { created() {
if(process.client) { if(process.client) {
if(this.$route && this.$route.query) { if(this.$route && this.$route.query) {
...@@ -86,6 +90,7 @@ export default { ...@@ -86,6 +90,7 @@ export default {
async getStudyRankData(params) { async getStudyRankData(params) {
await getStudyRankData(params).then(res => { await getStudyRankData(params).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.isShowLoading = false;
this.rankList = res.data.studyRank; this.rankList = res.data.studyRank;
this.title = `共${this.rankList.length}条数据` this.title = `共${this.rankList.length}条数据`
} }
...@@ -101,7 +106,7 @@ export default { ...@@ -101,7 +106,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.pdt-50 { .pdt-50 {
padding-top: 49px; padding-top: 50px;
} }
.mt-10 { .mt-10 {
margin-top: 10px !important; margin-top: 10px !important;
......
service/api.js
浏览文件 @ f5ce68d8
...@@ -22,6 +22,7 @@ Axios.interceptors.request.use( ...@@ -22,6 +22,7 @@ Axios.interceptors.request.use(
// config.headers.token = '3EB9111164E84A45B5B00428D52BC966'; // config.headers.token = '3EB9111164E84A45B5B00428D52BC966';
config.headers.token = cookies.get('lreporttoken') || '8F88F86408314155B6840723FAB7DAEC' || '299F66567E7C48C78ADE418B364C5A35' || 'F24CD42F1CFA46829639228E9CFE1E3D' || 'C284B868425D494386EAEF6C9AE99937'; config.headers.token = cookies.get('lreporttoken') || '8F88F86408314155B6840723FAB7DAEC' || '299F66567E7C48C78ADE418B364C5A35' || 'F24CD42F1CFA46829639228E9CFE1E3D' || 'C284B868425D494386EAEF6C9AE99937';
} }
// config.timeout = 30000;
return config; return config;
}, },
error => { error => {
...@@ -30,7 +31,8 @@ Axios.interceptors.request.use( ...@@ -30,7 +31,8 @@ Axios.interceptors.request.use(
error.code === 'ECONNABORTED' && error.code === 'ECONNABORTED' &&
error.message.indexOf('timeout') !== -1 error.message.indexOf('timeout') !== -1
) { ) {
VUE_ENV === 'client' && Toast({ message: '请求超时', duration: 1000 }); VUE_ENV === 'client' && Toast({ message: '系统繁忙，请稍后重新进入页面查询', duration: 1000 });
// VUE_ENV === 'client' && Toast({ message: '请求超时', duration: 1000 });
} }
return Promise.reject(error); return Promise.reject(error);
} }
...@@ -46,7 +48,7 @@ export default function(options) { ...@@ -46,7 +48,7 @@ export default function(options) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
Axios(options) Axios(options)
.then(res => { .then(res => {
const { status, data } = res; const { status, data } = res;
if (status !== 200) { if (status !== 200) {
let cmsg = REPONSE_CODE[status]; let cmsg = REPONSE_CODE[status];
...@@ -59,12 +61,14 @@ export default function(options) { ...@@ -59,12 +61,14 @@ export default function(options) {
if (data.code != '000000') { if (data.code != '000000') {
// 如果要是有其他特殊需求在此处添加 // 如果要是有其他特殊需求在此处添加
console.log(`调用后台接口报错，CODE: ${data.code}，MESSAGE: ${data.message}。`); console.log(`调用后台接口报错，CODE: ${data.code}，MESSAGE: ${data.message}。`);
// console.log(`调用后台接口报错，CODE: ${data.code}，MESSAGE: ${data.message}。`);
} }
resolve(res.data); resolve(res.data);
}) })
.catch(error => { .catch(error => {
console.log('axios catch error: ', error.message); // console.log('axios catch error: ', error.message);
VUE_ENV === 'client' && Toast({ message: error.message, duration: 1000 }); VUE_ENV === 'client' && Toast({ message: '系统繁忙，请稍后重新进入页面查询', duration: 1000 });
// VUE_ENV === 'client' && Toast({ message: error.message, duration: 1000 });
// reject(error); // reject(error);
}) })
}) })
......
utils/enumerate.js
浏览文件 @ f5ce68d8
...@@ -2,7 +2,8 @@ const { NUXT_ENV_APP } = process.env; ...@@ -2,7 +2,8 @@ const { NUXT_ENV_APP } = process.env;
export const BASE_URL = { export const BASE_URL = {
// dev: 'https://dev-sc.yunqueyi.com', // dev: 'https://dev-sc.yunqueyi.com',
dev: 'https://uat-sc.yunqueyi.com', // dev: 'https://uat-sc.yunqueyi.com',
dev: 'https://sc.yunqueyi.com',
test: 'https://test1-sc.yunqueyi.com', test: 'https://test1-sc.yunqueyi.com',
uat: 'https://uat-sc.yunqueyi.com', uat: 'https://uat-sc.yunqueyi.com',
prod: 'https://sc.yunqueyi.com' prod: 'https://sc.yunqueyi.com'
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或