修改造数据接口及返回值

src/api/effect.js

@@ -24,17 +24,17 @@ export function getJobList() {
   })
 }
 
-export function addWhiteList(queryInfo) {
+export function addWhiteList(data) {
   return request({
-    url: '/common/whitelist',
-    method: 'get',
-    params: queryInfo
+    url: '/login/addWhiteList',
+    method: 'post',
+    data
   })
 }
 
 export function getLoginInfoList(queryInfo) {
   return request({
-    url: '/common/logininfo/list',
+    url: '/login/list',
     method: 'get',
     params: queryInfo
   })

src/api/genXyqbData.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 
 export function genData(data) {
   return request({
-    url: '/xyqb/gen/data',
+    url: '/xyqb/genLoanUser',
     method: 'post',
     data
   })
@@ -11,7 +11,7 @@ export function genData(data) {
 
 export function queryUserStatus(queryInfo) {
   return request({
-    url: '/xyqb/gen/userStatus',
+    url: '/xyqb/userStatus',
     method: 'get',
     params: queryInfo
   })
@@ -19,14 +19,14 @@ export function queryUserStatus(queryInfo) {
 
 export function getSupportChannelAndFund() {
   return request({
-    url: '/xyqb/gen/supportChannelAndFund',
+    url: '/xyqb/supportChannelAndFund',
     method: 'get'
   })
 }
 
 export function channelMappedFund(queryInfo) {
   return request({
-    url: '/xyqb/gen/channelMappedFund',
+    url: '/xyqb/channelMappedFund',
     method: 'get',
     params: queryInfo
   })
@@ -34,7 +34,7 @@ export function channelMappedFund(queryInfo) {
 
 export function fundMappedChannel(queryInfo) {
   return request({
-    url: '/xyqb/gen/fundMappedChannel',
+    url: '/xyqb/fundMappedChannel',
     method: 'get',
     params: queryInfo
   })

src/api/getXyqbData.js

@@ -3,14 +3,14 @@ import request from '@/utils/request'
 
 export function getAllStatus () {
   return request({
-    url: '/xyqb/query/getAllStatus',
+    url: '/xyqb/getLoanStatus',
     method: 'get'
   })
 }
 
 export function queryLoanUser(queryInfo) {
   return request({
-    url: '/xyqb/query/loanUser',
+    url: '/xyqb/getLoanUser',
     method: 'get',
     params: queryInfo
   })

src/views/jira/Notify.vue

@@ -28,22 +28,22 @@
             <span>{{(queryInfo.pageNum -1 ) * queryInfo.pageSize + scope.$index + 1}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="dingRobot.projectName" label="项目名" width="220px"></el-table-column>
-        <el-table-column label="服务->分支" width="300px">
+        <el-table-column prop="dingRobot.projectName" label="项目名" width="150px"></el-table-column>
+        <el-table-column label="服务->分支" width="250px">
           <template slot-scope="scope">
             <div v-for="item in scope.row.pipelineList" :key="item.id"><b>{{ item.serviceName }}</b> ->
               {{ item.serviceBranch }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="dingRobot.namespace" label="测试环境" width="100px"></el-table-column>
-        <el-table-column prop="dingRobot.status" label="状 态" width="100px">
+        <el-table-column prop="dingRobot.namespace" label="测试环境" width="80px"></el-table-column>
+        <el-table-column prop="dingRobot.status" label="状 态" width="80px">
           <template slot-scope="scope">
             <p v-if="scope.row.dingRobot.status===1">进行中</p>
             <p v-if="scope.row.dingRobot.status===2">已完成</p>
           </template>
         </el-table-column>
-        <el-table-column prop="dingRobot.creator" label="创建人" width="100px"></el-table-column>
-        <el-table-column prop="dingRobot.createTime" label="创建时间" width="180px"></el-table-column>
+        <el-table-column prop="dingRobot.creator" label="创建人" width="80px"></el-table-column>
+        <el-table-column prop="dingRobot.createTime" label="创建时间" width="170px"></el-table-column>
         <el-table-column label="操作">
           <slot slot-scope="scope">
             <el-button type="primary" size="small" @click="openEditDialog(scope.row)"
@@ -78,17 +78,10 @@
         <el-form-item label="项目名称" prop="dingRobot.projectName">
           <el-input v-model="pipelineFrom.dingRobot.projectName" placeholder="请输入项目名称"></el-input>
         </el-form-item>
-        <!-- 新增状态 -->
-        <!-- <el-form-item label="状 态" prop="dingRobot.projectName">
-          <el-input v-model="pipelineFrom.dingRobot.projectName" placeholder="请输入项目名称"></el-input>
-        </el-form-item> -->
         <el-form-item label="钉钉通知地址" prop="dingRobot.dingUrl">
           <el-input v-model="pipelineFrom.dingRobot.dingUrl" placeholder="请输入钉钉通知地址" type="textarea" :rows="3">
           </el-input>
         </el-form-item>
-        <!-- <el-form-item label="创建人" prop="dingRobot.creator">
-          <el-input v-model="pipelineFrom.dingRobot.creator" placeholder="请输入创建人"></el-input>
-        </el-form-item> -->
         <el-form-item label="环 境" prop="dingRobot.namespace">
           <el-select v-model="pipelineFrom.dingRobot.namespace" placeholder="请选择环境">
             <el-option v-for="item in namespaceList" :key="item.name" :label="item.name" :value="item.name">
@@ -180,9 +173,6 @@
             </el-input>
           </el-form-item>
         </el-tooltip>
-        <!-- <el-form-item label="创建人" prop="dingRobot.creator">
-          <el-input v-model="editPipelineForm.dingRobot.creator"></el-input>
-        </el-form-item> -->
         <el-form-item label="环 境" prop="dingRobot.namespace">
           <el-select v-model="editPipelineForm.dingRobot.namespace" placeholder="请选择环境">
             <el-option v-for="item in namespaceList" :key="item.name" :label="item.name" :value="item.name">

src/views/xyqb/GenLoanData.vue

 <template>
   <div>
-    <!-- 头部导航栏 -->
-    <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item>现金分期</el-breadcrumb-item>
-      <el-breadcrumb-item>生成新数据</el-breadcrumb-item>
-    </el-breadcrumb> -->
-    <!-- 卡片视图 -->
     <el-card>
       <div class="filter">
         借款状态：
-        <el-select v-model="genDataBody.status" @change="handleChannelChange" placeholder="请选择类型">
+        <el-select v-model="genDataBody.status" placeholder="请选择类型">
           <el-option
             v-for="item in statusOptions"
             :key="item.label"
@@ -21,7 +15,6 @@
         渠道：
         <el-select
           v-model="genDataBody.channel"
-          @change="handleChannelChange"
           @clear="handleClear"
           clearable
           placeholder="请选择渠道"
@@ -37,7 +30,6 @@
         资方：
         <el-select
           v-model="genDataBody.fundId"
-          @change="haneleFundChange"
           @clear="handleClear"
           clearable
           placeholder="请选择资方"
@@ -144,9 +136,7 @@ import { uuid } from '@/utils/randomData'
 import {
   genData,
   queryUserStatus,
-  getSupportChannelAndFund,
-  channelMappedFund,
-  fundMappedChannel
+  getSupportChannelAndFund
 } from '@/api/genXyqbData'
 import { getAll } from '@/api/testdata'
 export default {
@@ -259,24 +249,6 @@ export default {
         this.genDataBody.phoneNo
       )
     },
-    // 选定渠道有变化
-    handleChannelChange() {
-      if (this.genDataBody.channel !== '') {
-        channelMappedFund({ channel: this.genDataBody.channel }).then(
-          (resp) => {
-            this.fundList = resp.data.data
-          }
-        )
-      }
-    },
-    // 选定资方有变化
-    haneleFundChange() {
-      if (this.genDataBody.fundId !== '') {
-        fundMappedChannel({ fundId: this.genDataBody.fundId }).then((resp) => {
-          this.channelList = resp.data.data
-        })
-      }
-    },
     // 清空下拉框
     handleClear() {
       this.getSupportChannelAndFund()

src/views/xyqb/GetLoanData.vue

 <template>
   <div>
-    <!-- 头部导航栏 -->
-    <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
-      <el-breadcrumb-item>现金分期</el-breadcrumb-item>
-      <el-breadcrumb-item>已有数据查询</el-breadcrumb-item>
-    </el-breadcrumb> -->
-
-    <!-- 卡片视图 -->
     <el-card>
       <div>
         <!-- 借款状态下拉框 -->
@@ -27,29 +20,19 @@
         <el-input v-model="queryInfo.fundId" clearable placeholder="资方id" style="width: 200px;"></el-input>
         <el-button type="primary" style="margin-left:20px" @click="checkData">查询数据</el-button>
       </div>
-      <!-- <div>
-        手机号：
-        <el-input v-model="queryInfo.phone" clearable placeholder="手机号" style="width: 200px;"></el-input>
-        金额：
-        <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 class="dataTable">
         <el-table :data="dataTable" border style="width: 100%">
           <el-table-column prop="phoneNo" label="手机号" width="150px"></el-table-column>
-          <el-table-column prop="userId" label="userId" width="100px"></el-table-column>
+          <el-table-column prop="id" label="userId" width="100px"></el-table-column>
           <el-table-column prop="uuid" label="uuid" width="330px"></el-table-column>
           <el-table-column prop="registeredFrom" label="注册渠道" width="120px"></el-table-column>
-          <!-- <el-table-column prop="channelName" label="注册渠道名" width="120px"></el-table-column> -->
           <el-table-column prop="fundId" label="资方id" width="120px"></el-table-column>
-          <!-- <el-table-column prop="fundName" label="资方名称" width="120px"></el-table-column> -->
           <el-table-column prop="createdAt" label="创建时间" width="200px"></el-table-column>
           <el-table-column prop="enable" label="enable">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.enable === 1" type="success">启用</el-tag>
-              <el-tag v-else-if="scope.row.enable === 0" type="danger">停用</el-tag>
+              <el-tag v-if="scope.row.enable === true" type="success">启用</el-tag>
+              <el-tag v-else-if="scope.row.enable === false" type="danger">停用</el-tag>
             </template>
           </el-table-column>
         </el-table>
@@ -71,14 +54,11 @@
 <script>
 import { getAllStatus, queryLoanUser } from '@/api/getXyqbData'
 export default {
-  // inject: ['reload'],
   data() {
     return {
       baseUrl: '',
-      // namespaceOptions: [],
       statusOptions: [],
       dataTable: [],
-      // selectNamespace: '',
       selectStatus: '',
       totalNum: 0,
       queryInfo: {
@@ -114,8 +94,8 @@ export default {
       this.dataTable = []
       queryLoanUser(this.queryInfo)
         .then((response) => {
-          this.dataTable = response.data.data.content
-          this.totalNum = response.data.data.totalNum
+          this.dataTable = response.data.data.list
+          this.totalNum = response.data.data.total
         })
         .catch((error) => console.log(error))
     },