Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/projectManage/dialog_vue.vue

@@ -251,8 +251,10 @@ export default {
               that.$set(that.task_form, 'projectId', '')
               that.$set(that.task_form, 'bizId', Number(localStorage.getItem('bizId')))
               that.task_form.followVersion === 2 ? that.show_Client = false : ''
-              if (data.requirementId) {
+              if (data) {
                 that.task_form.requireId = data.requirementId
+                that.task_form.name = data.name
+                that.task_form.priority = data.priority
               }
             }, 300)
           })

src/views/projectManage/requirement/requirementDetail.vue

@@ -414,12 +414,19 @@ export default {
       })
       if (res.code === 200) {
         this.$message({ message: '删除成功', type: 'success', duration: 1000, offset: 150 })
+        this.$router.push({ name: '需求', query: {}})
       }
     },
     reated_task() { // 新建任务
       this.task_open = true
       this.$nextTick(() => {
-        this.$refs.task_createdUpdata.init(4, this.$route.query.id, { requirementId: this.requirementId })
+        this.$refs.task_createdUpdata.init(4, this.$route.query.id,
+          {
+            requirementId: this.requirementId,
+            name: `${this.form_query.name}的任务`,
+            priority: this.form_query.priority
+          }
+        )
       })
     },
     created_bug() { // 缺陷创建
@@ -502,12 +509,12 @@ export default {
     }
     .comment-main {
       list-style: none;
-      padding: 0px;
+      padding: 15px 0 0 0;
       margin: 0 0 20px 0;
       li {
         list-style: none;
         padding: 0px;
-        margin: 0px;
+        margin: 0px 0px 25px 0;
       }
       .comment-name {
         font-size:14px;

src/views/projectManage/taskList/taskViewDetail.vue

@@ -440,6 +440,7 @@ export default {
       const res = await tasktaskDelete(user, this.taskId)
       if (res.code === 200) {
         this.$message({ message: '删除成功', type: 'success', duration: 1000, offset: 150 })
+        this.$router.push({ name: '任务', query: {}})
       }
     },
     created_bug() { // 缺陷创建
@@ -535,12 +536,12 @@ export default {
     }
     .comment-main {
       list-style: none;
-      padding: 0px;
+      padding: 15px 0 0 0;
       margin: 0 0 20px 0;
       li {
         list-style: none;
         padding: 0px;
-        margin: 0px;
+        margin: 0px 0px 25px 0;
       }
       .comment-name {
         font-size:14px;

src/views/workbench/person/components/myFullCalendar.vue

@@ -272,6 +272,9 @@ export default {
   transform: scale(1);
   font-size: 14px;
 }
+>>>.fc-scroller::-webkit-scrollbar {
+  display:none !important;
+}
 </style>
 
 // fullcalendar