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

src/components/input/textArea.vue

@@ -11,7 +11,7 @@
         </el-tooltip>
       </div>
       <div v-show="!isEmpty && !edit">
-        <pre class="text-pre" @click="ImmediateAddition" v-html="value" />
+        <pre class="text-pre" @click="ImmediateAddition" v-html="handlerText(value)" />
       </div>
       <div :id="'inputUpload_'+id" style="display: none" @click.stop="blur_textarea" />
       <div v-show="edit" class="control">
@@ -120,6 +120,10 @@ export default {
         this.$emit('update:value', this.inputValue)
         this.$emit('change', this.inputValue)
       }
+    },
+    handlerText(val) {
+      const reg = new RegExp(/<\/?p[^>]*>/gi)
+      return val.replace(reg, '')
     }
   }
 }
@@ -142,7 +146,6 @@ article {
   color: #333B4A;
   cursor: pointer;
   min-height: 20vh;
-  padding: 0 40px;
 }
 /deep/ textarea {
   width: calc(100% - 40px);

src/styles/detail-pages.scss

@@ -84,6 +84,7 @@
     justify-content: space-between;
     align-items: center;
     /deep/.icon-add {
+      padding-top: 4px;
       font-size: 20px;
       color: #409EFF;
     }

src/views/projectManage/projectList/components/needsList.vue

@@ -18,7 +18,7 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="需求名称" width="250" align="center" show-overflow-tooltip>
+      <el-table-column label="需求名称" width="250" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="table-project-name" @click="needs_link(scope.row.id)">
             <span class="id">{{ scope.row.requirementDisplayId }}</span>
@@ -99,7 +99,7 @@ export default {
       }
     },
     needs_link(id) {
-      this.$router.push({ name: '需求详情', params: { id: id + '' }})
+      this.$router.push({ name: '需求详情', query: { id: id }})
     }
   }
 }
@@ -152,10 +152,10 @@ export default {
   @include setStatus(#FF8952)
 }
 .status3 {
-  @include setStatus(#C97DEA)
+  @include setStatus(#FF8952)
 }
 .status5 {
-  @include setStatus(#13C2C2)
+  @include setStatus(#FF8952)
 }
 .status9 {
   @include setStatus(#7ED321)
@@ -180,6 +180,9 @@ export default {
   .name {
     font-size: 14px;
     color: #666666;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 }
 </style>

src/views/projectManage/projectList/components/taskList.vue

@@ -58,14 +58,7 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="{
-              'status_color': scope.row.status === 0,
-              'status_color1': scope.row.status === 1,
-              'status_color4': scope.row.status === 3,
-              'status_color6': scope.row.status === 2,
-              'status_color7': scope.row.status === 4,
-              'status_color2': scope.row.status === 5
-            }"
+            :class="'status'+scope.row.status"
             class="btns"
             size="mini"
             @change="changeStatus(scope.row)"
@@ -315,6 +308,9 @@ export default {
     cursor: pointer;
     color: #666666;
     font-size: 14px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
   .task-id {
     color: #A7AEBC;
@@ -345,12 +341,9 @@ export default {
 .status0 {
   @include setStatus(#409EFF)
 }
-.status1 {
+.status1, .status2, .status3, .status4{
   @include setStatus(#FF8952)
 }
-.status3 {
-  @include setStatus(#13C2C2)
-}
 .status5 {
   @include setStatus(#7ED321)
 }

src/views/projectManage/projectList/projectViewDetails.vue

@@ -95,7 +95,7 @@
             <div class="title-left-name">项目描述</div>
           </div>
           <div>
-            <text-area :id="'pro-desc'" :value.sync="form_query.description" :empty-text="'请输入'" :input-button="'需求描述'" @change="changeArea" />
+            <text-area :id="'pro-desc'" :value.sync="form_query.description" :empty-text="'点击'" :input-button="'添加描述'" @change="changeArea" />
           </div>
         </section>
         <section class="main-section">
@@ -182,6 +182,7 @@
     </el-container></div>
 </template>
 <script>
+const _ = require('lodash')
 import {
   projectList,
   projectUpdate,
@@ -277,7 +278,7 @@ export default {
   },
   methods: {
     async changeArea(e) { // area修改
-      const projectInfo = this.form_query
+      const projectInfo = _.cloneDeep(this.form_query)
       const res = await projectUpdate({ projectInfo, user: this.user })
       if (res.code === 200) {
         this.$message({ message: '修改成功', type: 'success', duration: 1000, offset: 150 })

src/views/projectManage/requirement/components/taskList.vue

@@ -58,14 +58,7 @@
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.status"
-            :class="{
-              'status_color': scope.row.status === 0,
-              'status_color1': scope.row.status === 1,
-              'status_color4': scope.row.status === 3,
-              'status_color6': scope.row.status === 2,
-              'status_color7': scope.row.status === 4,
-              'status_color2': scope.row.status === 5
-            }"
+            :class="'status'+scope.row.status"
             class="btns"
             size="mini"
             @change="changeStatus(scope.row)"
@@ -313,6 +306,9 @@ export default {
     cursor: pointer;
     color: #666666;
     font-size: 14px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
   .task-id {
     color: #A7AEBC;
@@ -343,12 +339,9 @@ export default {
 .status0 {
   @include setStatus(#409EFF)
 }
-.status1 {
+.status1, .status2, .status3, .status4{
   @include setStatus(#FF8952)
 }
-.status3 {
-  @include setStatus(#13C2C2)
-}
 .status5 {
   @include setStatus(#7ED321)
 }

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

@@ -264,6 +264,14 @@ export default {
   height: 52px;
   line-height: 52px;
 }
+>>>#small-calendar .fc-dayGridMonth-view .table-bordered .fc-body .fc-day-number {
+  transform: scale(1);
+  font-size: 12px;
+}
+>>>#small-calendar .fc-view-container .table-bordered .fc-head .fc-day-header {
+  transform: scale(1);
+  font-size: 14px;
+}
 </style>
 
 // fullcalendar

src/views/workbench/person/index.vue

@@ -316,14 +316,17 @@ export default {
       }
     },
     async queryWorkListByTime(view) { // 获取指定时间段用户日程信息
-      this.calendarView = view
+      this.calendarView = {
+        activeStart: view.activeStart,
+        activeEnd: view.activeEnd
+      }
       const params = {
         timeInfo: {
-          startTime: view.activeStart
-            ? moment(view.activeStart).format('YYYY.MM.DD')
+          startTime: this.calendarView.activeStart
+            ? moment(this.calendarView.activeStart).format('YYYY.MM.DD')
             : moment().startOf('month').format('YYYY.MM.DD'),
-          endTime: view.activeEnd
-            ? moment(view.activeEnd).format('YYYY.MM.DD')
+          endTime: this.calendarView.activeEnd
+            ? moment(this.calendarView.activeEnd).format('YYYY.MM.DD')
             : moment().endOf('month').format('YYYY.MM.DD')
         },
         teamSearchInfo: { bizId: null },

src/views/workbench/team/index.vue

@@ -122,7 +122,6 @@ import ganntViews from './components/ganntViews'
 import MyFullCalendar from '@/views/workbench/person/components/myFullCalendar'
 import calenderDetail from '@/views/workbench/person/components/calenderDetail'
 import calendarDialog from '@/views/workbench/person/components/calendarFormDialog'
-import { View } from '@fullcalendar/core'
 import bugTableList from '@/views/workbench/bugTableList.vue'
 
 export default {
@@ -333,14 +332,17 @@ export default {
       }
     },
     async queryTeamWorkListByTime(view) { // 获取指定时间段团队日程信息
-      this.calendarView = View
+      this.calendarView = {
+        activeStart: view.activeStart,
+        activeEnd: view.activeEnd
+      }
       const params = {
         timeInfo: {
-          startTime: view.activeStart
-            ? moment(view.activeStart).format('YYYY.MM.DD')
+          startTime: this.calendarView.activeStart
+            ? moment(this.calendarView.activeStart).format('YYYY.MM.DD')
             : moment().startOf('month').format('YYYY.MM.DD'),
-          endTime: view.activeEnd
-            ? moment(view.activeEnd).format('YYYY.MM.DD')
+          endTime: this.calendarView.activeEnd
+            ? moment(this.calendarView.activeEnd).format('YYYY.MM.DD')
             : moment().endOf('month').format('YYYY.MM.DD')
         },
         teamSearchInfo: this.searchForm,