Skip to content

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

代码整理与优化

上级 04bcdae3
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 247 行增加 和 3098 行删除
components/bussiness/charts/chart-column-horizontal-tc-long.vue
浏览文件 @ 30b2b711
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
let vm = null; let vm = null;
import CommonNoMore from "@/components/common/common-no-more"; import CommonNoMore from "@/components/common/common-no-more";
import NoContent from "@/components/bussiness/no-content"; import NoContent from "@/components/bussiness/no-content";
// let chartColumn = null;
export default { export default {
components: { components: {
CommonNoMore, CommonNoMore,
...@@ -87,20 +86,15 @@ export default { ...@@ -87,20 +86,15 @@ export default {
vm = this; vm = this;
}, },
methods: { methods: {
// 画 // 绘制图表
drawColumn(yAxisData, series0Data, series1Data) { drawColumn(yAxisData, series0Data, series1Data) {
let chartColumn = this.$echarts.init(document.getElementById(this.id)); let chartColumn = this.$echarts.init(document.getElementById(this.id));
// let chartColumn = this.$echarts.init(document.getElementById("myChart1"));
// 基于准备好的dom，初始化echarts实例
// 绘制图表
let options = { let options = {
color: vm.colors || [], color: vm.colors || [],
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
// 坐标轴指示器，坐标轴触发有效 type: "shadow"
type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
}, },
formatter: "{b}<br/>{a0}: {c0}%<br/>{a1}: {c1}%" formatter: "{b}<br/>{a0}: {c0}%<br/>{a1}: {c1}%"
}, },
...@@ -191,7 +185,6 @@ export default { ...@@ -191,7 +185,6 @@ export default {
{ {
name: "培训后正确率", name: "培训后正确率",
data: series1Data, data: series1Data,
// data: [0, 0],
// data: [120, 20, 160, 80, 70, 110, 130, 130], // data: [120, 20, 160, 80, 70, 110, 130, 130],
type: "bar", type: "bar",
barWidth: 15, //柱图宽度 barWidth: 15, //柱图宽度
...@@ -229,13 +222,6 @@ export default { ...@@ -229,13 +222,6 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.chart-column-vtc { .chart-column-vtc {
// position: relative; font-size: 14px;
// 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);
} }
</style> </style>
components/bussiness/charts/chart-column-horizontal-tc.vue
浏览文件 @ 30b2b711
...@@ -91,8 +91,7 @@ export default { ...@@ -91,8 +91,7 @@ export default {
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
// 坐标轴指示器，坐标轴触发有效 type: "shadow"
type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
}, },
formatter: "{b}<br/>{a0}: {c0}%<br/>{a1}: {c1}%" formatter: "{b}<br/>{a0}: {c0}%<br/>{a1}: {c1}%"
}, },
...@@ -101,7 +100,6 @@ export default { ...@@ -101,7 +100,6 @@ export default {
data: ["培训前正确率", "培训后正确率"], data: ["培训前正确率", "培训后正确率"],
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,
// fontWeight: "bolder",
color: "#676869" color: "#676869"
} }
}, },
...@@ -213,7 +211,6 @@ export default { ...@@ -213,7 +211,6 @@ export default {
.chart-column-htc { .chart-column-htc {
position: relative; position: relative;
top: -6px; top: -6px;
// height: 280px;
margin: 15px; margin: 15px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/charts/chart-column-stack.vue
浏览文件 @ 30b2b711
...@@ -58,7 +58,6 @@ export default { ...@@ -58,7 +58,6 @@ export default {
handler(newVal, oldValue) { handler(newVal, oldValue) {
if(newVal.length) { if(newVal.length) {
this.isShow = true; this.isShow = true;
// console.log(newVal, oldValue);
vm.legendData = []; vm.legendData = [];
vm.yAxisData = []; vm.yAxisData = [];
vm.seriesData = []; vm.seriesData = [];
...@@ -124,11 +123,9 @@ export default { ...@@ -124,11 +123,9 @@ export default {
}); });
} }
}, },
// 画 // 绘制图表
drawColumn() { drawColumn() {
// 基于准备好的dom，初始化echarts实例
let chartColumn = this.$echarts.init(document.getElementById(this.id)); let chartColumn = this.$echarts.init(document.getElementById(this.id));
// 绘制图表
let options = { let options = {
color: [ color: [
"#FFB01B", "#FFB01B",
...@@ -181,7 +178,6 @@ export default { ...@@ -181,7 +178,6 @@ export default {
// formatter: function(config) { // formatter: function(config) {
// console.log('config', config); // console.log('config', config);
// } // }
}, },
legend: { legend: {
top: 20, top: 20,
...@@ -250,59 +246,9 @@ export default { ...@@ -250,59 +246,9 @@ export default {
color: "#efefef", color: "#efefef",
width: 1 width: 1
} }
}, }
// //设置网格线颜色
// splitLine: {
// show: true,
// lineStyle: {
// color: ["#efefef"],
// width: 1,
// type: "solid"
// }
// }
}, },
series: vm.seriesData 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); chartColumn.setOption(options, true);
} }
......
components/bussiness/charts/chart-column-vertical-score.vue
浏览文件 @ 30b2b711
...@@ -43,20 +43,10 @@ export default { ...@@ -43,20 +43,10 @@ export default {
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
// 坐标轴指示器，坐标轴触发有效 type: "shadow"
type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
}, },
formatter: '{b}分获得人数{c0}人' formatter: '{b}分获得人数{c0}人'
}, },
// legend: {
// top: 20,
// data: ["获优秀人数", "获及格人数", "未获证人数"],
// textStyle: {
// fontSize: 12,
// // fontWeight: "bolder",
// color: "#676869"
// }
// },
grid: { grid: {
top: "10%", top: "10%",
left: "3%", left: "3%",
...@@ -171,87 +161,9 @@ export default { ...@@ -171,87 +161,9 @@ export default {
this.drawColumn(); this.drawColumn();
}, },
methods: { methods: {
// 画 // 绘制图表
drawColumn() { drawColumn() {
// 基于准备好的dom，初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id)); 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); chartColumn.setOption(this.options, true);
} }
} }
......
components/bussiness/charts/chart-column-vertical-tc.vue
浏览文件 @ 30b2b711
...@@ -82,18 +82,15 @@ export default { ...@@ -82,18 +82,15 @@ export default {
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: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
// 坐标轴指示器，坐标轴触发有效 type: "shadow"
type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
}, },
// formatter: '{a}<br/>{b}<br/>{c}<br/>{a0}<br/>{a1}<br/>{b0}<br/>{b1}', // formatter: '{a}<br/>{b}<br/>{c}<br/>{a0}<br/>{a1}<br/>{b0}<br/>{b1}',
formatter: '{b}<br/>{a0}: {c0}%<br/> {a1}: {c1}%' formatter: '{b}<br/>{a0}: {c0}%<br/> {a1}: {c1}%'
...@@ -198,7 +195,6 @@ export default { ...@@ -198,7 +195,6 @@ export default {
.chart-column-vtc { .chart-column-vtc {
position: relative; position: relative;
top: -6px; top: -6px;
// height: 280px;
margin: 15px 15px 0; margin: 15px 15px 0;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/charts/chart-column-vertical-times.vue
浏览文件 @ 30b2b711
...@@ -133,7 +133,6 @@ export default { ...@@ -133,7 +133,6 @@ export default {
watch: { watch: {
dataList: { dataList: {
handler(newVal) { handler(newVal) {
console.log('chart-cvtimes', newVal)
if(newVal.length) { if(newVal.length) {
this.isShow = true; this.isShow = true;
let cList = newVal.slice(0, 5); let cList = newVal.slice(0, 5);
...@@ -161,18 +160,6 @@ export default { ...@@ -161,18 +160,6 @@ export default {
document.body.clientWidth || document.body.clientWidth ||
document.documentElement.clientWidth; document.documentElement.clientWidth;
this.chartWidth = (clientWidth * 0.9).toFixed(0) + 'px'; 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() { mounted() {
...@@ -180,87 +167,9 @@ export default { ...@@ -180,87 +167,9 @@ export default {
this.drawColumn(); this.drawColumn();
}, },
methods: { methods: {
// 画 // 绘制图表
drawColumn() { drawColumn() {
// 基于准备好的dom，初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id)); 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); chartColumn.setOption(this.options, true);
} }
} }
......
components/bussiness/charts/chart-column-vertical.vue
浏览文件 @ 30b2b711
...@@ -40,19 +40,9 @@ export default { ...@@ -40,19 +40,9 @@ export default {
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
// 坐标轴指示器，坐标轴触发有效 type: "shadow"
type: "shadow" // 默认为直线，可选为：'line' | 'shadow'
} }
}, },
// legend: {
// top: 20,
// data: ["获优秀人数", "获及格人数", "未获证人数"],
// textStyle: {
// fontSize: 12,
// // fontWeight: "bolder",
// color: "#676869"
// }
// },
grid: { grid: {
top: "10%", top: "10%",
left: "3%", left: "3%",
...@@ -117,7 +107,6 @@ export default { ...@@ -117,7 +107,6 @@ export default {
watch: { watch: {
dataList: { dataList: {
handler(newVal) { handler(newVal) {
// debugger
this.xAxisData = newVal.map( item => { this.xAxisData = newVal.map( item => {
return item.timesStr return item.timesStr
}) })
...@@ -138,18 +127,6 @@ export default { ...@@ -138,18 +127,6 @@ export default {
document.body.clientWidth || document.body.clientWidth ||
document.documentElement.clientWidth; document.documentElement.clientWidth;
this.chartWidth = (clientWidth * 0.9).toFixed(0) + 'px'; 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() { mounted() {
...@@ -157,87 +134,9 @@ export default { ...@@ -157,87 +134,9 @@ export default {
this.drawColumn(); this.drawColumn();
}, },
methods: { methods: {
// 画 // 绘制图表
drawColumn() { drawColumn() {
// 基于准备好的dom，初始化echarts实例
chartColumn = this.$echarts.init(document.getElementById(this.id)); 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); chartColumn.setOption(this.options, true);
} }
} }
...@@ -248,7 +147,6 @@ export default { ...@@ -248,7 +147,6 @@ export default {
.chart-pie { .chart-pie {
position: relative; position: relative;
top: -6px; top: -6px;
// height: 280px;
margin: 15px; margin: 15px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/charts/chart-pie-cert.vue
浏览文件 @ 30b2b711
...@@ -55,11 +55,9 @@ export default { ...@@ -55,11 +55,9 @@ export default {
return { name: item.certName, value: item.doneCount} return { name: item.certName, value: item.doneCount}
}) })
}, },
// 画饼图 // 绘制图表
drawPie() { drawPie() {
// 基于准备好的dom，初始化echarts实例
let chartPie = vm.$echarts.init(document.getElementById(vm.pieId)); let chartPie = vm.$echarts.init(document.getElementById(vm.pieId));
// 绘制图表
let options = { let options = {
color: echartColors, color: echartColors,
tooltip: { tooltip: {
...@@ -79,7 +77,6 @@ export default { ...@@ -79,7 +77,6 @@ export default {
// fontWeight: "bolder", // fontWeight: "bolder",
color: "#8C8C8C" color: "#8C8C8C"
}, },
// icon: "image://./assets/images/left-array-black.png", //格式为'image://+icon文件地址'，其中image::后的//不能省略 position: "inner",
formatter: function(name) { formatter: function(name) {
return name + " " + vm.fmtLengend(name); return name + " " + vm.fmtLengend(name);
} }
...@@ -125,7 +122,6 @@ export default { ...@@ -125,7 +122,6 @@ export default {
.chart-pie { .chart-pie {
position: relative; position: relative;
top: -6px; top: -6px;
// height: 280px;
margin: 15px; margin: 15px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/charts/chart-pie-edu.vue
浏览文件 @ 30b2b711
...@@ -80,16 +80,13 @@ export default { ...@@ -80,16 +80,13 @@ export default {
}) })
this.count = count; this.count = count;
}, },
// 画饼图 // 绘制图表
drawPie() { drawPie() {
// 基于准备好的dom，初始化echarts实例
let chartPie = vm.$echarts.init(document.getElementById(vm.pieId)); let chartPie = vm.$echarts.init(document.getElementById(vm.pieId));
// 绘制图表
let options = { let options = {
color: echartColors, color: echartColors,
title: { title: {
text: "总人数: " + vm.count, text: "总人数: " + vm.count,
// subtext: "纯属虚构",
top: '10%', top: '10%',
left: '60%', left: '60%',
textStyle: { textStyle: {
...@@ -152,7 +149,6 @@ export default { ...@@ -152,7 +149,6 @@ export default {
chartPie.setOption(options, true); chartPie.setOption(options, true);
}, },
fmtLengend(name) { fmtLengend(name) {
console.log(name);
let item = this.dataList.find(item => { let item = this.dataList.find(item => {
return item.name === name; return item.name === name;
}); });
...@@ -166,7 +162,6 @@ export default { ...@@ -166,7 +162,6 @@ export default {
.chart-pie-edu { .chart-pie-edu {
position: relative; position: relative;
top: -12px; top: -12px;
// height: 280px;
margin: 15px; margin: 15px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/charts/chart-pie-title.vue
浏览文件 @ 30b2b711
...@@ -86,16 +86,13 @@ export default { ...@@ -86,16 +86,13 @@ export default {
}) })
this.count = count; this.count = count;
}, },
// 画饼图 // 绘制图表
drawPie() { drawPie() {
// 基于准备好的dom，初始化echarts实例
let chartPie = vm.$echarts.init(document.getElementById(vm.pieId)); let chartPie = vm.$echarts.init(document.getElementById(vm.pieId));
// 绘制图表
let options = { let options = {
color: echartColors, color: echartColors,
title: { title: {
text: "总人数: " + vm.count, text: "总人数: " + vm.count,
// subtext: "纯属虚构",
top: '10%', top: '10%',
left: '60%', left: '60%',
textStyle: { textStyle: {
...@@ -124,42 +121,11 @@ export default { ...@@ -124,42 +121,11 @@ export default {
data: vm.legendData, // ["优秀证书", "及格证书", "未获证"], data: vm.legendData, // ["优秀证书", "及格证书", "未获证"],
textStyle: { textStyle: {
fontSize: 12, fontSize: 12,
// fontWeight: "bolder",
color: "#8C8C8C", 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) { formatter: function(name) {
return name + " " + vm.fmtLengend(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: [ series: [
{ {
...@@ -203,7 +169,6 @@ export default { ...@@ -203,7 +169,6 @@ export default {
.chart-pie { .chart-pie {
position: relative; position: relative;
top: -6px; top: -6px;
// height: 280px;
margin: 15px; margin: 15px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/charts/chart-pie.vue
浏览文件 @ 30b2b711
...@@ -75,9 +75,6 @@ export default { ...@@ -75,9 +75,6 @@ export default {
}, },
mounted() { mounted() {
vm = this; vm = this;
// this.legendData = ["优秀证书", "及格证书", "未获证"];
// this.seriesData = vm.pieData;
// this.drawPie();
}, },
methods: { methods: {
handlePieData(pieData) { handlePieData(pieData) {
...@@ -88,13 +85,11 @@ export default { ...@@ -88,13 +85,11 @@ export default {
return { name: item.certName, value: item.doneCount} return { name: item.certName, value: item.doneCount}
}) })
}, },
// 画饼图 // 绘制图表
drawPie() { drawPie() {
// 基于准备好的dom，初始化echarts实例
if(!chartPie) { if(!chartPie) {
chartPie = vm.$echarts.init(document.getElementById(vm.id)); chartPie = vm.$echarts.init(document.getElementById(vm.id));
} }
// 绘制图表
options = { options = {
color: echartColors, color: echartColors,
tooltip: { tooltip: {
...@@ -116,10 +111,8 @@ export default { ...@@ -116,10 +111,8 @@ export default {
// fontWeight: "bolder", // fontWeight: "bolder",
color: "#8C8C8C" color: "#8C8C8C"
}, },
// icon: "image://./assets/images/left-array-black.png", //格式为'image://+icon文件地址'，其中image::后的//不能省略 position: "inner",
formatter: function(name) { formatter: function(name) {
return name; return name;
// return name + " " + vm.fmtLengend(name);
} }
}, },
series: [ series: [
...@@ -129,13 +122,12 @@ export default { ...@@ -129,13 +122,12 @@ export default {
label: { label: {
position: "inner", position: "inner",
formatter: function(config) { formatter: function(config) {
// alert(JSON.stringify(config))
return `${config.percent.toFixed(1)}%`; return `${config.percent.toFixed(1)}%`;
} }
}, },
radius: "65%", radius: "65%",
center: ["30%", "50%"], center: ["30%", "50%"],
data: vm.seriesData, // vm.pieData, data: vm.seriesData,
itemStyle: { itemStyle: {
emphasis: { emphasis: {
shadowBlur: 10, shadowBlur: 10,
...@@ -163,7 +155,6 @@ export default { ...@@ -163,7 +155,6 @@ export default {
.chart-pie { .chart-pie {
position: relative; position: relative;
top: -6px; top: -6px;
// height: 280px;
margin: 15px; margin: 15px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04); box-shadow: 0px 10px 30px 0px rgba(0, 0, 0, 0.04);
......
components/bussiness/course-times-list.vue
浏览文件 @ 30b2b711
<!-- 课程列表组件 --> <!-- 课程列表组件 -->
<template> <template>
<div class="corse-times-list"> <div class="corse-times-list">
<!-- <TipsInfo></TipsInfo> -->
<ul class="title"> <ul class="title">
<li>课程名</li> <li>课程名</li>
<li>课程时长</li> <li>课程时长</li>
...@@ -17,11 +16,7 @@ ...@@ -17,11 +16,7 @@
</div> </div>
</template> </template>
<script> <script>
// import TipsInfo from '@/components/bussiness/tips-info'
export default { export default {
// components: {
// TipsInfo
// },
props: { props: {
dataList: { dataList: {
type: Array, type: Array,
......
components/bussiness/exam-times-list.vue
浏览文件 @ 30b2b711
<!-- 完成项目考试分数情况 --> <!-- 完成项目考试次数情况 -->
<template> <template>
<div class="exam-times-wrapper"> <div class="exam-times-wrapper">
<TipsInfo></TipsInfo> <TipsInfo></TipsInfo>
......
components/bussiness/no-content.vue
浏览文件 @ 30b2b711
<template> <!-- 无数据组件 -->
<!-- 专项合作无内容 --> <template>
<section class="nc-container"> <section class="nc-container">
<img <img
class="nc-container-img" class="nc-container-img"
......
components/bussiness/ranking-item-days.vue
浏览文件 @ 30b2b711
...@@ -18,14 +18,6 @@ ...@@ -18,14 +18,6 @@
</ul> </ul>
</template> </template>
<script> <script>
// {
// "subId":10000,
// "subName":null,
// "certCount":0,
// "joinCount":0,
// "certRate":0,
// "costTime":2000
// }
export default { export default {
props: { props: {
rankList: { rankList: {
...@@ -42,13 +34,11 @@ export default { ...@@ -42,13 +34,11 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.rank-item-days { .rank-item-days {
// margin: 20px 15px;
margin: 0 15px; margin: 0 15px;
li { li {
height: 78px; height: 78px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
// margin-top: 20px;
border-bottom: 1px solid #f0f1f2; border-bottom: 1px solid #f0f1f2;
.order { .order {
width: 25px; width: 25px;
...@@ -87,7 +77,6 @@ export default { ...@@ -87,7 +77,6 @@ export default {
.desc-2 { .desc-2 {
height: 12px; height: 12px;
line-height: 12px; line-height: 12px;
// padding-bottom: 10px;
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #979899; color: #979899;
......
components/bussiness/tips-info-chart.vue
浏览文件 @ 30b2b711
<!-- 提示信息：报表专用 -->
<template> <template>
<div class="tips-info-wrapper"> <div class="tips-info-wrapper">
<span>{{content}}</span> <span>{{content}}</span>
...@@ -26,7 +27,6 @@ ...@@ -26,7 +27,6 @@
font-size: 13px; font-size: 13px;
font-weight: 400; font-weight: 400;
color: #676869; color: #676869;
// border-bottom: 1px solid #F0F1F2;
} }
} }
</style> </style>
\ No newline at end of file
components/bussiness/tips-info.vue
浏览文件 @ 30b2b711
<!-- 提示信息 -->
<template> <template>
<div class="tips-info-wrapper"> <div class="tips-info-wrapper">
<span>{{content}}</span> <span>{{content}}</span>
......
components/bussiness/title-klg-point.vue
浏览文件 @ 30b2b711
...@@ -16,18 +16,8 @@ export default { ...@@ -16,18 +16,8 @@ export default {
title: { title: {
type: String, type: String,
default: "证书分布情况" default: "证书分布情况"
},
needRightBtn: {
type: Boolean,
default: false
} }
}, }
data() {
return {
};
},
methods: {}
}; };
</script> </script>
......
components/common/common-area-select.vue
浏览文件 @ 30b2b711
...@@ -6,10 +6,7 @@ ...@@ -6,10 +6,7 @@
</li> </li>
<li class="center" :class="{'gray': isNotVisible}" @click="orgClick"> <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"/> {{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>
<!-- <li class="center" @click="orgClick">
{{orgName}}<img src="../../assets/images/left-array-black.png"/>
</li> -->
</ul> </ul>
</template> </template>
<script> <script>
...@@ -39,19 +36,14 @@ export default { ...@@ -39,19 +36,14 @@ export default {
areaDegree: 'areaDegree' areaDegree: 'areaDegree'
}), }),
isNotVisible() { 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.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; return true;
} else { } else {
return false; return false;
} }
// return this.orgList.length == 0 || this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2
} }
}, },
// watch: {
// },
methods: { methods: {
areaClick() { areaClick() {
this.$emit("areaClick"); this.$emit("areaClick");
......
components/common/common-header.vue
浏览文件 @ 30b2b711
<!-- 通用Navbar -->
<template> <template>
<section :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight"> <section :class="isFixNavbar ? 'nav-top fixed' : 'nav-top'" :style="'height:' + navHeight">
<div <div
...@@ -42,8 +43,8 @@ export default { ...@@ -42,8 +43,8 @@ export default {
type: String, type: String,
default: "暂无数据" default: "暂无数据"
}, },
// 是否fix定位
isFixNavbar: { isFixNavbar: {
//是否fix定位
type: Boolean, type: Boolean,
default: true default: true
}, },
...@@ -92,7 +93,6 @@ export default { ...@@ -92,7 +93,6 @@ export default {
} else { } else {
this.$rocNative.goBack(); this.$rocNative.goBack();
} }
// rocNative.goBack();
}, },
//分享 //分享
goShare() { goShare() {
...@@ -143,9 +143,6 @@ export default { ...@@ -143,9 +143,6 @@ export default {
width: 55px; width: 55px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
// -ms-transform: translate(180deg);
// -webkit-transform: (180deg);
// transform: rotate(180deg);
} }
img { img {
display: block; display: block;
...@@ -177,7 +174,6 @@ export default { ...@@ -177,7 +174,6 @@ export default {
z-index: 2010; z-index: 2010;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
/* padding:0 33px;*/
height: 36px; height: 36px;
&-title { &-title {
height: 18px; height: 18px;
...@@ -188,12 +184,10 @@ export default { ...@@ -188,12 +184,10 @@ export default {
} }
} }
.nav-part { .nav-part {
// margin-top: 10px;
width: 100%; width: 100%;
font-size: 18px; font-size: 18px;
text-align: center; text-align: center;
padding: 0 0 10px 0; padding: 0 0 10px 0;
/* height: 25px;*/
} }
} }
...@@ -204,6 +198,5 @@ export default { ...@@ -204,6 +198,5 @@ export default {
z-index: 2010; z-index: 2010;
border-bottom: 0px solid #e7e7e7; border-bottom: 0px solid #e7e7e7;
background: #fff; background: #fff;
/* height: 25px;*/
} }
</style> </style>
\ No newline at end of file
components/common/common-loading.vue
浏览文件 @ 30b2b711
...@@ -53,8 +53,6 @@ ...@@ -53,8 +53,6 @@
svg path, svg path,
svg rect { svg rect {
// fill: #fff;
// fill: #449284;
fill: #449284; fill: #449284;
} }
</style> </style>
components/common/common-no-more.vue
浏览文件 @ 30b2b711
...@@ -22,10 +22,8 @@ export default { ...@@ -22,10 +22,8 @@ export default {
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
// background:rgba(248,248,248,1);
&-sub { &-sub {
width: 84px; width: 84px;
// height: 26px);
border: 1px solid #F7F7F7; border: 1px solid #F7F7F7;
border-bottom: 0; border-bottom: 0;
} }
......
components/common/common-split-line.vue
浏览文件 @ 30b2b711
<!-- 通用分隔线组件 -->
<template> <template>
<div <div
class="common-split-line" class="common-split-line"
......
components/common/common-swiper-item.vue
浏览文件 @ 30b2b711
<!-- Swipter的子组件 --> <!-- Swipter的子组件：概述页面专用 -->
<template> <template>
<section class="common-swiper-item"> <section class="common-swiper-item">
<article class="middle"> <article class="middle">
......
components/common/common-tabs.vue
浏览文件 @ 30b2b711
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<div class="common-tabs-wrapper"> <div class="common-tabs-wrapper">
<ul class="common-tabs"> <ul class="common-tabs">
<li <li
v-show="(item === '课程分析' && projectInfo.existCourse === 1) v-show="(item === '总体概况'
|| item === '人群分析'
|| item === '课程分析' && projectInfo.existCourse === 1)
|| (item === '考试分析' && projectInfo.existExam === 1) || (item === '考试分析' && projectInfo.existExam === 1)
|| (item === '学习效果分析' && projectInfo.existEffect === 1) || (item === '学习效果分析' && projectInfo.existEffect === 1)"
|| item === '总体概况'
|| item === '人群分析'"
v-for="(item, index) in tapList" v-for="(item, index) in tapList"
:class="{'active': index === cIndex}" :class="{'active': index === cIndex}"
:key="index" :key="index"
...@@ -37,22 +37,12 @@ export default { ...@@ -37,22 +37,12 @@ export default {
type: Object type: Object
} }
}, },
mounted() { mounted() {},
// this.handleTabs(true, true);
},
methods: { methods: {
clickTab(index) { clickTab(index) {
this.cIndex = index; this.cIndex = index;
this.$emit("tabClicked", index); this.$emit("tabClicked", index);
}, }
// handleTabs(needOne, needTwo) {
// if(needOne) {
// this.tapList.push('考试分析');
// }
// if(needTwo) {
// this.tapList.push('学习效果分析');
// }
// }
} }
}; };
</script> </script>
...@@ -68,9 +58,8 @@ export default { ...@@ -68,9 +58,8 @@ export default {
.common-tabs { .common-tabs {
white-space: nowrap; white-space: nowrap;
overflow-x: auto; overflow-x: auto;
// height: 30px;
padding-bottom: 6px; padding-bottom: 6px;
font-size: 13px; font-size: 13px;
li { li {
display: inline-block; display: inline-block;
height: 30px; height: 30px;
...@@ -101,7 +90,6 @@ export default { ...@@ -101,7 +90,6 @@ export default {
height: 6px; height: 6px;
z-index: 2; z-index: 2;
background: #fff; background: #fff;
// border-bottom: 1px solid red;
} }
.border { .border {
display: block; display: block;
...@@ -109,7 +97,6 @@ export default { ...@@ -109,7 +97,6 @@ export default {
height: 1px; height: 1px;
bottom: -3px; bottom: -3px;
left: 0; left: 0;
// padding-top: 6px;
border-bottom: 1px solid #f0f1f2; border-bottom: 1px solid #f0f1f2;
position: absolute; position: absolute;
z-index: 2; z-index: 2;
......
components/common/common-title-mini-old.vue 已删除 100644 → 0
浏览文件 @ 04bcdae3
<!-- 标题组件 -->
<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>
components/common/common-title-mini.vue
浏览文件 @ 30b2b711
...@@ -3,13 +3,6 @@ ...@@ -3,13 +3,6 @@
<div class="common-title-wrapper"> <div class="common-title-wrapper">
<ul class="mini"> <ul class="mini">
<li class="left">{{title}}</li> <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> </ul>
</div> </div>
</template> </template>
...@@ -19,29 +12,8 @@ export default { ...@@ -19,29 +12,8 @@ export default {
title: { title: {
type: String, type: String,
default: "证书分布情况" 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> </script>
...@@ -85,38 +57,5 @@ export default { ...@@ -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> </style>
components/common/common-title-with-dropdown-old.vue 已删除 100644 → 0
浏览文件 @ 04bcdae3
<!-- 标题组件 - 带下拉选择 -->
<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>
components/common/common-title-with-dropdown.vue
浏览文件 @ 30b2b711
...@@ -23,7 +23,6 @@ export default { ...@@ -23,7 +23,6 @@ export default {
title: { title: {
type: String, type: String,
default: "共0条数据" default: "共0条数据"
// default: "共34个省"
}, },
needRightBtn: { needRightBtn: {
type: Boolean, type: Boolean,
...@@ -108,39 +107,7 @@ export default { ...@@ -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 { .dropdown-menu {
position: relative; position: relative;
left: 0; left: 0;
...@@ -164,9 +131,7 @@ export default { ...@@ -164,9 +131,7 @@ export default {
height: 12px; height: 12px;
} }
span.active { span.active {
// span { color: #449284 !important;
color: #449284 !important;
// }
} }
} }
} }
......
components/common/common-title-with-what.vue
浏览文件 @ 30b2b711
...@@ -27,14 +27,12 @@ export default { ...@@ -27,14 +27,12 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.common-title-with-what { .common-title-with-what {
// margin: 15px;
font-size: 18px; font-size: 18px;
margin: 30px 15px 20px; margin: 30px 15px 20px;
li { li {
display: inline-block; display: inline-block;
font-size: 18px; font-size: 18px;
&.left { &.left {
// width: 216px;
display: block; display: block;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
......
components/common/common-title.vue
浏览文件 @ 30b2b711
...@@ -23,12 +23,10 @@ export default { ...@@ -23,12 +23,10 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.common-title { .common-title {
// margin: 15px;
margin: 30px 15px 20px; margin: 30px 15px 20px;
li { li {
display: inline-block; display: inline-block;
&.left { &.left {
// width: 216px;
display: block; display: block;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
......
components/common/pica-area-new.vue 已删除 100644 → 0
浏览文件 @ 04bcdae3
此差异已折叠。
components/common/pica-area-old.vue 已删除 100644 → 0
浏览文件 @ 04bcdae3
此差异已折叠。
components/common/pica-area.vue
浏览文件 @ 30b2b711
此差异已折叠。
components/common/pica-org.vue
浏览文件 @ 30b2b711
<!-- 选择地区组件 --> <!-- 选择机构组件 -->
<template> <template>
<div class="select-wrapper"> <div class="select-wrapper">
<div class="mask" @click="cancel" @touchmove.prevent> <div class="mask" @click="cancel" @touchmove.prevent>
......
components/common/pica-process.vue
浏览文件 @ 30b2b711
<!-- Tabs组件 --> <!-- 进度条组件 -->
<template> <template>
<div class="common-process"> <div class="common-process">
<span class="bar" :style="{'width': maxPocessWidth, 'background': barColor}"></span><span class="desc">{{value}}{{unitName}}</span> <span class="bar" :style="{'width': maxPocessWidth, 'background': barColor}"></span><span class="desc">{{value}}{{unitName}}</span>
...@@ -69,11 +69,7 @@ export default { ...@@ -69,11 +69,7 @@ export default {
}, },
deep: true deep: true
} }
}, }
mounted() {
},
methods: {}
}; };
</script> </script>
...@@ -92,8 +88,6 @@ export default { ...@@ -92,8 +88,6 @@ export default {
&.desc { &.desc {
font-size: 18px; font-size: 18px;
font-weight: 700; font-weight: 700;
// height: 20px;
// line-height: 20px;
color: #373839; color: #373839;
} }
} }
......
pages/examscore.vue
浏览文件 @ 30b2b711
<template> <template>
<section> <section>
<CommonHeader title="完成项目考试分数情况"></CommonHeader> <CommonHeader title="完成项目考试分数情况"></CommonHeader>
<!-- <CommonTitleMini :title="title" :needRightBtn="needRightBtn"></CommonTitleMini> -->
<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>
...@@ -12,7 +11,6 @@ const cookies = require("cookie-universal")(); ...@@ -12,7 +11,6 @@ const cookies = require("cookie-universal")();
import { getGeneralExam } from "@/service"; import { getGeneralExam } from "@/service";
import CommonHeader from "@/components/common/common-header"; 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 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";
...@@ -61,36 +59,6 @@ export default { ...@@ -61,36 +59,6 @@ export default {
CommonNoMore, CommonNoMore,
ExamScoreList 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() { created() {
if (process.client) { if (process.client) {
if(this.$route && this.$route.query) { if(this.$route && this.$route.query) {
...@@ -99,7 +67,6 @@ export default { ...@@ -99,7 +67,6 @@ export default {
this.queryGDParams.regionId = cQuery.regionId || ''; this.queryGDParams.regionId = cQuery.regionId || '';
let hospitalIdList = cQuery.hospitalIdList || '' let hospitalIdList = cQuery.hospitalIdList || ''
this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || []; this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || ''); cookies.set("lreporttoken", cQuery.token || '');
this.getGeneralExam(this.queryGDParams); this.getGeneralExam(this.queryGDParams);
} }
......
pages/examtimes.vue
浏览文件 @ 30b2b711
...@@ -47,36 +47,6 @@ export default { ...@@ -47,36 +47,6 @@ export default {
CommonNoMore, CommonNoMore,
ExamTimesList 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() { created() {
if (process.client) { if (process.client) {
...@@ -86,7 +56,6 @@ export default { ...@@ -86,7 +56,6 @@ export default {
this.queryGDParams.projectId = cQuery.projectId || ''; this.queryGDParams.projectId = cQuery.projectId || '';
this.queryGDParams.regionId = cQuery.regionId || ''; this.queryGDParams.regionId = cQuery.regionId || '';
this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || []; this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || ''); cookies.set("lreporttoken", cQuery.token || '');
this.getGeneralExam(this.queryGDParams); this.getGeneralExam(this.queryGDParams);
} }
......
pages/index copy.vue 已删除 100644 → 0
浏览文件 @ 04bcdae3
此差异已折叠。
pages/index.vue
浏览文件 @ 30b2b711
...@@ -276,35 +276,7 @@ export default { ...@@ -276,35 +276,7 @@ export default {
courseInfo: { courseInfo: {
pCourseTotalTime: 0, pCourseTotalTime: 0,
pCourseAvg: 0, pCourseAvg: 0,
pCourseList: [{ 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
}]
}, },
generalExamData: { generalExamData: {
beforeExamCount: 4, beforeExamCount: 4,
...@@ -369,6 +341,7 @@ export default { ...@@ -369,6 +341,7 @@ export default {
} }
}, },
methods: { methods: {
// 获取可区域高度
getViewportHeight() { getViewportHeight() {
var doc = document; var doc = document;
var docE = doc.documentElement; var docE = doc.documentElement;
...@@ -541,15 +514,15 @@ export default { ...@@ -541,15 +514,15 @@ export default {
}); });
}, },
// Tabs切换
tabClicked(index) { tabClicked(index) {
this.cIndex = index; this.cIndex = index;
}, },
// 清空参数 // 清空参数
clearParams() { clearParams() {
this.orgName = '全部机构'; this.orgName = '全部机构';
this.queryGDParams.hospitalIdList = []; this.queryGDParams.hospitalIdList = [];
// this.setOrgList([]);
// this.setRegionId
}, },
// 确认选择区域 // 确认选择区域
...@@ -599,13 +572,8 @@ export default { ...@@ -599,13 +572,8 @@ export default {
this.getGeneralData(this.queryGDParams); this.getGeneralData(this.queryGDParams);
} }
this.otherInterface(); 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() { orgCancel() {
this.isShowOrg = false; this.isShowOrg = false;
...@@ -710,7 +678,6 @@ export default { ...@@ -710,7 +678,6 @@ export default {
setProvinceList: "setProvinceList", setProvinceList: "setProvinceList",
setExamTimesList: "setExamTimesList", setExamTimesList: "setExamTimesList",
setExamScoreList: "setExamScoreList", setExamScoreList: "setExamScoreList",
setOrgList: "setOrgList",
setAreaDegree: "setAreaDegree" setAreaDegree: "setAreaDegree"
}) })
} }
......
pages/klgpoint.vue
浏览文件 @ 30b2b711
...@@ -25,7 +25,7 @@ export default { ...@@ -25,7 +25,7 @@ export default {
beginDate: "", beginDate: "",
endDate: "", endDate: "",
hospitalIdList: [], hospitalIdList: [],
originalFlag: 2, // 默认值0：0不查看原始数据 originalFlag: 2,
projectId: 374, projectId: 374,
regionId: "", regionId: "",
timeFlag: 1, timeFlag: 1,
...@@ -46,7 +46,6 @@ export default { ...@@ -46,7 +46,6 @@ export default {
ChartColumnHorizontalTCLong, ChartColumnHorizontalTCLong,
TipsInfo TipsInfo
}, },
// async asyncData( context ) { } // async方法，由于图标比较难实现，则放弃使用
created() { created() {
if (process.client) { if (process.client) {
...@@ -56,7 +55,6 @@ export default { ...@@ -56,7 +55,6 @@ export default {
this.queryGDParams.projectId = cQuery.projectId || ""; this.queryGDParams.projectId = cQuery.projectId || "";
this.queryGDParams.regionId = cQuery.regionId || ""; this.queryGDParams.regionId = cQuery.regionId || "";
this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || []; this.queryGDParams.hospitalIdList = hospitalIdList && hospitalIdList.split(',') || [];
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || ""); cookies.set("lreporttoken", cQuery.token || "");
this.getStudyEffect(this.queryGDParams); this.getStudyEffect(this.queryGDParams);
} }
......
pages/rankdays.vue
浏览文件 @ 30b2b711
...@@ -21,7 +21,6 @@ export default { ...@@ -21,7 +21,6 @@ export default {
listTitle: '共0条数据', listTitle: '共0条数据',
rankList: [], rankList: [],
queryGDParams: { queryGDParams: {
// appSelectType: 1,
beginDate: "", beginDate: "",
endDate: "", endDate: "",
hospitalIdList: [], hospitalIdList: [],
...@@ -36,16 +35,6 @@ export default { ...@@ -36,16 +35,6 @@ export default {
type: 1 type: 1
} }
}, },
// dataList: [{
// desc: '按获证比例排名',
// type: 1
// },{
// desc: '按获证人数排名',
// type: 2
// },{
// desc: '按参与人数排名',
// type: 3
// }],
}; };
}, },
components: { components: {
......
pages/rankedu.vue
浏览文件 @ 30b2b711
...@@ -22,7 +22,6 @@ export default { ...@@ -22,7 +22,6 @@ export default {
rankList: [], rankList: [],
needRightBtn: true, needRightBtn: true,
queryGDParams: { queryGDParams: {
// appSelectType: 1,
beginDate: "", beginDate: "",
endDate: "", endDate: "",
hospitalIdList: [], hospitalIdList: [],
...@@ -77,10 +76,8 @@ export default { ...@@ -77,10 +76,8 @@ export default {
type: 3 type: 3
}] }]
} }
// cookies.remove("token");
cookies.set("lreporttoken", cQuery.token || ''); cookies.set("lreporttoken", cQuery.token || '');
this.getStudyRankData(this.queryGDParams); this.getStudyRankData(this.queryGDParams);
console.log(this.queryGDParams)
} }
} }
}, },
...@@ -90,7 +87,6 @@ export default { ...@@ -90,7 +87,6 @@ export default {
await getStudyRankData(params).then(res => { await getStudyRankData(params).then(res => {
if (res.code === "000000") { if (res.code === "000000") {
this.rankList = res.data.studyRank; this.rankList = res.data.studyRank;
// this.title = `共${this.rankList.length}个省`
this.title = `共${this.rankList.length}条数据` this.title = `共${this.rankList.length}条数据`
} }
}); });
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或