Skip to content

D
dd_school
Commit d34a5819 by xuwenhao
Options

Merge remote-tracking branch 'origin/master'

parents 52fab2ea 73357f4d
Showing with 24 additions and 68 deletions
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
...@@ -178,7 +178,7 @@ export function getTeaList(tId) { ...@@ -178,7 +178,7 @@ export function getTeaList(tId) {
//添加老师 //添加老师
export function addTeachaer(ids) { export function addTeachaer(ids) {
return request({ return request({
url: `/teacherFiles/files/teacherAdd/${ids}` , url: '/teacherFiles/files/teacherAdd/' +ids,
method: "get", method: "get",
}); });
} }
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-carousel :interval="4000" height="100px"> <el-carousel :interval="4000" height="100px">
<el-carousel-item v-for="(item, index) in scope.row.schoolAccessoryList" :key="index"> <el-carousel-item v-for="(item, index) in scope.row.schoolAccessoryList" :key="index">
<el-image style="width: 100px; height: 100px" :src="item.accessoryUrl" <el-image style="width: 100px; height: 100px" :src="pev + item.accessoryUrl"
:preview-src-list="[item.accessoryUrl]"></el-image> :preview-src-list="[item.accessoryUrl]"></el-image>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</div> </div>
<div v-else> <div v-else>
<div v-for="(item, index) in form.schoolAccessoryList" :key="index"> <div v-for="(item, index) in form.schoolAccessoryList" :key="index">
<img :src="item.accessoryUrl" class="avatar" /> <img :src="pev + item.accessoryUrl" class="avatar" />
</div> </div>
</div> </div>
</el-upload> </el-upload>
...@@ -269,10 +269,7 @@ export default { ...@@ -269,10 +269,7 @@ export default {
this.getTeacher(); this.getTeacher();
}, },
methods: { methods: {
handlePreview(url) {
this.previewImageUrl = url;
this.$refs.previewDialog.open();
},
//获取列表数据 //获取列表数据
getList() { getList() {
getCompetition(this.queryForm).then(response => { getCompetition(this.queryForm).then(response => {
...@@ -280,17 +277,6 @@ export default { ...@@ -280,17 +277,6 @@ export default {
console.log('response', response); console.log('response', response);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
// this.competitionData.forEach(item => {
// if (item.schoolAccessoryList) {
// item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)];
// item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
// } else {
// item.previewUrls = [];
// item.pictureUrl = [];
// }
// });
}); });
}, },
...@@ -307,10 +293,11 @@ export default { ...@@ -307,10 +293,11 @@ export default {
console.log('response', response); console.log('response', response);
console.log('file', file); console.log('file', file);
// 处理上传成功的逻辑 // 处理上传成功的逻辑
const accessoryUrl = this.pev + response.fileName; // 假设响应中包含了图片的访问URL const picUrl = response.fileName; // 假设响应中包含了图片的访问URL
const accessoryName = response.originalFilename; // 获取上传文件的名称 const accessoryName = response.originalFilename; // 获取上传文件的名称
this.form.schoolAccessoryList.push({ this.form.schoolAccessoryList.push({
accessoryUrl: accessoryUrl, // url: this.pev + picUrl,
accessoryUrl: picUrl,
accessoryName: accessoryName accessoryName: accessoryName
}); });
console.log('this.form.schoolAccessoryList', this.form.schoolAccessoryList); console.log('this.form.schoolAccessoryList', this.form.schoolAccessoryList);
...@@ -379,26 +366,25 @@ export default { ...@@ -379,26 +366,25 @@ export default {
schoolAccessoryList: [], schoolAccessoryList: [],
}; };
this.nowType = type; this.nowType = type;
if (type != 0) { if (type !== 0) {
const id = row.id; const id = row.id;
getCompetitionxq(id).then(response => { getCompetitionxq(id).then(response => {
console.log(response.data, 'chakan'); console.log(response.data, 'chakan');
if (response.code == 200) { if (response.code === 200) {
Object.keys(this.form).forEach(key => { Object.keys(this.form).forEach(key => {
if (response.data[key]) { if (response.data[key]) {
this.accessoryUrl = this.pev + this.picUrl
console.log(this.accessoryUrl, 'chakan ');
this.$set(this.form, key, response.data[key]); this.$set(this.form, key, response.data[key]);
const teacherId = this.form.teacherId const teacherId = this.form.teacherId
this.form.teacherName = teacherId == '' ? '' : this.teacherList.find(item => item.userId == teacherId).userName this.form.teacherName = teacherId == '' ? '' : this.teacherList.find(item => item.userId == teacherId).userName
console.log(this.form.teacherName, 'this.form.teacherName'); console.log(this.form.teacherName, 'this.form.teacherName');
} }
if (response.data.schoolAccessoryList && response.data.schoolAccessoryList.length > 0) {
this.imageUrls = response.data.schoolAccessoryList.map(item => item.accessoryUrl);
}
}); });
} }
}); });
} }
......
ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue
...@@ -593,9 +593,7 @@ export default { ...@@ -593,9 +593,7 @@ export default {
/** 查询信息列表 */ /** 查询信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
// const noticeName = this.queryForm.noticeName;
const userId = this.$store.state.user.userId; const userId = this.$store.state.user.userId;
// 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,
......
ruoyi-ui/src/views/smartSchool/schoolManage/introduce/schoolPic/index.vue
...@@ -297,7 +297,6 @@ export default { ...@@ -297,7 +297,6 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset() this.reset()
const ids = row.id || this.ids const ids = row.id || this.ids
getPic(ids).then(response => { getPic(ids).then(response => {
this.form = response.data this.form = response.data
this.imageUrl = this.pev + this.form.picUrl this.imageUrl = this.pev + this.form.picUrl
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
...@@ -700,10 +700,10 @@ export default { ...@@ -700,10 +700,10 @@ export default {
studentTurnover: [], studentTurnover: [],
// 表单校验 // 表单校验
rules: { rules: {
idCard: [ // idCard: [
{ required: true, message: "身份证号不能为空", trigger: 'blur' }, // { required: true, message: "身份证号不能为空", trigger: 'blur' },
{ validator: this.validID, trigger: 'blur' } // { validator: this.validID, trigger: 'blur' }
], // ],
// nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }], // nation: [{ required: true, message: '民族不能为空', trigger: 'blur' }],
studentName: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }], studentName: [{ required: true, message: '学生姓名不能为空', trigger: 'blur' }],
// birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }], // birthday: [{ required: true, message: '出生日期不能为空', trigger: 'blur' }],
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataReceiver.vue
...@@ -209,34 +209,13 @@ export default { ...@@ -209,34 +209,13 @@ export default {
}, },
//弹窗确定按钮 //弹窗确定按钮
// confirmDialog() {
// const params = {
// id: this.dialogTableData.id,
// userId: this.$store.state.user.userId,
// tid: this.dialogTableData.tid,
// gid: this.dialogTableData.gid,
// gruoName: this.dialogTableData.gruoName,
// userName: this.dialogTableData.userName,
// };
// console.log(params, "params");
// // addTeachaer(this.selectedRows).then((res) => {});
// this.dialogVisible = false;
// },
confirmDialog() { confirmDialog() {
const params = { const ids = this.selectedRows.map((row) => parseInt(row.id));
ids: this.selectedRows.map((row) => row.id), //查看数据的id // dialogVisible = false
userId: this.selectedRows.map((row) => row.userId), addTeachaer(ids).then((res) => {
tid: this.selectedRows.map((row) => row.tid), this.$message.success("修改成功");
gid: this.selectedRows.map((row) => row.gid), this.dialogVisible = false;
gruoName: this.selectedRows.map((row) => row.gruoName), this.getList();
userName: this.selectedRows.map((row) => row.userName),
};
// const ids = this.selectedRows.map((row) => row.id);
let data = [];
data.push(params);
addTeachaer(data).then((res) => {
console.log(res, "ressss");
}); });
}, },
...@@ -275,13 +254,6 @@ export default { ...@@ -275,13 +254,6 @@ export default {
this.dialogVisible = true; this.dialogVisible = true;
this.handleSecher(); this.handleSecher();
}, },
//多选按钮
// handleSelectionChange(selection) {
// this.selectedRows = selection.map((item) => item.id);
// this.single = selection.length !== 1;
// this.multiple = !selection.length;
// },
handleSelectionChange(selection) { handleSelectionChange(selection) {
if (selection.length > 0) { if (selection.length > 0) {
this.selectedRows = selection.map((item) => item.id); this.selectedRows = selection.map((item) => item.id);
......
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