Merge branch 'Test' into 'master'

Test

See merge request crowd-2019/crowd-test-service-front!121

build/webpack.base.conf.js

@@ -19,6 +19,7 @@ const createLintingRule = () => ({
   }
 })
 
+
 module.exports = {
   context: path.resolve(__dirname, '../'),
   entry: {
@@ -88,5 +89,9 @@ module.exports = {
     net: 'empty',
     tls: 'empty',
     child_process: 'empty'
-  }
+  },
+  // externals: {
+  //   'vue': 'Vue',
+  //   'vue-router': 'VueRouter'
+  // }
 }

src/components/Home.vue

@@ -175,15 +175,15 @@
 </template>
 
 <script>
-import TaskCard from '@/components/commons/TaskCard'
-import InstitutionRank from '@/components/InstitutionRank'
-import PersonRank from '@/components/PersonRank'
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {defaultValue, getIndexStatisticsInfo, getRolesPermissions, storageGet} from '@/js/index'
+  import TaskCard from '@/components/commons/TaskCard'
+  import InstitutionRank from '@/components/InstitutionRank'
+  import PersonRank from '@/components/PersonRank'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {defaultValue, getIndexStatisticsInfo, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'Home',
   components: {TaskCard, InstitutionRank, PersonRank},
   data () {

src/components/InstitutionRank.vue

@@ -22,9 +22,9 @@
 </template>
 
 <script>
-import {defaultValue} from '@/js/index'
+  import {defaultValue} from '@/js/index'
 
-export default {
+  export default {
   name: 'InstitutionRank',
   props: {item: {}},
   data () {

src/components/Mine.vue

@@ -106,15 +106,15 @@
 </template>
 
 <script>
-import TaskItem from '@/components/commons/TaskItem'
-import ProjectItem from '@/components/commons/ProjectItem'
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {defaultValue, getRolesPermissions, storageGet} from '@/js/index'
-import echarts from 'echarts'
+  import TaskItem from '@/components/commons/TaskItem'
+  import ProjectItem from '@/components/commons/ProjectItem'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {defaultValue, storageGet} from '@/js/index'
+  import echarts from 'echarts'
 
-export default {
+  export default {
   name: 'Mine',
   components: {TaskItem, ProjectItem},
   watch: {

src/components/PersonRank.vue

@@ -23,9 +23,9 @@
 </template>
 
 <script>
-import {defaultValue} from '@/js/index'
+  import {defaultValue} from '@/js/index'
 
-export default {
+  export default {
   name: 'PersonRank',
   props: {item: {}},
   data () {

src/components/Square.vue

@@ -27,12 +27,12 @@
 </template>
 
 <script>
-import TaskItem from '@/components/commons/TaskItem'
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
+  import TaskItem from '@/components/commons/TaskItem'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
 
-export default {
+  export default {
   name: 'Square',
   components: {TaskItem},
   data () {

src/components/authen/AgencyAuthentication.vue

@@ -96,23 +96,22 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {
-  defaultValue,
-  getAllAgencyResourceTypes,
-  getAllServiceTypes,
-  getCurrentAgencyAuthInfo,
-  getCurrentAuthenInfo,
-  getCurrentUser,
-  getRolesPermissions,
-  storageGet,
-  storageSave,
-  updateAgencyAuthInfo
-} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {
+    defaultValue,
+    getAllAgencyResourceTypes,
+    getAllServiceTypes,
+    getCurrentAgencyAuthInfo,
+    getCurrentUser,
+    getRolesPermissions,
+    storageGet,
+    storageSave,
+    updateAgencyAuthInfo
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'AgencyAuthentication',
   data () {
     return {

src/components/authen/AgencyAuthenticationCreate.vue

@@ -83,20 +83,20 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {
-  getAllAgencyResourceTypes,
-  getAllServiceTypes,
-  getCurrentUser,
-  getRolesPermissions,
-  storageGet,
-  storageSave,
-  uploadAgencyAuthenticationInfo
-} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {
+    getAllAgencyResourceTypes,
+    getAllServiceTypes,
+    getCurrentUser,
+    getRolesPermissions,
+    storageGet,
+    storageSave,
+    uploadAgencyAuthenticationInfo
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'AgencyAuthenticationCreate',
   data () {
     return {

src/components/authen/AuthenticationManage.vue

@@ -224,19 +224,19 @@
 </template>
 
 <script>
-    import {
-        checkPassAuth,
-        checkRejectAuth,
-        getAllHandledAuthInfo,
-        getAllHandlingAuthInfo,
-        getCurrentAgencyAuthInfo,
-        getCurrentEnterpriseAuthInfo,
-        getCurrentIndividualAuthenInfo,
-        getFormalTimeFromDate
-    } from '@/js/index'
-    import {notify} from '@/constants/index'
+  import {
+    checkPassAuth,
+    checkRejectAuth,
+    getAllHandledAuthInfo,
+    getAllHandlingAuthInfo,
+    getCurrentAgencyAuthInfo,
+    getCurrentEnterpriseAuthInfo,
+    getCurrentIndividualAuthenInfo,
+    getFormalTimeFromDate
+  } from '@/js/index'
+  import {notify} from '@/constants/index'
 
-    export default {
+  export default {
         name: 'AuthenticationManage',
         data () {
             return {

src/components/authen/EnterpriseAuthentication.vue

@@ -70,20 +70,20 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {
-  defaultValue,
-  getCurrentEnterpriseAuthInfo,
-  getCurrentUser,
-  getRolesPermissions,
-  storageGet,
-  storageSave,
-  updateEnterpriseAuthInfo
-} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {
+    defaultValue,
+    getCurrentEnterpriseAuthInfo,
+    getCurrentUser,
+    getRolesPermissions,
+    storageGet,
+    storageSave,
+    updateEnterpriseAuthInfo
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'EnterpriseAuthentication',
   data () {
     return {

src/components/authen/EnterpriseAuthenticationCreate.vue

@@ -54,18 +54,18 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {
-  getCurrentUser,
-  getRolesPermissions,
-  storageGet,
-  storageSave,
-  uploadEnterpriseAuthenticationInfo
-} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {
+    getCurrentUser,
+    getRolesPermissions,
+    storageGet,
+    storageSave,
+    uploadEnterpriseAuthenticationInfo
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'EnterpriseAuthenticationCreate',
   data () {
     return {

src/components/authen/IndividualAuthentication.vue

@@ -62,24 +62,20 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {
-  defaultValue,
-  getAllAgencyResourceTypes,
-  getAllServiceTypes,
-  getCurrentIndividualAuthenInfo,
-  getCurrentUser,
-  getProvinceCodeByProvinceName,
-  getProvinceNameByProvinceCode,
-  getRolesPermissions,
-  storageGet,
-  storageSave,
-  updateIndividualAuthInfo
-} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {
+    defaultValue,
+    getCurrentIndividualAuthenInfo,
+    getCurrentUser,
+    getRolesPermissions,
+    storageGet,
+    storageSave,
+    updateIndividualAuthInfo
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'IndividualAuthentication',
   data () {
     return {

src/components/authen/IndividualAuthenticationCreate.vue

@@ -52,22 +52,18 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {
-  getAllAgencyResourceTypes,
-  getAllServiceTypes,
-  getCurrentUser,
-  getProvinceCodeByProvinceName,
-  getProvinceNameByProvinceCode,
-  getRolesPermissions,
-  storageGet,
-  storageSave,
-  uploadIndividualAuthenticationInfo,
-} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {
+    getCurrentUser,
+    getRolesPermissions,
+    storageGet,
+    storageSave,
+    uploadIndividualAuthenticationInfo,
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'IndividualAuthenticationCreate',
   data () {
     return {

src/components/cheat/AgencyAdd.vue

@@ -132,12 +132,12 @@
 </template>
 
 <script>
-import Http from '@/js/http'
-import Apis from '@/js/api'
-import {notify} from '@/constants/index'
-import {getAllAbilities, getAllAgencyResourceTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http'
+  import Apis from '@/js/api'
+  import {notify} from '@/constants/index'
+  import {getAllAbilities, getAllAgencyResourceTypes, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'AgencyAdd',
   data () {
     return {

src/components/cheat/AgencyDetail.vue

@@ -80,16 +80,16 @@
 </template>
 
 <script>
-import {notify} from '@/constants/index'
-import {
-  getAllAbilities,
-  getAllAgencyResourceTypes,
-  getCurrentAgencyAuthInfo,
-  storageGet,
-  updateAgencyResourceAndAbility
-} from '@/js/index'
+  import {notify} from '@/constants/index'
+  import {
+    getAllAbilities,
+    getAllAgencyResourceTypes,
+    getCurrentAgencyAuthInfo,
+    storageGet,
+    updateAgencyResourceAndAbility
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'Agency',
   data () {
     return {

src/components/cheat/ProjectAdd.vue

@@ -245,17 +245,17 @@
 </template>
 
 <script>
-    import Http from '@/js/http.js'
-    import Apis from '@/js/api.js'
-    import {notify} from '@/constants/index'
-    import {
-        getAllPlatformTypes,
-        getAllServiceTypes,
-        getGreenChannelAddProjectExcelTemplateFile,
-        storageGet
-    } from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {
+    getAllPlatformTypes,
+    getAllServiceTypes,
+    getGreenChannelAddProjectExcelTemplateFile,
+    storageGet
+  } from '@/js/index'
 
-    export default {
+  export default {
         name: 'ProjectAdd',
         data() {
             return {

src/components/commons/Header.vue

@@ -317,21 +317,20 @@
 </template>
 
 <script>
-import {
-  defaultValue,
-  deleteAuthInfo,
-  getCurrentAgencyAuthInfo,
-  getCurrentEnterpriseAuthInfo,
-  getCurrentIndividualAuthenInfo,
-  getCurrentUser,
-  getRolesPermissions,
-  logout,
-  storageGet,
-  storageSave
-} from '@/js/index'
-import {notify} from '@/constants/index'
-
-export default {
+  import {
+    defaultValue,
+    deleteAuthInfo,
+    getCurrentAgencyAuthInfo,
+    getCurrentEnterpriseAuthInfo,
+    getCurrentIndividualAuthenInfo,
+    getRolesPermissions,
+    logout,
+    storageGet,
+    storageSave
+  } from '@/js/index'
+  import {notify} from '@/constants/index'
+
+  export default {
   name: 'header-container',
   data () {
     return {

src/components/commons/Header2.0.vue

@@ -73,19 +73,20 @@
 
 <script>
   import {
-      defaultValue,
-      deleteAuthInfo,
-      getCurrentAgencyAuthInfo,
-      getCurrentEnterpriseAuthInfo,
-      getCurrentIndividualAuthenInfo,
-      getCurrentUser,
-      getRolesPermissions,
-      logout,
-      storageGet,
-      storageSave
+    defaultValue,
+    deleteAuthInfo,
+    getCurrentAgencyAuthInfo,
+    getCurrentEnterpriseAuthInfo,
+    getCurrentIndividualAuthenInfo,
+    getCurrentUser,
+    getRolesPermissions,
+    logout,
+    storageGet,
+    storageSave
   } from '@/js/index'
   import Http from '@/js/http.js'
   import Apis from '@/js/api.js'
+  import {mapActions} from 'vuex'
 
   export default {
     name: "Header2.0",
@@ -118,6 +119,7 @@
         deep: true
     },
     methods: {
+        ...mapActions(['setUser']),
         gotoHome(){
             this.$router.push('/home');
         },
@@ -159,6 +161,7 @@
 
                 getCurrentUser().then((res) => {
                     storageSave('user', res)
+                    this.setUser(res);
                     this.user = res
                     this.rolesPermissions = getRolesPermissions(res.roleList)
                     storageSave('rolesPermissions', getRolesPermissions(res.roleList))
@@ -185,6 +188,7 @@
             this.rolesPermissions = getRolesPermissions(res.roleList)
             storageSave('rolesPermissions', getRolesPermissions(res.roleList))
             console.log('用户信息加载成功')
+
             this.isLogin = true
             this.fullScreenLoading = false
         },
@@ -379,7 +383,7 @@
         // if (storageGet('user' != null)){
         //   this.isLogin = true
         // }
-    }
+    },
   }
 </script>
 

src/components/commons/HomeSlice.vue

@@ -21,11 +21,12 @@
 </template>
 
 <script>
-    import Apis from '@/js/api'
-    import Http from '@/js/http'
-    import {storageGet} from '@/js/index.js'
-    import {notify} from "../../constants";
-    export default {
+  import Apis from '@/js/api'
+  import Http from '@/js/http'
+  import {storageGet} from '@/js/index.js'
+  import {notify} from "../../constants";
+
+  export default {
         name: 'HomeSlice',
         data() {
             return {

src/components/commons/MidTab.vue

@@ -17,9 +17,6 @@
 
 
 <script>
-  import { mapGetters , mapActions} from 'vuex'
-  import  commonData  from '../../constants/tabMenu'
-  import Http from '@/js/http.js'
   export default {
     name: 'MidTab',
     props: ['menuArr']

src/components/commons/NProvinceCity.vue

@@ -29,10 +29,9 @@
 </template>
 
 <script type="text/javascript">
-import provinceCity from "@/constants/provinceCity.json";
-import {storageGet,getAllServiceTypes,getProvinceNameByProvinceCode,getProvinceCodeByProvinceName} from '@/js/index'
+  import provinceCity from "@/constants/provinceCity.json";
 
-export default {
+  export default {
   name: "nProvinceCity",
   props: {
     provinceCode: {

src/components/commons/ProjectItem.vue

@@ -30,9 +30,9 @@
 </template>
 
 <script>
-import PlatformType from '@/constants/enum/platform-type'
+  import PlatformType from '@/constants/enum/platform-type'
 
-export default {
+  export default {
   name: 'Project-Item',
   props: {
     projectItem: {}

src/components/commons/ProvinceCity.vue

@@ -29,8 +29,9 @@
 </template>
 
 <script type="text/javascript">
-import provinceCity from "@/constants/provinceCity.json";
-export default {
+  import provinceCity from "@/constants/provinceCity.json";
+
+  export default {
   name: "provinceCity",
   props: {
     provinceCode: {

src/components/commons/SearchBar.vue

@@ -42,9 +42,8 @@
 
 
 <script>
-  import { mapGetters , mapActions} from 'vuex'
-  import  commonData  from '../../constants/tabMenu'
   import Http from '@/js/http.js'
+
   export default {
     name: 'SearchBar',
     // components:{},

src/components/commons/TaskItem.vue

@@ -26,9 +26,9 @@
 </template>
 
 <script>
-import TaskStatus from '@/constants/enum/task-status'
+  import TaskStatus from '@/constants/enum/task-status'
 
-export default {
+  export default {
   name: 'Task-Item',
   props: {
     task: {}

src/components/commons/TopSearch.vue

@@ -32,13 +32,11 @@
 
 
 <script>
-    import {mapGetters, mapActions} from 'vuex'
-    import commonData from '../../constants/tabMenu'
-    import Http from '@/js/http.js'
-    import {storageGet} from '@/js/index.js'
-    import {notify} from "../../constants";
+  import Http from '@/js/http.js'
+  import {storageGet} from '@/js/index.js'
+  import {notify} from "../../constants";
 
-    export default {
+  export default {
         name: 'TopSearch',
         props: ['searchVal','searchType','searchTypeArr'],
         data() {

src/components/project/AnalyseDemand.vue

@@ -50,9 +50,10 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-export default {
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+
+  export default {
   name: "AnalyseDemand",
   data() {
     return {

src/components/project/Project.vue

@@ -38,7 +38,7 @@
             <el-form-item label="计价标准" prop="valuationStandard">
               <el-input style="width: 400px" autosize v-if="isModifyMode" type="textarea"
                         v-model="project.valuationStandard"></el-input>
-              <span v-if="!isModifyMode">{{project.valuationStandard}}</span>
+              <span v-if="!isModifyMode">{{project.valuationStandard ? project.valuationStandard : '暂无'}}</span>
             </el-form-item>
 
             <!--            <el-form-item size="small" label="计价标准" prop="valuationStandard">-->
@@ -56,7 +56,7 @@
             <el-form-item label="需求描述">
               <el-input style="width: 400px" autosize v-if="isModifyMode" type="textarea"
                         v-model="project.desc"></el-input>
-              <span v-if="!isModifyMode">{{project.desc}}</span>
+              <span v-if="!isModifyMode">{{project.desc ? project.desc : '暂无'}}</span>
             </el-form-item>
             <!--<el-form-item label="价格" prop="price">-->
             <!--<el-input v-if="isModifyMode" type="number" v-model="project.price">-->
@@ -310,11 +310,11 @@
   import {notify} from '@/constants/index'
   import echarts from 'echarts'
   import {
-    checkFileType,
+    deleteTask,
     ensureEndProject,
+    getAllFields,
     getAllInstitutions,
     getAllPlatformTypes,
-    getAllFields,
     getAllServiceTypes,
     getFormalTimeFromDate,
     getProvinceCodeByProvinceName,
@@ -322,8 +322,7 @@
     receiveProjectRequest,
     rejectProject,
     storageGet,
-    submitProjectRequest,
-    deleteTask
+    submitProjectRequest
   } from '@/js/index'
 
   export default {

src/components/project/ProjectCreate.vue

@@ -141,23 +141,22 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import provincecity from '@/components/commons/ProvinceCity'
-import provinceCityJSON from '@/constants/provinceCity.json'
-import ResourceType from '@/constants/enum/resource-type'
-import {notify} from '@/constants/index'
-import {
-  checkFileType,
-  getAllInstitutions,
-  getAllFields,
-  getAllPlatformTypes,
-  getAllServiceTypes,
-  getProvinceNameByProvinceCode,
-  storageGet
-} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import provincecity from '@/components/commons/ProvinceCity'
+  import provinceCityJSON from '@/constants/provinceCity.json'
+  import ResourceType from '@/constants/enum/resource-type'
+  import {notify} from '@/constants/index'
+  import {
+    getAllFields,
+    getAllInstitutions,
+    getAllPlatformTypes,
+    getAllServiceTypes,
+    getProvinceNameByProvinceCode,
+    storageGet
+  } from '@/js/index'
 
-export default {
+  export default {
   name: 'ProjectCreate',
   components: {
     provincecity

src/components/report/ProjectReport.vue

@@ -74,12 +74,12 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {getAllReportTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {getAllReportTypes, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'ProjectReport',
   components: {},
   data () {

src/components/report/ProjectReportCreate.vue

@@ -76,12 +76,12 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {getAllReportTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {getAllReportTypes, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'ProjectReportCreate',
   components: {},
   data () {

src/components/report/TaskReport.vue

@@ -72,12 +72,12 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {getAllReportTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {getAllReportTypes, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'TaskReport',
   components: {},
   data () {

src/components/report/TaskReportCreate.vue

@@ -57,12 +57,12 @@
 </template>
 
 <script>
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import {notify} from '@/constants/index'
-import {getAllReportTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {getAllReportTypes, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'TaskReportCreate',
   components: {},
   data () {

src/components/task/Task.vue

@@ -14,7 +14,7 @@
         </el-form-item>
         <el-form-item label="任务描述" prop="desc" style="width: 700px;">
           <el-input autosize v-if="isModifyMode" type="textarea" v-model="task.description"></el-input>
-          <span v-if="!isModifyMode">{{task.description}}</span>
+          <span v-if="!isModifyMode">{{task.description ? task.description : '暂无'}}</span>
         </el-form-item>
         <el-form-item label="任务报价" prop="quotePrice" style="width: 700px;">
           <el-input size="small" type="number" v-if="isModifyMode" v-model="task.quotePrice">
@@ -37,13 +37,15 @@
           <span class="badge" v-if="!isModifyMode">{{task.serviceType}}</span>
         </el-form-item>
 
-        <el-form-item label="examId" prop="endPointVO.examId" style="width: 700px;" v-if="showBD&&task.endPointVO&&task.serviceType=='北斗众测'" required>
+        <el-form-item label="examId" prop="endPointVO.examId" style="width: 700px;"
+                      v-if="showBD&&task.endPointVO&&task.serviceType=='北斗众测'" required>
           <el-input v-if="isModifyMode" v-model="task.endPointVO.examId" label="examId"></el-input>
           <span v-if="!isModifyMode&&showBD">{{task.endPointVO.examId}}</span>
         </el-form-item>
 
 
-        <el-form-item label="caseId" prop="endPointVO.caseId" style="width: 700px;" v-if="showBD&&task.endPointVO&&task.serviceType=='北斗众测'" required>
+        <el-form-item label="caseId" prop="endPointVO.caseId" style="width: 700px;"
+                      v-if="showBD&&task.endPointVO&&task.serviceType=='北斗众测'" required>
           <el-input v-if="isModifyMode" v-model.number="task.endPointVO.caseId" label="caseId"></el-input>
           <span v-if="!isModifyMode&&showBD">{{task.endPointVO.caseId}}</span>
         </el-form-item>
@@ -266,7 +268,7 @@
     data() {
       return {
         user: {},
-        showBD:true,
+        showBD: true,
         rolesPermissions: {},
         loading: false,
         isModifyMode: false,
@@ -464,9 +466,9 @@
       setUserInfo() {
         this.user = storageGet('user')
         this.rolesPermissions = storageGet('rolesPermissions')
-        if(storageGet('rolesPermissions').isRegionManager || storageGet('rolesPermissions').isSystemAdministrator){
+        if (storageGet('rolesPermissions').isRegionManager || storageGet('rolesPermissions').isSystemAdministrator) {
           this.showBD = true;
-        }else {
+        } else {
           this.showBD = false;
         }
       },
@@ -514,7 +516,10 @@
         this.task.agencyId = res.crowdTaskVO.agencyId
         this.task.status = res.crowdTaskVO.status
         this.task.statusVO = res.crowdTaskVO.statusVO
-        this.task.endPointVO = res.crowdTaskVO.endPointVO
+        this.task.endPointVO = res.crowdTaskVO.endPointVO ? res.crowdTaskVO.endPointVO : {
+          caseId: '',
+          examId: ''
+        }
         this.taskOperationControl = res.taskOperationControl
         this.acceptedUserList = res.acceptedUserList;
         this.crowdReportUrl = res.crowdTaskVO.writeReportUrl;

src/components/task/TaskCreate.vue

@@ -2,14 +2,14 @@
   <div class="create-container" v-loading="loading">
     <div class="title h1">创建任务</div>
     <div class="create-body">
-      <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task" style="margin-left: 100px;width: 700px">
-        <el-form-item label="任务名称" prop="name">
+      <el-form :model="task" :rules="rules" ref="task" label-width="120px" class="demo-task" style="margin:0 100px">
+        <el-form-item label="任务名称" prop="name" style="width:700px;">
           <el-input size="small" v-model="task.name"></el-input>
         </el-form-item>
-        <el-form-item label="任务描述" prop="desc">
+        <el-form-item label="任务描述" prop="desc" style="width:700px;">
           <el-input autosize type="textarea" style="width: 400px" v-model="task.desc"></el-input>
         </el-form-item>
-        <el-form-item label="任务报价" prop="quotePrice">
+        <el-form-item label="任务报价" prop="quotePrice" style="width:700px;">
           <el-input size="small" type="number" v-model="task.quotePrice">
             <template slot="append">¥</template>
           </el-input>
@@ -28,15 +28,15 @@
         </el-form-item>
 
 
-        <el-form-item label="examId" prop="endpoint.examId" v-if="task.type=='BDSPT'" required>
+        <el-form-item label="examId" prop="endpoint.examId" style="width:700px;" v-if="task.type=='BDSPT'" required>
           <el-input v-model="task.endpoint.examId" label="examId"></el-input>
         </el-form-item>
-        <el-form-item label="caseId" prop="endpoint.caseId" v-if="task.type=='BDSPT'" required>
+        <el-form-item label="caseId" prop="endpoint.caseId" style="width:700px;" v-if="task.type=='BDSPT'" required>
           <el-input v-model="task.endpoint.caseId" label="caseId"></el-input>
         </el-form-item>
 
 
-        <el-form-item label="任务可见性" prop="resource">
+        <el-form-item label="任务可见性" prop="resource" style="width:700px;" v-if="task.type!=='BDSPT'">
           <el-tabs :tab-position="tabPosition" v-model="task.resource" style="width: 800px">
             <el-tab-pane :label="resourceType[0]" name="0">
               <el-radio-group v-model="task.institution">
@@ -60,9 +60,19 @@
             <el-tab-pane :label="resourceType[2]" name="2"></el-tab-pane>
           </el-tabs>
         </el-form-item>
-        <el-form-item label="领取人数" prop="contactPhone" v-if="task.resource !== '0'">
+
+        <el-form-item label="任务可见性" prop="resource" style="width:700px;" v-if="task.type ==='BDSPT'">
+          <el-tabs :tab-position="tabPosition" v-model="task.resource" style="width: 800px">
+            <el-tab-pane :label="resourceType[2]" name="2"></el-tab-pane>
+          </el-tabs>
+        </el-form-item>
+
+        <el-form-item label="领取人数" prop="contactPhone" v-if="task.resource !== '0' && task.type!=='BDSPT'">
           <el-input-number v-model="task.participantCount" :min="1" :max="1000" label="领取人数"></el-input-number>
         </el-form-item>
+        <el-form-item label="领取人数" prop="contactPhone" v-if="task.resource !== '0' && task.type=='BDSPT'">
+          <el-input-number v-model="task.participantCount" :min="2" :max="1000" label="领取人数"></el-input-number>
+        </el-form-item>
         <el-form-item label="需求文档" prop="doc">
           <el-upload
             drag
@@ -106,15 +116,15 @@
 </template>
 
 <script>
-import provincecity from '@/components/commons/ProvinceCity'
-import provinceCityJSON from '@/constants/provinceCity.json'
-import Http from '@/js/http.js'
-import Apis from '@/js/api.js'
-import ResourceType from '@/constants/enum/resource-type.js'
-import {notify} from '@/constants/index'
-import {getAllAgencies, getAllServiceTypes, getProvinceNameByProvinceCode, storageGet} from '@/js/index'
+  import provincecity from '@/components/commons/ProvinceCity'
+  import provinceCityJSON from '@/constants/provinceCity.json'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import ResourceType from '@/constants/enum/resource-type.js'
+  import {notify} from '@/constants/index'
+  import {getAllAgencies, getAllServiceTypes, getProvinceNameByProvinceCode, storageGet} from '@/js/index'
 
-export default {
+  export default {
   name: 'Task',
   components: {
     provincecity

src/components/task/TaskList.vue

@@ -13,8 +13,9 @@
 </template>
 
 <script>
-import TaskItem from "@/components/commons/TaskItem";
-export default {
+  import TaskItem from "@/components/commons/TaskItem";
+
+  export default {
   name: "TaskList",
   components: { TaskItem },
   data() {

src/pages/DetailPage/AgencyDetail.vue

@@ -50,16 +50,13 @@
   </div>
 </template>
 <script>
-  import Http from '@/js/http.js'
-  import Apis from '@/js/api.js'
   import {notify} from '@/constants/index'
   import {
-    getAllReportTypes,
     defaultValue,
-    storageGet,
     getAgencyAuthInfoCommon,
     getAllAgencyResourceTypes,
     getAllServiceTypes,
+    storageGet,
   } from '@/js/index'
 
   export default {

src/pages/DetailPage/CrowdDetail.vue

@@ -75,7 +75,7 @@
   import SearchBar from '../../components/commons/SearchBar'
   import {notify} from "../../constants"
   import ProjectItem from '../../components/commons/ProjectItem'
-  import {defaultValue, storageGet} from '@/js/index'
+  import {storageGet} from '@/js/index'
 
   export default {
     name: 'CrowdDetail',

src/pages/DetailPage/ExpertDetail.vue

@@ -30,12 +30,12 @@
 </template>
 
 <script>
-    import Http from '@/js/http.js'
-    import Apis from '@/js/api.js'
-    import {notify} from '@/constants/index'
-    import {getAllReportTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {storageGet} from '@/js/index'
 
-    export default {
+  export default {
         name: 'ExpertDetail',
         components: {},
         data() {

src/pages/DetailPage/FieldDetail.vue

@@ -10,10 +10,9 @@
 </template>
 
 <script>
-    import {storageGet, getAllFields} from '@/js/index.js'
-    import {notify} from "../../constants";
+  import {getAllFields} from '@/js/index.js'
 
-    export default {
+  export default {
         name: "FieldDetail",
         data() {
             return {

src/pages/DetailPage/ResourceDetail.vue

@@ -48,12 +48,12 @@
 </template>
 
 <script>
-    import Http from '@/js/http.js'
-    import Apis from '@/js/api.js'
-    import {notify} from '@/constants/index'
-    import {getAllReportTypes, storageGet} from '@/js/index'
+  import Http from '@/js/http.js'
+  import Apis from '@/js/api.js'
+  import {notify} from '@/constants/index'
+  import {storageGet} from '@/js/index'
 
-    export default {
+  export default {
         name: 'ResourceDetail',
         components: {},
         data() {

src/pages/DetailPage/TestTypeDetail.vue

@@ -10,9 +10,9 @@
 </template>
 
 <script>
-    import {getAllServiceTypes, getAllFields} from '@/js/index.js'
+  import {getAllServiceTypes} from '@/js/index.js'
 
-    export default {
+  export default {
         name: "TestTypeDetail",
         data() {
             return {

src/pages/DetailPage/UserDetail.vue

@@ -30,7 +30,7 @@
   import Http from '@/js/http.js'
   import Apis from '@/js/api.js'
   import {notify} from '@/constants/index'
-  import {getAllReportTypes, storageGet,defaultValue} from '@/js/index'
+  import {defaultValue, storageGet} from '@/js/index'
 
   export default {
     name: 'UserDetail',

src/pages/Homepage/BrandCard.vue

@@ -16,6 +16,7 @@
 
 <script>
   import {defaultValue} from '@/js/index.js'
+
   export default {
     name: "BrandCard",
     props:['residentAgencyList'],

src/pages/Homepage/Homepage.vue

@@ -46,7 +46,7 @@
         <el-col :span="19" class="test-type-wrapper">
           <TestMenu :testTypeList="homeData.testTypeList"></TestMenu>
           <TestCard :applicationTypeList="homeData.applicationTypeList"></TestCard>
-          <el-row>
+          <el-row style="margin-top: 10px">
             <ResourceAndTool :resourceList="homeDataNoCache.resourceList"></ResourceAndTool>
           </el-row>
           <el-row>
@@ -81,10 +81,10 @@
   import HotContest from './HotContest'
   import PopularProject from '../Square/PopularProject'
   import Http from '@/js/http.js'
-  import {mapActions, mapGetters} from 'vuex'
+  import {mapGetters} from 'vuex'
   import Waterfall from 'vue-waterfall/lib/waterfall'
   import WaterfallSlot from 'vue-waterfall/lib/waterfall-slot'
-  import {storageGet, getAllFields} from '@/js/index.js'
+  import {getAllFields, storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
   import Apis from '@/js/api'
   // console.log(commonData);
@@ -154,6 +154,9 @@
         currTab: 'homepage'
       }
     },
+    computed: {
+      ...mapGetters(['getUserInfo'])
+    },
     methods: {
       loadData() {
         this.showLoading();
@@ -254,9 +257,15 @@
         this.user = storageGet('user') && storageGet('user').userVO;
       }
     },
-    mounted() {
+    mounted(){
       this.setUserInfo();
       this.loadData();
+    },
+    watch:{
+      getUserInfo(val){
+        this.setUserInfo();
+        this.loadData();
+      }
     }
   }
 </script>

src/pages/Homepage/HotAgency.vue

@@ -30,7 +30,7 @@
 
 <script>
   import {defaultValue} from '@/js/index.js'
-  import Http from '@/js/http.js';
+
   export default {
     name: 'HotAgency',
     props:['agencyRank'],

src/pages/Homepage/HotContest.vue

@@ -29,7 +29,6 @@
 </template>
 
 <script>
-  import moment from 'moment';
   export default {
     name: 'HotContest',
     props:['competitionList'],

src/pages/Homepage/HotUser.vue

@@ -30,6 +30,7 @@
 
 <script>
   import {defaultValue} from '@/js/index.js'
+
   export default {
     name: 'HotCrowd',
     props:['userRank'],

src/pages/Homepage/LoginCard.vue

@@ -26,8 +26,7 @@
 
 <script>
   import Http from '@/js/http.js'
-  import Apis from '@/js/api.js'
-  import {storageGet, logout, defaultValue} from '@/js/index.js'
+  import {logout, storageGet} from '@/js/index.js'
 
   export default {
     name: "LoginCard",

src/pages/Homepage/TestCard.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="card-waterfull">
-    <el-row :gutter="15">
+    <el-row :gutter="20">
       <waterfall
                         :line-gap="400"
                         :min-line-gap="150"
@@ -11,7 +11,7 @@
 
         <waterfall-slot
           v-for="(item, index) in applicationTypeList"
-          width="350"
+          width="310"
           :height="200"
           :order="index"
           :key="item.code"
@@ -33,7 +33,7 @@
 <script>
   import Waterfall from 'vue-waterfall/lib/waterfall'
   import WaterfallSlot from 'vue-waterfall/lib/waterfall-slot'
-  import {mapGetters} from  'vuex'
+
   export default {
     name: "TestCard",
     props:['applicationTypeList'],
@@ -71,7 +71,7 @@
 
   .card-waterfull {
     .el-card {
-      width: 300px !important;
+      width: 98% !important;
     }
     .el-row {
       margin:  0 !important;

src/pages/HomepageSearch/AgencyList.vue

@@ -93,7 +93,7 @@
 <script>
   import Http from '@/js/http.js';
   import TopSearch from "../../components/commons/TopSearch";
-  import {storageGet, defaultValue} from '@/js/index.js'
+  import {defaultValue, storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
   import Apis from '@/js/api'
 

src/pages/HomepageSearch/AgencyResidentList.vue

@@ -87,7 +87,7 @@
 <script>
   import Http from '@/js/http.js';
   import TopSearch from "../../components/commons/TopSearch";
-  import {storageGet, defaultValue} from '@/js/index.js'
+  import {defaultValue, storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
   import Apis from '@/js/api';
 

src/pages/HomepageSearch/CompetitionList.vue

@@ -85,7 +85,7 @@
 <script>
   import Http from '@/js/http.js';
   import TopSearch from "../../components/commons/TopSearch";
-  import {storageGet, defaultValue} from '@/js/index.js'
+  import {defaultValue, storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
   import Apis from '@/js/api';
 

src/pages/HomepageSearch/UserList.vue

@@ -96,7 +96,7 @@
 <script>
   import Http from '@/js/http.js';
   import TopSearch from "../../components/commons/TopSearch";
-  import {storageGet, defaultValue} from '@/js/index.js'
+  import {defaultValue, storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
   import Apis from '@/js/api';
 

src/pages/Square/PopularProject.vue

@@ -33,9 +33,6 @@
 </template>
 
 <script>
-    import Http from '@/js/http.js';
-    import Apis from '@/js/api.js';
-    import {notify} from "../../constants";
   export default {
     name: 'PopularProject',
     props:['hotCrowdTestProjectVOs'],

src/pages/Square/PopularProjectAndTaskList.vue

@@ -102,8 +102,7 @@
   import {notify} from "../../constants"
   import TaskItem from '../../components/commons/TaskItem'
   import ProjectItem from '../../components/commons/ProjectItem'
-  import {defaultValue, getRolesPermissions, storageGet} from '@/js/index'
-  import {mapActions, mapGetters} from 'vuex';
+  import {storageGet} from '@/js/index'
 
   export default {
     name: 'PopularProjectAndTaskList',

src/pages/Square/PopularTask.vue

@@ -30,9 +30,6 @@
 </template>
 
 <script>
-  import Http from '@/js/http.js';
-  import Apis from '@/js/api.js';
-  import {notify} from "../../constants";
   export default {
     name: 'PopularTask',
     props:['hotCrowdTaskVOs'],

src/pages/Square/Square2.0.vue

@@ -74,7 +74,7 @@
   import PopularTask from './PopularTask'
   import {storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
-  import { mapActions ,mapGetters} from 'vuex';
+
   export default {
     name: 'Square2.0',
     data(){

src/pages/Square/SquareCard.vue

@@ -41,6 +41,7 @@
   import Http from '@/js/http.js';
   import {storageGet} from '@/js/index.js'
   import Apis from '@/js/api'
+
   export default {
     name: 'SquareCard',
     props: ['card'],

src/pages/Technology/HotActicle.vue

@@ -28,7 +28,6 @@
 
 <script>
   import Http from '@/js/http.js'
-  import Apis from '@/js/api.js';
 
   export default {
     name: 'HotArticle',

src/pages/Technology/Technology2.0.vue

@@ -70,8 +70,6 @@
   import PopularProject from '../Square/PopularProject'
   import {storageGet} from '@/js/index.js'
   import {notify} from "../../constants";
-  import qs from 'querystring'
-  import { mapActions ,mapGetters} from 'vuex';
 
   export default {
     name: 'Technology2.0',

src/pages/Technology/TechnologyCard.vue

@@ -37,8 +37,8 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex';
   import Http from '@/js/http.js'
+
   export default {
     name: 'TechnologyCard',
     props:['techArticleList'],

src/pages/Technology/TechnologyMG.vue

@@ -28,7 +28,6 @@
 </template>
 
 <script>
-  import { mapGetters } from 'vuex';
   export default {
     name: 'TechnologyMG',
     props:['techArticleList'],

src/pages/UserCenter/Authentication.vue

@@ -64,7 +64,7 @@
 <script>
   import Http from '@/js/http.js'
   import {storageGet} from '@/js/index'
-  import {notify} from '@/constants/index'
+
   export default {
     name: "Authentication",
     data() {

src/pages/UserCenter/BankCard.vue

@@ -37,7 +37,6 @@
 <script>
   import {storageGet} from '@/js/index'
   import Http from '@/js/http.js'
-  import BankCard from './BankCard'
   import {notify} from '@/constants/index'
 
   export default {

src/pages/UserCenter/BindingMail.vue

@@ -22,6 +22,7 @@
   import Http from '@/js/http.js'
   import {storageGet} from '@/js/index'
   import {notify} from '@/constants/index'
+
   export default {
     name: "BindingMail",
     data(){

src/pages/UserCenter/EnterpriseAuth.vue

@@ -199,8 +199,6 @@
   import Http from '@/js/http'
   import {notify} from '@/constants/index'
   import {storageGet} from '@/js/index'
-  import idcardPositive from '../../assets/img/idcard-positive.png'
-  import idcardBack from '../../assets/img/idcard-back.png'
 
   export default {
     name: "EnterpriseAuth",

src/pages/UserCenter/IndividualAuth.vue

@@ -144,8 +144,6 @@
   import Http from '@/js/http'
   import {notify} from '@/constants/index'
   import {storageGet} from '@/js/index'
-  import idcardPositive from '../../assets/img/idcard-positive.png'
-  import idcardBack from '../../assets/img/idcard-back.png'
 
   export default {
     name: "IndividualAuth",

src/pages/UserCenter/Mine.vue

@@ -64,8 +64,14 @@
   import Http from '@/js/http'
   import Apis from '@/js/api'
   import {notify} from '@/constants/index'
-  import {storageGet,getAllServiceTypes,getProvinceNameByProvinceCode,getProvinceCodeByProvinceName} from '@/js/index'
+  import {
+    getAllServiceTypes,
+    getProvinceCodeByProvinceName,
+    getProvinceNameByProvinceCode,
+    storageGet
+  } from '@/js/index'
   import provincecity from '@/components/commons/NProvinceCity'
+
   export default {
     name: "Mine",
     data() {

src/pages/UserCenter/ModifyPsw.vue

@@ -28,8 +28,9 @@
 
 <script>
   import Http from '@/js/http.js'
-  import {storageGet,logout} from '@/js/index'
+  import {logout, storageGet} from '@/js/index'
   import {notify} from '@/constants/index'
+
   export default {
     name: "ModifyPsw",
     data(){

src/pages/UserCenter/MyBankCard.vue

@@ -53,6 +53,7 @@
   import Http from '@/js/http.js'
   import BankCard from './BankCard'
   import {notify} from '@/constants/index'
+
   export default {
     name: "MyBankCard",
     components:{

src/pages/UserCenter/PhoneBinding.vue

@@ -26,6 +26,7 @@
   import ReBindingMobile from './ReBindingMobile'
   import {storageGet} from '@/js/index'
   import Http from '@/js/http.js'
+
   export default {
     name: "PhoneBinding",
     components:{

src/pages/UserCenter/ReBindingMail.vue

@@ -20,7 +20,7 @@
 
 <script>
   import Http from '@/js/http.js'
-  import {storageGet,logout} from '@/js/index'
+  import {logout, storageGet} from '@/js/index'
   import {notify} from '@/constants/index'
 
   export default {

src/store/index.js

@@ -8,8 +8,8 @@ const store = new Vuex.Store({
     isLogin:false,
     techArticleList: ['sss'],// 技术文章
     activeTab:'',
-    homeData:{}
-
+    homeData:{},
+    user:{}
   },
   mutations:{
     setTechArticleList(state,techArticleList){
@@ -21,6 +21,9 @@ const store = new Vuex.Store({
     setHomeData(state,homeData){
       store.state.homeData = homeData;
     },
+    setUserInfo(state,userInfo){
+      store.state.user = userInfo
+    }
   },
   actions:{
     setTechArticleList({commit},techArticleList){
@@ -31,6 +34,9 @@ const store = new Vuex.Store({
     },
     setHomeData({commit},homeData){
       commit('setHomeData', homeData)
+    },
+    setUser({commit},userInfo){
+      commit('setUserInfo', userInfo)
     }
   },
   getters:{
@@ -43,6 +49,9 @@ const store = new Vuex.Store({
     getHomeData: () => {
       return store.state.homeData;
     },
+    getUserInfo:()=>{
+      return store.state.user;
+    }
   },
   modules:{
 

tool4deploy-test/conf.d/nginx.conf

@@ -6,6 +6,14 @@ server {
         client_max_body_size 100m;
         #access_log  logs/host.access.log  main;
 
+        # 开启代理缓冲区
+        proxy_buffering on;
+        # 响应头的缓冲区
+        proxy_buffer_size 128k;
+        # 网页内容缓冲区的个数为4，单个大小为1M
+        proxy_buffers 8 1M;
+        proxy_busy_buffers_size 2M;
+
         location / {
             root /usr/share/nginx/html;
         }

tool4deploy/conf.d/nginx.conf

@@ -6,6 +6,14 @@ server {
         client_max_body_size 100m;
         #access_log  logs/host.access.log  main;
 
+        # 开启代理缓冲区
+        proxy_buffering on;
+        # 响应头的缓冲区
+        proxy_buffer_size 128k;
+        # 网页内容缓冲区的个数为4，单个大小为1M
+        proxy_buffers 8 1M;
+        proxy_busy_buffers_size 2M;
+
         location / {
             root /usr/share/nginx/html;
         }