From d94dc5ebea3e77b6edd218db440b1221cd688e85 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 11 Jun 2021 00:17:19 +0800
Subject: [PATCH] no message

---
 resources/assets/js/components/ImgUpload.vue  |  5 +----
 resources/assets/js/pages/manage.vue          |  8 ++++---
 .../js/pages/manage/components/TaskDetail.vue | 22 +++++++++++++++++++
 .../assets/sass/components/img-update.scss    | 14 +++++++-----
 resources/assets/sass/pages/common.scss       |  4 ++++
 resources/assets/sass/pages/components/_.scss |  1 +
 .../sass/pages/components/project-list.scss   |  1 +
 .../sass/pages/components/task-detail.scss    |  3 +++
 resources/assets/sass/pages/page-manage.scss  |  2 +-
 9 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 resources/assets/js/pages/manage/components/TaskDetail.vue
 create mode 100644 resources/assets/sass/pages/components/task-detail.scss

diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue
index 3b6d209a..59482f60 100755
--- a/resources/assets/js/components/ImgUpload.vue
+++ b/resources/assets/js/components/ImgUpload.vue
@@ -289,10 +289,7 @@
                 this.isLoading = true;
                 $A.apiAjax({
                     url: 'system/imgview',
-                    data: { path: path?path:'' },
-                    beforeSend: true,
-                    complete: true,
-                    error: true,
+                    data: {path: path ? path : ''},
                     success: (res) => {
                         this.isLoading = false;
                         if (res.ret === 1) {
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index 05f98e89..b3202a05 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -104,17 +104,19 @@
         <!--任务详情-->
         <Modal
             v-model="projectTask._show"
-            :title="$L('任务详情')"
-            :mask-closable="false">
-
+            :mask-closable="false"
+            footer-hide>
+            <TaskDetail/>
         </Modal>
     </div>
 </template>
 
 <script>
 import { mapState } from 'vuex'
+import TaskDetail from "./manage/components/TaskDetail";
 
 export default {
+    components: {TaskDetail},
     data() {
         return {
             loadIng: 0,
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
new file mode 100644
index 00000000..600cb61b
--- /dev/null
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -0,0 +1,22 @@
+<template>
+    <div class="task-detail">
+        {{projectTask}}
+    </div>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+    name: "TaskDetail",
+
+    data() {
+        return {
+
+        }
+    },
+    computed: {
+        ...mapState(['userId', 'projectTask']),
+    },
+}
+</script>
diff --git a/resources/assets/sass/components/img-update.scss b/resources/assets/sass/components/img-update.scss
index e654ae40..3c0cf6dd 100644
--- a/resources/assets/sass/components/img-update.scss
+++ b/resources/assets/sass/components/img-update.scss
@@ -60,11 +60,15 @@
         font-size: 28px;
     }
 
-    .ivu-progress-outer {
-        background-color: rgba(0, 0, 0, 0.68);
-
-        .ivu-progress-inner {
-            width: 88%;
+    .ivu-progress {
+        height: 100%;
+        .ivu-progress-outer {
+            background-color: rgba(0, 0, 0, 0.68);
+            height: 100%;
+            .ivu-progress-inner {
+                width: 88%;
+                margin: 0 auto;
+            }
         }
     }
 }
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index c2246e4e..268d0d79 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -229,6 +229,10 @@ body {
     .ivu-progress {
         display: flex;
         align-items: center;
+        .ivu-progress-outer {
+            display: flex;
+            align-items: center;
+        }
         &.ivu-progress-show-info {
             .ivu-progress-outer {
                 margin: 0;
diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss
index 378b067e..24ba0444 100755
--- a/resources/assets/sass/pages/components/_.scss
+++ b/resources/assets/sass/pages/components/_.scss
@@ -3,4 +3,5 @@
 @import "project-list";
 @import "task-add";
 @import "task-add-simple";
+@import "task-detail";
 @import "task-priority";
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index 2aa70133..8f83c4ce 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -400,6 +400,7 @@
                                 color: #777777;
                                 background-color: #EAEDF2;
                                 padding: 1px 4px;
+                                margin-left: 18px;
                                 font-size: 12px;
                                 font-weight: 500;
                                 border-radius: 3px;
diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss
new file mode 100644
index 00000000..3264d9a5
--- /dev/null
+++ b/resources/assets/sass/pages/components/task-detail.scss
@@ -0,0 +1,3 @@
+.task-detail {
+    padding-bottom: 22px;
+}
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index c2c81c12..f99242fd 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -172,7 +172,7 @@
                                         padding-right: 6px;
                                     }
                                     .ivu-progress {
-                                        margin-right: -26px;
+                                        margin-right: -18px;
                                         .ivu-progress-inner {
                                             background-color: #e4e4e4;
                                         }