Merge branch 'dev_bugList' into dev

mock/routers/buglist.js

@@ -36,7 +36,7 @@ router.get('/list', (req, res) => {
         endTime: Random.datetime(),
         expectedTimeCost: 140,
         'id|+5': 1001,
-        priority: ['紧急', '一般', '宽松'],
+        'priority|1': ['紧急', '一般', '宽松'],
         startTime: Random.datetime(),
         'state|1': ['CREATED', 'PROCESSING', 'FINISHED'],
         title: 'bug titleeee',

src/views/Project/BugList.vue

@@ -52,16 +52,16 @@
       width="100"
     ></ElTableColumn>
     <ElTableColumn
+      prop="startTime"
       label="开始时间"
       align="center"
       width="180"
-      :formatter="(row) => timeFormatter(row, 'startTime')"
     ></ElTableColumn>
     <ElTableColumn
+      prop="endTime"
       label="结束时间"
       align="center"
       width="180"
-      :formatter="(row) => timeFormatter(row, 'endTime')"
     ></ElTableColumn>
     <ElTableColumn
       prop="state"
@@ -110,8 +110,6 @@ export default {
     this.fetch();
   },
   methods: {
-    timeFormatter: (row, property) => `${row[property].year}/${row[property].month}/${row[property].day} `
-            + `${row[property].hours}:${row[property].minutes}:${row[property].seconds}`,
     async fetch() {
       this.bugList = await BugListAPI.getBugListByProjectId(this.$store.state.workspace.currentProjectId);
     },

src/views/Project/TaskList.vue

@@ -121,34 +121,7 @@ export default {
 </script>
 
 <style scoped>
-.taskListContainer{
-  margin: 70px 30px 0 30px;
+.table-container {
+  margin: 50px 100px;
 }
-.taskFunctionBar .masterFunctionBar{
-  display: flex;
-  align-items:center;
-  justify-content:space-between;
-}
-.taskFunctionBar .filterFunctionBar{
-  margin-top: 20px;
-  display: flex;
-  align-items:center;
-}
-.subSelect {
-  width: 130px;
-}
-.taskScopeSelect{
-  margin-left: 0px;
-}
-.taskStatusSelect{
-  margin-left: 18px;
-}
-.sortOptionsSelect{
-  margin-left: auto;
-}
-
-.taskTableContainer{
-  margin-top: 20px;
-}
-
 </style>