Skip to content

P
pica.cloud.web-education-admin
提交 726bc639 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

勾选状态记录

上级 033b24ad
隐藏空白字符变更
内嵌 并排
正在显示 包含 119 行增加 和 36 行删除
src/utils/fetch.js
浏览文件 @ 726bc639
......@@ -54,8 +54,8 @@ service.interceptors.request.use(config => {
}
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
// config.headers['token'] = '367F0B613A604751AC94CE12CD4E0E53';
config.headers['token'] = '874879EF8F0F477F85D8FF1A9BFEC634';
config.headers['token'] = '0F2535FDC86946C284312962FF7FC2AF';
// config.headers['token'] = '874879EF8F0F477F85D8FF1A9BFEC634';
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
src/utils/operation.js
浏览文件 @ 726bc639
......@@ -516,4 +516,17 @@ export function getIds(formData, organizationList, checkAll) {
ids = ids.substring(0, ids.length - 1);
}
return ids;
}
//获取id的list
export function getDoctorIdList(data) {
let list = [];
if (typeof data === 'undefined') {
return list;
}
if (data.constructor === Array) {
for (let i = 0; i < data.length; i++) {
list.push(data[i].doctorId);
}
}
return list;
}
\ No newline at end of file
src/views/learning/course-training.vue
浏览文件 @ 726bc639
......@@ -47,7 +47,7 @@
<el-table :data="tableData" class="course-table">
<el-table-column prop="doctorName" label="姓名" align="center"></el-table-column>
<el-table-column prop="doctorSex" label="性别" align="center"></el-table-column>
<el-table-column prop="age" label="年龄" align="center"></el-table-column>
<el-table-column prop="doctorAge" label="年龄" align="center"></el-table-column>
<el-table-column prop="doctorTitle" label="职称" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="机构" align="center"></el-table-column>
<el-table-column prop="countyName" label="地区" align="center"></el-table-column>
......
src/views/learning/data-alignment.vue
浏览文件 @ 726bc639
......@@ -20,19 +20,19 @@
<el-form
class="form-update"
ref="serchForm"
:model="formInline"
:model="formData"
label-width="100px"
style="width:40%;"
>
<el-form-item label="项目成绩:">
<el-select
v-model="formInline.record"
v-model="formData.achievementStatus"
size="small"
style="width: 100%;"
placeholder="请选择项目成绩"
>
<el-option
v-for="(item,index) in recordSelect"
v-for="(item,index) in achievementList"
:key="index"
:label="item.label"
:value="item.value"
......@@ -41,13 +41,13 @@
</el-form-item>
<el-form-item label="统计状态:">
<el-select
v-model="formInline.mathStatus"
v-model="formData.status"
size="small"
style="width: 100%;"
placeholder="请选择统计状态"
>
<el-option
v-for="(item,index) in mathStaSelect"
v-for="(item,index) in statusList"
:key="index"
:label="item.label"
:value="item.value"
......@@ -98,9 +98,9 @@
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="formInline.pageNo"
:current-page="formData.pageNo"
:page-sizes="[10, 30, 50]"
:page-size="formInline.pageSize"
:page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
></el-pagination>
......@@ -122,19 +122,25 @@ import * as operationData from "../../utils/operation";
let vm;
export default {
props: {
formInline: {
type: Object
},
organizationList: {
type: Array
},
dialogData: {
type: Object
}
},
data() {
return {
formInline: {
record: "",
mathStatus: "",
formData: {
achievementStatus: "",
status: 3,
pageNo: 1,
pageSize: 2,
},
recordSelect: [
achievementList: [
//项目状态
{
label: "通过",
......@@ -149,8 +155,12 @@ export default {
value: 3
}
],
mathStaSelect: [
statusList: [
//项目状态
{
label: "全部",
value: 3
},
{
label: "归入统计",
value: 1
......@@ -158,22 +168,27 @@ export default {
{
label: "移除统计",
value: 2
}
},
],
tableData: [],
multipleSelection: [], //被选中的行
totalRows: 0, //数据总数
pageNo: 1, //当前是第几页
pageSize: 20, //页面总数
pageSize: 2, //页面总数
getRowKeys(row) {
return row.id;
return row.doctorId;
},
selectedData: [],
dialogVisible: false
dialogVisible: false,
projectId: "",
changedDoctor: [],
changedDoctor2: [],
lookedDoctor: [],
};
},
created() {
vm = this;
this.projectId = vm.getUrlSearch(window.location.href, "id");
// this.search();
console.log(vm.dialogData);
},
......@@ -186,17 +201,26 @@ export default {
methods: {
// 将选中行放入数组
handleSelectionChange(rows) {
// this.multipleSelection = val;
// console.log(this.multipleSelection);
this.changedDoctor = [];
this.changedDoctor2 = [];
this.selectedData = [];
if (rows) {
rows.forEach(row => {
if (row) {
this.selectedData.push(row.id);
this.changedDoctor.push(row.doctorId);
}
});
}
console.log('selectedData',this.selectedData);
this.changedDoctor2 = operationData.getDifference(
this.lookedDoctor,
this.changedDoctor
);
console.log(
"选",
this.changedDoctor,
"没",
this.changedDoctor2
);
},
handleClick(row) {
console.log(row);
......@@ -204,35 +228,73 @@ export default {
// 更改数据显示数量
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
vm.formInline.pageSize = val;
vm.formData.pageSize = val;
},
// 换页
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
vm.formInline.pageNo = val;
vm.formData.pageNo = val;
},
close() {
this.$emit("closeDialog");
},
search() {
let checkAll = operationData.hasAll(vm.formInline.organization);
let req = {
pageNo: 1,
pageSize: 2,
projectId: 1,
achievementStatus: 1,
status: 1,
projectId: vm.projectId,
achievementStatus: vm.formData.achievementStatus,
status: vm.formData.status,
ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
type: operationData.getSearchType(vm.formInline),
pageNo: vm.formData.pageNo,
pageSize: vm.formData.pageSize,
};
openLoading(vm);
vm.GET("report/portal/getProjectData", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.tableData = res.data;
vm.tableData = res.data.projectData;
vm.totalRows = res.data.count;
let idList = operationData.getDoctorIdList(vm.tableData);
// console.log('idList',idList);
vm.idList = operationData.getUnion(
vm.lookedDoctor,
idList
);
vm.initDoctorChoose();
}
});
},
initDoctorChoose() {
let tableStatus = vm.tableData;
if(typeof tableStatus === 'undefined') {
return;
}
tableStatus.forEach(row => {
let idList = [];
idList[0] = row.doctorId;
let intersect = operationData.getIntersect(idList,this.changedDoctor);
let intersect2 = operationData.getIntersect(idList,this.changedDoctor2);
// console.log('intersect',intersect,'intersect2',intersect2);
//debugger;
if(intersect.length > 0) {
//选中
//this.$refs.multipleOrganization.toggleRowSelection(row);
} else if (intersect2.length > 0) {
//不选
} else {
if (row.status == 1) {
this.$nextTick(function() {
this.$refs.multipleTable.toggleRowSelection(row);
});
}
}
});
},
//重置
resetForm() {
vm.formInline = Object.assign(
vm.formData = Object.assign(
{},
{
record: "",
......
src/views/learning/item-list.vue
浏览文件 @ 726bc639
......@@ -98,7 +98,7 @@
</el-tab-pane>
<!-- <el-tab-pane label="学习效果分析" name="fifth" lazy>
<learning-effect></learning-effect>
</el-tab-pane> -->
</el-tab-pane>-->
</el-tabs>
<el-dialog title="提示" :visible.sync="dialogVisible" width="30%" center>
<p style="text-align:center">文件正在生成，你可以去“我的导出下载”页，下载文件</p>
......@@ -109,7 +109,13 @@
</el-dialog>
<el-dialog title :visible.sync="dialogUpdate" width="90%" center>
<!-- <el-button @click="dialogUpdate = false">取 消</el-button> -->
<data-alignment ref="childAlignment" @closeDialog="dialogUpdate = false" :dialogData="dialogData"></data-alignment>
<data-alignment
ref="childAlignment"
@closeDialog="dialogUpdate = false"
:formInline="formInline"
:dialogData="dialogData"
:organizationList="organizationList"
></data-alignment>
</el-dialog>
</div>
</div>
......@@ -197,7 +203,7 @@ export default {
dialogData: {
region: "",
// regionData: "",
organization: "",
organization: ""
// organizationData: "",
},
tags: [],
......@@ -371,7 +377,9 @@ export default {
vm.GET("report/portal/getOrganizationList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
this.organizationList = operationData.getLearnOrganization(res.data.hospitalList);
this.organizationList = operationData.getLearnOrganization(
res.data.hospitalList
);
debugger;
}
});
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或