添加获取模板文件接口

src/components/cheat/ProjectAdd.vue

@@ -234,7 +234,12 @@
 import Http from '@/js/http.js'
 import Apis from '@/js/api.js'
 import {notify} from '@/constants/index'
-import {getAllPlatformTypes, getAllServiceTypes, storageGet} from '@/js/index'
+import {
+  getAllPlatformTypes,
+  getAllServiceTypes,
+  getGreenChannelAddProjectExcelTemplateFile,
+  storageGet
+} from '@/js/index'
 
 export default {
   name: 'ProjectAdd',
@@ -242,7 +247,7 @@ export default {
     return {
       userId: 0,
       user: {},
-      loading:false,
+      loading: false,
       dialogVisible: false,
       isModifyMode: true,
       serviceType: [],
@@ -438,6 +443,7 @@ export default {
       this.setServiceType()
       this.setPlatformType()
       this.setUserInfo()
+      this.setTemplateExcel()
     },
     //加载数据
     loadData: function () {
@@ -619,10 +625,20 @@ export default {
     setUserInfo () {
       this.user = storageGet('user')
     },
-    showLoading(){
+    setTemplateExcel () {
+      getGreenChannelAddProjectExcelTemplateFile(this.setTemplateExcelSuccess, this.setTemplateExcelFail)
+    },
+    setTemplateExcelSuccess (res) {
+      this.showLoading()
+    },
+    setTemplateExcelFail (error) {
+      this.hideLoading()
+      notify('error', '加载模板文件失败：' + error.data)
+    },
+    showLoading () {
       this.loading = true
     },
-    hideLoading(){
+    hideLoading () {
       this.loading = false
     }
   },

src/components/project/ProjectCreate.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="create-container" v-loading="loading">
-    <div class="title h1">申请项目</div>
+    <div class="title h1">创建项目</div>
     <div class="create-body">
       <el-form :model="project" :rules="rules" ref="project" label-width="12%" class="demo-project">
         <el-form-item label="项目名称" prop="name">

src/components/report/TaskReport.vue

@@ -223,12 +223,13 @@ export default {
       return isDOC || isEXCEL || isPDF || isTXT || isXLS || isXLSX
     },
     back () {
-      if (window.history.length <= 1) {
-        this.$router.push({path: '/'})
-        return false
-      } else {
-        this.$router.go(-1)
-      }
+      this.$router.push({
+        name: 'Task',
+        params: {
+          projectId: this.projectId,
+          taskId: this.taskId
+        }
+      })
     },
     loadData () {
       //pro1564487183259

src/js/api.js

@@ -37,7 +37,8 @@ export default {
     APK: '/api/files/apk/{userId}/',
     UPLOAD_REPORT_FILE: '/api/files/report/{userId}/',
     UPLOAD_EXCEL: '',
-    UPLOAD_IMAGE: '/api/files/image/{userId}/'
+    UPLOAD_IMAGE: '/api/files/image/{userId}/',
+    GET_TEMPLATE_EXCEL_FILE: ''
   },
   USER: {
     ADD_AGENCY: '/api/greenChannel/agency/',

src/js/index.js

@@ -199,7 +199,7 @@ export const updateTask = (projectId, taskId, task, updateTaskSuccess, updateTas
 
 //查看任务
 export const getTask = (projectId, taskId, getTaskSuccess, getTaskFail) => {
-  Http.get(Apis.TASK.GET_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId),{}).then((res) => {
+  Http.get(Apis.TASK.GET_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId), {}).then((res) => {
     getTaskSuccess(res)
   }).catch((error) => {
     getTaskFail(error)
@@ -213,7 +213,7 @@ export const udeleteTask = () => {
 
 //测评机构接受任务
 export const receiveTaskRequest = (projectId, taskId, userId, receiveTaskRequestSuccess, receiveTaskRequestFail) => {
-  Http.put(Apis.TASK.ACCEPT_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId).replace('{userId}', userId),{}).then((res) => {
+  Http.put(Apis.TASK.ACCEPT_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId).replace('{userId}', userId), {}).then((res) => {
     receiveTaskRequestSuccess(res)
   }).catch((error) => {
     receiveTaskRequestFail(error)
@@ -223,7 +223,7 @@ export const receiveTaskRequest = (projectId, taskId, userId, receiveTaskRequest
 
 //测评机构提出结束任务申请
 export const submitTaskRequest = (projectId, taskId, submitTaskSuccess, submitTaskFail) => {
-  Http.put(Apis.TASK.SUBMIT_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId),{}).then((res) => {
+  Http.put(Apis.TASK.SUBMIT_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId), {}).then((res) => {
     submitTaskSuccess(res)
   }).catch((error) => {
     submitTaskFail(error)
@@ -231,7 +231,7 @@ export const submitTaskRequest = (projectId, taskId, submitTaskSuccess, submitTa
 }
 
 export const rejectTask = (projectId, taskId, rejectTaskSuccess, rejectTaskFail) => {
-  Http.put(Apis.TASK.REJECT_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId),{}).then((res) => {
+  Http.put(Apis.TASK.REJECT_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId), {}).then((res) => {
     rejectTaskSuccess(res)
   }).catch((error) => {
     rejectTaskFail(error)
@@ -240,7 +240,7 @@ export const rejectTask = (projectId, taskId, rejectTaskSuccess, rejectTaskFail)
 
 //区域管理员确认结束任务
 export const ensureEndTask = (projectId, taskId, endTaskSuccess, endTaskFail) => {
-  Http.put(Apis.TASK.END_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId),{}).then((res) => {
+  Http.put(Apis.TASK.END_TASK.replace('{projectId}', projectId).replace('{taskId}', taskId), {}).then((res) => {
     endTaskSuccess(res)
   }).catch((error) => {
     endTaskFail(error)
@@ -402,8 +402,12 @@ export const getProvinceCodeByProvinceName = (provinceName, cityName) => {
 }
 
 //获取批量上传项目模板文件
-export const getGreenChannelAddProjectExcelTemplateFile = () => {
-  return '123.excel'
+export const getGreenChannelAddProjectExcelTemplateFile = (getTemplateExcelSuccess, getTemplateExcelFail) => {
+  Http.get(Apis.FILE.GET_TEMPLATE_EXCEL_FILE).then((res) => {
+    getTemplateExcelSuccess(res)
+  }).catch((error) => {
+    getTemplateExcelFail(error)
+  })
 }
 
 //获取所有认证消息