From fb4cc47beba61507f7437a9ffa0211f34f4d8212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 7 Nov 2022 13:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BDid=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/doc/ExtGantt/Ext甘特图.html            | 20 +++++++++-----
 .../doc/ExtGantt/Ext甘特图_files/GanttMenu.js | 26 ++++++++++---------
 .../projectFront/scheduleManage/gantt.vue     | 10 ++++++-
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/public/doc/ExtGantt/Ext甘特图.html b/public/doc/ExtGantt/Ext甘特图.html
index 8cb14582..2d84cf26 100644
--- a/public/doc/ExtGantt/Ext甘特图.html
+++ b/public/doc/ExtGantt/Ext甘特图.html
@@ -85,6 +85,11 @@
 
 
     <script type="text/javascript">
+        // 父级传过来的参数
+         window.addEventListener('message', function(e) {
+         console.log(e.data, '父级页面传来的数据')
+         localStorage.setItem('id',e.data)
+      })
       //页面加载就绪
       window.onload = () => {
         console.log("window.onload");
@@ -164,15 +169,15 @@
                     //   },
                     // ],
                   };
-                  console.log("参数传进去了吗", data.PredecessorLink);
+                //   console.log("参数传进去了吗", data.PredecessorLink);
                   if (dataArr[i].children.length > 0) {
                     let threeData = dataArr[i].children;
                     let threeNum = 0;
                     for (let j = 0; j < dataArr[i].children.length; j++) {
-                      console.log(
-                        "有关联的前置任务嘛",
-                        dataArr[i].children[j].predecessorIds
-                      );
+                    //   console.log(
+                    //     "有关联的前置任务嘛",
+                    //     dataArr[i].children[j].predecessorIds
+                    //   );
                       number++;
                       let children = {
                         id: dataArr[i].children[j].id,
@@ -529,7 +534,6 @@
 
         //右侧 拖拽
         var itemdragcomplete = (e) => {
-            // console.log('=====拖拽回调',e)
           let requestData = {
             id: e.item.id,
             projectSn: projectSn,
@@ -632,10 +636,11 @@
         position:absolute;
         top: 20%;
         left: 30%;
-        z-index: 9999;
+        z-index: 999;
         width: 400px;
         height: 400px;
         border: 1px solid #000;
+        background-color: #fff;
     }
     .addbox{
         margin: 20px;
@@ -650,6 +655,7 @@
         width:80px;
         height: 30px;
         margin-top: 20px;
+        margin-left: 80px;
     }
   </style>
 </html>
diff --git a/public/doc/ExtGantt/Ext甘特图_files/GanttMenu.js b/public/doc/ExtGantt/Ext甘特图_files/GanttMenu.js
index 8fd1744f..3ff91639 100644
--- a/public/doc/ExtGantt/Ext甘特图_files/GanttMenu.js
+++ b/public/doc/ExtGantt/Ext甘特图_files/GanttMenu.js
@@ -97,6 +97,7 @@ mini.extend(GanttMenu, mini.Menu, {
     console.log("点击新增执行",e);
     var gantt = this.owner;
     var targetTask = gantt.getSelected();
+    console.log('新增选中的',targetTask)
     var task = gantt.newTask()
     let url = window.parent.document.getElementById("iframe").contentWindow.location.search;
     var parameter = url.split("="); //所有参数
@@ -104,13 +105,13 @@ mini.extend(GanttMenu, mini.Menu, {
     var projectSn = parameter[2].split("&")[0]; //projectSn
     // var createUserId = store.state.userInfo.userId
     //加到选中任务之后
-    // gantt.addTask(task, "after", targetTask);
+    
     document.getElementById('addDiv').style.display = 'block';
-    console.log('vvvvv',document.getElementById('addDiv'))
     document.getElementById('cancel').onclick=function(){
         document.getElementById('addDiv').style.display = 'none';
     }
     document.getElementById('submit').onclick=function(){
+        let userid = localStorage.getItem('id')
         let data  = {}
         data.taskName = document.getElementById("taskName").value;
         data.duration = document.getElementById("duration").value;
@@ -121,20 +122,21 @@ mini.extend(GanttMenu, mini.Menu, {
         data.actualStartDate = document.getElementById("actualStartDate").value;
         data.actualFinishDate = document.getElementById("actualFinishDate").value;
         data.remark = document.getElementById("remark").value;
-        console.log('data',data)
-        // document.getElementById('addDiv').style.display = 'none';
-        // if (!targetTask) {
-        //     data.parentId = e.task.id
-        // }
+        console.log('新增的参数',data)
+        if(typeof(targetTask) != "undefined") {
+            data.parentId = e.targetTask.id
+        }
         data.projectSn = projectSn
-        data.createUserId = '4'
-        console.log('data',data)
+        data.createUserId = userid
         axios
           .post(requestUrl + "xmgl/progressTask/addProgressTask", data)
           .then((res) => {
-           console.log('====新增',res)
-           alert('新增成功！')
-           document.getElementById('addDiv').style.display = 'none';
+            document.getElementById('addDiv').style.display = 'none';
+            console.log('res',res)
+            if(res.data.code == 200){
+                alert('新增成功！')
+                // gantt.loadTasks();
+            }
           });
     } 
   },
diff --git a/src/views/projectFront/scheduleManage/gantt.vue b/src/views/projectFront/scheduleManage/gantt.vue
index 9f2f7007..ab30e6ed 100644
--- a/src/views/projectFront/scheduleManage/gantt.vue
+++ b/src/views/projectFront/scheduleManage/gantt.vue
@@ -9,7 +9,7 @@
       </gantt-elastic> -->
         <!-- <gantt-header slot="header"></gantt-header>
           <gantt-footer slot="footer"></gantt-footer> -->
-          <iframe :src="'doc/ExtGantt/Ext甘特图.html?url='+baseURL+'&projectSn='+projectSn+'&token='+$store.state.userInfo.token" id="iframe" class="Extgantt" > </iframe>
+          <iframe  @load="load" :src="'doc/ExtGantt/Ext甘特图.html?url='+baseURL+'&projectSn='+projectSn+'&token='+$store.state.userInfo.token" id="iframe" class="Extgantt" > </iframe>
     </div>
   </div>
 </template>
@@ -25,6 +25,7 @@ export default {
     return {
       baseURL:'',
       projectSn:'',
+      userId:"",
      tasks: [
         {
           id: 99,
@@ -265,7 +266,14 @@ export default {
   created(){
    this.baseURL = this.$http.defaults.baseURL;
    this.projectSn = this.$store.state.projectSn;
+   this.userId = this.$store.state.userInfo.userId
   },
+  methods:{
+    load() {
+      var idom = document.getElementById('iframe').contentWindow;
+      idom.postMessage(this.userId)
+    },
+  }
 };
 </script>
 <style lang="less" scoped>