修改整体结构

config/dev.env.js

@@ -3,5 +3,8 @@ const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  ENV_CONFIG: '"dev"',
+  QA_PLATFORM: '"//localhost:8082"',
+  TESTDATA_API: '"//testdata.liangkebang.com"',
 })

config/prod.env.js

 'use strict'
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  ENV_CONFIG: '"prod"',
+  QA_PLATFORM: '"//qa-platform-pre.liangkebang.net/"',
+  TESTDATA_API: '"//testdata.liangkebang.com"',
 }

src/api/genNewData.js

+// 生成新数据相关
+import request from '@/utils/request'
+
+export function genUserData(data) {
+  return request({
+    url: '/gen/loanUser',
+    method: 'post',
+    data
+  })
+}
+
+export function queryUserStatus(queryInfo) {
+  return request({
+    url: '/gen/userStatus',
+    method: 'get',
+    params: queryInfo
+  })
+}
+
+export function getSupportChannelAndFund() {
+  return request({
+    url: '/gen/supportChannelAndFund',
+    method: 'get'
+  })
+}

src/api/getOldData.js

+// 捞数据相关
+import request from '@/utils/request'
+
+export function getAllStatus () {
+  return request({
+    url: '/query/getAllStatus',
+    method: 'get'
+  })
+}
+
+export function queryLoanUser(queryInfo) {
+  return request({
+    url: '/query/loanUser',
+    method: 'get',
+    params: queryInfo
+  })
+}

src/api/testdata.js

+import request from '@/utils/requestTestdata'
+
+export function getAll(query) {
+  return request({
+    url: '/testdata/getAll',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getBankID() {
+  return request({
+    url: '/testdata/getBankID',
+    method: 'get'
+  })
+}
+
+export function getBankList() {
+  return request({
+    url: '/testdata/getBankList',
+    method: 'get'
+  })
+}
+
+export function getProvinceList() {
+  return request({
+    url: '/testdata/getProvinceList',
+    method: 'get'
+  })
+}

src/main.js

@@ -40,7 +40,7 @@ Vue.prototype.$axios = axios
 Vue.prototype.$echarts = echarts
 
 Vue.prototype.$message = Message
-axios.defaults.baseURL = 'https://qa-platform-pre.liangkebang.net'
+// axios.defaults.baseURL = 'https://qa-platform-pre.liangkebang.net'
 // axios.defaults.baseURL = 'http://localhost:8082'
 
 Vue.use(Container)

src/assets/api/utils.js → src/utils/randomData.js

-export function uuid() {
+export function uuid () {
   var s = []
   var hexDigits = '0123456789abcdef'
   for (var i = 0; i < 36; i++) {

src/utils/request.js

+import axios from 'axios'
+
+const service = axios.create(
+  {
+    baseURL: process.env.QA_PLATFORM,
+    timeout: 500000
+  }
+)
+
+// request interceptor
+service.interceptors.request.use(
+)
+
+// response interceptor
+service.interceptors.response.use(
+  response => response,
+  error => {
+    console.log('error' + error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+export default service

src/utils/requestTestdata.js

+import axios from 'axios'
+
+// create an axios instance
+const serviceTestData = axios.create({
+  baseURL: process.env.TESTDATA_API,
+  timeout: 5000 // request timeout
+})
+
+// request interceptor
+serviceTestData.interceptors.request.use(
+)
+
+// response interceptor
+serviceTestData.interceptors.response.use(
+  response => response,
+  error => {
+    console.log('err' + error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+export default serviceTestData

src/views/ProcessData/CheckOldLoanData.vue

@@ -34,7 +34,7 @@
         <el-input v-model="queryInfo.salary" clearable placeholder="金额" style="width: 200px;"></el-input>
         期数：
         <el-input v-model="queryInfo.termNo" clearable placeholder="期数" style="width: 200px;"></el-input>
-      </div> -->
+      </div>-->
       <!-- 数据表格 -->
       <div class="dataTable">
         <el-table :data="dataTable" border style="width: 100%">
@@ -69,6 +69,7 @@
 </template>
 
 <script>
+import { getAllStatus, queryLoanUser } from '@/api/getOldData'
 export default {
   inject: ['reload'],
   data() {
@@ -96,8 +97,7 @@ export default {
   methods: {
     // 获取状态选项
     getStatusOptions() {
-      this.$axios
-        .get('/query/getAllStatus')
+      getAllStatus()
         .then((response) => {
           this.statusOptions = response['data']['data']
         })
@@ -112,10 +112,7 @@ export default {
         return this.$message.error('状态不能为空！')
       }
       this.dataTable = []
-      this.$axios
-        .get('/query/loanUser', {
-          params: this.queryInfo
-        })
+      queryLoanUser(this.queryInfo)
         .then((response) => {
           this.dataTable = response.data.data.content
           this.totalNum = response.data.data.totalNum

src/views/ProcessData/GenNewLoanData.vue

@@ -7,7 +7,7 @@
     </el-breadcrumb>
     <!-- 卡片视图 -->
     <el-card>
-      <div>
+      <div class="filter">
         借款状态：
         <el-select v-model="genDataBody.status" placeholder="请选择类型">
           <el-option
@@ -38,7 +38,7 @@
           ></el-option>
         </el-select>
       </div>
-      <div>
+      <div class="filter">
         手机号：
         <el-input
           v-model="genDataBody.phoneNo"
@@ -49,18 +49,19 @@
         ></el-input>期数：
         <el-input v-model="genDataBody.term" clearable placeholder="期数" style="width: 200px"></el-input>金额：
         <el-input v-model="genDataBody.amount" clearable placeholder="金额" style="width: 200px"></el-input>
-        <!-- 数据个数 -->
-        <!-- 数据个数：
-        <el-input-number
-          v-model="expectNum"
-          @change="handleExpectNumChange"
-          :min="1"
-          :max="100"
-          label="数据个数"
-        ></el-input-number>-->
         <!-- 查询数据按钮 -->
-        <el-button type="primary" style="margin-top:20px" @click="genData">生成数据</el-button>
+        <el-button type="primary" @click="genData">生成数据</el-button>
       </div>
+      <el-collapse v-model="activeCollapse">
+        <el-collapse-item title="基本信息(非必填)" name="1">
+          姓名：
+          <el-input v-model="genDataBody.name" clearable placeholder="姓名" style="width: 150px"></el-input>身份证号：
+          <el-input v-model="genDataBody.idNo" clearable placeholder="身份证" style="width: 200px"></el-input>银行卡号：
+          <el-input v-model="genDataBody.cardNo" clearable placeholder="银行卡号" style="width: 200px"></el-input>银行code：
+          <el-input v-model="genDataBody.bankCode" clearable placeholder="银行code" style="width: 200px"></el-input>
+          <el-button type="primary" @click="reGenBankCardData">换一换</el-button>
+        </el-collapse-item>
+      </el-collapse>
       <!-- 数据表格 -->
       <div class="dataTable">
         <el-table :data="dataTableList" border style="width: 100%">
@@ -93,10 +94,17 @@
 </template>
 
 <script>
-import { uuid } from '../../assets/api/utils'
+import { uuid } from '@/utils/randomData'
+import {
+  genUserData,
+  queryUserStatus,
+  getSupportChannelAndFund
+} from '@/api/genNewData'
+import { getAll } from '@/api/testdata'
 export default {
   data() {
     return {
+      activeCollapse: ['1'],
       namespaceOptions: [],
       statusOptions: [
         { label: '审核通过', value: 0 },
@@ -119,7 +127,11 @@ export default {
         amount: '10000',
         fundId: '',
         status: '',
-        symbol: ''
+        symbol: '',
+        name: '',
+        idNo: '',
+        cardNo: '',
+        bankCode: ''
       },
       // 轮询状态
       loopStatus: '',
@@ -129,9 +141,25 @@ export default {
     }
   },
   methods: {
+    // 随机生成用户基本信息
+    getUserBasicInfo() {
+      getAll({ count: 1 })
+        .then((resp) => {
+          let data = resp.data.data[0]
+          this.genDataBody.name = data['name']
+          this.genDataBody.idNo = data['IDCardNo']
+          this.genDataBody.cardNo = data['bankNo']
+          this.genDataBody.phoneNo = data['mobile']
+          this.genDataBody.bankCode = data['bankType'].split(' ')[1]
+        })
+        .catch((error) => console.log(error))
+    },
+    reGenBankCardData() {
+      this.getUserBasicInfo()
+    },
     // 获取资方和渠道列表
     getSupportChannelAndFund() {
-      this.$axios.get('/gen/supportChannelAndFund').then((resp) => {
+      getSupportChannelAndFund().then((resp) => {
         this.channelList = resp.data.data.channelList
         this.fundList = resp.data.data.fundList
       })
@@ -152,8 +180,7 @@ export default {
       }
       this.genDataBody.symbol = uuid()
       // 请求造数据接口
-      this.$axios
-        .post('/gen/loanUser', this.genDataBody)
+      genUserData(this.genDataBody)
         .then((resp) => {
           if (resp.data.data === false) {
             // 结束轮询
@@ -181,13 +208,10 @@ export default {
     },
     // 查询造数据过程中的用户状态
     queryGenProgress(phoneNo) {
-      this.$axios
-        .get('/gen/userStatus', {
-          params: {
-            namespace: window.sessionStorage.getItem('env'),
-            phoneNo: phoneNo
-          }
-        })
+      queryUserStatus({
+        namespace: window.sessionStorage.getItem('env'),
+        phoneNo: phoneNo
+      })
         .then((resp) => {
           this.loopStatus = resp.data.data.status
           var flag = 0
@@ -213,8 +237,11 @@ export default {
     // todo
     retryToGen(phoneNo) {},
     initWebSocket() {
-      const wsuri = 'wss://qa-platform-pre.liangkebang.net/websocket/' + this.genDataBody.symbol
-      // const wsuri = 'ws://localhost:8082/websocket/' + this.genDataBody.symbol
+      const wsuri =
+        'wss:' +
+        process.env.QA_PLATFORM +
+        '/websocket/' +
+        this.genDataBody.symbol
       this.websock = new WebSocket(wsuri)
       this.websock.onopen = this.websocketonopen
       this.websock.onerror = this.websocketonerror
@@ -232,7 +259,9 @@ export default {
       this.genLog += e.data
       this.genLog += '\n'
       var textarea = document.getElementById('textarea')
-      textarea.scrollTop = textarea.scrollHeight
+      if (textarea.scrollHeight) {
+        textarea.scrollTop = textarea.scrollHeight
+      }
     },
     websocketsend(agentData) {
       // 数据发送
@@ -245,6 +274,7 @@ export default {
   },
   mounted() {
     this.getSupportChannelAndFund()
+    this.getUserBasicInfo()
   },
   // 计算属性
   computed: {
@@ -285,16 +315,19 @@ export default {
   margin-top: 20px;
 }
 
-// .filter {
-//   margin-bottom: 10px;
-// }
+.filter {
+  margin-bottom: 15px;
+}
 
 .el-select {
   margin-right: 15px;
-  margin-bottom: 10px;
 }
 
 .el-input {
   margin-right: 15px;
 }
+
+.el-collapse {
+  margin-top: 10px;
+}
 </style>