Skip to content

D
dd_school
Commit f38ec712 by zhaopanyu
Options

Merge branch 'master' of 49.232.152.146:qangqi/dd_school

parents 75a42747 93120dba
Showing with 41 additions and 96 deletions
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
...@@ -93,11 +93,12 @@ export function getNoticeInfo(query) { ...@@ -93,11 +93,12 @@ export function getNoticeInfo(query) {
} }
//老师查看列表 //老师查看列表
export function getTeacherTnfo(query) { export function getTeacherTnfo(userId,query) {
return request({ return request({
url: '/teacherFiles/files/getTeachList', url: `/teacherFiles/files/getTeachList/${userId}`,
// url: `/teacherFiles/files/getTeachList/${userId}`,
method: 'get', method: 'get',
params: query params:query
}) })
} }
......
ruoyi-ui/src/views/smartSchool/massOrganization/memberManagement/index.vue
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="序号" align="center" prop="id" width="80" /> -->
<el-table-column label="序号" align="center" type="index" width="80" /> <el-table-column label="序号" align="center" type="index" width="80" />
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="sex"> <el-table-column label="性别" align="center" prop="sex">
...@@ -173,60 +172,6 @@ ...@@ -173,60 +172,6 @@
@getStudentList="getStudentList" @getStudentList="getStudentList"
@setStudentInfo="setStudentInfo" @setStudentInfo="setStudentInfo"
></StudentInfoSelect> ></StudentInfoSelect>
<!-- 学生选择
<el-dialog title="学生选择" :visible="dialogVisible" width="45%">
<el-form ref="formStu" :model="formStu" :rules="rules" label-width="68px">
<el-row>
<el-col :span="12">
<el-form-item label="姓名:" prop="name">
<el-input v-model="formStu.name" placeholder="请选择学生姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>
搜索
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">
重置
</el-button>
</el-form-item>
</el-col>
</el-row>
<el-table
ref="tableStu"
:data="atuList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="35" align="center" />
<el-table-column
label="序号"
align="center"
type="index"
width="80"
/>
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="性别" align="center" prop="name" />
<el-table-column label="级部" align="center" prop="name" />
<el-table-column label="班级" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="name" />
</el-table>
</el-form>
<div slot="footer" class="dialog-footer" center>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog> -->
</div> </div>
</template> </template>
...@@ -319,6 +264,8 @@ export default { ...@@ -319,6 +264,8 @@ export default {
}, },
/** 设置学生信息 */ /** 设置学生信息 */
setStudentInfo(item) { setStudentInfo(item) {
this.form.ids = item.id;
console.log(this.form.ids, "this.form.ids11111");
console.log(item, "item"); console.log(item, "item");
this.$set(this.form, "name", item.studentName); this.$set(this.form, "name", item.studentName);
this.$set(this.form, "sex", item.sex); this.$set(this.form, "sex", item.sex);
...@@ -397,7 +344,7 @@ export default { ...@@ -397,7 +344,7 @@ export default {
if (this.form.id != null) { if (this.form.id != null) {
// 修改 // 修改
const paramsedit = { const paramsedit = {
id: this.form.id, id: this.form.ids,
name: this.form.name, name: this.form.name,
sex: this.form.sex, sex: this.form.sex,
cardid: this.form.cardid, cardid: this.form.cardid,
...@@ -418,7 +365,7 @@ export default { ...@@ -418,7 +365,7 @@ export default {
} else { } else {
// 新增 // 新增
// 获取当前登录人userId // 获取当前登录人userId
const userName = this.$store.state.user.userId; // const userName = this.$store.state.user.userId;
const params = { const params = {
cid: this.$route.query.id, cid: this.$route.query.id,
orgName: this.form.orgName, orgName: this.form.orgName,
...@@ -429,7 +376,7 @@ export default { ...@@ -429,7 +376,7 @@ export default {
classes: this.form.classes, classes: this.form.classes,
orgPosition: this.form.orgPosition, orgPosition: this.form.orgPosition,
phone: this.form.phone, phone: this.form.phone,
userId: userName, userId: this.form.ids,
}; };
addMemberInfo(params) addMemberInfo(params)
.then((response) => { .then((response) => {
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -593,11 +593,11 @@ export default { ...@@ -593,11 +593,11 @@ export default {
/** 查询信息列表 */ /** 查询信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
// const userName = this.$store.state.user; // const noticeName = this.queryForm.noticeName;
// const userId = this.$store.state.user.userId; const userId = this.$store.state.user.userId;
// queryForm.noticeName // queryForm.noticeName
const params = { const params = {
userId: this.$store.state.user.userId, // userId: this.$store.state.user.userId,
noticeName: this.queryForm.noticeName, noticeName: this.queryForm.noticeName,
}; };
// const params = { // const params = {
...@@ -605,20 +605,11 @@ export default { ...@@ -605,20 +605,11 @@ export default {
// pageSize: this.queryForm.pageSize, // pageSize: this.queryForm.pageSize,
// teacherId: this.$store.state.user.userId, // teacherId: this.$store.state.user.userId,
// }; // };
getTeacherTnfo(params).then((res) => { getTeacherTnfo(userId, params).then((res) => {
this.tableData = res.rows; this.tableData = res.rows;
console.log(params, "params"); console.log(params, "params");
console.log(res, "res"); console.log(res, "res");
this.total = res.total; this.total = res.total;
// =======
// const userId = this.$store.state.user.userId;
// const noticeName = this.queryForm.noticeName;
// console.log(userId, 'userId');
// console.log(noticeName, 'noticeName');
// getTeacherTnfo(userId, noticeName).then((res) => {
// this.tableData = res.rows;
// console.log(res, "res");
// >>>>>>> 026f530da388d11c389acb34cb726a7be3a375cf
}); });
}, },
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
...@@ -610,11 +610,26 @@ export default { ...@@ -610,11 +610,26 @@ export default {
syncNotice(id).then((res) => { syncNotice(id).then((res) => {
console.log(id, "id"); console.log(id, "id");
console.log("res提取", res); console.log("res提取", res);
this.tableFirstData = res; this.$modal.msgSuccess("提取成功");
this.tableSecondData = res; // this.tableFirstData = res;
this.tableThirdData = res; // this.tableSecondData = res;
this.tableForthData = res; // this.tableThirdData = res;
// this.tableForthData = res;
}); });
// const id = this.form.id;
// this.$modal
// .confirm("是否提取信息?")
// .then(function () {
// return syncNotice(id);
// })
// .then(() => {
// this.$modal.msgSuccess("提取成功");
// this.tableFirstData = res;
// this.tableSecondData = res;
// this.tableThirdData = res;
// this.tableForthData = res;
// })
// .catch(() => {});
}, },
//修改按钮 //修改按钮
handleEdit(row) { handleEdit(row) {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver.vue
...@@ -225,26 +225,17 @@ export default { ...@@ -225,26 +225,17 @@ export default {
confirmDialog() { confirmDialog() {
const params = { const params = {
ids: this.selectedRows.map((row) => row.id), ids: this.selectedRows.map((row) => row.id), //查看数据的id
// userId: this.selectedRows.map((row) => row.userId), userId: this.selectedRows.map((row) => row.userId),
// tid: this.selectedRows.map((row) => row.tid), tid: this.selectedRows.map((row) => row.tid),
// gid: this.selectedRows.map((row) => row.gid), gid: this.selectedRows.map((row) => row.gid),
// gruoName: this.selectedRows.map((row) => row.gruoName), gruoName: this.selectedRows.map((row) => row.gruoName),
// userName: this.selectedRows.map((row) => row.userName), userName: this.selectedRows.map((row) => row.userName),
}; };
// this.$refs["tab"].validate((valid) => {
// if (valid) {
// addTeachaer(params)
// .then((response) => {
// this.getList();
// this.$message.success("新增成功");
// this.tableadd = false;
// })
// .catch((err) => {});
// }
// });
// const ids = this.selectedRows.map((row) => row.id); // const ids = this.selectedRows.map((row) => row.id);
addTeachaer(params).then((res) => { let data = [];
data.push(params);
addTeachaer(data).then((res) => {
console.log(res, "ressss"); console.log(res, "ressss");
}); });
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment