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

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

@@ -2,7 +2,7 @@
   <div class="data-main">
     <article>
       <div class="data-num">
-        <div class="data-add blue" @click="need_open = true">
+        <div class="data-add blue">
           <img :src="requireImg">
         </div>
         <div class="data-detail">
@@ -17,7 +17,7 @@
     </article>
     <article>
       <div class="data-num">
-        <div class="data-add green" @click="reated_task()">
+        <div class="data-add green">
           <img :src="taskImg">
         </div>
         <div class="data-detail">
@@ -32,7 +32,7 @@
     </article>
     <article>
       <div class="data-num">
-        <div class="data-add red" @click="created_bug()">
+        <div class="data-add red">
           <img :src="bugImg">
         </div>
         <div class="data-detail">

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

@@ -2,7 +2,7 @@
   <div class="data-main">
     <article>
       <div class="data-num">
-        <div class="data-add green" @click="reated_task()">
+        <div class="data-add green">
           <img :src="taskImg">
         </div>
         <div class="data-detail">
@@ -17,7 +17,7 @@
     </article>
     <article>
       <div class="data-num">
-        <div class="data-add red" @click="created_bug()">
+        <div class="data-add red">
           <img :src="bugImg">
         </div>
         <div class="data-detail">

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

@@ -2,7 +2,7 @@
   <div class="data-main">
     <article>
       <div class="data-num">
-        <div class="data-add red" @click="created_bug()">
+        <div class="data-add red">
           <img :src="bugImg">
         </div>
         <div class="data-detail">

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

@@ -41,15 +41,10 @@
       :header-row-style="{height: '61px'}"
     >
       <el-table-column label="日程名称" prop="name" width="250" align="center" show-overflow-tooltip />
-      <el-table-column label="日期" width="250" align="center" prop="seperateDaysNoHoliday" show-overflow-tooltip />
-      <el-table-column label="参与人" align="center" width="120" show-overflow-tooltip>
+      <el-table-column label="日期" width="250" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
-          {{ scope.row.peopleObjectList | peopleListHandler }}
-        </template>
-      </el-table-column>
-      <el-table-column label="业务线" align="center" width="120" show-overflow-tooltip>
-        <template slot-scope="scope">
-          {{ scope.row.bizName }}
+          {{ scope.row.startTime }}~
+          {{ scope.row.endTime }}
         </template>
       </el-table-column>
       <el-table-column label="使用/工作日/全部" align="center" width="150" show-overflow-tooltip>