From 8152086a7ac92222f0668da17a3e78dfe58d40bb Mon Sep 17 00:00:00 2001
From: zhoulexin <zhoulexin123@qq.com>
Date: Thu, 27 Nov 2025 11:42:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=89=93=E5=9B=9E=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html          | 17 ++++++++++++++---
 public/css/main.css | 39 +++++++++++++++++++++++++++++++++++++++
 public/js/editor.js |  5 +++++
 public/js/header.js | 26 +++++++++++++++++++++++---
 4 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index 62feefd..d04a24c 100644
--- a/index.html
+++ b/index.html
@@ -18,8 +18,20 @@
 		<div id="main-editor"></div>
 		<!-- div id="batch-editor"-->
 		</div>
-		<template id="editor-template"><div id="main-ui" class="editor-ui">
+		<template id="editor-template">
+			<div id="main-ui" class="editor-ui">
 				<div id="header">
+					<!-- 打回弹出框 -->
+					<div id="popup" class="popup-container">
+						<div>
+							<span>打回原因：</span>
+							<textarea id="reson" rows="4"></textarea>
+						</div>
+						<div>
+							<span id="cancel-reject-btn" class="reject-button">取消</span>
+							<span id="save-reject-btn" class="reject-button">确定</span>
+						</div>
+					</div>
 					<div id="global-info">
 						<!-- text id="frame"></text-->
 						<div id="selectors">
@@ -75,7 +87,7 @@
 							<div id="save-pass" class="ui-button" style="width: auto; display: none;">
 								通过
 							</div>
-							<div id="save-reject" class="ui-button" style="width: auto; display: none;">
+							<div id="save-reject" class="ui-button" style="width: auto; display: none; ">
 								打回
 							</div>
 							<div id="back" class="ui-button" style="width: auto;">
@@ -103,7 +115,6 @@
 
 					
 				</div>
-
 				<div id="content">
 					<div id="container">			
 						<div id='select-box' ></div>
diff --git a/public/css/main.css b/public/css/main.css
index 9c78a10..8ba3684 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -1085,4 +1085,43 @@ td {
 	height: 100%;
 	width: 100%;
 	z-index: 10;	
+}
+.popup-container{
+	display: none;
+	padding: 10px 20px;
+    position: absolute;
+    top: 25px;
+    right: 10px;
+    z-index: 999;
+    background: rgba(255, 255, 255, 0.3);
+	text-align: center;
+	color: #fff;
+	border-radius: 5px;
+}
+.popup-container>div:first-child{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.popup-container>div:first-child>span{
+	width: 80px;
+}
+.popup-container>div:first-child>textarea{
+	resize: none;
+	border: none;
+	padding: 10px;
+	outline: none;
+}
+.popup-container>div:last-child{
+	padding-top: 10px;
+	text-align: right;
+}
+.reject-button{
+	display: inline-block;
+    padding: 0px 10px;
+    cursor: pointer;
+    border-radius: 3px;
+}
+#save-reject-btn{
+	background: #409eff;
 }
\ No newline at end of file
diff --git a/public/js/editor.js b/public/js/editor.js
index fcdb4d1..40b871a 100644
--- a/public/js/editor.js
+++ b/public/js/editor.js
@@ -2104,6 +2104,11 @@ function Editor(editorUi, wrapperUi, editorCfg, data, name = "editor") {
   // }
 
   this.keydown = function (ev) {
+    const element = document.getElementById('reson');
+    const displayValue = window.getComputedStyle(element).display;
+    if (displayValue === 'block') {
+      return;
+    }
     // if (this.keydownDisabled)
     //     return;
 
diff --git a/public/js/header.js b/public/js/header.js
index f7e0d93..93a91ca 100644
--- a/public/js/header.js
+++ b/public/js/header.js
@@ -229,10 +229,29 @@ var Header = function (
   this.ui.querySelector("#save-pass").onclick = () => {
     qc(1)
   };
-  // 打回
+  // 打回弹窗
   this.ui.querySelector("#save-reject").onclick = () => {
-    qc(0)
+    document.getElementById('popup').style.display = "block";
   };
+   this.ui.addEventListener('click', (event) => {
+      const target = event.target;
+      // 处理确认打回按钮
+      if (target.id === 'save-reject-btn') {
+        const resonTextarea = this.ui.querySelector('#reson');
+        const resonValue = resonTextarea.value;
+        if(!resonValue || resonValue === ''){
+          alert('请填写打回理由');
+        }else{
+          qc(0);
+        }
+      }
+      
+      // 处理取消打回按钮
+      if (target.id === 'cancel-reject-btn') {
+        const popup = this.ui.querySelector('#popup');
+        if (popup) popup.style.display = "none";
+      }
+   })
   function qc(type){
     const microData = window.microApp.getData()
       var xhr = new XMLHttpRequest();
@@ -241,11 +260,12 @@ var Header = function (
           // window.microApp.dispatch({ type: 'pointCloudBack', time: new Date() })          
           document.getElementById('save-pass').style.display = 'none'
           document.getElementById('save-reject').style.display = 'none'
+          document.getElementById('popup').style.display = "none";
         }
       }
       xhr.open(
         "POST",
-        `${http.requestHttp}/project/qc?id=${microData.dataId}&type=${type}&taskId=${microData.taskId}`,
+        `${http.requestHttp}/project/qc?id=${microData.dataId}&type=${type}&taskId=${microData.taskId}${type === 0 ? `&remark=${document.getElementById('reson').value}` : ''}`,
         true
       );
       xhr.setRequestHeader('Content-Type', 'application/json');