Skip to content

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

部分bug修复。。。

上级 e8ed87f8
隐藏空白字符变更
内嵌 并排
正在显示 包含 71 行增加 和 30 行删除
components/bussiness/course-times-list.vue
浏览文件 @ 13847598
......@@ -9,7 +9,7 @@
</ul>
<ul class="list">
<li v-for="(item, index) in dataList" :key="index">
<span>{{item.courseName}}</span>
<span>{{item.courseName | shortName}}</span>
<span>{{item.courseTime}}分钟</span>
<span>{{item.averageTime}}分钟</span>
</li>
......@@ -28,6 +28,19 @@ export default {
default: () => []
}
},
filters: {
shortName: function (value, length = 8, append = '...') {
if (value && value.length > length) {
return value.substring(0, length) + append
} else {
return value
}
},
},
methods: {
},
};
</script>
<style scoped lang="scss">
......
components/bussiness/course-times-stat.vue
浏览文件 @ 13847598
......@@ -5,7 +5,7 @@
<li>
<p>
课程总时长
<span>(所有课程数 2门)</span>
<span>(所有课程数 {{totalSize}}门)</span>
</p>
<ProcessBar :maxValue="maxDuration" :value="maxDuration"></ProcessBar>
</li>
......@@ -18,13 +18,13 @@
<li>
<p>
课程总时长
<span>(所有课程数 2门)</span>
<span>(所有课程数 {{totalSize}}门)</span>
</p>
<ProcessBar :maxValue="avgDuration" :value="maxDuration"></ProcessBar>
<ProcessBar :maxValue="avgDuration" :value="avgDuration"></ProcessBar>
</li>
<li>
<p>平均学习时长</p>
<ProcessBar barColor="#FFB01A" :maxValue="avgDuration" :value="avgDuration"></ProcessBar>
<ProcessBar barColor="#FFB01A" :maxValue="avgDuration" :value="maxDuration"></ProcessBar>
</li>
</ul>
</div>
......@@ -33,6 +33,10 @@
import ProcessBar from "@/components/common/pica-process";
export default {
props: {
totalSize: {
type: Number | String,
default: 0
},
maxDuration: {
type: Number | String,
default: 100
......
components/common/common-area-select.vue
浏览文件 @ 13847598
......@@ -35,10 +35,11 @@ export default {
},
computed: {
...mapGetters({
orgList: 'orgList'
orgList: 'orgList',
areaDegree: 'areaDegree'
}),
isNotVisible() {
return this.orgList.length == 0
return this.orgList.length == 0 || this.areaDegree == 0 || this.areaDegree == 1 || this.areaDegree == 2
}
},
// watch: {
......
components/common/pica-area.vue
浏览文件 @ 13847598
......@@ -15,7 +15,7 @@
{{
value.provinceName
? value.provinceName
: '请选择'
: '请选择1'
}}
</li>
<li
......@@ -23,7 +23,7 @@
:class="{ active: isShowCity }"
class="item"
@click="tabAddressClick(2)"
>{{ value.cityName ? value.cityName : '请选择' }}</li>
>{{ value.cityName ? value.cityName : '请选择2' }}</li>
<li
v-show="value.cityName && rank>2 && isShowCounty"
:class="{ active: isShowCounty }"
......@@ -31,7 +31,7 @@
@click="tabAddressClick(3)"
>
{{
value.countyName ? value.countyName : '请选择'
value.countyName ? value.countyName : '请选择3'
}}
</li>
<li
......@@ -39,7 +39,7 @@
:class="{ active: isShowTown }"
class="item"
@click="tabAddressClick(4)"
>{{ value.townName ? value.townName : '请选择' }}</li>
>{{ value.townName ? value.townName : '请选择4' }}</li>
</ul>
<div class="address-content" @touchmove.stop>
<ul v-show="isShowProvince" id="province">
......@@ -158,6 +158,14 @@ export default {
// localStorage.setItem('baseUrl',this.baseUrl);
// this.projectId = (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 || '';
}
}
},
computed: {
...mapGetters({
......@@ -272,6 +280,7 @@ export default {
// },
//选择省份的操作
provinceSelect(item, idx) {
console.log('provinceSelect', item, this.rank);
this.value.regionId = item.id
this.value.provinceId = item.id;
this.queryParams.regionId = item.id;
......@@ -294,7 +303,7 @@ export default {
// 调用机构接口
this.setAreaDegree(item.degree)
this.getHospitalsByRegionId(this.queryParams);
return;
// return;
}
//控制省市县乡数据展示与隐藏
this.isShowProvince = false;
......@@ -313,6 +322,7 @@ export default {
},
//选择市的操作
citySelect(item, idx) {
console.log('citySelect', item, this.rank);
this.value.regionId = item.id
this.value.cityId = item.id;
this.queryParams.regionId = item.id;
......@@ -348,6 +358,7 @@ export default {
},
//选择区/县的操作
countySelect(item, idx) {
console.log('countySelect', item, this.rank);
this.value.regionId = item.id
this.value.countyId = item.id;
this.queryParams.regionId = item.id;
......@@ -365,7 +376,7 @@ export default {
// 调用机构接口
this.setAreaDegree(item.degree)
this.getHospitalsByRegionId(this.queryParams);
return;
// return;
}
//控制省市县乡数据展示与隐藏
this.isShowProvince = false;
......@@ -381,6 +392,7 @@ export default {
},
//选择乡镇的操作
townSelect(item, idx) {
console.log('townSelect', item, this.rank);
this.value.regionId = item.id
this.value.townId = item.id;
this.queryParams.regionId = item.id;
......@@ -393,7 +405,7 @@ export default {
// 调用机构接口
this.setAreaDegree(item.degree)
this.getHospitalsByRegionId(this.queryParams);
return;
// return;
}
// 当前选中的样式
this.areaList.townList.map(a => (a.selected = false));
......
components/common/pica-process.vue
浏览文件 @ 13847598
......@@ -13,7 +13,7 @@ export default {
},
value: {
type: Number | String,
default: 100
default: 0
},
valueDescWidth: {
type: Number | String,
......@@ -37,13 +37,18 @@ export default {
mounted() {
// let maxWidth = window.clien
// scrollWidth offsetWidth
let clientWidth = window.outerWidth || document.body.clientWidth || document.documentElement.clientWidth
let maxWidth = clientWidth - this.valueDescWidth
let ratio = 1
if(this.value && this.value < this.maxValue) {
ratio = this.value / this.maxValue
}
this.maxPocessWidth = Math.round(ratio * maxWidth) + 'px'
this.$nextTick(() => {
let clientWidth = window.outerWidth || document.body.clientWidth || document.documentElement.clientWidth;
let maxWidth = clientWidth - this.valueDescWidth;
let ratio = 1;
if(this.value && this.value < this.maxValue) {
ratio = this.value / this.maxValue;
}
if(!this.value) {
ratio = 0.01;
}
this.maxPocessWidth = Math.round(ratio * maxWidth) + 'px'
})
},
methods: {}
};
......
pages/exam-score.vue
浏览文件 @ 13847598
......@@ -90,12 +90,14 @@ export default {
});
},
selectSortItem(type) {
alert(type)
console.log(this.allData)
if(type == 1) {
this.dataList = this.allData.examScoreList || [];
} else if(type === 2) {
this.dataList = this.allData.examFiveScoreList || [];
this.dataList = this.allData.fiveExamScoreList || [];
} else if(type === 3) {
this.dataList = this.allData.examTenScoreList || [];
this.dataList = this.allData.tenExamScoreList || [];
}
this.title = `共${this.dataList.length}条数据`;
}
......
pages/index.vue
浏览文件 @ 13847598
......@@ -55,7 +55,7 @@
<!-- 课程分析 -->
<article v-show="(cIndex === 2) && (projectInfo.existCourse == 1)" style="padding-top: 8px;">
<CourseTimesStat :maxDuration="courseInfo.pCourseTotalTime" :avgDuration="courseInfo.pCourseAvg"></CourseTimesStat>
<CourseTimesStat :totalSize="courseInfo.totalSize" :maxDuration="courseInfo.pCourseTotalTime" :avgDuration="courseInfo.pCourseAvg"></CourseTimesStat>
<CommonSplitLine></CommonSplitLine>
<CommonTitle title="课程列表"></CommonTitle>
<CourseTimesList :dataList="courseInfo.pCourseList"></CourseTimesList>
......@@ -217,7 +217,7 @@ export default {
allData: {},
projectId: "",
token:
"4F17C83E6D44456CB873B489BDC1380A" ||
"A0E52265D31B4D2380C7CFC9E1ACCDCE" ||
"A7F0A8A4BB5C4EC4B78E71261B753C9C" ||
"4281940A6A0C49F69F06BBC9E83DA90D" ||
"A62E9F92365547A29724F21F29BED4F6" ||
......@@ -314,6 +314,9 @@ export default {
(this.$router && this.$route.query && this.$route.query.projectId) ||
374;
this.queryGDParams.projectId = this.projectId;
this.CNTParams.projectId = this.projectId;
this.examSingleParams.projectId = this.projectId;
this.queryParams.projectId = this.projectId;
if (this.$rocNative.isWeb) {
this.setUserToken(this.token);
cookies.set("token", this.token);
......@@ -535,7 +538,7 @@ export default {
// if(this.isShowArea) {
// this.isShowArea = false;
// }
if(this.orgDegree !== 3 && this.orgDegree !== 4) {
if(this.areaDegree !== 3 && this.areaDegree !== 4) {
this.$toast('选择区/县后才可选择机构');
return;
}
......@@ -565,14 +568,14 @@ export default {
analysisEduClick(index) {
this.analysisEduData = this.analysisData.eduList[
index ? "join" : "finish"
index ? "finish" : "join"
];
this.$forceUpdate();
},
analysisTitleClick(index) {
this.analysisTitleData = this.analysisData.titleList[
index ? "join" : "finish"
index ? "finish" : "join"
];
this.$forceUpdate();
},
......
utils/enumerate.js
浏览文件 @ 13847598
const { NUXT_ENV_APP } = process.env;
export const BASE_URL = {
dev: 'https://dev-sc.yunqueyi.com',
// dev: 'https://dev-sc.yunqueyi.com',
dev: 'https://uat-sc.yunqueyi.com',
test: 'https://test1-sc.yunqueyi.com',
uat: 'https://uat-sc.yunqueyi.com',
prod: 'https://sc.yunqueyi.com'
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或