diff --git a/src/main/index.js b/src/main/index.js
index f43c571..a430510 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -244,6 +244,13 @@ app.on('ready', () => {
loginWindow.show()
loginWindow.focus()
})
+ // 打印窗口
+ ipcMain.on('printPage', (event, printOptions) => {
+ //console.log("ipcMain-print-page")
+ mainWindow.webContents.print(printOptions, (success, failureReason) => {
+ if (!success) console.error(failureReason);
+ });
+ });
//打开作业窗口
ipcMain.on('openWindow', (e, data) => {
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 03bb2e6..a8ab3c4 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -78,7 +78,7 @@
@@ -161,6 +161,7 @@ const route = useRoute();
const router = useRouter()
const { proxy } = getCurrentInstance()
const useClassTaskStores = useClassTaskStore();
+const { ipcRenderer } = require('electron')
const props = defineProps({
currentCourse: Object,
@@ -841,6 +842,22 @@ const editWork = async (cform) =>{
}
}
+
+// 测试, 未实装
+const handlePrint = () => {
+ const printOptions = {
+ silent: false, // 是否静默打印
+ printBackground: true, // 是否打印背景颜色和图像
+ color: false, // 是否打印为黑白
+ marginsType: 0, // 边距类型,0: 默认边距,1: 无边距,2: 最小边距
+ pageSize: 'A4', // 纸张大小
+ // 其他选项可以根据需要配置
+ };
+
+ console.log("print-page-click");
+ ipcRenderer.send('printPage', printOptions);
+};
+
//----
@@ -977,5 +994,8 @@ const editWork = async (cform) =>{
}
}
}
+::v-deep img {
+ display: inline-block !important;
+}
diff --git a/src/renderer/src/views/profile/cropperImage.vue b/src/renderer/src/views/profile/cropperImage.vue
index f75630d..3c86df0 100644
--- a/src/renderer/src/views/profile/cropperImage.vue
+++ b/src/renderer/src/views/profile/cropperImage.vue
@@ -22,13 +22,11 @@
-
选择
-
+
+
+
取消
提交
@@ -216,6 +214,7 @@ export default {
position: relative;
display: flex;
margin-top: 30px;
+ cursor: pointer;
> .upload {
display: block;
width: 60px;
@@ -224,6 +223,7 @@ export default {
top: 0;
left: 0;
opacity: 0;
+ cursor: pointer;
}
}
}
@@ -265,4 +265,22 @@ export default {
background-color: rgba(43, 43, 43, 0.7215686275);
}
}
+.lBut{
+ width: 87px;
+ height: 32px;
+ font-size: 14px;
+ line-height: 1.15;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 4px;
+ padding: 8px 10px;
+ margin-right: 10px;
+ transition: all 0.5s;
+ white-space: nowrap;
+ background-color: #409eff;
+ color: white;
+ border: 1px solid #409eff;
+ cursor: pointer;
+}