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

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

@@ -28,9 +28,9 @@
               <span :style="{color: stColors[scope.row.status]}"> {{ scope.row.statusString }} </span>
             </template>
           </el-table-column>
-          <el-table-column label="创建人" min-width="100" align="center">
+          <el-table-column label="报告人" min-width="100" align="center">
             <template slot-scope="scope">
-              <span v-if="dataStatus">{{ scope.row.creatorObject === null ? '' : scope.row.creatorObject.name }}</span>
+              <span v-if="dataStatus">{{ scope.row.reportorObject === null ? '' : scope.row.reportorObject.name }}</span>
               <span v-if="!dataStatus">{{ scope.row.createrObject.name }}</span>
             </template>
           </el-table-column>
@@ -96,9 +96,9 @@
           <el-table-column label="状态" min-width="100" align="center">
             <template slot-scope="scope">{{ scope.row.statusString }}</template>
           </el-table-column>
-          <el-table-column label="创建人" min-width="100" align="center">
+          <el-table-column label="报告人" min-width="100" align="center">
             <template slot-scope="scope">
-              <span v-if="dailyDataStatus">{{ !scope.row.createrObject? '':scope.row.createrObject.name }}</span>
+              <span v-if="dailyDataStatus">{{ !scope.row.reportorObject? '':scope.row.reportorObject.name }}</span>
               <span v-if="!dailyDataStatus">{{ scope.row.createrObject.name }}</span>
             </template>
           </el-table-column>
@@ -111,7 +111,7 @@
                 <span v-if="scope.row.status === 0 ? true : false" class="btn" @click="dailyButtom(5,scope.row.id, scope.row)">发送</span>
                 <span v-if="scope.row.status === 0 ? true : false" style="margin: 0 30px;" class="btn" @click="dailyButtom(6,scope.row.id, scope.row)">编辑</span>
                 <span v-if="scope.row.status === 0 ? true : false" class="btn" @click="dailyButtom(4,scope.row.id, scope.row )">删除</span>
-                <span v-if="scope.row.status === 1 ? true : false" class="btn" @click="dailyButtom(3,scope.row.id, scope.row)">复制</span>
+                <span v-if="scope.row.status === 3 ? true : false" class="btn" @click="dailyButtom(3,scope.row.id, scope.row)">复制</span>
                 <el-dialog :title="titName" :visible.sync="dialog_daily" width="30%" :close-on-click-modal="false">
                   <div style="position: absolute; top: 23px; left: 12px;width:4px;height:17px;background:#409EFF;border-radius:1px;" />
                   <div align="center">
@@ -165,10 +165,10 @@
               <span v-if="releaseDataStatus">{{ scope.row.statusString }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="创建人" min-width="100" align="center">
+          <el-table-column label="报告人" min-width="100" align="center">
             <template slot-scope="scope">
               <span v-if="!releaseDataStatus">{{ scope.row.createrObject.name }}</span>
-              <span v-if="releaseDataStatus">{{ scope.row.creatorObject === null ? '' :scope.row.creatorObject.name }}</span>
+              <span v-if="releaseDataStatus">{{ scope.row.reportorObject === null ? '' :scope.row.reportorObject.name }}</span>
             </template>
           </el-table-column>
           <el-table-column label="创建日期" min-width="100" align="center">

src/views/reportManagement/ReleaseReport/components/iconDisplay.vue

@@ -61,12 +61,11 @@ export default {
     taskIds: {
       handler(newV) {
         if (newV) {
-          if (newV.statusString && newV.statusString === '已发送') {
+          if (newV.statusString === '已发送') {
             const data = JSON.parse(newV.dataInfo)
             this.getDataInfo(data)
-            console.log(data)
           } else {
-            newV && newV.length > 0 ? this.getRouterData(newV) : ''
+            newV.length > 0 ? this.getRouterData(newV) : ''
           }
         }
       },
@@ -74,6 +73,7 @@ export default {
     },
     releaseType: {
       handler(newV) {
+        console.log(newV)
         this.types = newV
       },
       immediate: true
@@ -136,14 +136,14 @@ export default {
     },
 
     async getRouterData(val) {
-      if (this.types) {
+      if (!this.types) {
         const res = await bugGetReportOutSumData({ taskIds: val })
         if (res.code === 200) {
           this.bugTableData = [res.data]
         }
         const res1 = await bugGetReportNotResolveData({ taskIds: val })
         if (res1.code === 200) {
-          this.tableData = res1.dada
+          this.tableData = res1.data
         }
         const res6 = await bugGetReportDisDataByDate({ taskIds: val })
         if (res6.code === 200) {

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -111,7 +111,6 @@ export default {
         if (newV === '新建模版') {
           this.releaseType = true
         } else {
-          this.releaseType = false
           if (newV.set_up) {
             this.releaseType = true
             this.settingGetReportModuleById(newV.set_up)

src/views/reportManagement/daily/dailyTemplate.vue

@@ -42,7 +42,6 @@
 </template>
 
 <script>
-import { Loading } from 'element-ui'
 import '@/styles/PublicStyle/index.scss'
 import normalArea from '@/components/input/normalArea'
 import { taskList as allTaskList } from '@/api/taskIndex'