Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/projectcenter/TaskPage.vue

@@ -1192,12 +1192,13 @@
         :closable="close"
         wrapClassName="canclestu"
         centered="true"
+        @cancel="closeModal1"
       >
         <div class="delete">
           <div class="del_header"></div>
           <div class="del_main">
             <div class="header">
-              <div class="icon"></div>
+              <div class="icon1"></div>
               <span>提示</span>
             </div>
             <div class="body">
@@ -1482,6 +1483,7 @@
         :closable="closableQR"
         wrapClassName="DelModal"
         style="margin-top: 400px"
+        @cancel="delete_exit"
       >
         <div class="delete" :style="{ display: delete_hs ? 'block' : 'none' }">
           <div class="del_header"></div>
@@ -2771,7 +2773,7 @@ export default {
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
-              .icon {
+              .icon1 {
                 width: 16px;
                 height: 16px;
                 margin-right: 10px;