Skip to content

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

对接新接口、新UI等

上级 695eee7d
隐藏空白字符变更
内嵌 并排
正在显示 包含 232 行增加 和 217 行删除
components/bussiness/charts/chart-column-horizontal-tc-long.vue
浏览文件 @ a43fcd3e
...@@ -5,18 +5,8 @@ ...@@ -5,18 +5,8 @@
</div> </div>
</template> </template>
<script> <script>
import { format } from "path";
let vm = null; let vm = null;
let paramData = [ // let chartColumn = null;
"生活方\n式干预",
"生活方\n式",
"本科",
"大专",
"中专以下",
"大专",
"中专以下",
"中专以下"
];
export default { export default {
props: { props: {
id: { id: {
...@@ -34,27 +24,60 @@ export default { ...@@ -34,27 +24,60 @@ export default {
"#76d2d2" "#76d2d2"
] ]
}, },
paramData: { dataList: {
type: Array, type: Array,
default: () => [ default: () => []
"生活方\n式干预",
"生活方\n式",
"本科",
"大专",
"中专以下",
"大专",
"中专以下",
"中专以下"
]
} }
}, },
data() { data() {
return { return {
chartWidth: "300px", chartWidth: "300px",
chartHeight: "350px", chartHeight: "350px",
options: { };
// color: vm.colors, },
color: ["#FFB01B", "#39AF9A"], watch: {
dataList: {
handler(newVal) {
let yAxisData = [], series0Data = [], series1Data = []
yAxisData = newVal.map( item => {
return item.classifyName
})
series0Data = this.dataList.map( item => {
return item.beforeRate
})
series1Data = this.dataList.map( item => {
return item.afterRate
})
this.drawColumn(yAxisData, series0Data, series1Data);
},
deep: false
}
},
created() {
if (process.client) {
let clientWidth =
window.outerWidth ||
document.body.clientWidth ||
document.documentElement.clientWidth;
this.chartWidth = clientWidth + "px";
this.chartHeight = 54 * 3 + "px";
// this.chartHeight = 54 * this.dataList.length + "px";
}
},
mounted() {
vm = this;
// chartColumn = this.$echarts.init(document.getElementById(this.id));
this.drawColumn([], [], []);
},
methods: {
// 画
drawColumn(yAxisData, series0Data, series1Data) {
let chartColumn = this.$echarts.init(document.getElementById(this.id));
// 基于准备好的dom，初始化echarts实例
// 绘制图表
let options = {
color: vm.colors,
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
...@@ -106,7 +129,7 @@ export default { ...@@ -106,7 +129,7 @@ export default {
yAxis: { yAxis: {
axisTick: false, axisTick: false,
type: "category", type: "category",
data: paramData, data: yAxisData,
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,
color: "#676869" color: "#676869"
...@@ -132,7 +155,8 @@ export default { ...@@ -132,7 +155,8 @@ export default {
series: [ series: [
{ {
name: "培训前正确率", name: "培训前正确率",
data: [12, 200, 150, 80, 70, 110, 130, 130], data: series0Data,
// data: [12, 200, 150, 80, 70, 110, 130, 130],
type: "bar", type: "bar",
barWidth: 15, //柱图宽度 barWidth: 15, //柱图宽度
label: { label: {
...@@ -145,7 +169,8 @@ export default { ...@@ -145,7 +169,8 @@ export default {
}, },
{ {
name: "培训后正确率", name: "培训后正确率",
data: [120, 20, 160, 80, 70, 110, 130, 130], data: series1Data,
// data: [120, 20, 160, 80, 70, 110, 130, 130],
type: "bar", type: "bar",
barWidth: 15, //柱图宽度 barWidth: 15, //柱图宽度
label: { label: {
...@@ -157,135 +182,8 @@ export default { ...@@ -157,135 +182,8 @@ export default {
} }
} }
] ]
} };
}; chartColumn.setOption(options);
},
created() {
if (process.client) {
let clientWidth =
window.outerWidth ||
document.body.clientWidth ||
document.documentElement.clientWidth;
this.chartWidth = clientWidth + "px";
this.chartHeight = 54 * this.paramData.length + "px";
}
},
mounted() {
vm = this;
this.drawColumn();
},
methods: {
// 画
drawColumn() {
// 基于准备好的dom，初始化echarts实例
let chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
// let options = {
// color: vm.colors,
// tooltip: {
// trigger: "axis",
// axisPointer: {
// // 坐标轴指示器，坐标轴触发有效
// type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
// }
// },
// legend: {
// show: false,
// top: 20,
// data: ["培训前正确率", "培训后正确率"],
// textStyle: {
// fontSize: 12,
// // fontWeight: "bolder",
// color: "#676869"
// }
// },
// grid: {
// top: "2%",
// left: "3%",
// right: "6%",
// bottom: "0%",
// containLabel: true,
// borderWidth: 0
// },
// lineStyle: {
// color: "#fff"
// },
// xAxis: {
// axisTick: false,
// type: "value",
// axisLabel: {
// show: false,
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#676869",
// width: 0
// }
// },
// splitLine: {
// show: false
// }
// },
// yAxis: {
// axisTick: false,
// type: "category",
// data: vm.paramData,
// textStyle: {
// fontSize: 12,
// color: "#676869"
// },
// splitLine: {
// show: false
// },
// axisLabel: {
// formatter: "{value}",
// textAlign: "left",
// textStyle: {
// textAlign: "left",
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#676869",
// width: 0
// }
// }
// },
// series: [
// {
// name: "培训前正确率",
// data: [12, 200, 150, 80, 70, 110, 130, 130],
// type: "bar",
// barWidth: 15, //柱图宽度
// label: {
// normal: {
// formatter: "{c}%",
// show: true,
// position: "inside"
// }
// }
// },
// {
// name: "培训后正确率",
// data: [120, 20, 160, 80, 70, 110, 130, 130],
// type: "bar",
// barWidth: 15, //柱图宽度
// label: {
// normal: {
// formatter: "{c}%",
// show: true,
// position: "inside"
// }
// }
// }
// ]
// };
chartColumn.setOption(this.options);
} }
} }
}; };
......
components/bussiness/charts/chart-column-horizontal-tc.vue
浏览文件 @ a43fcd3e
...@@ -33,20 +33,10 @@ export default { ...@@ -33,20 +33,10 @@ export default {
chartHeight: "350px" chartHeight: "350px"
}; };
}, },
created() {
if (process.client) {
let clientWidth =
window.outerWidth ||
document.body.clientWidth ||
document.documentElement.clientWidth;
this.chartWidth = (clientWidth * 0.9).toFixed(0) + 'px';
}
},
watch: { watch: {
dataList: { dataList: {
handler(newVal) { handler(newVal) {
let yAxisData = [], series0Data = [], series1Data = [] let yAxisData = [], series0Data = [], series1Data = []
yAxisData = newVal.map( item => { yAxisData = newVal.map( item => {
return item.classifyName return item.classifyName
...@@ -62,16 +52,25 @@ export default { ...@@ -62,16 +52,25 @@ export default {
deep: false deep: false
} }
}, },
created() {
if (process.client) {
let clientWidth =
window.outerWidth ||
document.body.clientWidth ||
document.documentElement.clientWidth;
this.chartWidth = (clientWidth * 0.9).toFixed(0) + 'px';
}
},
mounted() { mounted() {
vm = this; vm = this;
this.drawColumn([], [], []); this.drawColumn([], [], []);
}, },
methods: { methods: {
// 画 // 绘制图表
drawColumn(yAxisData, series0Data, series1Data) { drawColumn(yAxisData, series0Data, series1Data) {
// 基于准备好的dom，初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id)); chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
let options = { let options = {
color: vm.colors, color: vm.colors,
tooltip: { tooltip: {
......
components/bussiness/pop-notice.vue 0 → 100644
浏览文件 @ a43fcd3e
<template>
<div class="pop-notice-wrapper">
<div class="mask"></div>
<div class="content">
<div class="top">
<span class="title">公告提醒</span>
<span class="body">该项目已于2019年12月1日<span class="b">停止发放项目证书</span>，但仍可以继续学习该项目</span>
</div>
<div class="line"></div>
<div class="bottom">
<span @click="clickNotice">我知道了</span>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
};
},
props: {
popText: {
type: String,
default: ""
},
btnText: {
type: String,
default: ""
}
},
methods: {
clickNotice() {
this.$emit('clickNotice')
}
},
};
</script>
<style lang="scss" scoped>
@import "../../style/mixin";
.pop-notice-wrapper {
position: fixed;
width: 100%;
height: 100%;
left: 0;
top: 0;
z-index: 110;
font-size: px2rem(20px);
.mask {
position: absolute;
background: rgba(0, 0, 0, 0.5);
width: 100%;
height: 100%;
z-index: 111;
}
.content {
position: absolute;
left: 50%;
top: 50%;
z-index: 112;
width: px2rem(300px);
height: px2rem(185px);
margin: px2rem(-150px) 0 0 px2rem(-150px);
border-radius: px2rem(7px);
text-align: center;
background: #fff;
.top {
padding: px2rem(30px);
.title {
display: block;
font-size: px2rem(18px);
height: px2rem(18px);
line-height: px2rem(18px);
font-weight: 400;
color: #333333;
}
.body {
text-align: left;
display: block;
margin: px2rem(14px) 0;
font-size: px2rem(14px);
height: px2rem(21px);
line-height: px2rem(21px);
font-weight: 400;
color: #676869;
.b {
font-weight: 700;
}
}
}
.line {
width: px2rem(300px);
height: px2rem(1px);
background:rgba(240,241,242,1);
}
.bottom {
text-align: center;
// margin-top: px2rem(14px);
font-size: px2rem(17px);
height: px2rem(50px);
line-height: px2rem(50px);
font-weight: 400;
span {
color: #449284;
}
}
}
}
</style>
components/common/common-area-select.vue
浏览文件 @ a43fcd3e
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<template> <template>
<ul class="common-area-select"> <ul class="common-area-select">
<li class="center" @click="areaClick"> <li class="center" @click="areaClick">
{{areaName}}<img src="../../assets/images/arr-down.png"/> {{areaName}}<img v-show="!showArea" src="../../assets/images/arr-down.png"/><img v-show="showArea" src="../../assets/images/arr-up.png"/>
</li> </li>
<li class="center" @click="orgClick"> <li class="center" @click="orgClick">
{{orgName}}<img src="../../assets/images/arr-down.png"/> {{orgName}}<img v-show="!showOrg" src="../../assets/images/arr-down.png"/><img v-show="showOrg" src="../../assets/images/arr-up.png"/>
</li> </li>
<!-- <li class="center" @click="orgClick"> <!-- <li class="center" @click="orgClick">
{{orgName}}<img src="../../assets/images/left-array-black.png"/> {{orgName}}<img src="../../assets/images/left-array-black.png"/>
...@@ -17,13 +17,24 @@ export default { ...@@ -17,13 +17,24 @@ export default {
props: { props: {
areaName: { areaName: {
type: String, type: String,
default: "全部区域" default: "全部"
}, },
orgName: { orgName: {
type: String, type: String,
default: "全部机构" default: "全部机构"
},
showArea: {
type: Boolean,
default: false,
},
showOrg: {
type: Boolean,
default: false
} }
}, },
// watch: {
// },
methods: { methods: {
areaClick() { areaClick() {
this.$emit("areaClick"); this.$emit("areaClick");
...@@ -58,9 +69,9 @@ export default { ...@@ -58,9 +69,9 @@ export default {
// padding-top: 10px; // padding-top: 10px;
position: relative; position: relative;
left: 3px; left: 3px;
top: 3px; top: 1px;
width: 16px; width: 12px;
height: 16px; height: 12px;
} }
} }
</style> </style>
components/common/pica-area.vue
浏览文件 @ a43fcd3e
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
.mask { .mask {
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
top: 0; top: 124px;
right: 0; right: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;
......
components/common/pica-org.vue
浏览文件 @ a43fcd3e
...@@ -97,7 +97,7 @@ export default { ...@@ -97,7 +97,7 @@ export default {
.mask { .mask {
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
top: 0; top: 124px;
right: 0; right: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;
......
pages/index.vue
浏览文件 @ a43fcd3e
<template> <template>
<section class="container"> <section class="container">
<CommonHeader></CommonHeader> <CommonHeader></CommonHeader>
<CommonAreaSelect @areaClick="areaTabClick" @orgClick="orgTabClick"></CommonAreaSelect> <CommonAreaSelect
@areaClick="areaTabClick"
@orgClick="orgTabClick"
:areaName="areaName"
:orgName="orgName"
:showArea="isShowArea"
:showOrg="isShowOrg">
</CommonAreaSelect>
<CommonTaps :projectInfo="projectInfo" @tabClicked="tabClicked"></CommonTaps> <CommonTaps :projectInfo="projectInfo" @tabClicked="tabClicked"></CommonTaps>
<!-- 总体概况 --> <!-- 总体概况 -->
<article v-show="cIndex === 0"> <article v-show="cIndex === 0">
...@@ -179,6 +186,10 @@ export default { ...@@ -179,6 +186,10 @@ export default {
return { return {
isShowArea: false, isShowArea: false,
isShowOrg: false, isShowOrg: false,
areaName: '全部',
orgName: '全部机构',
// :areaTitle="areaTitle"
// :orgTitle="orgTitle"
cIndex: 0, cIndex: 0,
colors: ["#39AF9A", "#FF9A4B", "#abb7bb", "#76d2d2"], colors: ["#39AF9A", "#FF9A4B", "#abb7bb", "#76d2d2"],
needBG: true, needBG: true,
...@@ -274,7 +285,8 @@ export default { ...@@ -274,7 +285,8 @@ export default {
afterRate: 0, afterRate: 0,
educationEffectList: [], educationEffectList: [],
knowledgeEffectList: [] knowledgeEffectList: []
} },
}; };
}, },
async asyncData() { async asyncData() {
...@@ -459,6 +471,9 @@ export default { ...@@ -459,6 +471,9 @@ export default {
this.CNTParams.regionId = selData.regionId; this.CNTParams.regionId = selData.regionId;
this.getHospitalsCNT(this.CNTParams); this.getHospitalsCNT(this.CNTParams);
this.isShowArea = false; this.isShowArea = false;
this.areaName = selData.townName || selData.countyName || selData.cityName || selData.provinceName
console.log(selData)
// this. = hospitalNames[0] || this.orgName
// this.getGeneralData(this.queryGDParams); // this.getGeneralData(this.queryGDParams);
}, },
areaCancel() { areaCancel() {
...@@ -466,8 +481,13 @@ export default { ...@@ -466,8 +481,13 @@ export default {
}, },
orgConfirm(selData) { orgConfirm(selData) {
let hospitalIds = []; let hospitalIds = [];
let hospitalNames = [];
let orgName = '';
selData.forEach(org => { selData.forEach(org => {
if (org.selected) hospitalIds.push(org.hospitalId); if (org.selected) {
hospitalIds.push(org.hospitalId);
hospitalNames.push(org.hospitalName);
}
}); });
// this.queryGDParams.hospitalIdList = hospitalIds // this.queryGDParams.hospitalIdList = hospitalIds
...@@ -479,6 +499,7 @@ export default { ...@@ -479,6 +499,7 @@ export default {
this.getGeneralData(this.queryGDParams); this.getGeneralData(this.queryGDParams);
} }
this.isShowOrg = false; this.isShowOrg = false;
this.orgName = hospitalNames[0] || this.orgName
console.log(selData, hospitalIds); console.log(selData, hospitalIds);
}, },
orgCancel() { orgCancel() {
...@@ -498,14 +519,12 @@ export default { ...@@ -498,14 +519,12 @@ export default {
// 通用跳转页面 // 通用跳转页面
gotoPage(subUrl) { gotoPage(subUrl) {
let subUrlAndParams = `/lreport_ssr${subUrl} let subUrlAndParams = `${subUrl}?token=${this.token}&projectId=${this.queryGDParams.projectId}&regionId=${this.queryGDParams.regionId}&hospitalIdList=${this.queryGDParams.hospitalIdList.join(',')}`
?token=${this.token}&projectId=${this.queryGDParams.projectId}
&regionId=${this.queryGDParams.regionId}&hospitalIdList=${this.queryGDParams.hospitalIdList.join(',')}`
if (this.$rocNative.isWeb) { if (this.$rocNative.isWeb) {
this.$router.push(subUrl); this.$router.push(subUrlAndParams);
} else { } else {
let url = `/lreport_ssr${subUrl}?token=${this.token}` let nativeUrl = `/lreport_ssr${subUrlAndParams}`
goPageByNative(this, url); goPageByNative(this, nativeUrl);
} }
}, },
......
pages/klg-point.vue
浏览文件 @ a43fcd3e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<section> <section>
<CommonHeader title="培训前后知识点掌握情况"></CommonHeader> <CommonHeader title="培训前后知识点掌握情况"></CommonHeader>
<TitleKLGPoint :title="listTitle"></TitleKLGPoint> <TitleKLGPoint :title="listTitle"></TitleKLGPoint>
<ChartColumnHorizontalTCLong :dataList="queryGDParams" class="mt-10"></ChartColumnHorizontalTCLong> <ChartColumnHorizontalTCLong :dataList="knowledgeEffectList" class="mt-10"></ChartColumnHorizontalTCLong>
<CommonNoMore></CommonNoMore> <CommonNoMore></CommonNoMore>
</section> </section>
</template> </template>
...@@ -19,25 +19,7 @@ export default { ...@@ -19,25 +19,7 @@ export default {
data() { data() {
return { return {
listTitle: "共10知识点", listTitle: "共10知识点",
needRightBtn: false,
// projectId: '',
token: '', token: '',
// // 查询概况数据
// queryGDParams: {
// beginDate: "",
// endDate: "",
// hospitalIdList: [],
// originalFlag: 1, // 默认值0：0不查看原始数据
// projectId: 256,
// regionId: "",
// timeFlag: 0,
// pageCfg: {
// type: 1,
// pageNo: 0,
// pageSize: 0
// }
// },
// 查询概况数据
queryGDParams: { queryGDParams: {
beginDate: "", beginDate: "",
endDate: "", endDate: "",
...@@ -76,15 +58,6 @@ export default { ...@@ -76,15 +58,6 @@ export default {
cookies.set("token", cQuery.token || ""); cookies.set("token", cQuery.token || "");
this.getStudyEffect(this.queryGDParams); this.getStudyEffect(this.queryGDParams);
} }
// this.token = (this.$route && this.$route.query && this.$route.query.token) || '';
// this.projectId = (this.$route && this.$route.query && this.$route.query.projectId) || 256;
// this.regionId = (this.$route && this.$route.query && this.$route.query.regionId) || '000';
// this.hospitalIdList = (this.$route && this.$route.query && this.$route.query.hospitalIdList) || '';
// this.queryGDParams.projectId = this.projectId;
// this.queryGDParams.regionId = this.regionId;
// this.queryGDParams.hospitalIdList = (this.hospitalIdList && this.hospitalIdList.split(',')) || [];
// cookies.set("token", this.token);
// this.getGeneralExam(this.queryGDParams);
} }
}, },
methods: { methods: {
......
service/index.js
浏览文件 @ a43fcd3e
...@@ -127,7 +127,8 @@ export const getGeneralPersonal = async data => { ...@@ -127,7 +127,8 @@ export const getGeneralPersonal = async data => {
method: 'post', method: 'post',
data: data, data: data,
withCredentials: true, withCredentials: true,
url: `stats/report/generalPersonal/${data.pageCfg.type}/${data.pageCfg.pageNo}/${data.pageCfg.pageSize}` url: `stats/report/generalPersonal/${data.pageCfg.type}`
// url: `stats/report/generalPersonal/${data.pageCfg.type}/${data.pageCfg.pageNo}/${data.pageCfg.pageSize}`
}); });
}; };
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或