zpy 10.24

ruoyi-ui/src/permission.js

@@ -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 = [
       ),
       ),
     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 {
 
 
     //点击批量打印跳转
     //点击批量打印跳转
     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';
-      console.log(url, 'url');
+      // const url = `${baseUrl}/printBarcodes`;
+      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 {
 
 
 
 
 
 
+
     //打印条码
     //打印条码
     // printCode() {
     // printCode() {
     //   printJS({
     //   printJS({

ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue

@@ -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 {
             });
             });
         },
         },
 
 
-
         //打印条码
         //打印条码
         printCode() {
         printCode() {
             printJS({
             printJS({
@@ -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 {
     // },
     // },
     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 newURL = `${baseUrl}/studentRegistra?id=${encodeURIComponent(row.id)}&name=${encodeURIComponent(row.studentName)}&idCard=${encodeURIComponent(row.idCard)}&schoolNo=${encodeURIComponent(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)}`;
       dd.biz.util.openLink({
       dd.biz.util.openLink({
-        // url: newURL,
-        url: url,
+        url: newURL,
+        // url: url,
         onSuccess: () => {
         onSuccess: () => {
           console.log(newURL, 'newURL');
           console.log(newURL, 'newURL');
           console.log('跳转成功，准备打印');
           console.log('跳转成功，准备打印');