提交 30b2b711 编写于 作者: guangjun.yang's avatar guangjun.yang

代码整理与优化

上级 04bcdae3
......@@ -12,7 +12,6 @@
let vm = null;
import CommonNoMore from "@/components/common/common-no-more";
import NoContent from "@/components/bussiness/no-content";
// let chartColumn = null;
export default {
components: {
CommonNoMore,
......@@ -87,20 +86,15 @@ export default {
vm = this;
},
methods: {
//
// 绘制图表
drawColumn(yAxisData, series0Data, series1Data) {
let chartColumn = this.$echarts.init(document.getElementById(this.id));
// let chartColumn = this.$echarts.init(document.getElementById("myChart1"));
// 基于准备好的dom,初始化echarts实例
// 绘制图表
let options = {
color: vm.colors || [],
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器,坐标轴触发有效
type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
type: "shadow"
},
formatter: "{b}<br/>{a0}: {c0}%<br/>{a1}: {c1}%"
},
......@@ -191,7 +185,6 @@ export default {
{
name: "培训后正确率",
data: series1Data,
// data: [0, 0],
// data: [120, 20, 160, 80, 70, 110, 130, 130],
type: "bar",
barWidth: 15, //柱图宽度
......@@ -229,13 +222,6 @@ export default {
<style lang="scss" scoped>
.chart-column-vtc {
// position: relative;
// top: -6px;
// height: 280px;
// margin: 15px;
// background: rgba(255, 255, 255, 1);
// box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
// border-radius: 6px;
// border: 1px solid rgba(231, 232, 233, 1);
font-size: 14px;
}
</style>
......@@ -91,8 +91,7 @@ export default {
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器,坐标轴触发有效
type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
type: "shadow"
},
formatter: "{b}<br/>{a0}: {c0}%<br/>{a1}: {c1}%"
},
......@@ -101,7 +100,6 @@ export default {
data: ["培训前正确率", "培训后正确率"],
textStyle: {
fontSize: 12,
// fontWeight: "bolder",
color: "#676869"
}
},
......@@ -213,7 +211,6 @@ export default {
.chart-column-htc {
position: relative;
top: -6px;
// height: 280px;
margin: 15px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
......@@ -58,7 +58,6 @@ export default {
handler(newVal, oldValue) {
if(newVal.length) {
this.isShow = true;
// console.log(newVal, oldValue);
vm.legendData = [];
vm.yAxisData = [];
vm.seriesData = [];
......@@ -124,11 +123,9 @@ export default {
});
}
},
//
// 绘制图表
drawColumn() {
// 基于准备好的dom,初始化echarts实例
let chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
let options = {
color: [
"#FFB01B",
......@@ -181,7 +178,6 @@ export default {
// formatter: function(config) {
// console.log('config', config);
// }
},
legend: {
top: 20,
......@@ -250,59 +246,9 @@ export default {
color: "#efefef",
width: 1
}
},
// //设置网格线颜色
// splitLine: {
// show: true,
// lineStyle: {
// color: ["#efefef"],
// width: 1,
// type: "solid"
// }
// }
}
},
series: vm.seriesData
// series: [
// {
// name: "获优秀人数",
// type: "bar",
// stack: "总量",
// barWidth: 16, //柱图宽度
// label: {
// normal: {
// show: false,
// position: "insideRight"
// }
// },
// data: [320, 302, 301, 334, 390, 330, 320]
// },
// {
// name: "获及格人数",
// type: "bar",
// stack: "总量",
// barWidth: 16, //柱图宽度
// label: {
// normal: {
// show: false,
// position: "insideRight"
// }
// },
// data: [120, 132, 101, 134, 90, 230, 210]
// },
// {
// name: "未获证人数",
// type: "bar",
// stack: "总量",
// barWidth: 16, //柱图宽度
// label: {
// normal: {
// show: false,
// position: "insideRight"
// }
// },
// data: [220, 182, 191, 234, 290, 330, 310]
// }
// ]
};
chartColumn.setOption(options, true);
}
......
......@@ -43,20 +43,10 @@ export default {
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器,坐标轴触发有效
type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
type: "shadow"
},
formatter: '{b}分获得人数{c0}人'
},
// legend: {
// top: 20,
// data: ["获优秀人数", "获及格人数", "未获证人数"],
// textStyle: {
// fontSize: 12,
// // fontWeight: "bolder",
// color: "#676869"
// }
// },
grid: {
top: "10%",
left: "3%",
......@@ -171,87 +161,9 @@ export default {
this.drawColumn();
},
methods: {
//
// 绘制图表
drawColumn() {
// 基于准备好的dom,初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
// let options = {
// color: vm.colors,
// tooltip: {
// trigger: "axis",
// axisPointer: {
// // 坐标轴指示器,坐标轴触发有效
// type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
// }
// },
// // legend: {
// // top: 20,
// // data: ["获优秀人数", "获及格人数", "未获证人数"],
// // textStyle: {
// // fontSize: 12,
// // // fontWeight: "bolder",
// // color: "#676869"
// // }
// // },
// grid: {
// top: "10%",
// left: "3%",
// right: "6%",
// bottom: "6%",
// containLabel: true
// },
// lineStyle: {
// color: "#676869"
// },
// yAxis: {
// axisTick: false,
// type: "value",
// axisLabel: {
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#efefef",
// width: 1
// }
// }
// },
// xAxis: {
// axisTick: false,
// type: "category",
// data: [],
// // data: ["其他", "中专以下", "大专", "本科", "硕士"],
// textStyle: {
// fontSize: 12,
// color: "#676869"
// },
// axisLabel: {
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#efefef",
// width: 1
// }
// }
// },
// series: [
// {
// name: "获优秀人数",
// data: [],
// // data: [120, 200, 150, 80, 70, 110, 130],
// type: "bar",
// barWidth: 20 //柱图宽度
// }
// ]
// };
chartColumn.setOption(this.options, true);
}
}
......
......@@ -82,18 +82,15 @@ export default {
this.drawColumn([], [], []);
},
methods: {
//
// 绘制图表
drawColumn(yAxisData, series0Data, series1Data) {
// 基于准备好的dom,初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
let options = {
color: vm.colors,
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器,坐标轴触发有效
type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
type: "shadow"
},
// formatter: '{a}<br/>{b}<br/>{c}<br/>{a0}<br/>{a1}<br/>{b0}<br/>{b1}',
formatter: '{b}<br/>{a0}: {c0}%<br/> {a1}: {c1}%'
......@@ -198,7 +195,6 @@ export default {
.chart-column-vtc {
position: relative;
top: -6px;
// height: 280px;
margin: 15px 15px 0;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
......@@ -133,7 +133,6 @@ export default {
watch: {
dataList: {
handler(newVal) {
console.log('chart-cvtimes', newVal)
if(newVal.length) {
this.isShow = true;
let cList = newVal.slice(0, 5);
......@@ -161,18 +160,6 @@ export default {
document.body.clientWidth ||
document.documentElement.clientWidth;
this.chartWidth = (clientWidth * 0.9).toFixed(0) + 'px';
console.log(clientWidth);
// if (clientWidth <= 320) {
// this.chartWidth = "260px";
// } else if (clientWidth <= 360) {
// this.chartWidth = "320px";
// } else if (clientWidth <= 375) {
// this.chartWidth = "340px";
// } else if (clientWidth <= 414) {
// this.chartWidth = "375px";
// } else {
// this.chartWidth = (clientWidth * 0.8).toFixed(0) + 'px';
// }
}
},
mounted() {
......@@ -180,87 +167,9 @@ export default {
this.drawColumn();
},
methods: {
// 画
// 绘制图表
drawColumn() {
// 基于准备好的dom,初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
// let options = {
// color: vm.colors,
// tooltip: {
// trigger: "axis",
// axisPointer: {
// // 坐标轴指示器,坐标轴触发有效
// type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
// }
// },
// // legend: {
// // top: 20,
// // data: ["获优秀人数", "获及格人数", "未获证人数"],
// // textStyle: {
// // fontSize: 12,
// // // fontWeight: "bolder",
// // color: "#676869"
// // }
// // },
// grid: {
// top: "10%",
// left: "3%",
// right: "6%",
// bottom: "6%",
// containLabel: true
// },
// lineStyle: {
// color: "#676869"
// },
// yAxis: {
// axisTick: false,
// type: "value",
// axisLabel: {
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#efefef",
// width: 1
// }
// }
// },
// xAxis: {
// axisTick: false,
// type: "category",
// data: [],
// // data: ["其他", "中专以下", "大专", "本科", "硕士"],
// textStyle: {
// fontSize: 12,
// color: "#676869"
// },
// axisLabel: {
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#efefef",
// width: 1
// }
// }
// },
// series: [
// {
// name: "获优秀人数",
// data: [],
// // data: [120, 200, 150, 80, 70, 110, 130],
// type: "bar",
// barWidth: 20 //柱图宽度
// }
// ]
// };
chartColumn.setOption(this.options, true);
}
}
......
......@@ -40,19 +40,9 @@ export default {
tooltip: {
trigger: "axis",
axisPointer: {
// 坐标轴指示器,坐标轴触发有效
type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
type: "shadow"
}
},
// legend: {
// top: 20,
// data: ["获优秀人数", "获及格人数", "未获证人数"],
// textStyle: {
// fontSize: 12,
// // fontWeight: "bolder",
// color: "#676869"
// }
// },
grid: {
top: "10%",
left: "3%",
......@@ -117,7 +107,6 @@ export default {
watch: {
dataList: {
handler(newVal) {
// debugger
this.xAxisData = newVal.map( item => {
return item.timesStr
})
......@@ -138,18 +127,6 @@ export default {
document.body.clientWidth ||
document.documentElement.clientWidth;
this.chartWidth = (clientWidth * 0.9).toFixed(0) + 'px';
console.log(clientWidth);
// if (clientWidth <= 320) {
// this.chartWidth = "260px";
// } else if (clientWidth <= 360) {
// this.chartWidth = "320px";
// } else if (clientWidth <= 375) {
// this.chartWidth = "340px";
// } else if (clientWidth <= 414) {
// this.chartWidth = "375px";
// } else {
// this.chartWidth = (clientWidth * 0.8).toFixed(0) + 'px';
// }
}
},
mounted() {
......@@ -157,87 +134,9 @@ export default {
this.drawColumn();
},
methods: {
//
// 绘制图表
drawColumn() {
// 基于准备好的dom,初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
// let options = {
// color: vm.colors,
// tooltip: {
// trigger: "axis",
// axisPointer: {
// // 坐标轴指示器,坐标轴触发有效
// type: "shadow" // 默认为直线,可选为:'line' | 'shadow'
// }
// },
// // legend: {
// // top: 20,
// // data: ["获优秀人数", "获及格人数", "未获证人数"],
// // textStyle: {
// // fontSize: 12,
// // // fontWeight: "bolder",
// // color: "#676869"
// // }
// // },
// grid: {
// top: "10%",
// left: "3%",
// right: "6%",
// bottom: "6%",
// containLabel: true
// },
// lineStyle: {
// color: "#676869"
// },
// yAxis: {
// axisTick: false,
// type: "value",
// axisLabel: {
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#efefef",
// width: 1
// }
// }
// },
// xAxis: {
// axisTick: false,
// type: "category",
// data: [],
// // data: ["其他", "中专以下", "大专", "本科", "硕士"],
// textStyle: {
// fontSize: 12,
// color: "#676869"
// },
// axisLabel: {
// formatter: "{value}",
// textStyle: {
// color: "#676869"
// }
// },
// axisLine: {
// lineStyle: {
// color: "#efefef",
// width: 1
// }
// }
// },
// series: [
// {
// name: "获优秀人数",
// data: [],
// // data: [120, 200, 150, 80, 70, 110, 130],
// type: "bar",
// barWidth: 20 //柱图宽度
// }
// ]
// };
chartColumn.setOption(this.options, true);
}
}
......@@ -248,7 +147,6 @@ export default {
.chart-pie {
position: relative;
top: -6px;
// height: 280px;
margin: 15px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
......@@ -55,11 +55,9 @@ export default {
return { name: item.certName, value: item.doneCount}
})
},
// 画饼图
// 绘制图表
drawPie() {
// 基于准备好的dom,初始化echarts实例
let chartPie = vm.$echarts.init(document.getElementById(vm.pieId));
// 绘制图表
let options = {
color: echartColors,
tooltip: {
......@@ -79,7 +77,6 @@ export default {
// fontWeight: "bolder",
color: "#8C8C8C"
},
// icon: "image://./assets/images/left-array-black.png", //格式为'image://+icon文件地址',其中image::后的//不能省略 position: "inner",
formatter: function(name) {
return name + " " + vm.fmtLengend(name);
}
......@@ -125,7 +122,6 @@ export default {
.chart-pie {
position: relative;
top: -6px;
// height: 280px;
margin: 15px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
......@@ -80,16 +80,13 @@ export default {
})
this.count = count;
},
// 画饼图
// 绘制图表
drawPie() {
// 基于准备好的dom,初始化echarts实例
let chartPie = vm.$echarts.init(document.getElementById(vm.pieId));
// 绘制图表
let options = {
color: echartColors,
title: {
text: "总人数: " + vm.count,
// subtext: "纯属虚构",
top: '10%',
left: '60%',
textStyle: {
......@@ -152,7 +149,6 @@ export default {
chartPie.setOption(options, true);
},
fmtLengend(name) {
console.log(name);
let item = this.dataList.find(item => {
return item.name === name;
});
......@@ -166,7 +162,6 @@ export default {
.chart-pie-edu {
position: relative;
top: -12px;
// height: 280px;
margin: 15px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
......@@ -86,16 +86,13 @@ export default {
})
this.count = count;
},
// 画饼图
// 绘制图表
drawPie() {
// 基于准备好的dom,初始化echarts实例
let chartPie = vm.$echarts.init(document.getElementById(vm.pieId));
// 绘制图表
let options = {
color: echartColors,
title: {
text: "总人数: " + vm.count,
// subtext: "纯属虚构",
top: '10%',
left: '60%',
textStyle: {
......@@ -124,42 +121,11 @@ export default {
data: vm.legendData, // ["优秀证书", "及格证书", "未获证"],
textStyle: {
fontSize: 12,
// fontWeight: "bolder",
color: "#8C8C8C",
// rich: {
// a: {
// fontSize: 20,
// verticalAlign: "top",
// align: "center",
// padding: [0, 0, 28, 0]
// }
// }
},
// textStyle: {
// rich: {
// a: {
// width: 20
// }
// }
// },
// icon: "image://./assets/images/left-array-black.png", //格式为'image://+icon文件地址',其中image::后的//不能省略 position: "inner",
},
formatter: function(name) {
return name + " " + vm.fmtLengend(name);
},
// itemStyle: {
// normal: {
// shadowBlur: 10,
// shadowColor: 'rgba(120, 36, 50, 0.5)',
// shadowOffsetY: 5,
// color: this.$echarts.graphic.RadialGradient(0.4, 0.3, 1, [{
// offset: 0,
// color: 'rgb(251, 118, 123)'
// }, {
// offset: 1,
// color: 'rgb(204, 46, 72)'
// }])
// }
// },
},
series: [
{
......@@ -203,7 +169,6 @@ export default {
.chart-pie {
position: relative;
top: -6px;
// height: 280px;
margin: 15px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
......@@ -75,9 +75,6 @@ export default {
},
mounted() {
vm = this;
// this.legendData = ["优秀证书", "及格证书", "未获证"];
// this.seriesData = vm.pieData;
// this.drawPie();
},
methods: {
handlePieData(pieData) {
......@@ -88,13 +85,11 @@ export default {
return { name: item.certName, value: item.doneCount}
})
},
// 画饼图
// 绘制图表
drawPie() {
// 基于准备好的dom,初始化echarts实例
if(!chartPie) {
chartPie = vm.$echarts.init(document.getElementById(vm.id));
}
// 绘制图表
options = {
color: echartColors,
tooltip: {
......@@ -116,10 +111,8 @@ export default {
// fontWeight: "bolder",
color: "#8C8C8C"
},
// icon: "image://./assets/images/left-array-black.png", //格式为'image://+icon文件地址',其中image::后的//不能省略 position: "inner",
formatter: function(name) {
return name;
// return name + " " + vm.fmtLengend(name);
}
},
series: [
......@@ -129,13 +122,12 @@ export default {
label: {
position: "inner",
formatter: function(config) {
// alert(JSON.stringify(config))
return `${config.percent.toFixed(1)}%`;
}
},
radius: "65%",
center: ["30%", "50%"],
data: vm.seriesData, // vm.pieData,
data: vm.seriesData,
itemStyle: {
emphasis: {
shadowBlur: 10,
......@@ -163,7 +155,6 @@ export default {
.chart-pie {
position: relative;
top: -6px;
// height: 280px;
margin: 15px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
<!-- 课程列表组件 -->
<template>
<div class="corse-times-list">
<!-- <TipsInfo></TipsInfo> -->
<ul class="title">
<li>课程名</li>
<li>课程时长</li>
......@@ -17,11 +16,7 @@
</div>
</template>
<script>
// import TipsInfo from '@/components/bussiness/tips-info'
export default {
// components: {
// TipsInfo
// },
props: {
dataList: {
type: Array,
......
<!-- 完成项目考试数情况 -->
<!-- 完成项目考试数情况 -->
<template>
<div class="exam-times-wrapper">
<TipsInfo></TipsInfo>
......
<template>
<!-- 专项合作无内容 -->
<!-- 无数据组件 -->
<template>
<section class="nc-container">
<img
class="nc-container-img"
......
......@@ -18,14 +18,6 @@
</ul>
</template>
<script>
// {
// "subId":10000,
// "subName":null,
// "certCount":0,
// "joinCount":0,
// "certRate":0,
// "costTime":2000
// }
export default {
props: {
rankList: {
......@@ -42,13 +34,11 @@ export default {
</script>
<style scoped lang="scss">
.rank-item-days {
// margin: 20px 15px;
margin: 0 15px;
li {
height: 78px;
display: flex;
flex-direction: row;
// margin-top: 20px;
border-bottom: 1px solid #f0f1f2;
.order {
width: 25px;
......@@ -87,7 +77,6 @@ export default {
.desc-2 {
height: 12px;
line-height: 12px;
// padding-bottom: 10px;
font-size: 12px;
font-weight: 400;
color: #979899;
......
<!-- 提示信息:报表专用 -->
<template>
<div class="tips-info-wrapper">
<span>{{content}}</span>
......@@ -26,7 +27,6 @@
font-size: 13px;
font-weight: 400;
color: #676869;
// border-bottom: 1px solid #F0F1F2;
}
}
</style>
\ No newline at end of file
<!-- 提示信息 -->
<template>
<div class="tips-info-wrapper">
<span>{{content}}</span>
......
......@@ -16,18 +16,8 @@ export default {
title: {
type: String,
default: "证书分布情况"
},
needRightBtn: {
type: Boolean,
default: false
}
},
data() {
return {
};
},
methods: {}
}
};
</script>
......
......@@ -7,9 +7,6 @@
<li class="center" :class="{'gray': isNotVisible}" @click="orgClick">
{{orgName}}<img v-show="isNotVisible" src="../../assets/images/arr-down-white.png"/><img v-show="!showOrg && !isNotVisible" src="../../assets/images/arr-down.png"/><img v-show="showOrg && !isNotVisible" src="../../assets/images/arr-up.png"/>
</li>
<!-- <li class="center" @click="orgClick">
{{orgName}}<img src="../../assets/images/left-array-black.png"/>
</li> -->
</ul>
</template>
<script>
......@@ -39,19 +36,14 @@ export default {
areaDegree: 'areaDegree'
}),
isNotVisible() {
console.log('this.areaDegree', this.areaDegree)
if((this.orgList && this.orgList.length == 0) || this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2) {
// if(this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2) {
return true;
} else {
return false;
}
// return this.orgList.length == 0 || this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2
}
},
// watch: {
// },
methods: {
areaClick() {
this.$emit("areaClick");
......
<!-- 通用Navbar -->
<template>
<section :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight">
<div
......@@ -42,8 +43,8 @@ export default {
type: String,
default: "暂无数据"
},
// 是否fix定位
isFixNavbar: {
//是否fix定位
type: Boolean,
default: true
},
......@@ -92,7 +93,6 @@ export default {
} else {
this.$rocNative.goBack();
}
// rocNative.goBack();
},
//分享
goShare() {
......@@ -143,9 +143,6 @@ export default {
width: 55px;
padding-left: 15px;
padding-right: 15px;
// -ms-transform: translate(180deg);
// -webkit-transform: (180deg);
// transform: rotate(180deg);
}
img {
display: block;
......@@ -177,7 +174,6 @@ export default {
z-index: 2010;
display: inline-block;
width: 100%;
/* padding:0 33px;*/
height: 36px;
&-title {
height: 18px;
......@@ -188,12 +184,10 @@ export default {
}
}
.nav-part {
// margin-top: 10px;
width: 100%;
font-size: 18px;
text-align: center;
padding: 0 0 10px 0;
/* height: 25px;*/
}
}
......@@ -204,6 +198,5 @@ export default {
z-index: 2010;
border-bottom: 0px solid #e7e7e7;
background: #fff;
/* height: 25px;*/
}
</style>
\ No newline at end of file
......@@ -53,8 +53,6 @@
svg path,
svg rect {
// fill: #fff;
// fill: #449284;
fill: #449284;
}
</style>
......@@ -22,10 +22,8 @@ export default {
flex-direction: row;
justify-content: center;
align-items: center;
// background:rgba(248,248,248,1);
&-sub {
width: 84px;
// height: 26px);
border: 1px solid #F7F7F7;
border-bottom: 0;
}
......
<!-- 通用分隔线组件 -->
<template>
<div
class="common-split-line"
......
<!-- Swipter的子组件 -->
<!-- Swipter的子组件:概述页面专用 -->
<template>
<section class="common-swiper-item">
<article class="middle">
......
......@@ -3,11 +3,11 @@
<div class="common-tabs-wrapper">
<ul class="common-tabs">
<li
v-show="(item === '课程分析' && projectInfo.existCourse === 1)
v-show="(item === '总体概况'
|| item === '人群分析'
|| item === '课程分析' && projectInfo.existCourse === 1)
|| (item === '考试分析' && projectInfo.existExam === 1)
|| (item === '学习效果分析' && projectInfo.existEffect === 1)
|| item === '总体概况'
|| item === '人群分析'"
|| (item === '学习效果分析' && projectInfo.existEffect === 1)"
v-for="(item, index) in tapList"
:class="{'active': index === cIndex}"
:key="index"
......@@ -37,22 +37,12 @@ export default {
type: Object
}
},
mounted() {
// this.handleTabs(true, true);
},
mounted() {},
methods: {
clickTab(index) {
this.cIndex = index;
this.$emit("tabClicked", index);
},
// handleTabs(needOne, needTwo) {
// if(needOne) {
// this.tapList.push('考试分析');
// }
// if(needTwo) {
// this.tapList.push('学习效果分析');
// }
// }
}
}
};
</script>
......@@ -68,7 +58,6 @@ export default {
.common-tabs {
white-space: nowrap;
overflow-x: auto;
// height: 30px;
padding-bottom: 6px;
font-size: 13px;
li {
......@@ -101,7 +90,6 @@ export default {
height: 6px;
z-index: 2;
background: #fff;
// border-bottom: 1px solid red;
}
.border {
display: block;
......@@ -109,7 +97,6 @@ export default {
height: 1px;
bottom: -3px;
left: 0;
// padding-top: 6px;
border-bottom: 1px solid #f0f1f2;
position: absolute;
z-index: 2;
......
<!-- 标题组件 -->
<template>
<div class="common-title-wrapper">
<ul class="mini">
<li class="left">{{title}}</li>
<!-- <li class="right" v-if="needRightBtn">
<span>按获证比例排名</span>
<img src="../../assets/images/arr-down.png" alt />
</li>-->
<van-dropdown-menu v-if="needRightBtn">
<van-dropdown-item v-model="value2" :options="option2" />
</van-dropdown-menu>
</ul>
</div>
</template>
<script>
export default {
props: {
title: {
type: String,
default: "证书分布情况"
},
needRightBtn: {
type: Boolean,
default: false
}
},
data() {
return {
value1: 0,
value2: "a",
option1: [
{ text: "全部商品", value: 0 },
{ text: "新款商品", value: 1 },
{ text: "活动商品", value: 2 }
],
option2: [
{ text: "默认排序", value: "a" },
{ text: "好评排序", value: "b" },
{ text: "销量排序", value: "c" }
]
};
},
methods: {}
};
</script>
<style lang="scss">
.common-title-wrapper {
position: relative;
left: 0;
top: 0;
z-index: 1;
height: 44px;
line-height: 44px;
background: #f8f9fa;
.mini {
padding: 0px 15px;
display: flex;
flex-direction: row;
justify-content: space-between;
height: 44px;
line-height: 44px;
background: #f8f9fa;
li {
display: inline-block;
&.left {
// width: 216px;
display: block;
height: 44px;
line-height: 44px;
font-size: 15px;
font-weight: 700;
color: #676869;
}
&.right {
font-size: 15px;
font-weight: 700;
color: #676869;
img {
width: 12px;
height: 12px;
}
}
}
}
.van-dropdown-menu {
height: 44px;
line-height: 44px;
background: #f8f9fa;
color: #676869 !important;
font-size: 15px;
font-weight: 700;
}
.van-dropdown-menu__title {
font-size: 15px;
font-weight: 700;
color: #676869 !important;
.van-ellipsis {
color: #676869 !important;
}
}
.van-dropdown-item__option--active,
.van-dropdown-item__option--active .van-dropdown-item__icon {
.van-cell__title span{
color: #449284 !important;
font-weight: 400 !important;
}
}
// .van-cell {
// // color: #676869 !important;
// font-size: 15px;
// font-weight: 400;
// }
.van-cell .van-cell--clickable .van-dropdown-item__option {
color: #676869 !important;
font-size: 15px;
font-weight: 400 !important;
}
}
</style>
......@@ -3,13 +3,6 @@
<div class="common-title-wrapper">
<ul class="mini">
<li class="left">{{title}}</li>
<!-- <li class="right" v-if="needRightBtn">
<span>按获证比例排名</span>
<img src="../../assets/images/arr-down.png" alt />
</li>-->
<!-- <van-dropdown-menu v-if="needRightBtn">
<van-dropdown-item v-model="value2" :options="option2" />
</van-dropdown-menu> -->
</ul>
</div>
</template>
......@@ -19,29 +12,8 @@ export default {
title: {
type: String,
default: "证书分布情况"
},
needRightBtn: {
type: Boolean,
default: false
}
},
data() {
return {
value1: 0,
value2: "a",
option1: [
{ text: "全部商品", value: 0 },
{ text: "新款商品", value: 1 },
{ text: "活动商品", value: 2 }
],
option2: [
{ text: "默认排序", value: "a" },
{ text: "好评排序", value: "b" },
{ text: "销量排序", value: "c" }
]
};
},
methods: {}
}
};
</script>
......@@ -85,38 +57,5 @@ export default {
}
}
}
.van-dropdown-menu {
height: 44px;
line-height: 44px;
background: #f8f9fa;
color: #676869 !important;
font-size: 15px;
font-weight: 700;
}
.van-dropdown-menu__title {
font-size: 15px;
font-weight: 700;
color: #676869 !important;
.van-ellipsis {
color: #676869 !important;
}
}
.van-dropdown-item__option--active,
.van-dropdown-item__option--active .van-dropdown-item__icon {
.van-cell__title span{
color: #449284 !important;
font-weight: 400 !important;
}
}
// .van-cell {
// // color: #676869 !important;
// font-size: 15px;
// font-weight: 400;
// }
.van-cell .van-cell--clickable .van-dropdown-item__option {
color: #676869 !important;
font-size: 15px;
font-weight: 400 !important;
}
}
</style>
<!-- 标题组件 - 带下拉选择 -->
<template>
<div class="common-title-wd-wrapper">
<div v-show="isShowDropdown" class="mask" @click="isShowDropdown = !isShowDropdown"></div>
<ul class="mini">
<li class="left">{{title}}</li>
<li class="right" v-if="needRightBtn" @click="isShowDropdown = !isShowDropdown">
<span>{{cDesc || (dataList[0] && dataList[0].desc)}}</span>
<img src="../../assets/images/arr-down.png" alt />
</li>
</ul>
<ul v-show="isShowDropdown" class="dropdown-menu">
<li v-for="(item, index) in dataList" :key="index" @click="selectSortItem(index)">
<span :class="{'active': cIndex === index }">{{item.desc}}</span>
<img v-show="cIndex === index" src="../../assets/images/sort-select-icon.png" alt="">
</li>
</ul>
</div>
</template>
<script>
export default {
props: {
title: {
type: String,
default: "共0条数据"
// default: "共34个省"
},
needRightBtn: {
type: Boolean,
default: false
},
dataList: {
type: Array,
default: () => []
}
},
data() {
return {
isShowDropdown: false,
cIndex: 0,
cDesc: '',
cType: 1
};
},
methods: {
selectSortItem(index) {
this.isShowDropdown = false;
this.cIndex = index;
this.cDesc = this.dataList[index].desc;
this.cType = this.dataList[index].type;
this.$emit('selectSortItem', this.cType);
}
}
};
</script>
<style lang="scss" scoped>
.common-title-wd-wrapper {
position: relative;
left: 0;
top: 0;
z-index: 1001;
height: 44px;
line-height: 44px;
background: #f8f9fa;
.mask {
position: fixed;
left: 0;
top: 100px;
z-index: 1002;
bottom: 0;
right: 0;
background: rgba(0, 0, 0, 0.5);
}
.mini {
position: relative;
left: 0;
top: 0;
z-index: 1003;
padding: 0px 15px;
display: flex;
flex-direction: row;
justify-content: space-between;
height: 44px;
line-height: 44px;
background: #f8f9fa;
li {
display: inline-block;
&.left {
// width: 216px;
display: block;
height: 44px;
line-height: 44px;
font-size: 15px;
font-weight: 700;
color: #676869;
}
&.right {
font-size: 15px;
font-weight: 700;
color: #676869;
img {
width: 12px;
height: 12px;
}
}
}
}
.van-dropdown-menu {
height: 44px;
line-height: 44px;
background: #f8f9fa;
color: #676869 !important;
font-size: 15px;
font-weight: 700;
}
.van-dropdown-menu__title {
font-size: 15px;
font-weight: 700;
color: #676869 !important;
.van-ellipsis {
color: #676869 !important;
}
}
.van-dropdown-item__option--active,
.van-dropdown-item__option--active .van-dropdown-item__icon {
.van-cell__title span{
color: #449284 !important;
font-weight: 400 !important;
}
}
// .van-cell {
// // color: #676869 !important;
// font-size: 15px;
// font-weight: 400;
// }
.van-cell .van-cell--clickable .van-dropdown-item__option {
color: #676869 !important;
font-size: 15px;
font-weight: 400 !important;
}
.dropdown-menu {
position: relative;
left: 0;
top: 0;
z-index: 1004;
padding: 0 15px;
background: #fff;
li {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
height: 56px;
line-height: 56px;
font-size: 14px;
color: #676869;
border-bottom: 1px solid #F0F1F2;
img {
line-height: 56px;
width: 12px;
height: 12px;
}
span.active {
// span {
color: #449284 !important;
// }
}
}
}
}
</style>
......@@ -23,7 +23,6 @@ export default {
title: {
type: String,
default: "共0条数据"
// default: "共34个省"
},
needRightBtn: {
type: Boolean,
......@@ -108,39 +107,7 @@ export default {
}
}
}
.van-dropdown-menu {
height: 44px;
line-height: 44px;
background: #f8f9fa;
color: #676869 !important;
font-size: 15px;
font-weight: 700;
}
.van-dropdown-menu__title {
font-size: 15px;
font-weight: 700;
color: #676869 !important;
.van-ellipsis {
color: #676869 !important;
}
}
.van-dropdown-item__option--active,
.van-dropdown-item__option--active .van-dropdown-item__icon {
.van-cell__title span{
color: #449284 !important;
font-weight: 400 !important;
}
}
// .van-cell {
// // color: #676869 !important;
// font-size: 15px;
// font-weight: 400;
// }
.van-cell .van-cell--clickable .van-dropdown-item__option {
color: #676869 !important;
font-size: 15px;
font-weight: 400 !important;
}
.dropdown-menu {
position: relative;
left: 0;
......@@ -164,9 +131,7 @@ export default {
height: 12px;
}
span.active {
// span {
color: #449284 !important;
// }
}
}
}
......
......@@ -27,14 +27,12 @@ export default {
<style lang="scss" scoped>
.common-title-with-what {
// margin: 15px;
font-size: 18px;
margin: 30px 15px 20px;
li {
display: inline-block;
font-size: 18px;
&.left {
// width: 216px;
display: block;
height: 18px;
line-height: 18px;
......
......@@ -23,12 +23,10 @@ export default {
<style lang="scss" scoped>
.common-title {
// margin: 15px;
margin: 30px 15px 20px;
li {
display: inline-block;
&.left {
// width: 216px;
display: block;
height: 18px;
line-height: 18px;
......
此差异已折叠。
此差异已折叠。
......@@ -156,16 +156,11 @@ export default {
}
},
created() {
// localStorage.setItem('baseUrl',this.baseUrl);
// this.projectId = (this.$route.query && this.$route.query.projectId) || 374;
// this.projectId = (this.$route && this.$route.query && this.$route.query.projectId) || 374;
// this.getProvinceData(this.queryParams);
if(process.client) {
if(this.$route && this.$route.query) {
let cQuery = this.$route.query
let hospitalIdList = cQuery.hospitalIdList || ''
this.queryParams.projectId = cQuery.projectId || '';
if (process.client) {
if (this.$route && this.$route.query) {
let cQuery = this.$route.query;
let hospitalIdList = cQuery.hospitalIdList || "";
this.queryParams.projectId = cQuery.projectId || "";
}
}
},
......@@ -177,41 +172,36 @@ export default {
},
watch: {
projectId(newVal) {
// alert(newVal)
console.log('###############', newVal);
this.queryParams.projectId = newVal;
// this.getProvinceData(this.queryParams);
},
provinceList(newVal) {
console.log('###############', newVal);
this.areaList.provinceList = newVal;
this.areaList.provinceList[0].selected = true
this.value.provinceName = '全部'
// this.areaList.provinceList.map(a => {
// if (a.id == this.value.provinceId) {
// a.selected = true;
// }
// });
this.areaList.provinceList[0].selected = true;
this.value.provinceName = "全部";
}
},
methods: {
// 映射Store中的Actions
...mapActions({
setOrgList: 'setOrgList',
setAreaDegree: 'setAreaDegree'
setOrgList: "setOrgList",
setAreaDegree: "setAreaDegree"
}),
// 根据区域获取机构列表(一般在是三、四级区域才调用此方法)
async getHospitalsByRegionId(params) {
await getHospitalsByRegionId(params).then(res => {
if (res.code === "000000") {
this.setOrgList(res.data.list || [])
this.setOrgList(res.data.list || []);
}
});
},
// 获取省列表
async getProvinceData(params) {
console.log('getProvinceData')
console.log("getProvinceData");
await getProvinceList(params).then(res => {
if (res.code === "000000") {
this.areaList.provinceList = res.data && res.data.list || [];
this.areaList.provinceList = (res.data && res.data.list) || [];
console.log(this.areaList.provinceList);
this.areaList.provinceList.map(a => {
if (a.id == this.value.provinceId) {
......@@ -221,11 +211,13 @@ export default {
}
});
},
// 获取城市列表
async getCityData(params) {
console.log('getCityData')
console.log("getCityData");
await getCityList(params).then(res => {
if (res.code === "000000") {
this.areaList.cityList = res.data && res.data.list || [];
this.areaList.cityList = (res.data && res.data.list) || [];
if (this.areaList.cityList.length === 0) {
this.isShowProvince = true;
this.isShowCity = false;
......@@ -239,11 +231,13 @@ export default {
}
});
},
// 获取区/县列表
async getCountyData(params) {
console.log('getCountyData')
console.log("getCountyData");
await getCountyList(params).then(res => {
if (res.code === "000000") {
this.areaList.countyList = res.data && res.data.list || [];
this.areaList.countyList = (res.data && res.data.list) || [];
if (this.areaList.countyList.length === 0) {
this.isShowProvince = false;
this.isShowCity = true;
......@@ -258,10 +252,12 @@ export default {
}
});
},
// 获取乡/镇列表
async getTownData(params) {
await getTownList(params).then(res => {
if (res.code === "000000") {
this.areaList.townList = res.data && res.data.list || [];
this.areaList.townList = (res.data && res.data.list) || [];
if (this.areaList.townList.length === 0) {
this.isShowProvince = false;
this.isShowCity = false;
......@@ -278,10 +274,10 @@ export default {
});
},
//选择省份的操作
// 选择省份的操作
provinceSelect(item, idx) {
console.log('provinceSelect', item, this.rank);
this.value.regionId = item.id
console.log("provinceSelect", item, this.rank);
this.value.regionId = item.id;
this.value.provinceId = item.id;
this.queryParams.regionId = item.id;
this.value.provinceName = item.label;
......@@ -298,13 +294,11 @@ export default {
this.areaList.provinceList[idx].selected = true;
// this.setAreaDegree(item.degree)
this.value.areaDegree = item.degree;
if(item.degree == 0){
if (item.degree == 0) {
return;
}
if(item.degree == 3 || item.degree == 4){
// 调用机构接口
if (item.degree == 3 || item.degree == 4) {
this.getHospitalsByRegionId(this.queryParams);
// return;
}
//控制省市县乡数据展示与隐藏
this.isShowProvince = false;
......@@ -317,14 +311,12 @@ export default {
} else {
this.isDisabled = false;
}
// // 当前选中的样式
// this.areaList.provinceList.map(a => (a.selected = false));
// this.areaList.provinceList[idx].selected = true;
},
//选择市的操作
// 选择市的操作
citySelect(item, idx) {
console.log('citySelect', item, this.rank);
this.value.regionId = item.id
console.log("citySelect", item, this.rank);
this.value.regionId = item.id;
this.value.cityId = item.id;
this.queryParams.regionId = item.id;
this.value.cityName = item.label;
......@@ -338,15 +330,13 @@ export default {
this.areaList.cityList[idx].selected = true;
// this.setAreaDegree(item.degree)
this.value.areaDegree = item.degree;
if(item.degree == 0){
if (item.degree == 0) {
return;
}
if(item.degree == 3 || item.degree == 4){
// 调用机构接口
if (item.degree == 3 || item.degree == 4) {
this.getHospitalsByRegionId(this.queryParams);
// return;
}
//控制省市县乡数据展示与隐藏
// 控制省市县乡数据展示与隐藏
this.isShowProvince = false;
this.isShowCity = false;
this.isShowTown = false;
......@@ -358,10 +348,11 @@ export default {
this.isDisabled = false;
}
},
//选择区/县的操作
// 选择区/县的操作
countySelect(item, idx) {
console.log('countySelect', item, this.rank);
this.value.regionId = item.id
console.log("countySelect", item, this.rank);
this.value.regionId = item.id;
this.value.countyId = item.id;
this.queryParams.regionId = item.id;
this.value.countyName = item.label;
......@@ -373,15 +364,13 @@ export default {
this.areaList.countyList[idx].selected = true;
// this.setAreaDegree(item.degree)
this.value.areaDegree = item.degree;
if(item.degree == 0){
if (item.degree == 0) {
return;
}
if(item.degree == 3 || item.degree == 4){
// 调用机构接口
if (item.degree == 3 || item.degree == 4) {
this.getHospitalsByRegionId(this.queryParams);
// return;
}
//控制省市县乡数据展示与隐藏
// 控制省市县乡数据展示与隐藏
this.isShowProvince = false;
this.isShowCity = false;
this.isShowCounty = false;
......@@ -393,23 +382,22 @@ export default {
this.isDisabled = false;
}
},
//选择乡镇的操作
// 选择乡镇的操作
townSelect(item, idx) {
console.log('townSelect', item, this.rank);
this.value.regionId = item.id
console.log("townSelect", item, this.rank);
this.value.regionId = item.id;
this.value.townId = item.id;
this.queryParams.regionId = item.id;
this.value.townName = item.label;
this.value.patientAddress = `${this.value.provinceName}${this.value.cityName}${this.value.countyName}${this.value.townName}`;
// this.setAreaDegree(item.degree)
this.value.areaDegree = item.degree;
if(item.degree == 0){
if (item.degree == 0) {
return;
}
if(item.degree == 3 || item.degree == 4){
// 调用机构接口
if (item.degree == 3 || item.degree == 4) {
this.getHospitalsByRegionId(this.queryParams);
// return;
}
// 当前选中的样式
this.areaList.townList.map(a => (a.selected = false));
......@@ -449,7 +437,7 @@ export default {
};
</script>
<style lang="less" scoped>
.select-wrapper {
.select-wrapper {
font-family: PingFangSC-Regular;
.mask {
position: fixed;
......@@ -627,5 +615,5 @@ export default {
}
}
}
}
}
</style>
\ No newline at end of file
<!-- 选择地区组件 -->
<!-- 选择机构组件 -->
<template>
<div class="select-wrapper">
<div class="mask" @click="cancel" @touchmove.prevent>
......
<!-- Tabs组件 -->
<!-- 进度条组件 -->
<template>
<div class="common-process">
<span class="bar" :style="{'width': maxPocessWidth, 'background': barColor}"></span><span class="desc">{{value}}{{unitName}}</span>
......@@ -69,11 +69,7 @@ export default {
},
deep: true
}
},
mounted() {
},
methods: {}
}
};
</script>
......@@ -92,8 +88,6 @@ export default {
&.desc {
font-size: 18px;
font-weight: 700;
// height: 20px;
// line-height: 20px;
color: #373839;
}
}
......
<template>
<section>
<CommonHeader title="完成项目考试分数情况"></CommonHeader>
<!-- <CommonTitleMini :title="title" :needRightBtn="needRightBtn"></CommonTitleMini> -->
<CommonTitleWithDropdown :dataList="dropdownList" :title="title" :needRightBtn="needRightBtn" @selectSortItem="selectSortItem"></CommonTitleWithDropdown>
<ExamScoreList class="pdt-50" :dataList="dataList"></ExamScoreList>
<CommonNoMore v-if="dataList.length >= 10" class="mt-10"></CommonNoMore>
......@@ -12,7 +11,6 @@ const cookies = require("cookie-universal")();
import { getGeneralExam } from "@/service";
import CommonHeader from "@/components/common/common-header";
// import CommonTitleMini from "@/components/common/common-title-mini";
import CommonTitleWithDropdown from "@/components/common/common-title-with-dropdown";
import CommonNoMore from "@/components/common/common-no-more";
import ExamScoreList from "@/components/bussiness/exam-score-list";
......@@ -61,36 +59,6 @@ export default {
CommonNoMore,
ExamScoreList
},
// async asyncData( { query } ) {
// let queryGDParams = {
// appSelectType: 2,
// beginDate: "",
// endDate: "",
// hospitalIdList: [],
// originalFlag: 2, // 默认值0:0不查看原始数据
// projectId: 374,
// regionId: "",
// timeFlag: 1,
// pageNo: 0,
// pageSize: 0,
// sourceType: 1,
// pageCfg: {
// type: 1
// }
// };
// let hospitalIdList = query.hospitalIdList || ''
// queryGDParams.projectId = query.projectId || '';
// queryGDParams.regionId = query.regionId || '';
// queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.set("token", query.token || '');
// let examData = await getGeneralExam(queryGDParams);
// console.log(examData);
// return {
// allData: examData.data,
// dataList: examData.data && examData.data.examScoreList || [],
// title: `共${examData.data && examData.data.examScoreList && examData.data.examScoreList.length || 0}条数据`
// }
// },
created() {
if (process.client) {
if(this.$route && this.$route.query) {
......@@ -99,7 +67,6 @@ export default {
this.queryGDParams.regionId = cQuery.regionId || '';
let hospitalIdList = cQuery.hospitalIdList || ''
this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || '');
this.getGeneralExam(this.queryGDParams);
}
......
......@@ -47,36 +47,6 @@ export default {
CommonNoMore,
ExamTimesList
},
// async asyncData( { query } ) {
// let queryGDParams = {
// appSelectType: 1,
// beginDate: "",
// endDate: "",
// hospitalIdList: [],
// originalFlag: 2, // 默认值0:0不查看原始数据
// projectId: 374,
// regionId: "",
// timeFlag: 1,
// pageNo: 0,
// pageSize: 0,
// sourceType: 1,
// pageCfg: {
// type: 1
// }
// };
// let hospitalIdList = query.hospitalIdList || ''
// queryGDParams.projectId = query.projectId || '';
// queryGDParams.regionId = query.regionId || '';
// queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.set("token", query.token || '');
// let examData = await getGeneralExam(queryGDParams);
// console.log(examData);
// return {
// dataList: examData.data && examData.data.examTimesList,
// title: `共${(examData.data && examData.data.examTimesList && examData.data.examTimesList.length) || 0}条数据`
// }
// },
created() {
if (process.client) {
......@@ -86,7 +56,6 @@ export default {
this.queryGDParams.projectId = cQuery.projectId || '';
this.queryGDParams.regionId = cQuery.regionId || '';
this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || '');
this.getGeneralExam(this.queryGDParams);
}
......
此差异已折叠。
......@@ -276,35 +276,7 @@ export default {
courseInfo: {
pCourseTotalTime: 0,
pCourseAvg: 0,
pCourseList: [{
"courseId":765,
"courseName":"ww学情无比例不同专用四",
"courseTime":159,
"averageTime":23,
"joinCount":27,
"finishCount":7
},{
"courseId":765,
"courseName":"ww学情无比例不同专用四",
"courseTime":159,
"averageTime":23,
"joinCount":27,
"finishCount":7
},{
"courseId":765,
"courseName":"ww学情无比例不同专用四",
"courseTime":159,
"averageTime":23,
"joinCount":27,
"finishCount":7
},{
"courseId":765,
"courseName":"ww学情无比例不同专用四",
"courseTime":159,
"averageTime":23,
"joinCount":27,
"finishCount":7
}]
pCourseList: []
},
generalExamData: {
beforeExamCount: 4,
......@@ -369,6 +341,7 @@ export default {
}
},
methods: {
// 获取可区域高度
getViewportHeight() {
var doc = document;
var docE = doc.documentElement;
......@@ -541,15 +514,15 @@ export default {
});
},
// Tabs切换
tabClicked(index) {
this.cIndex = index;
},
// 清空参数
clearParams() {
this.orgName = '全部机构';
this.queryGDParams.hospitalIdList = [];
// this.setOrgList([]);
// this.setRegionId
},
// 确认选择区域
......@@ -599,13 +572,8 @@ export default {
this.getGeneralData(this.queryGDParams);
}
this.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);
},
// 取消选择机构
orgCancel() {
this.isShowOrg = false;
......@@ -710,7 +678,6 @@ export default {
setProvinceList: "setProvinceList",
setExamTimesList: "setExamTimesList",
setExamScoreList: "setExamScoreList",
setOrgList: "setOrgList",
setAreaDegree: "setAreaDegree"
})
}
......
......@@ -25,7 +25,7 @@ export default {
beginDate: "",
endDate: "",
hospitalIdList: [],
originalFlag: 2, // 默认值0:0不查看原始数据
originalFlag: 2,
projectId: 374,
regionId: "",
timeFlag: 1,
......@@ -46,7 +46,6 @@ export default {
ChartColumnHorizontalTCLong,
TipsInfo
},
// async asyncData( context ) { } // async方法,由于图标比较难实现,则放弃使用
created() {
if (process.client) {
......@@ -56,7 +55,6 @@ export default {
this.queryGDParams.projectId = cQuery.projectId || "";
this.queryGDParams.regionId = cQuery.regionId || "";
this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || "");
this.getStudyEffect(this.queryGDParams);
}
......
......@@ -21,7 +21,6 @@ export default {
listTitle: '共0条数据',
rankList: [],
queryGDParams: {
// appSelectType: 1,
beginDate: "",
endDate: "",
hospitalIdList: [],
......@@ -36,16 +35,6 @@ export default {
type: 1
}
},
// dataList: [{
// desc: '按获证比例排名',
// type: 1
// },{
// desc: '按获证人数排名',
// type: 2
// },{
// desc: '按参与人数排名',
// type: 3
// }],
};
},
components: {
......
......@@ -22,7 +22,6 @@ export default {
rankList: [],
needRightBtn: true,
queryGDParams: {
// appSelectType: 1,
beginDate: "",
endDate: "",
hospitalIdList: [],
......@@ -77,10 +76,8 @@ export default {
type: 3
}]
}
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || '');
this.getStudyRankData(this.queryGDParams);
console.log(this.queryGDParams)
}
}
},
......@@ -90,7 +87,6 @@ export default {
await getStudyRankData(params).then(res => {
if (res.code === "000000") {
this.rankList = res.data.studyRank;
// this.title = `共${this.rankList.length}个省`
this.title = `共${this.rankList.length}条数据`
}
});
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册