Skip to content

D
dd_school
Commit f2d2c7a6 by baochunxin
Options

Merge remote-tracking branch 'origin/master'

parents e7dacf8c f5ea23e8
Showing with 56 additions and 31 deletions
ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js
...@@ -54,6 +54,14 @@ export function getDepInfo(query) { ...@@ -54,6 +54,14 @@ export function getDepInfo(query) {
params: query params: query
}) })
} }
//查看档案详情
export function getFileTnfo(id) {
return request({
url: '/teacherFiles/files/'+id,
method: 'get',
})
}
// 同步档案 // 同步档案
export function syncNotice(id) { export function syncNotice(id) {
return request({ return request({
......
ruoyi-ui/src/permission.js
...@@ -17,6 +17,7 @@ const whiteList = [ ...@@ -17,6 +17,7 @@ const whiteList = [
"/dd", "/dd",
"/studentRegistra", "/studentRegistra",
"/printBarcodes", "/printBarcodes",
"/printLesson",
]; ];
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
......
ruoyi-ui/src/router/index.js
...@@ -78,6 +78,15 @@ export const constantRoutes = [ ...@@ -78,6 +78,15 @@ export const constantRoutes = [
), ),
hidden: true, hidden: true,
}, },
//课程表
{
path: "/printLesson",
component: () =>
import(
"@/views/smartSchool/teachAffairAdministration/lessonManage/printLesson"
),
hidden: true,
},
{ {
path: "/studentRegistra", path: "/studentRegistra",
component: () => component: () =>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -624,18 +624,19 @@ export default { ...@@ -624,18 +624,19 @@ export default {
//点击批量打印跳转 //点击批量打印跳转
printBarcodes() { printBarcodes() {
// this.printDialog = true; const baseUrl = window.location.origin +'/printBarcodes';
console.log(baseUrl, 'baseUrl');
this.printList = this.chooseList; this.printList = this.chooseList;
console.log(11, this.printList); console.log(11, this.printList);
const url = 'http://localhost:1024/printBarcodes'; // const url = `${baseUrl}/printBarcodes`;
console.log(url, 'url'); console.log(baseUrl, 'baseUrl');
const ids = this.electItem.join(','); const ids = this.electItem.join(',');
console.log(ids, 'ids'); console.log(ids, 'ids');
const encodes = this.chooseList.map(item => item.encode).join(','); const encodes = this.chooseList.map(item => item.encode).join(',');
console.log(encodes, 'encodes'); console.log(encodes, 'encodes');
const printListParam = encodeURIComponent(JSON.stringify(this.printList)); const printListParam = encodeURIComponent(JSON.stringify(this.printList));
dd.biz.util.openLink({ dd.biz.util.openLink({
url: `${url}?ids=${ids}&encodes=${encodes}&printList=${printListParam}`, url: `${baseUrl}?ids=${ids}&encodes=${encodes}&printList=${printListParam}`,
onSuccess: () => { onSuccess: () => {
console.log('跳转成功，准备打印'); console.log('跳转成功，准备打印');
// 打印条码 // 打印条码
...@@ -649,6 +650,7 @@ export default { ...@@ -649,6 +650,7 @@ export default {
//打印条码 //打印条码
// printCode() { // printCode() {
// printJS({ // printJS({
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
...@@ -84,6 +84,7 @@ export default { ...@@ -84,6 +84,7 @@ export default {
const ids = this.$route.query.ids; const ids = this.$route.query.ids;
const encodes = this.$route.query.encodes; const encodes = this.$route.query.encodes;
const printList = JSON.parse(decodeURIComponent(this.$route.query.printList)); const printList = JSON.parse(decodeURIComponent(this.$route.query.printList));
this.printBarcodes(ids, encodes, printList); this.printBarcodes(ids, encodes, printList);
}, },
...@@ -121,7 +122,6 @@ export default { ...@@ -121,7 +122,6 @@ export default {
}); });
}, },
//打印条码 //打印条码
printCode() { printCode() {
printJS({ printJS({
...@@ -141,6 +141,11 @@ export default { ...@@ -141,6 +141,11 @@ export default {
#printBlock{ #printBlock{
display:block!important display:block!important
} }
#tabnav, #pagenum {
display: none !important;
}
}` }`
}); });
} }
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairStudentManage/index.vue
...@@ -935,13 +935,14 @@ export default { ...@@ -935,13 +935,14 @@ export default {
// }, // },
studentProve(row) { studentProve(row) {
console.log('准备跳转'); console.log('准备跳转');
const baseUrl = window.location.protocol + '//' + window.location.host; // 获取当前页面的协议、主机作为前缀URL const baseUrl = window.location.origin; // 获取当前页面的协议、主机作为前缀URL
// const baseUrl = window.location.protocol + '//' + window.location.host; // 获取当前页面的协议、主机作为前缀URL
console.log('im_1_0', baseUrl); console.log('im_1_0', baseUrl);
const url = `http://localhost:1024/studentRegistra?id=${row.id}&name=${row.studentName}&idCard=${row.idCard}&schoolNo=${row.schoolNo}`; // const url = `http://localhost:1024/studentRegistra?id=${row.id}&name=${row.studentName}&idCard=${row.idCard}&schoolNo=${row.schoolNo}`;
// const newURL = `${baseUrl}/studentRegistra?id=${encodeURIComponent(row.id)}&name=${encodeURIComponent(row.studentName)}&idCard=${encodeURIComponent(row.idCard)}&schoolNo=${encodeURIComponent(row.schoolNo)}`; const newURL = `${baseUrl}/studentRegistra?id=${encodeURIComponent(row.id)}&name=${encodeURIComponent(row.studentName)}&idCard=${encodeURIComponent(row.idCard)}&schoolNo=${encodeURIComponent(row.schoolNo)}`;
dd.biz.util.openLink({ dd.biz.util.openLink({
// url: newURL, url: newURL,
url: url, // url: url,
onSuccess: () => { onSuccess: () => {
console.log(newURL, 'newURL'); console.log(newURL, 'newURL');
console.log('跳转成功，准备打印'); console.log('跳转成功，准备打印');
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/dataMaintenance.vue
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
type="success" type="success"
size="mini" size="mini"
style="float: right; margin-right: 50px; margin-top: 10px" style="float: right; margin-right: 50px; margin-top: 10px"
@click="handleExtract"
>提 取 >提 取
</el-button> </el-button>
</div> </div>
...@@ -333,7 +334,8 @@ ...@@ -333,7 +334,8 @@
<script> <script>
import { import {
getteacherNotice, // 通知下档案查看|数据维护 getteacherNotice, // 通知下档案查看|数据维护
getNoticeInfo, //查看档案详情//查看档案详情 getNoticeInfo, //查看档案详情
getFileTnfo, //查看档案详情
getDepInfo, //级部查询列表 getDepInfo, //级部查询列表
syncNotice, // 同步档案 syncNotice, // 同步档案
} from "@/api/smartSchool/teacherFiles/teacherElectronicFile"; } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
...@@ -350,6 +352,7 @@ export default { ...@@ -350,6 +352,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
courseName: "", courseName: "",
filesSemester: "",
gradeName: "", gradeName: "",
teacherName: "", teacherName: "",
}, },
...@@ -388,24 +391,21 @@ export default { ...@@ -388,24 +391,21 @@ export default {
}; };
}, },
mounted() { mounted() {
console.log("id", this.$route.query.noticeId); // console.log("id", this.$route.query.noticeId);
console.log("status", this.$route.query.noticeState); // console.log("status", this.$route.query.noticeState);
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询信息列表 */ /** 查询信息列表 */
getList() { getList() {
// this.loading = true;
const params = { const params = {
pageNum: this.queryForm.pageNum,
pageSize: this.queryForm.pageSize,
noticeId: this.$route.query.noticeId, noticeId: this.$route.query.noticeId,
pageNum: this.$route.query.pageNum,
pageSize: this.$route.query.pageSize,
}; };
getteacherNotice(params).then((res) => { getteacherNotice(params).then((res) => {
this.tableData = res.rows; this.tableData = res.rows;
this.total = res.total; this.total = res.total;
console.log(this.total, "total");
console.log(res, "getList");
}); });
}, },
// 搜索按钮 // 搜索按钮
...@@ -426,23 +426,23 @@ export default { ...@@ -426,23 +426,23 @@ export default {
}, },
//查看按钮 //查看按钮
handleCheck(row) { handleCheck(row) {
const params = { const id = row.id;
pageNum: this.queryForm.pageNum, getFileTnfo(id).then((res) => {
pageSize: this.queryForm.pageSize, this.dialogForm = res.rows;
teacherId: row.teacherId, // this.tableFirstData = res.rows;
// noticeId: row.noticeId, // this.tableSecondData = res.rows;
}; // this.tableThirdData = res.rows;
getNoticeInfo(params).then((res) => { // this.tableForthData = res.rows;
// this.dialogForm = res.rows;
this.dialogForm = res.rows[0];
console.log(this.dialogForm, "弹窗数据");
// console.log(res, "res");
this.check = true; this.check = true;
this.title = "基本信息查看"; this.title = "基本信息查看";
this.dialogVisible = true; this.dialogVisible = true;
}); });
}, },
// 提取
handleExtract() {
// syncNotice().then(() => {});
},
//修改按钮 //修改按钮
handleEdit(row) { handleEdit(row) {
this.check = false; this.check = false;
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/electronicRecord/index.vue
...@@ -426,7 +426,6 @@ export default { ...@@ -426,7 +426,6 @@ export default {
}, },
// 数据维护按钮 // 数据维护按钮
dataMaintenance(row) { dataMaintenance(row) {
console.log("数据维护按钮row", row);
const noticeId = row.id; const noticeId = row.id;
const pageNum = this.queryForm.pageNum; const pageNum = this.queryForm.pageNum;
const pageSize = this.queryForm.pageSize; const pageSize = this.queryForm.pageSize;
......
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