From cf90f7d0b5d666ff93b1afda5c439d3753eced2f Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Tue, 26 Mar 2024 15:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  6 ++++++
 .../constrator/material/reviseController.js   | 15 ++++++++++----
 .../constrator/material/reviseMessage.js      | 20 +++++++++++++++----
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93c80f1..6f0c87a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -313,6 +313,12 @@
 			<artifactId>commons-compress</artifactId>
 			<version>1.19</version>
 		</dependency>
+
+		<!-- amqp依赖，包含Rabbitmq-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-amqp</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/resources/static/js/newWork/constrator/material/reviseController.js b/src/main/resources/static/js/newWork/constrator/material/reviseController.js
index edcedc1..f90e143 100644
--- a/src/main/resources/static/js/newWork/constrator/material/reviseController.js
+++ b/src/main/resources/static/js/newWork/constrator/material/reviseController.js
@@ -379,6 +379,7 @@ function delPerson(obj){
 };
 
 function delDataIndexArray(idIndex,idOrder) {
+    debugger;
     var addFileBtn = "addFileBtn_"+idIndex+"_"+idOrder;
     var addAnnexFileBtn = "addAnnexFileBtn_"+idIndex+"_"+idOrder;
     $.each(dataIndexArray,function (idx,items) {
@@ -403,13 +404,14 @@ function delDataIndexArray(idIndex,idOrder) {
 
 //删除工器具
 function delSecuriity(obj){
+    debugger;
     var indexLayui = layer.confirm("确认移除该工器具吗？",{icon: 0},function () {
         var idName = $(obj).attr("id");
         var idIndex = idName.split("_")[1];
         var idOrder = idName.split("_")[2];
-        // console.log("idName="+idName);
-        // console.log("idIndex="+idIndex);
-        // console.log("idOrder="+idOrder);
+        console.log("idName="+idName);
+        console.log("idIndex="+idIndex);
+        console.log("idOrder="+idOrder);
 
         var toolsObj = fileMap[idIndex-1].obj;
         var childs = toolsObj.childs;
@@ -419,6 +421,7 @@ function delSecuriity(obj){
                 uuid = items.uuid;
             }
         })
+
         $.ajax({
             type: 'POST',
             async: false, // 默认异步true,false表示同步
@@ -469,6 +472,7 @@ function delFileMap(idIndex,idOrder) {
 
 //添加FIieMap文件-单个
 function addFileMapSingle(i,addFileBtn,uploadBtn,addImgDiv,obj,item,uploadcom,upStatus,btIndex) {
+    debugger;
     // console.log("obj="+JSON.stringify(obj))
     var nums = $("#" + addImgDiv).children().length;
     // if(obj.fileNum>=10){
@@ -553,6 +557,7 @@ function addFileMapSingle(i,addFileBtn,uploadBtn,addImgDiv,obj,item,uploadcom,up
 
 //添加FIieMap文件-多个
 function addFileMapMultiple(i,addFileBtn,uploadBtn,addImgDiv,obj,item,uploadcom,btIndex,type,upStatus) {
+    debugger;
     // // console.log("obj="+JSON.stringify(obj));
     // // console.log("obj="+JSON.stringify(obj));
     // // console.log("item="+JSON.stringify(item))
@@ -627,7 +632,7 @@ function addFileMapMultiple(i,addFileBtn,uploadBtn,addImgDiv,obj,item,uploadcom,
             item[btIndex].files = obj.pushFile();
         }
         //// console.log("file.name="+file.name); //得到文件名称
-
+    debugger;
         $('#' + addImgDiv).append(
             '<div id="" class="layui-input-inline '+addImgDiv+'"  style="margin-right: 0px;width: auto">' +
             '<div class="handle"  >' +
@@ -840,6 +845,7 @@ function cleanMapFile_4(itemArray,type,i,btIndex) {
  * @param isCheck
  */
 function addToolsHtml(typeName,fileName,i,fileId,id,nums,qualificationId,toolsNameValue,numsValue,requestUrl,isCheck) {
+    debugger;
 //保存操作的按钮，上一步
     var operatePrevious = "operatePrevious_"+fileId;
     //保存操作的按钮，取消
@@ -1540,6 +1546,7 @@ function addPersonQualifiFileOrder(i,fileId,fileName,typeName,operatePrevious,op
 //安全工器具
 function addSecuriityFileOrder(i,fileId,fileName,typeName,operatePrevious,operateCancel,operateNext,addFileBtn,uploadBtn,addImgDiv,
                                delThisMessage,addNewMessage,nums,requestUrl,isCheck,qualificationId) {
+    debugger;
     //// console.log("fileName,"+fileName+" ,typeName="+typeName+" ,i="+i)
     var fileList = new Array(),fileListUp = new Array();
     var files;
diff --git a/src/main/resources/static/js/newWork/constrator/material/reviseMessage.js b/src/main/resources/static/js/newWork/constrator/material/reviseMessage.js
index 36b49e4..88fa591 100644
--- a/src/main/resources/static/js/newWork/constrator/material/reviseMessage.js
+++ b/src/main/resources/static/js/newWork/constrator/material/reviseMessage.js
@@ -121,6 +121,7 @@ function getConsFileByConsIdAndProId() {
             }else{
                 layer.alert("改分包商为分配资质上传目录。");
             }
+            debugger;
             //console.log("personIdArray="+personIdArray)
             if(person !=null && person.length > 0){
                 for(var i=0;i<person.length;i++){
@@ -155,7 +156,7 @@ function getConsFileByConsIdAndProId() {
                 let svgId = "personSvgDiv";
                 let addDivId = "addPersonDiv";
                 addSvg(svgId,addDivId);
-                $("#addPerson_"+(personFileId+1)).click(function () {
+                $("#addPerson_"+("3")).click(function () {
                     $("#"+svgId).remove();
                     addPersonHtml("personQualifiFileContent","",personFileId,personFileDivId,"",personNum,
                         "","","","","1","",personRequestUrl,'0',"","","","",
@@ -163,6 +164,7 @@ function getConsFileByConsIdAndProId() {
                 });
 
             }
+            debugger;
             //console.log("securityArray="+securityArray)
             if(security !=null && security.length > 0){
                 for(var i=0;i<security.length;i++){
@@ -179,7 +181,7 @@ function getConsFileByConsIdAndProId() {
                 let svgId = "toolsSvgDiv";
                 let addDivId = "addSecuriityDiv";
                 addSvg(svgId,addDivId);
-                $("#addTools_"+(securityFileId+1)).click(function () {
+                $("#addTools_"+("4")).click(function () {
                 $("#"+svgId).remove();
                 addToolsHtml("securiityFileContent","",securityFileId,toolsFileDivId,"",securityNum,
                     "","","",securityRequestUrl,'0');
@@ -204,7 +206,7 @@ function getConsFileByConsIdAndProId() {
                 let uploadBtn = "uploadBtn_"+fileId+"_"+personNum;
                 let addImgDiv = "addImgDiv_"+fileId+"_"+personNum;
                 let requestUrl = securityRequestUrl;
-                fileUpload(i,addFileBtn,uploadBtn,addImgDiv,requestUrl,fileId);
+                fileUpload(i,addFileBtn,uploadBtn,addImgDiv,requestUrl,fileId,fileId);
             }
         }
     });
@@ -282,6 +284,7 @@ function switchHead(ids) {
 }
 
 function addNewMessage() {
+    debugger;
     $.each(fileMap,function (index,item) {
         var addNewMessage = item.obj.addNewMessage;
         var fileId = item.obj.fileId;
@@ -434,6 +437,7 @@ function addPageHtml(typeName,fileName,i,fileId,id,requestUrl,filePath) {
         return;
     }
     if(typeName === 'securiityFileContent'){
+        debugger;
         addSecuriityFileContent(typeName,fileName,i,fileId,id,securityNum,requestUrl);
         //securityNum ++;
         securityFileId = i;
@@ -698,6 +702,7 @@ function addHaveFileOrder(i,typeName,operatePrevious,operateNext) {
  * @param addImgDiv     添加存储图片img
  */
 function fileUpload(i,addFileBtn,uploadBtn,addImgDiv,requestUrl,fileId,typeId){
+    debugger;
     //console.log("fileUpload---------------------------------------")
     var uploadcom =upload.render({
         elem: '#' + addFileBtn,
@@ -726,7 +731,12 @@ function fileUpload(i,addFileBtn,uploadBtn,addImgDiv,requestUrl,fileId,typeId){
                         if(childs != undefined && childs.length >0){
                             var item = fileMap[i];
                             var butIdx = addFileBtn.split("_")[2]
-                            item.obj.childs[butIdx].isClick ='0';
+                            try{
+                                item.obj.childs[butIdx].isClick ='0';
+                            }catch (e){
+                                console.log("异常="+e)
+                            }
+
                             // $.each(childs,function (idx,item) {
                             //     item.isClick ='0'
                             // })
@@ -1218,6 +1228,7 @@ function addPersonQualifiFileContent(typeName,fileName,i,fileId,id,nums,requestU
 
 
 function addSecuriityFileContent(typeName,fileName,i,fileId,id,nums,requestUrl) {
+    debugger;
     //保存操作的按钮，上一步
     var operatePrevious = "operatePrevious_"+fileId;
     //保存操作的按钮，取消
@@ -1248,6 +1259,7 @@ function addSecuriityFileContent(typeName,fileName,i,fileId,id,nums,requestUrl)
     html +='        <div id="addSecuriityTitle">';
     html +='         添加更多工器具';
     html +='        </div>';
+    debugger;
     html +='        <div id="'+addNewMessage+'" class="addSecuriityBtn" title="添加">';
     html +='        </div>';
     html +='    </div>';