From 6629496569777a756f452dacd37c619140cca1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Wed, 8 Jan 2025 16:35:03 +0800
Subject: [PATCH 1/3] test

---
 src/main/index.js                               |  7 +++++++
 .../classTask/newClassTaskAssign/index.vue      | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)

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..fac6342 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -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);
+};
+
 //----
 
 

From 8185cc458d09d6aa3f7cc5fa9e12888e4579f169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 13 Jan 2025 14:49:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1]=20-?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classTask/newClassTaskAssign/index.vue         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index fac6342..a8ab3c4 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -78,7 +78,7 @@
       </div>
       <div v-if="(currentRow.worktype == '科学实验' || classWorkForm.worktype == '科学实验')&& currentRow.id>0" class="page-center">
         <div class="experiment-homework">
-          <ExperimentQuestion :expObj="classWorkForm.fileHomeworkList&&classWorkForm.fileHomeworkList[0]" @clickExpObj="getExpObj" />  
+          <ExperimentQuestion :expObj="classWorkForm.fileHomeworkList&&classWorkForm.fileHomeworkList[0]" @clickExpObj="getExpObj" />
         </div>
       </div>
 
@@ -994,5 +994,8 @@ const handlePrint = () => {
     }
   }
 }
+::v-deep img {
+  display: inline-block !important;
+}
 
 </style>

From 04000e72796c22d05629c9ffb631adeb4214deac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=A8?= <666>
Date: Tue, 14 Jan 2025 09:58:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=8C=89=E9=92=AE;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/profile/cropperImage.vue        | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

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 @@
 
           <!--  裁剪按钮-->
           <div class="btn">
-            <el-button style="margin-right: 20px">选择</el-button>
-            <input
-              class="upload"
-              type="file"
-              accept=".png, .jpg, .jpeg"
-              @change="uploadImg"
-            />
+            <label for="submit">
+              <div class="lBut"><span>选择</span></div>
+            </label>
+            <input class="upload" id="submit" accept=".png, .jpg, .jpeg" type="file" style="display: none;" @change="uploadImg" />
+            <!-- <el-button style="margin-right: 20px;cursor:pointer">选择</el-button> -->
 
             <el-button @click="cancle">取消</el-button>
             <el-button @click="sureSava">提交</el-button>
@@ -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;
+}
 </style>