Skip to content

P
pica.cloud.web-education-admin
提交 f2814979 编写于 作者: guangjun.yang's avatar guangjun.yang
浏览文件
操作

Merge branch 'dev-phrase-report2.1-0316' into 'release' 

学情报告V2.1 code reviewer：杨广俊

学情报告V2.1 code reviewer：杨广俊

See merge request !140
上级 c2e65ce3 7b89f73d
显示空白字符变更
内嵌 并排
正在显示 包含 282 行增加 和 153 行删除
src/utils/operation.js
浏览文件 @ f2814979
......@@ -311,7 +311,7 @@ export function setRegionOptionNew(data) {
let obj = data[i];
obj.label = data[i].label;
obj.value = data[i].id;
if(obj.degree == 4 || obj.degree == 0 || obj.label == "全部") {
if(obj.degree == 5 || obj.degree == 0 || obj.label == "全部") {
// if(obj.degree == 4 ) {
obj.leaf = true;
}
......
src/views/learning/data-alignment.vue
浏览文件 @ f2814979
......@@ -15,7 +15,7 @@
</div>
<div class="text">
<p>地区：{{ dialogData.region }}</p>
<p>选择机构：{{ dialogData.organization }}</p>
<!--<p>选择机构：{{ dialogData.organization }}</p>-->
</div>
<el-form
class="form-update"
......@@ -263,7 +263,8 @@ export default {
projectId: vm.projectId,
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
endDate: operationData.setDuringTime(vm.formInline.during,'end'),
......
src/views/learning/item-course-analysis.vue
浏览文件 @ f2814979
......@@ -192,7 +192,8 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during, "end"),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
pageNo: vm.pageNo,
pageSize: vm.pageSize,
......@@ -223,7 +224,8 @@ export default {
routerData.courseId = data.courseId;
routerData.beginDate = operationData.setDuringTime(vm.formInline.during, "begin"),
routerData.endDate = operationData.setDuringTime(vm.formInline.during, "end"),
routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
// routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
routerData.regionId = vm.formInline.selectRegionId;
routerData.originalFlag = vm.formInline.checked == false ? 2 : 1;
routerData.timeFlag = vm.formInline.timeFlag;
routerData.hospitalIdList = operationData.setHospitalIdList(vm.formInline.organization);
......@@ -252,7 +254,7 @@ export default {
window.open(routeData.href, "_blank");
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
// console.log(`每页 ${val} 条`);
vm.pageSize = val;
vm.pageNo = 1;
if(vm.downloadId == null) {
......@@ -260,7 +262,7 @@ export default {
}
},
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
// console.log(`当前页: ${val}`);
vm.pageNo = val;
if(vm.downloadId == null) {
vm.search();
......
src/views/learning/item-crowd-analysis.vue
浏览文件 @ f2814979
......@@ -190,7 +190,8 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during, "end"),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag
};
vm.POST("stats/report/userAnalysis_pc/"+vm.radio, req, '', '', true).then(res => {
......@@ -295,6 +296,7 @@ export default {
vm.sexData = sexData;
},
//设置--人员学历发布
educationDivision(data) {
if(data.length == 0) {
vm.showEducation = false;
......@@ -325,6 +327,7 @@ export default {
vm.echartsData.chart1 = myChart;
},20);
},
//设置--人员职务分布
jobDivision(data) {
if(data.length == 0) {
vm.showJob = false;
......@@ -354,6 +357,7 @@ export default {
vm.echartsData.chart2 = myChart2;
},20);
},
//设置--人员年龄分布
ageDivision(data) {
if(data.length == 0) {
vm.showAge = false;
......
src/views/learning/item-data-all.vue
浏览文件 @ f2814979
......@@ -518,21 +518,24 @@ export default {
}
},
gethHspitalsCnt() {
if (vm.formInline.organization.length == 0) {//无机构
let req = {
projectId: vm.projectId,
regionId: vm.formInline.region[vm.formInline.region.length - 1]
// regionId: vm.formInline.region[vm.formInline.region.length - 1]
regionId: vm.formInline.selectRegionId
};
vm.GET("stats/region/hospitals/cnt", req, '', '', true).then(res => {
if (res.code == "000000") {
vm.hospitalCnt = res.data.hospitalCnt;
// vm.hospitalCnt = 1;
if(vm.hospitalCnt == 1) {
vm.hospitalCutList = res.data.list;
}
// vm.searchType();
vm.getDisplay();
}
});
}else {
vm.hospitalCnt = 1;
}
vm.getDisplay();
},
getDisplay() {
let reqInfo = {
......@@ -540,7 +543,7 @@ export default {
};
vm.GET("stats/region/info", reqInfo).then(res => {
if (res.code == "000000") {
vm.certFlag = res.data.certFlag;
vm.certFlag = res.data.certFlag; //有无证书，0无证书，1有证书
vm.containOfficialFlag = res.data.containOfficialFlag;
vm.setCertLabel();
vm.searchType();
......@@ -551,9 +554,9 @@ export default {
if(vm.formInline.organization.length == 1) {
vm.dataType = 1;
} else {
if(vm.hospitalCnt == 1) {
if(vm.hospitalCnt == 1) { //有机构
vm.dataType = 1;
} else {
} else { //无机构
vm.dataType = 0;
}
}
......@@ -577,16 +580,17 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during,'end'),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
sourceType: 2,
pageNo: vm.formTable.pageNo,
pageSize: vm.formTable.pageSize,
};
if(req.hospitalIdList.length == 0) {
req.hospitalIdList = [];
req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
}
// if(req.hospitalIdList.length == 0) {
// req.hospitalIdList = [];
// req.hospitalIdList[0] = vm.hospitalCutList[0].hospitalId;
// }
vm.loadingTable = true;
vm.POST("stats/report/generalPersonal/"+vm.tableType, req, '', '', true).then(res => {
if (res.code == "000000") {
......@@ -611,13 +615,14 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during,'end'),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
};
vm.POST("stats/report/general_pc", req, '', '', true).then(res => {
if (res.code == "000000") {
vm.initCard(res.data.percentData);
if(vm.certFlag !== 0) {
if(vm.certFlag !== 0) { //有证书情况
vm.setDistributeChart(res.data.certData);
vm.setRecordChart(res.data.eduData);
}
......@@ -628,6 +633,7 @@ export default {
}
});
},
//整体情况中获取累积或新增table的数据
searchDwmy() {
let req = {};
if(vm.downloadId == null) {
......@@ -637,10 +643,11 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during,'end'),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
timeType: parseInt(vm.checkTime),
dataType: parseInt(vm.checkRange),
timeType: parseInt(vm.checkTime), //日周月年的选择
dataType: parseInt(vm.checkRange),//累积和新增的选择
pageNo: vm.formDwmy.pageNo,
pageSize: vm.formDwmy.pageSize,
};
......@@ -680,6 +687,7 @@ export default {
vm.timeType = value;
vm.searchDwmy();
},
//初始化机构参与率、人员参与率...
initCard(data) {
let cardData = [
{
......@@ -768,6 +776,7 @@ export default {
// };
// },100);
},
//设置--证书分布情况
setDistributeChart(data) {
if(data.length == 0) {
vm.showDistributeChart = false;
......@@ -813,6 +822,7 @@ export default {
// vm.updateResize();
},20);
},
//设置--证书级别按学历分布情况
setRecordChart(data) {
if(data.length == 0) {
vm.showRecordChart = false;
......@@ -921,9 +931,11 @@ export default {
projectId: vm.projectId,
beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
endDate: operationData.setDuringTime(vm.formInline.during,'end'),
hospitalIdList: vm.formInline.organization,
// hospitalIdList: vm.formInline.organization,
hospitalIdList: vm.formInline.orgId,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
};
openLoading(vm);
......@@ -936,6 +948,7 @@ export default {
vm.setCertificateChart(vm.timeInfoChild.genSituationModel.studyRankMap[index]);
}
},
//设置--项目情况排名
setCertificateChart(data) {
if(data.length == 0) {
vm.showCertificateChart = false;
......@@ -967,6 +980,7 @@ export default {
// vm.updateResize();
},20);
},
//设置--在线培训完成天数情况
setDurationChart(data) {
if(data.length == 0) {
vm.showDurationChart = false;
......
src/views/learning/item-examination-analysis.vue
浏览文件 @ f2814979
......@@ -240,7 +240,8 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during, "end"),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag
};
vm.POST("stats/report/exam", req, '', '', true).then(res => {
......@@ -256,6 +257,7 @@ export default {
}
});
},
//获取考试列表数据
searchTable() {
let req = {
projectId: vm.projectId,
......@@ -263,7 +265,8 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during, "end"),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag
};
let reqList = req;
......@@ -307,6 +310,7 @@ export default {
};
}, 30);
},
//设置--完成项目考试次数情况
setExamTimes(data) {
if(data.length == 0) {
vm.showExamTimes = false;
......@@ -348,6 +352,7 @@ export default {
}
}
},
//设置--完成项目考试分数情况
setExamScore(data) {
if(data.length == 0) {
vm.showExamScore = false;
......@@ -382,7 +387,8 @@ export default {
routerData.examId = data.examId;
routerData.beginDate = operationData.setDuringTime(vm.formInline.during, "begin"),
routerData.endDate = operationData.setDuringTime(vm.formInline.during, "end"),
routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
// routerData.regionId = vm.formInline.region[vm.formInline.region.length - 1];
routerData.regionId = vm.formInline.selectRegionId;
routerData.originalFlag = vm.formInline.checked == false ? 2 : 1;
routerData.timeFlag = vm.formInline.timeFlag;
routerData.hospitalIdList = operationData.setHospitalIdList(vm.formInline.organization);
......@@ -412,7 +418,7 @@ export default {
},
// 更改数据显示数量
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
// console.log(`每页 ${val} 条`);
vm.pageSize = val;
vm.pageNo = 1;
if(vm.downloadId == null) {
......@@ -421,7 +427,7 @@ export default {
},
// 换页
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
// console.log(`当前页: ${val}`);
vm.pageNo = val;
if(vm.downloadId == null) {
vm.searchTable();
......
src/views/learning/item-learning-effect.vue
浏览文件 @ f2814979
......@@ -103,7 +103,8 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during, "end"),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag
};
vm.POST("stats/report/studyEffect", req, '', '', true).then(res => {
......@@ -131,6 +132,7 @@ export default {
cardData[1].value = parseFloat((data.afterRate*100).toFixed(1)) + "%";
vm.cardData = cardData;
},
//设置--不同学历培训前后正确率对比
setEducation(data) {
if(data.length == 0) {
vm.showChartEdu = false;
......@@ -153,6 +155,7 @@ export default {
vm.echartsData.chart1 = myChart;
},20);
},
//设置--培训前后知识点掌握情况
setLearning(data) {
if(data.length == 0) {
vm.showChartLearn = false;
......
src/views/learning/item-list.vue
浏览文件 @ f2814979
......@@ -40,13 +40,18 @@
change-on-select
placeholder="请先选择地区后再进行查询"
style="width:330px"
></el-cascader>
>
<template slot-scope="{ node, data }">
<span>{{ data.label }}</span>
<span class="spe-label" v-if="node.level == 1 && data.degree == 5">我所在机构</span>
</template>
</el-cascader>
</el-col>
<el-col :span="6">
<el-checkbox v-if="showOriginal == 1" size="small" v-model="formInline.checked">查看原始数据</el-checkbox>
</el-col>
</el-form-item>
<el-form-item label="选择机构：">
<!--<el-form-item label="选择机构：">
<div class="form-text" v-if="optionsRegion.length == 1 && hospitalCntList.length == 1">{{ hospitalCntList[0].hospitalName }}</div>
<el-select
v-else
......@@ -75,7 +80,7 @@
closable
@close="handleTagClose(tag)"
>{{ tag.label }}</el-tag>
</div>
</div>-->
<el-form-item label="选择时间：">
<el-col :span="12">
<el-select
......@@ -256,7 +261,7 @@ export default {
lazy: true,
lazyLoad(node, resolve) {
const { level } = node;
// console.log("node props", node);
console.log("node props", node);
if (node.level >= 1 && node.loaded === false && node.children.length == 0) {
let req = {
projectId: vm.projectId,
......@@ -273,6 +278,7 @@ export default {
}
},
showOriginal: 2,
originalFlag: null,
roleType: '',
formInline: {
region: [],
......@@ -283,6 +289,10 @@ export default {
during: null,
pageNo: 1,
pageSize: 20,
selectRegionId: '', //新增选择的地区id
orgId: '', //新增机构Id,
// showOriginal: 2,
// originalFlag: null,
},
organizationNotice: '选择地区筛选到区才能选择机构',
dialogData: {
......@@ -299,16 +309,7 @@ export default {
displayExam: 1,
flag: 1,
//v2.0更新data部分
timeFlagList: [
// {
// value: 1,
// label: '截至昨日',
// },
// {
// value: 2,
// label: '自定义时间',
// }
],
timeFlagList: [],
areaLen: 1,
hospitalCnt: 0,
hospitalId: [],
......@@ -331,8 +332,11 @@ export default {
maxDate: '',
minDate: '',
allRegionId: '',
selectRegionId: '',
orgId: '',
containOfficialFlag: 1,
showRadio: 0,
containHospitalFlag: null, //新增判断是否当前有机构
pickerOptions0: {
disabledDate: time => {
// 在科学计数法中，为了使公式简便，可以用带“E”的格式表示。例如1.03乘10的8次方，可简写为“1.03e8”的形式
......@@ -363,9 +367,6 @@ export default {
this.curmbThird = vm.getUrlSearch(window.location.href, "projectName");
this.downloadId = vm.getUrlSearch(window.location.href, "downloadId");
this.checkShowType();
// this.getDisplay();
// this.search();
// this.getRegionOption();
},
mounted: function() {
commonUtil.resizeHeight();
......@@ -450,7 +451,10 @@ export default {
}
},
getDisplay(type) {
let reqInfo = {
//获取地区
vm.getRegionOption();
/*let reqInfo = {
projectId: vm.projectId,
};
vm.GET("stats/region/info", reqInfo).then(res => {
......@@ -467,10 +471,9 @@ export default {
vm.finalDateFlag = res.data.finalDateFlag;
vm.setTimeFlagList();
// console.log('日期:',vm.maxDate,vm.minDate)
vm.getRegionOption();
}
});
});*/
},
beforeLeave(activeName, oldActiveName) {
// console.log('action',activeName,'oldActive',oldActiveName)
......@@ -487,37 +490,31 @@ export default {
// this.$refs.childExam.$emit("init");
// }
},
//地区选择操作
handleChange(value) {
this.formInline.organization = [];
this.tags = [];
let node =this.$refs.cascaderRegion.getCheckedNodes()[0];
let node =this.$refs.cascaderRegion.getCheckedNodes()[0];//级联当前选中的值
console.log('node change',node)
//获取选中的inputValue
setTimeout(function() {
// console.log('行政区域改变',vm.$refs["cascaderRegion"].inputValue);
vm.dialogData.region = vm.$refs["cascaderRegion"].inputValue;
}, 20);
// console.log('region',value,vm.formInline);
if(node.label !== '全部') {
let areaArr = value[value.length -1].split('_');
vm.areaLen = areaArr.length;
// console.log('areaArr!!',areaArr);
if (areaArr.length >= 3) {
this.getOrganizationList();
this.organizationNotice = "请选择机构";
} else {
this.organizationNotice = "选择地区筛选到区才能选择机构";
}
// V2.1修改废弃
// if (areaArr.length >= 3) {
// this.getOrganizationList();
// this.organizationNotice = "请选择机构";
// } else {
// this.organizationNotice = "选择地区筛选到区才能选择机构";
// }
} else {
vm.areaLen = 1;
vm.organizationNotice = "选择地区筛选到区才能选择机构";
}
vm.gethHspitalsCnt()
//添加子节点
// let node =this.$refs.cascaderRegion.getCheckedNodes()[0];
if(node.data && node.data.id && node.hasChildren === true && node.loaded === false) {
let req = {
projectId: vm.projectId,
......@@ -528,7 +525,23 @@ export default {
vm.searchNode(vm.optionsRegion, node.data.id, newData);
});
}
vm.formInline.organization = [];//选择的机构
//这里需要判断当前选中项的degree，如果是5那就不需要再调接口
if (node.data && node.data.id && node.data.degree == 5) {
let changeItemData = node.data.id;
let subIndex = changeItemData.lastIndexOf('_');
vm.formInline.selectRegionId = changeItemData.slice(0, subIndex);
vm.formInline.orgId = changeItemData.slice(subIndex + 1);
vm.formInline.organization.push(vm.formInline.orgId);
vm.hospitalCnt = 1;
vm.search();
}else {
vm.formInline.selectRegionId = node.data.id;
vm.formInline.orgId = '';
vm.gethHspitalsCnt()
}
},
//给级联插入新获取数据的操作-即添加子节点
searchNode(val,id,data){
val.map(item=>{
if(item.id===id){
......@@ -539,19 +552,21 @@ export default {
return item
})
},
//操作获取到的地区或机构的数据
setRegionOptionMore(data) {
let option = [];
for (let i = 0; i < data.length; i++) {
let obj = data[i];
obj.label = data[i].label;
obj.value = data[i].id;
if(obj.degree == 4) {
if(obj.degree == 0 || obj.degree == 5) {
obj.leaf = true;
}
option.push(obj);
}
return option;
},
//选择机构操作-old
changeOrganization(value) {
// console.log('formInline',this.formInline.organization);
this.tags = [];
......@@ -620,54 +635,100 @@ export default {
};
vm.GET("stats/region", req, '', '', true).then(res => {
if (res.code == "000000") {
//containHospitalFlag判断自己是否有机构,1-有机构
this.containHospitalFlag = res.data.containHospitalFlag;
let doctorInfoRep = res.data.doctorInfoRep;
vm.showOriginal = doctorInfoRep.status;//判断是否显示原始数据
vm.originalFlag = doctorInfoRep.originalFlag;
vm.roleType = doctorInfoRep.roleType;
vm.displayCourse = doctorInfoRep.existCourse;
vm.displayExam = doctorInfoRep.existExam;
vm.displayEffect = doctorInfoRep.existEffect;
vm.certFlag = doctorInfoRep.certFlag;
vm.maxDate = new Date(doctorInfoRep.maxDate);
vm.minDate = new Date(doctorInfoRep.minDate);
vm.containOfficialFlag = doctorInfoRep.containOfficialFlag;
vm.finalDateFlag = doctorInfoRep.finalDateFlag;
// vm.formInline.showOriginal = doctorInfoRep.status;
// if (vm.showOriginal == 2) {
// vm.formInline.originalFlag = vm.originalFlag;
// }
vm.setTimeFlagList(); //设置选择时间
if (vm.showOriginal == 2) { //不显示原始数据,取接口返回的originalFlag
if (vm.originalFlag == 1) {
vm.formInline.checked = true;
}else if (vm.originalFlag == 2) {
vm.formInline.checked = false;
}
}
vm.formInline.region = [];
vm.formInline.region[0] = res.data.list[0].id;
vm.allRegionId = res.data.list[0].id;
vm.allRegionId = res.data.list[0].id; //存储当前所在id
vm.optionsRegion = operationData.setRegionOptionNew(
res.data.list
);
//初始化判断区域id 是不是有机构id
//判断是否有机构,有的情况就需要拆分出regionId和orgId
let firstItemData = res.data.list[0];
let value = res.data.list[0].id;
let areaArr = value.split('_');
vm.areaLen = areaArr.length;
if (areaArr.length >= 3) {
vm.getOrganizationList();
vm.organizationNotice = "请选择机构";
vm.formInline.organization = [];
if (firstItemData.degree == 5) {
let subIndex = value.lastIndexOf("_");
vm.formInline.selectRegionId = value.slice(0, subIndex);
vm.formInline.orgId = value.slice(subIndex + 1);
vm.hospitalCnt = 1;
vm.formInline.organization.push(vm.formInline.orgId);
vm.search();
}else {
vm.formInline.selectRegionId = value;
vm.formInline.orgId = '';
vm.gethHspitalsCnt();
}
vm.selectRegionId = vm.formInline.selectRegionId; //作存储
vm.orgId = vm.formInline.orgId; //作存储
//初始化判断区域id 是不是有机构id
// let value = res.data.list[0].id;
// let areaArr = value.split('_');
// vm.areaLen = areaArr.length;
// if (areaArr.length >= 3) { //V2.1舍弃
// vm.getOrganizationList();
// vm.organizationNotice = "请选择机构";
// }
// vm.search(); // deleted by Anndy Yang
vm.gethHspitalsCnt();
}
});
},
//获取机构
gethHspitalsCnt() {
let req = {
projectId: vm.projectId,
regionId: vm.formInline.region[vm.formInline.region.length - 1]
// regionId: vm.formInline.region[vm.formInline.region.length - 1]
regionId: vm.formInline.selectRegionId
};
vm.GET("stats/region/hospitals/cnt", req, '', '', false).then(res => {
if (res.code == "000000") {
vm.hospitalCnt = res.data.hospitalCnt;
vm.hospitalCntList = res.data.list
// 只有一个机构时，所有请求中要传递机构ID added by Anndy Yang
if(vm.hospitalCntList.length == 1) {
vm.hospitalCntList = res.data.list; //当前选中区域下的机构列表
vm.formInline.organization = [];
vm.organizationList = [];
// vm.organizationList = [];//选择机构操作被弃用
// 选中区域下只有一个机构时，所有请求中要传递机构ID added by Anndy Yang
if(vm.hospitalCntList.length == 1) {
let obj = {
index: 0,
label: vm.hospitalCntList[0].hospitalName,
value: vm.hospitalCntList[0].hospitalId,
};
vm.organizationList.push(obj);
// vm.organizationList.push(obj);
vm.formInline.organization.push(vm.hospitalCntList[0].hospitalId);
// vm.formInline.organization[0] = vm.hospitalCntList[0].hospitalId;
}
vm.search(); // added by Anndy Yang
}
});
},
//获取机构列表
getOrganizationList() {
//获取机构列表--V2.1弃用
/*getOrganizationList() {
vm.organizationList = [];
let regionId = vm.formInline.region[vm.formInline.region.length - 1];
let req = {
......@@ -687,7 +748,7 @@ export default {
// }
}
});
},
},*/
getOrganizationNum() {
//选择全部
let num = 0;
......@@ -708,13 +769,20 @@ export default {
vm.resetForm();
},
setExportReq() {
// let sureOriginalFlag = null;
// if (vm.formInline.showOriginal == 2) { //如果不显示，则取接口返回的数据
// sureOriginalFlag = vm.formInline.originalFlag;
// }else {
// sureOriginalFlag = (vm.formInline.checked == false ? 2 : 1);
// }
vm.exportReq = {
projectId: vm.projectId,
beginDate: operationData.setDuringTime(vm.formInline.during,'begin'),
endDate: operationData.setDuringTime(vm.formInline.during,'end'),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1],
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
};
},
......@@ -730,15 +798,16 @@ export default {
endDate: operationData.setDuringTime(vm.formInline.during, "end"),
hospitalIdList: vm.formInline.organization,
originalFlag: vm.formInline.checked == false ? 2 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
// regionId: vm.formInline.region[vm.formInline.region.length - 1], //id结构修改
regionId: vm.formInline.selectRegionId,
timeFlag: vm.formInline.timeFlag,
hospitalNames: vm.dialogData.organization,
regionNames: vm.dialogData.region,
};
if(vm.organizationList.length == 1) {
req.hospitalIdList = [];
req.hospitalIdList[0] = vm.organizationList[0].value;
}
// if(vm.organizationList.length == 1) {
// req.hospitalIdList = [];
// req.hospitalIdList[0] = vm.organizationList[0].value;
// }
// if(req.regionNames == '全部') {
//全部地区 机构只有一个情况
if(vm.hospitalCntList.length == 1) {
......@@ -758,7 +827,7 @@ export default {
});
},
search() {
// console.log(vm.formInline);
// console.log('formInline',vm.formInline);
if(vm.formInline.timeFlag == 1) {
//截止昨日
vm.setExportReq();
......@@ -809,9 +878,22 @@ export default {
during: null,
pageNo: 1,
pageSize: 20,
orgId: '',
selectRegionId: '',
}
);
vm.formInline.region[0] = vm.allRegionId;
vm.formInline.selectRegionId = vm.selectRegionId;
if (vm.orgId) {
vm.formInline.organization[0] = vm.orgId;
}
if (vm.showOriginal == 2) { //不显示原始数据,取接口返回的originalFlag
if (vm.originalFlag == 1) {
vm.formInline.checked = true;
}else if (vm.originalFlag == 2) {
vm.formInline.checked = false;
}
}
vm.areaLen = 0;
vm.tags = [];
......@@ -899,7 +981,7 @@ export default {
});
return;
}
this.setDialogData();
// this.setDialogData(); //弃用于V2.1，因为不再使用tags
this.dialogUpdate = true;
this.$nextTick(function() {
this.$refs.childAlignment.$emit("search");
......@@ -970,6 +1052,23 @@ export default {
};
</script>
<style lang="scss">
.el-cascader-menu:first-child{
/*#cascaderSpe{*/
.el-cascader-node:first-child{
height: 50px;
position: relative;
padding-top: 16px;
/*border-bottom: 1px solid rgba(39,0,8,0.1);*/
.spe-label{
position: absolute;
top: -8px;
left: 20px;
font-size: 12px;
color: #9B9997;
}
}
/*}*/
}
.item-list-wrap {
.el-radio-button__inner:hover {
color: #449284;
......
src/views/learning/name-list.vue
浏览文件 @ f2814979
......@@ -3,7 +3,7 @@
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird" :curmbFouth="curmbFouth" :jumPathThird="jumPathThird" :jumPathFouth="jumPathFouth"></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<p class="course-p">地区：{{ queryData.region }}</p>
<p class="course-p">选择机构：{{ queryData.organization }}</p>
<!--<p class="course-p">选择机构：{{ queryData.organization }}</p>-->
<el-form
class="form-update"
ref="serchForm"
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或