..

src/components/authen/Authentication.vue

@@ -5,23 +5,23 @@
       <el-form :model="authentication" :rules="rules" ref="authentication" label-width="12%" class="demo-report">
         <el-form-item label="机构名称" prop="name">
           <el-input v-if="isModifyMode" v-model="authentication.name"></el-input>
-          <span v-if="!isModifyMode">{{authentication.name}}</span>
+          <!--<span v-if="!isModifyMode">{{authentication.name}}</span>-->
         </el-form-item>
         <el-form-item label="银行卡账户" prop="name">
           <el-input v-if="isModifyMode" v-model="authentication.bankAccount"></el-input>
-          <span v-if="!isModifyMode">{{authentication.bankAccount}}</span>
+          <!--<span v-if="!isModifyMode">{{authentication.bankAccount}}</span>-->
         </el-form-item>
         <el-form-item label="地址" prop="name">
           <el-input v-if="isModifyMode" v-model="authentication.address"></el-input>
-          <span v-if="!isModifyMode">{{authentication.address}}</span>
+          <!--<span v-if="!isModifyMode">{{authentication.address}}</span>-->
         </el-form-item>
         <el-form-item label="测评机构能力" prop="name">
           <el-input v-if="isModifyMode" v-model="authentication.ability"></el-input>
-          <span v-if="!isModifyMode">{{authentication.ability}}</span>
+          <!--<span v-if="!isModifyMode">{{authentication.ability}}</span>-->
         </el-form-item>
         <el-form-item label="测评机构资源" prop="name">
           <el-input v-if="isModifyMode" v-model="authentication.resource"></el-input>
-          <span v-if="!isModifyMode">{{authentication.resource}}</span>
+          <!--<span v-if="!isModifyMode">{{authentication.resource}}</span>-->
         </el-form-item>
         <el-form-item prop="file" label="头像">
           <el-upload
@@ -33,8 +33,10 @@
             :before-remove="beforeRemove"
             multiple
             :limit="1"
+            :show-file-list="false"
             :on-exceed="handleExceed"
             :before-upload="beforeFileUpload"
+            :http-request="uploadFile"
             :file-list="authentication.photo"
           >
             <i class="el-icon-upload"></i>
@@ -42,22 +44,22 @@
               将文件拖到此处，或
               <em>点击上传</em>
             </div>
-            <div class="el-upload__tip" slot="tip">请上传报告文件</div>
+            <div class="el-upload__tip" slot="tip">请上传头像</div>
           </el-upload>
-          <div v-if="!isModifyMode">
-            <span v-if="authentication.photo==null">暂无文件</span>
-            <a :href="authentication.photo" v-if="authentication.photo!=null"><i class="fa fa-file-text-o"></i>
-              {{authentication.photo}}</a>
-          </div>
+          <!--<div v-if="!isModifyMode">-->
+          <!--<span v-if="authentication.photo==null">暂无文件</span>-->
+          <!--<a :href="authentication.photo" v-if="authentication.photo!=null"><i class="fa fa-file-text-o"></i>-->
+          <!--{{authentication.photo}}</a>-->
+          <!--</div>-->
         </el-form-item>
 
-        <el-form-item v-if="!isModifyMode">
-          <div class="btn btn-medium btn-info" @click="modifyInfo()">修改</div>
-          <div class="btn btn-medium" @click="cancelModify()">返回</div>
-        </el-form-item>
+        <!--<el-form-item v-if="!isModifyMode">-->
+        <!--<div class="btn btn-medium btn-info" @click="modifyInfo()">修改</div>-->
+        <!--<div class="btn btn-medium" @click="cancelModify()">返回</div>-->
+        <!--</el-form-item>-->
         <el-form-item v-if="isModifyMode">
-          <div class="btn btn-primary btn-info" @click="submitInfo()">确认修改</div>
-          <div class="btn btn-primary" @click="cancelModify()">取消</div>
+          <div class="btn btn-primary btn-info" @click="submitInfo()">提交</div>
+          <!--<div class="btn btn-primary" @click="cancelModify()">取消</div>-->
         </el-form-item>
       </el-form>
     </div>
@@ -81,6 +83,7 @@ export default {
         ability: '',
         resource: '',
         photo: [],
+        photoUrl: '',
       },
       rules: {
         // name: [
@@ -118,7 +121,7 @@ export default {
         address: this.authentication.address,
         ability: this.authentication.ability,
         resource: this.authentication.resource,
-        photo: this.authentication.photo[0],
+        photo: this.authentication.photoUrl,
       }
       Http.post(Apis.USER.AGENCY_AUTHENTICATION, newAuthentication).then((res) => {
         console.log(res)
@@ -142,6 +145,19 @@ export default {
     },
     beforeFileUpload () {
     },
+    uploadFile (param) {
+      const formData = new FormData()
+      let config = {
+        //添加请求头
+        headers: {'Content-Type': 'multipart/form-data'},
+      }
+      formData.append('file', param.file)
+      Http.upload(Apis.FILE.UPLOAD_IMAGE.replace('{userId}', 3), formData, config).then((res) => {
+        console.log('上传成功')
+        this.authentication.photoUrl = res.data
+        console.log(res.data)
+      })
+    }
   },
   created: function () {
   }

src/components/cheat/AgencyAdd.vue

@@ -5,23 +5,23 @@
       <el-form :model="agency" :rules="rules" ref="agency" label-width="12%" class="demo-report">
         <el-form-item label="机构名称" prop="name">
           <el-input v-if="isModifyMode" v-model="agency.name"></el-input>
-          <span v-if="!isModifyMode">{{agency.name}}</span>
+          <!--<span v-if="!isModifyMode">{{agency.name}}</span>-->
         </el-form-item>
         <el-form-item label="银行卡账户" prop="name">
           <el-input v-if="isModifyMode" v-model="agency.bankAccount"></el-input>
-          <span v-if="!isModifyMode">{{agency.bankAccount}}</span>
+          <!--<span v-if="!isModifyMode">{{agency.bankAccount}}</span>-->
         </el-form-item>
         <el-form-item label="地址" prop="name">
           <el-input v-if="isModifyMode" v-model="agency.address"></el-input>
-          <span v-if="!isModifyMode">{{agency.address}}</span>
+          <!--<span v-if="!isModifyMode">{{agency.address}}</span>-->
         </el-form-item>
         <el-form-item label="测评机构能力" prop="name">
           <el-input v-if="isModifyMode" v-model="agency.ability"></el-input>
-          <span v-if="!isModifyMode">{{agency.ability}}</span>
+          <!--<span v-if="!isModifyMode">{{agency.ability}}</span>-->
         </el-form-item>
         <el-form-item label="测评机构资源" prop="name">
           <el-input v-if="isModifyMode" v-model="agency.resource"></el-input>
-          <span v-if="!isModifyMode">{{agency.resource}}</span>
+          <!--<span v-if="!isModifyMode">{{agency.resource}}</span>-->
         </el-form-item>
         <el-form-item prop="file" label="头像">
           <el-upload
@@ -35,6 +35,7 @@
             :limit="1"
             :on-exceed="handleExceed"
             :before-upload="beforeFileUpload"
+            :http-request="uploadFile"
             :file-list="agency.photo"
           >
             <i class="el-icon-upload"></i>
@@ -44,20 +45,20 @@
             </div>
             <div class="el-upload__tip" slot="tip">请上传报告文件</div>
           </el-upload>
-          <div v-if="!isModifyMode">
-            <span v-if="agency.photo==null">暂无文件</span>
-            <a :href="agency.photo" v-if="agency.photo!=null"><i class="fa fa-file-text-o"></i>
-              {{agency.photo}}</a>
-          </div>
+          <!--<div v-if="!isModifyMode">-->
+            <!--<span v-if="agency.photo==null">暂无文件</span>-->
+            <!--<a :href="agency.photo" v-if="agency.photo!=null"><i class="fa fa-file-text-o"></i>-->
+              <!--{{agency.photo}}</a>-->
+          <!--</div>-->
         </el-form-item>
 
-        <el-form-item v-if="!isModifyMode">
-          <div class="btn btn-medium btn-info" @click="modifyInfo()">修改</div>
-          <div class="btn btn-medium" @click="cancelModify()">返回</div>
-        </el-form-item>
+        <!--<el-form-item v-if="!isModifyMode">-->
+          <!--<div class="btn btn-medium btn-info" @click="modifyInfo()">修改</div>-->
+          <!--<div class="btn btn-medium" @click="cancelModify()">返回</div>-->
+        <!--</el-form-item>-->
         <el-form-item v-if="isModifyMode">
-          <div class="btn btn-primary btn-info" @click="submitInfo()">确认修改</div>
-          <div class="btn btn-primary" @click="cancelModify()">取消</div>
+          <div class="btn btn-primary btn-info" @click="submitInfo()">提交</div>
+          <!--<div class="btn btn-primary" @click="cancelModify()">取消</div>-->
         </el-form-item>
       </el-form>
     </div>
@@ -81,6 +82,7 @@ export default {
         ability: '',
         resource: '',
         photo: [],
+        photoUrl: ''
       },
       rules: {
         // name: [
@@ -118,7 +120,7 @@ export default {
         address: this.agency.address,
         ability: this.agency.ability,
         resource: this.agency.resource,
-        photo: this.agency.photo[0],
+        photo: this.agency.photoUrl,
       }
       Http.post(Apis.USER.ADD_AGENCY, newAgency).then((res) => {
         console.log(res)
@@ -142,6 +144,19 @@ export default {
     },
     beforeFileUpload () {
     },
+    uploadFile (param) {
+      const formData = new FormData()
+      let config = {
+        //添加请求头
+        headers: {'Content-Type': 'multipart/form-data'},
+      }
+      formData.append('file', param.file)
+      Http.upload(Apis.FILE.UPLOAD_IMAGE.replace('{userId}', 3), formData, config).then((res) => {
+        console.log('上传成功')
+        this.agency.photoUrl = res.data
+        console.log(res.data)
+      })
+    }
   },
   created: function () {
   }

src/components/cheat/ProjectAdd.vue

@@ -3,7 +3,7 @@
     <div class="create-body">
       <div class="title">创建项目</div>
       <el-tabs tabPosition="top" type="card">
-        <el-tab-pane label="表单创建项目">
+        <el-tab-pane label="单个创建项目">
           <el-form :model="project" :rules="rules" ref="project" label-width="12%" class="demo-report">
             <el-form-item label="项目名称" prop="name">
               <el-input v-if="isModifyMode" v-model="project.name"></el-input>
@@ -128,7 +128,7 @@
             </el-form-item>
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="上传Excel创建项目">
+        <el-tab-pane label="批量创建项目">
           <el-form :model="project" :rules="rules" ref="project" label-width="12%" class="demo-report">
             <el-form-item prop="file" label="Excel模板文件">
               <div>
@@ -313,9 +313,9 @@ export default {
         headers: {'Content-Type': 'multipart/form-data'},
       }
       formData.append('file', param.file)
-      Http.upload(Apis.FILE.REQUIREMENT_FILE.replace('{userId}', 3), formData, config).then((res) => {
+      Http.upload(Apis.PROJECT.ADD_PROJECT_BY_EXCEL, formData, config).then((res) => {
         console.log('上传成功')
-        this.project.requireDocUrl = res.data
+        this.project.excelFileUrl = res.data
         console.log(res.data)
       })
     },

src/js/api.js

@@ -5,7 +5,7 @@ export default {
     UPDATE_PROJECT: '/api/project/{projectId}/',
     DELETE_PROJECT: '/api/project/{projectId}/',
     ADD_PROJECT: '',
-    ADD_PROJECT_BY_EXCEL: '',
+    ADD_PROJECT_BY_EXCEL: '/api/project/projectListImportByExcel/',
   },
   TASK: {
     GET_TASK: '/api/project/{projectId}/task/{taskId}/',
@@ -26,6 +26,8 @@ export default {
   FILE: {
     REQUIREMENT_FILE: '/api/files/requirementfile/{userId}/',
     APK: '/api/files/apk/{userId}/',
+    UPLOAD_EXCEL: '',
+    UPLOAD_IMAGE: '/api/files/image/{userId}/',
   },
   USER: {
     ACCEPT_TASK: '',