zc

src/api/creditViolation/newIndex.js

@@ -0,0 +1,100 @@
+import request from '@/utils/request'
+
+//个人违规记录列表
+export function creditFoulsHis(data) {
+  return request({
+    url: '/credit/fouls/his',
+    method: 'post',
+    data: data
+  })
+}
+//新增违规记录
+export function creditFoulsAdd(data) {
+  return request({
+    url: '/credit/fouls/add',
+    method: 'post',
+    data: data
+  })
+}
+//违规列表
+export function creditFoulsList(query) {
+  return request({
+    url: '/credit/fouls/list',
+    method: 'get',
+    params: query
+  })
+}
+//违规列表添加到黑名单
+export function creditFoulsAddBlacklists(query) {
+  return request({
+    url: '/credit/fouls/addBlacklists',
+    method: 'get',
+    params: query
+  })
+}
+//违规列表移除黑名单
+export function creditFoulsRemoveBlacklists(query) {
+  return request({
+    url: '/credit/fouls/removeBlacklists',
+    method: 'get',
+    params: query
+  })
+}
+
+//积分列表
+export function creditMainListUser(data) {
+  return request({
+    url: '/credit/main/listUser',
+    method: 'post',
+    data: data
+  })
+}
+//信用分明细
+export function creditMainListCre(data) {
+  return request({
+    url: '/credit/main/listCre',
+    method: 'post',
+    data: data
+  })
+}
+//奖励分明细
+export function creditMainListAward(data) {
+  return request({
+    url: '/credit/main/listAward',
+    method: 'post',
+    data: data
+  })
+}
+//奖励分统计
+export function creditMainSelectPointStatistics(query) {
+  return request({
+    url: '/credit/main/selectPointStatistics',
+    method: 'get',
+    params: query
+  })
+}
+//个人信用分/奖励分统计
+export function creditMainSelectDetailStatistics(query) {
+  return request({
+    url: '/credit/main/selectDetailStatistics',
+    method: 'get',
+    params: query
+  })
+}
+//个人-奖励分明细
+export function creditMainGetUserReward(data) {
+  return request({
+    url: '/credit/main/getUserReward',
+    method: 'post',
+    data: data
+  })
+}
+//个人-信用分明细
+export function creditMainGetUserCre(data) {
+  return request({
+    url: '/credit/main/getUserCre',
+    method: 'post',
+    data: data
+  })
+}
+

src/views/creditViolation/credit/pointsRecord/creditScoreList.vue

@@ -37,19 +37,19 @@
         </div>
         <div class="page-content-box" style="padding-top:0;">
           <el-table v-loading="loading" class="table-box" border :data="recordList">
-            <el-table-column label="信用分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
-            <el-table-column label="添加人" align="left" prop="createByName"  width="260" show-overflow-tooltip/>
+            <el-table-column label="信用分变动信息" align="left" prop="changeInfo" show-overflow-tooltip/>
+            <el-table-column label="添加人" align="left" prop="createBy"  width="260" show-overflow-tooltip/>
             <el-table-column label="变更时间" align="left" prop="createTime"  width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="变动" align="left" prop="points" width="260" show-overflow-tooltip>
+            <el-table-column label="变动" align="left" prop="scoreChange" width="260" show-overflow-tooltip>
               <template slot-scope="scope">
-                <p :class="scope.row.points>0?'color_14AE10':(scope.row.points<0?'color_FF4E00':'')">{{scope.row.points}}</p>
+                <p :class="scope.row.scoreChange>0?'color_14AE10':(scope.row.scoreChange<0?'color_FF4E00':'')">{{scope.row.scoreChange}}</p>
               </template>
             </el-table-column>
-            <el-table-column label="信用分余额" align="left" prop="surplusPoints"  width="260" show-overflow-tooltip/>
+            <el-table-column label="信用分余额" align="left" prop="scoreLeft"  width="260" show-overflow-tooltip/>
           </el-table>
           <pagination
             v-show="total>0"
@@ -65,7 +65,7 @@
 </template>
 
 <script>
-  import { examPointsRecordGetPointsLoglist } from "@/api/creditViolation/index";
+  import { creditMainListCre } from "@/api/creditViolation/newIndex";
 
     export default {
       name: "creditScoreList",
@@ -124,10 +124,8 @@
             this.queryParams.startTime=null;
             this.queryParams.endTime=null
           }
-
-          this.queryParams.pointsId = this.propsData.userId;
-          this.queryParams.pointsType = 1;
-          examPointsRecordGetPointsLoglist(this.queryParams).then( response => {
+          this.queryParams.identity = this.propsData.identity;
+          creditMainListCre(this.queryParams).then( response => {
             this.recordList =  response.data.records;
             this.total =  response.data.total;
             this.loading = false;

src/views/creditViolation/credit/pointsRecord/index.vue

@@ -32,11 +32,11 @@
     </div>
     <div class="page-content-box" v-if="pageType == 1">
       <el-table class="table-box" v-loading="loading" border :data="recordList" @sort-change="handleSelectionChange">
-        <el-table-column label="姓名" align="left" prop="nickName" />
-        <el-table-column label="学号" align="left" prop="userName" />
-        <el-table-column label="总积分" align="left" sortable="custom" prop="totalPoints" />
-        <el-table-column label="信用分" align="left" sortable="custom" prop="creditScore" />
-        <el-table-column label="奖励分" align="left" sortable="custom" prop="bonusPoints" />
+        <el-table-column label="姓名" align="left" prop="name" />
+        <el-table-column label="学号" align="left" prop="identity" />
+        <el-table-column label="总积分" align="left" sortable="custom" prop="total" />
+        <el-table-column label="信用分" align="left" sortable="custom" prop="scoreCredit" />
+        <el-table-column label="奖励分" align="left" sortable="custom" prop="scoreAward" />
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="240" v-if="tableButtonType">
           <template slot-scope="scope">
             <div class="table-button-box">
@@ -69,6 +69,7 @@
 </template>
 
 <script>
+  import { creditMainListUser } from "@/api/creditViolation/newIndex";
   import { examPointsRecordList, getRecord, delRecord, addRecord, updateRecord } from "@/api/creditViolation/index";
   import creditScoreList from "./creditScoreList.vue";
   import rewardPointsList from "./rewardPointsList.vue";
@@ -129,11 +130,7 @@
             this.pageType = type;
             this.getList();
           }else {
-            this.propsData.userId = row.id;
-            this.propsData.allBonusPoints = row.allBonusPoints;
-            this.propsData.consumeBonusPoints = row.consumeBonusPoints;
-            this.propsData.bonusPoints = row.bonusPoints;
-
+            this.propsData = row
             this.pageType = type;
           }
         }
@@ -151,12 +148,7 @@
           this.queryParams.startTime=null;
           this.queryParams.endTime=null
         }
-
-        if(this.pageType){
-          this.queryParams.pointsType = 2
-        }
-
-        examPointsRecordList(this.queryParams).then( response => {
+        creditMainListUser(this.queryParams).then( response => {
           this.recordList =  response.data.records;
           this.total =  response.data.total;
           this.loading = false;

src/views/creditViolation/credit/pointsRecord/rewardPointsList.vue

@@ -35,31 +35,31 @@
           <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
           <div style="float: right">
             <p class="queryParams-data-box">
-              获得总奖励分：{{propsData.allBonusPoints>0?propsData.allBonusPoints:0}}
+              获得总奖励分：{{totalScore}}
             </p>
             <p class="queryParams-data-box">
-              已兑换奖励分：{{propsData.consumeBonusPoints>0?propsData.consumeBonusPoints:0}}
+              已兑换奖励分：{{redeemedScore}}
             </p>
             <p class="queryParams-data-box">
-              剩余奖励分：{{propsData.bonusPoints>0?propsData.bonusPoints:0}}
+              剩余奖励分：{{remainingScore}}
             </p>
           </div>
         </el-form>
       </div>
       <div class="page-content-box" style="padding-top:0;">
         <el-table v-loading="loading" border class="table-box" :data="recordList">
-          <el-table-column label="奖励分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
+          <el-table-column label="奖励分变动信息" align="left" prop="changeInfo" show-overflow-tooltip/>
           <el-table-column label="变更时间" align="left" prop="createTime" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="变动" align="left" prop="points" show-overflow-tooltip>
+          <el-table-column label="变动" align="left" prop="scoreChange" show-overflow-tooltip>
             <template slot-scope="scope">
-              <p :class="scope.row.points>0?'color_14AE10':(scope.row.points<0?'color_FF4E00':'')">{{scope.row.points}}</p>
+              <p :class="scope.row.scoreChange>0?'color_14AE10':(scope.row.scoreChange<0?'color_FF4E00':'')">{{scope.row.scoreChange}}</p>
             </template>
           </el-table-column>
-          <el-table-column label="奖励分余额" align="left"  prop="surplusPoints" show-overflow-tooltip/>
+          <el-table-column label="奖励分余额" align="left"  prop="scoreLeft" show-overflow-tooltip/>
         </el-table>
         <pagination
           v-show="total>0"
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-  import { examPointsRecordGetPointsLoglistByReward } from "@/api/creditViolation/index";
+  import { creditMainListAward,creditMainSelectPointStatistics } from "@/api/creditViolation/newIndex";
   export default {
     name: "rewardPointsList",
     props: {
@@ -108,10 +108,14 @@
         total:0,
         // 日期范围
         dateRange: [],
+        redeemedScore:0,
+        remainingScore:0,
+        totalScore:0,
       }
     },
     created(){
       this.getList()
+      this.creditMainSelectPointStatistics();
     },
     methods:{
       //返回上级页面
@@ -131,15 +135,24 @@
           this.queryParams.startTime=null;
           this.queryParams.endTime=null
         }
-
-        this.queryParams.pointsId = this.propsData.userId;
-        this.queryParams.pointsType = 2;
-        examPointsRecordGetPointsLoglistByReward(this.queryParams).then( response => {
+        this.queryParams.identity = this.propsData.identity;
+        creditMainListAward(this.queryParams).then( response => {
           this.recordList = response.data.records;
           this.total =  response.data.total;
           this.loading = false;
         });
       },
+      creditMainSelectPointStatistics(){
+        let obj = {
+          identity:this.propsData.identity,
+          pointsType:1,
+        }
+        creditMainSelectPointStatistics(obj).then( response => {
+          this.$set(this,'redeemedScore',response.data.redeemedScore);
+          this.$set(this,'remainingScore',response.data.remainingScore);
+          this.$set(this,'totalScore',response.data.totalScore);
+        });
+      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.page = 1;

src/views/creditViolation/credit/violation/index.vue

@@ -5,16 +5,16 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" class="form-box" v-if="pageType==1">
 
-          <el-form-item label="" prop="searchValue" label-width="60px">
+          <el-form-item label="" prop="keyWord" label-width="60px">
             <el-input
-              v-model="queryParams.searchValue"
+              v-model="queryParams.keyWord"
               placeholder="姓名/学号"
               clearable
               size="small"
             />
           </el-form-item>
-          <el-form-item label="" prop="deptId" label-width="80px">
-            <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院">
+          <el-form-item label="" prop="collegeId" label-width="80px">
+            <el-select v-model="queryParams.collegeId" clearable placeholder="请选择学院">
               <el-option
                 v-for="dict in deptOptions"
                 :key="dict.deptId"
@@ -27,9 +27,9 @@
             <el-select v-model="queryParams.status" placeholder="请选择状态">
               <el-option
                 v-for="dict in deptOptionsTwo"
-                :key="dict.deptId"
-                :label="dict.deptName"
-                :value="dict.deptId"
+                :key="dict.value"
+                :label="dict.name"
+                :value="dict.value"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -48,16 +48,16 @@
       </div>
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="violationList" @sort-change="handleSelectionChange" v-if="pageType==1">
-          <el-table-column label="姓名" align="left" prop="joinUserName" show-overflow-tooltip/>
-          <el-table-column label="学号" align="left" prop="stuNo" show-overflow-tooltip/>
-          <el-table-column label="学院" align="left" prop="deptName" show-overflow-tooltip/>
-          <el-table-column label="违规次数" align="left" sortable="custom" prop="violationNum" show-overflow-tooltip/>
-          <el-table-column label="负面清单次数" align="left" sortable="custom" prop="negativeListNum" show-overflow-tooltip/>
-          <el-table-column label="黑名单次数" align="left" sortable="custom" prop="blackListNum" show-overflow-tooltip/>
-          <el-table-column label="信用分" align="left" prop="creditScore" show-overflow-tooltip/>
+          <el-table-column label="姓名" align="left" prop="name" show-overflow-tooltip/>
+          <el-table-column label="学号" align="left" prop="identity" show-overflow-tooltip/>
+          <el-table-column label="学院" align="left" prop="collegeName" show-overflow-tooltip/>
+          <el-table-column label="违规次数" align="left" sortable="custom" prop="fouls" show-overflow-tooltip/>
+          <el-table-column label="负面清单次数" align="left" sortable="custom" prop="negatives" show-overflow-tooltip/>
+          <el-table-column label="黑名单次数" align="left" sortable="custom" prop="blacklists" show-overflow-tooltip/>
+          <el-table-column label="信用分" align="left" prop="scoreCredit" show-overflow-tooltip/>
           <el-table-column label="当前状态" align="left" prop="status" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.status == 1?'正常':(scope.row.status == 2?'负面清单':(scope.row.status == 3?'黑名单':''))}}
+              {{scope.row.status == 0?'正常':(scope.row.status == 1?'负面清单':(scope.row.status == 2?'黑名单':''))}}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="200" v-if="tableButtonType">
@@ -71,12 +71,12 @@
                 <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
                   <p class="table-button-p">更多>></p>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item command="1" v-show="scope.row.status == 3"
-                                      v-hasPermiRouter="['exam:blacklist:del']">移除黑名单</el-dropdown-item>
-                    <el-dropdown-item command="2" v-show="scope.row.status == 1 || scope.row.status == 2"
-                                      v-hasPermiRouter="['exam:blacklist:add']">加入黑名单</el-dropdown-item>
-                    <el-dropdown-item command="3" v-show="scope.row.status == 2"
-                                      v-hasPermiRouter="['exam:violation:del']">移除负面清单</el-dropdown-item>
+                    <el-dropdown-item command="1" v-show="scope.row.status == 2"
+                                      v-hasPermiRouter="['credit:blacklists:del']">移除黑名单</el-dropdown-item>
+                    <el-dropdown-item command="2" v-show="scope.row.status == 0 || scope.row.status == 1"
+                                      v-hasPermiRouter="['credit:blacklists:add']">加入黑名单</el-dropdown-item>
+                    <el-dropdown-item command="3" v-show="scope.row.status == 1"
+                                      v-hasPermiRouter="['credit:blacklists:del']">移除负面清单</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
                 <p class="table-button-null"></p>
@@ -263,13 +263,13 @@
                :close-on-click-modal="false">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="90px">
         <el-form-item label="姓名：">
-          <el-input v-model="form1.userName" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form1.name" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="学号：">
-          <el-input v-model="form1.stuNo" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form1.identity" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="学院：">
-          <el-input v-model="form1.deptName" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form1.collegeName" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="原因：" prop="reason">
           <el-input
@@ -297,34 +297,34 @@
                :close-on-click-modal="false">
       <el-form ref="form2" :model="form2" :rules="rules2" label-width="120px">
         <el-form-item label="姓名：" style="width:600px;">
-          <el-input v-model="form2.joinUserName" :disabled="true" placeholder="请输入姓名"/>
+          <el-input v-model="form2.name" :disabled="true" placeholder="请输入姓名"/>
         </el-form-item>
         <el-form-item label="学号：" style="width:600px;">
-          <el-input v-model="form2.stuNo" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form2.identity" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="学院：" style="width:600px;">
-          <el-input v-model="form2.deptName" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form2.collegeName" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="原因：" prop="reason" style="width:600px;">
+        <el-form-item label="原因：" prop="msg" style="width:600px;">
           <el-input
             type="textarea"
             :autosize="{ minRows: 6, maxRows: 6}"
             placeholder="请输入原因"
             maxLength="50"
             resize="none"
-            v-model="form2.reason">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="处理天数时限" prop="handleDay" style="margin-bottom:0;">
-          <el-input
-            v-model="form2.handleDay"
-            placeholder="请输入"
-            maxLength="5"
-            clearable
-            style="width:200px;">
-            <template slot="append">天</template>
+            v-model="form2.msg">
           </el-input>
         </el-form-item>
+        <!--<el-form-item label="处理天数时限" prop="handleDay" style="margin-bottom:0;">-->
+          <!--<el-input-->
+            <!--v-model="form2.handleDay"-->
+            <!--placeholder="请输入"-->
+            <!--maxLength="5"-->
+            <!--clearable-->
+            <!--style="width:200px;">-->
+            <!--<template slot="append">天</template>-->
+          <!--</el-input>-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p >
@@ -338,22 +338,22 @@
                :close-on-click-modal="false">
       <el-form ref="form3" :model="form3" :rules="rules3" label-width="90px">
         <el-form-item label="姓名：">
-          <el-input v-model="form3.userName" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form3.name" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="学号：">
-          <el-input v-model="form3.stuNo" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form3.identity" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
         <el-form-item label="学院：">
-          <el-input v-model="form3.deptName" :disabled="true" placeholder="请输入姓名" />
+          <el-input v-model="form3.collegeName" :disabled="true" placeholder="请输入姓名" />
         </el-form-item>
-        <el-form-item label="原因：" prop="reason">
+        <el-form-item label="原因：" prop="msg">
           <el-input
             type="textarea"
             :autosize="{ minRows: 6, maxRows: 6}"
             placeholder="请输入原因"
             maxLength="50"
             resize="none"
-            v-model="form3.reason">
+            v-model="form3.msg">
           </el-input>
         </el-form-item>
         <el-form-item label="">
@@ -372,6 +372,7 @@
 </template>
 
 <script>
+  import { creditFoulsAdd,creditFoulsList,creditFoulsAddBlacklists } from "@/api/creditViolation/newIndex";
   import { delNegivelist,delBlacklist,blackAdd,
     getViolation, delViolation, addViolation, updateViolation,joinBlackList,
     getIntegralMatchingRules,addBlacklist } from "@/api/creditViolation/index";
@@ -393,7 +394,7 @@ export default {
   },
   data() {
     return {
-      tableButtonType:this.hasPermiDom(['exam:violationHistory:list','exam:blacklist:add','exam:blacklist:del','exam:violation:del']),
+      tableButtonType:this.hasPermiDom(['exam:violationHistory:list','credit:blacklists:del','exam:blacklist:del','exam:violation:del']),
       pageType:1,
       propsData:{},
       // 遮罩层
@@ -417,18 +418,18 @@ export default {
         page: 1,
         pageSize:20,
         userName: null,
-        searchValue: null,
+        keyWord: null,
         stuNo: null,
         status: null,
         joinUserId: null,
         negativeId: null,
         violationType: null,
         violationContent: null,
-        deptId: null,
+        collegeId: null,
         deptName: null,
         userId: null,
         endTime: null,
-        violationReasons: null
+        violationReasons: null,
       },
       subOptions:[],
       // 是否显示弹出层
@@ -488,7 +489,7 @@ export default {
         ],
       },
       rules2: {
-        reason:[
+        msg:[
           {required: true, message: '请输入原因', trigger: 'blur'},
           { required: true, message: "请输入原因", validator: this.spaceJudgment, trigger: "blur" }
         ],
@@ -499,7 +500,7 @@ export default {
         ],
       },
       rules3: {
-        reason:[
+        msg:[
           {required: true, message: '请输入原因', trigger: 'blur'},
           { required: true, message: "请输入原因", validator: this.spaceJudgment, trigger: "blur" }
         ],
@@ -570,9 +571,9 @@ export default {
       deptOptions:[],
       //状态
       deptOptionsTwo:[
-        {deptId:1,deptName:"正常"},
-        {deptId:2,deptName:"负面清单"},
-        {deptId:3,deptName:"黑名单"},
+        {value:0,name:"正常"},
+        {value:1,name:"负面清单"},
+        {value:2,name:"黑名单"},
       ],
       // 是否显示移除负面清单弹出层
       checklistOpen: false,
@@ -658,7 +659,6 @@ export default {
       row.buttonType = 2;
       this.$set(this,"form3",row);
       this.title = "移除负面清单";
-      this.form.negativeId = row.negativeId;
       this.form3Open = true;
     },
     //黑名单按钮
@@ -672,10 +672,6 @@ export default {
         this.title = "加入黑名单";
         let obj = JSON.parse(JSON.stringify(row));
         obj.buttonType = 3;
-        obj.checkList = [];
-        obj.checkListTwo = [];
-        obj.learnStatusType = false;
-        obj.practiceStatusType = false;
         this.$set(this,"form2",obj);
         this.form2Open = true;
       }
@@ -695,7 +691,7 @@ export default {
     /** 查询违规记录列表 */
     getList() {
       this.loading = true;
-      examViolationList(this.queryParams).then(response => {
+      creditFoulsList(this.queryParams).then(response => {
         this.violationList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
@@ -741,11 +737,11 @@ export default {
           if(this.form2.buttonType == 3){
             let obj = {
               id:this.form2.id,
-              joinUserId:this.form2.joinUserId,
-              reason:this.form2.reason,
-              handleDay:this.form2.handleDay,
+              // joinUserId:this.form2.joinUserId,
+              msg:this.form2.msg,
+              // handleDay:this.form2.handleDay,
             };
-            examViolationBlackAdd(obj).then(response => {
+            creditFoulsAddBlacklists(obj).then(response => {
               this.form2Open = false;
               this.$set(this,'form2',{})
               this.msgSuccess("操作成功");
@@ -799,6 +795,19 @@ export default {
       this.$set(this,'queryParams',{
         page: 1,
         pageSize:20,
+        userName: null,
+        keyWord: null,
+        stuNo: null,
+        status: null,
+        joinUserId: null,
+        negativeId: null,
+        violationType: null,
+        violationContent: null,
+        collegeId: null,
+        deptName: null,
+        userId: null,
+        endTime: null,
+        violationReasons: null,
       });
       this.handleQuery();
     },
@@ -848,15 +857,16 @@ export default {
             deptId:this.form.deptId,
             deptName:this.form.deptName,
             stuNo:this.form.stuNo,
-            joinUserId:this.form.joinUserId,
-            joinUserName:this.form.joinUserName,
-            subjectId:this.form.subjectId,
-            subjectName:this.form.subjectName,
             reasonId:this.form.reasonId,
             violationContent:this.form.violationContent,
             deductionVal:this.form.deductionVal,
             handleDay:this.form.handleDay,
             violationReasons:this.form.violationReasons,
+
+            id:this.form.joinUserId,
+            name:this.form.joinUserName,
+            labId:this.form.subjectId,
+            labName:this.form.subjectName,
           };
 
           //处理二级多选--警告/约谈
@@ -912,7 +922,7 @@ export default {
             obj.numberTopics = null;
             obj.numberAccuracy = null;
           }
-          examViolationAdd(obj).then(response => {
+          creditFoulsAdd(obj).then(response => {
             this.msgSuccess("操作成功");
             this.open = false;
             this.getList();

src/views/creditViolation/myViolation/violation_my/index.vue

@@ -4,7 +4,7 @@
     <div class="page-form-title-box">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="" prop="bonusType" label-width="80px">
-          <el-select v-model="queryParams.violationType" clearable placeholder="请选择违规类型">
+          <el-select v-model="queryParams.foulsType" clearable placeholder="请选择违规类型">
             <el-option
               v-for="dict in semesterList"
               :key="dict.id"
@@ -13,8 +13,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="overStatus" label-width="50px">
-          <el-select v-model="queryParams.overStatus" clearable placeholder="请选择状态">
+        <el-form-item label="" prop="status" label-width="50px">
+          <el-select v-model="queryParams.status" clearable placeholder="请选择状态">
             <el-option
               v-for="dict in bonusTypeOptions"
               :key="dict.id"
@@ -46,7 +46,7 @@
       <el-table class="table-box" v-loading="loading" border :data="violationList">
         <el-table-column label="违规类型" align="left" prop="reason"  width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{scope.row.violationType == 1 ?'负面清单':(scope.row.violationType == 2 ?'黑名单':'')}}
+            {{scope.row.violationType == 'negative' ?'负面清单':(scope.row.violationType == 2 ?'黑名单':'')}}
           </template>
         </el-table-column>
         <el-table-column label="违规原因" align="left" prop="reason"  width="300" show-overflow-tooltip/>
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import { examViolationMyList } from "@/api/creditViolation/index";
+import { creditFoulsHis } from "@/api/creditViolation/newIndex";
 
 export default {
   name: "Violation",
@@ -123,13 +123,8 @@ export default {
       queryParams: {
         page: 1,
         pageSize:20,
-        joinUserId: null,
-        violationType: null,
-        violationContent: null,
-        deptId: null,
-        deptName: null,
-        userId: null,
-        endTime: null
+        status:"",
+        bonusType: '',
       },
       // 表单参数
       form: {},
@@ -143,8 +138,8 @@ export default {
       ],
       //学期
       semesterList:[
-        {semesterName:'负面清单',id:'1'},
-        {semesterName:'黑名单',id:'2'}
+        {semesterName:'负面清单',id:'negative'},
+        {semesterName:'黑名单',id:'blacklist'}
       ],
     };
   },
@@ -188,7 +183,7 @@ export default {
         obj.startTime=null;
         obj.endTime=null
       }
-      examViolationMyList(obj).then(response => {
+      creditFoulsHis(obj).then(response => {
         this.violationList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
@@ -199,7 +194,7 @@ export default {
       this.form = {
         id: null,
         joinUserId: null,
-        violationType: null,
+        foulsType: null,
         violationContent: null,
         createTime: null,
         deptId: null,
@@ -225,7 +220,7 @@ export default {
       this.$set(this,'queryParams',{
         page: 1,
         pageSize:20,
-        overStatus:"",
+        status:"",
         bonusType: '',
       });
       this.dateRange = [];

src/views/creditViolation/record_my/index.vue

@@ -3,8 +3,8 @@
   <div class="record_my">
     <div class="title-form-box">
       <div>
-        <p :class="queryParams.pointsType == 2?'title-form-colorA':'title-form-colorB'" @click="pointsTypeClick(2)">奖励分明细</p>
-        <p :class="queryParams.pointsType == 1?'title-form-colorA':'title-form-colorB'" @click="pointsTypeClick(1)">信用分明细</p>
+        <p :class="queryParams.pointsType == 1?'title-form-colorA':'title-form-colorB'" @click="pointsTypeClick(1)">奖励分明细</p>
+        <p :class="queryParams.pointsType == 2?'title-form-colorA':'title-form-colorB'" @click="pointsTypeClick(2)">信用分明细</p>
       </div>
     </div>
     <div class="bottom-el-table">
@@ -13,33 +13,33 @@
         <img class="user-img" src="@/assets/ZDimages/basicsModules/tx_cion.png" v-else>
         <div class="user-info-min">
           <div class="user-info-min-top">
-            <p>{{userData.nickName}}</p>
+            <p>{{userData.userName}}</p>
             <p :class="userData.userStatus == 0?'color-p-a':(userData.userStatus == 1?'color-p-b':(userData.userStatus == 2?'color-p-c':''))">{{userData.userStatus == 0?'正常':(userData.userStatus == 1?'负面清单':(userData.userStatus == 2?'黑名单':''))}}</p>
           </div>
-          <div class="user-info-min-bottom" v-if="queryParams.pointsType == 2">
+          <div class="user-info-min-bottom" v-if="queryParams.pointsType == 1">
             <div>
               <p>获得总奖励分：</p>
-              <p class="num-color-one">{{userData.obtainPoints}}</p>
+              <p class="num-color-one">{{userData.totalAwadScore}}</p>
             </div>
             <div>
               <p>已扣减奖励分：</p>
-              <p class="num-color-two">{{userData.exchangePoints}}</p>
+              <p class="num-color-two">{{userData.redeemedScore}}</p>
             </div>
           </div>
-          <div class="user-info-min-bottom" v-if="queryParams.pointsType == 1">
+          <div class="user-info-min-bottom" v-if="queryParams.pointsType == 2">
             <div>
               <p>总信用分：</p>
-              <p class="num-color-one">{{userData.obtainPoints}}</p>
+              <p class="num-color-one">{{userData.totalCreditScore}}</p>
             </div>
             <div>
               <p>已扣减信用分：</p>
-              <p class="num-color-two">{{userData.exchangePoints}}</p>
+              <p class="num-color-two">{{userData.redeemedScore}}</p>
             </div>
           </div>
         </div>
         <div class="user-info-num">
           <div class="user-info-num-min">
-            <p class="user-info-num-p user-info-num-color-b">{{userData.creditScore}}</p>
+            <p class="user-info-num-p user-info-num-color-b">{{userData.remainingScore}}</p>
             <div>
               <img src="@/assets/ZDimages/creditViolation/icon_27.png">
               <p>信用分</p>
@@ -47,7 +47,7 @@
           </div>
           <p class="user-info-num-null"></p>
           <div class="user-info-num-min">
-            <p class="user-info-num-p user-info-num-color-a">{{userData.bonusPoints}}</p>
+            <p class="user-info-num-p user-info-num-color-a">{{userData.remainingScore}}</p>
             <div>
               <img src="@/assets/ZDimages/creditViolation/icon_28.png">
               <p>奖励分</p>
@@ -55,7 +55,7 @@
           </div>
         </div>
       </div>
-      <div class="instruction-box" v-if="queryParams.pointsType == 2">
+      <div class="instruction-box" v-if="queryParams.pointsType == 1">
         <p class="instruction-name-p">奖励分规则</p>
         <div class="instruction-text-box-one">
           <p>获得：</p>
@@ -66,7 +66,7 @@
           <p>奖励分可以在兑换机扫码兑换丰富礼品，累加到一定分值，还可以优先享受实验室资源。</p>
         </div>
       </div>
-      <div class="instruction-box" v-if="queryParams.pointsType == 1">
+      <div class="instruction-box" v-if="queryParams.pointsType == 2">
         <p class="instruction-name-p">信用分规则</p>
         <div class="instruction-text-box-one">
           <p>获得：</p>
@@ -107,7 +107,7 @@
         </el-form>
       </div>
       <div class="page-content-box" style="padding:20px 0 0;">
-        <el-table class="table-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 2">
+        <el-table class="table-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 1">
           <!--<el-table-column label="姓名" align="left" prop="userName" />-->
           <el-table-column label="奖励分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
           <el-table-column label="时间" align="left" prop="createTime" show-overflow-tooltip>
@@ -122,7 +122,7 @@
           </el-table-column>
           <el-table-column label="奖励分余额" align="left"  prop="surplusPoints" show-overflow-tooltip/>
         </el-table>
-        <el-table class="table-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 1">
+        <el-table class="table-box" v-loading="loading" border :data="recordList" v-if="queryParams.pointsType == 2">
           <!--<el-table-column label="姓名" align="left" prop="userName" />-->
           <el-table-column label="信用分变动信息" align="left" prop="messageContent" show-overflow-tooltip/>
           <el-table-column label="时间" align="left" prop="createTime" show-overflow-tooltip>
@@ -151,8 +151,8 @@
 </template>
 
 <script>
-// import { examPointsRecordList, getRecord, delRecord,myListRecord, addRecord, updateRecord, getMyPointsLoglist ,examPointsRecordGetMyPointsLogInfo } from "@/api/creditViolation/index";
-import { examPointsRecordGetMyPointsLogInfo,examPointsRecordGetMyPointsLoglist } from "@/api/creditViolation/index";
+  import { examPointsRecordGetMyPointsLogInfo,examPointsRecordGetMyPointsLoglist } from "@/api/creditViolation/index";
+  import { creditMainSelectDetailStatistics,creditMainGetUserReward,creditMainGetUserCre } from "@/api/creditViolation/newIndex";
 
 export default {
   name: "Record",
@@ -168,7 +168,7 @@ export default {
       recordList: [],
       // 查询参数
       queryParams: {
-        pointsType:2,
+        pointsType:1,
         page: 1,
         pageSize:20,
         bonusType:null
@@ -191,7 +191,7 @@ export default {
   methods: {
     //信用分/奖励分-查询
     examPointsRecordGetMyPointsLogInfo(){
-      examPointsRecordGetMyPointsLogInfo({pointsType:this.queryParams.pointsType}).then( response => {
+      creditMainSelectDetailStatistics({pointsType:this.queryParams.pointsType}).then( response => {
         this.userData =  response.data;
       });
     },
@@ -209,7 +209,11 @@ export default {
     /** 查询用户积分记录列表 */
     getList() {
       this.loading = true;
-      let obj = JSON.parse(JSON.stringify(this.queryParams))
+      let obj = {
+        page:this.queryParams.page,
+        pageSize:this.queryParams.pageSize,
+        bonusType:this.queryParams.bonusType,
+      }
       if(this.dateRange&&this.dateRange.length>0) {
         obj.startTime=this.dateRange[0]+'T00:00:00'
         obj.endTime=this.dateRange[1]+'T23:59:59'
@@ -217,11 +221,19 @@ export default {
         obj.startTime=null;
         obj.endTime=null
       }
-      examPointsRecordGetMyPointsLoglist(obj).then( response => {
-        this.$set(this,'recordList',response.data.records);
-        this.$set(this,'total',response.data.total);
-        this.loading = false;
-      });
+      if(this.queryParams.pointsType == 1){
+        creditMainGetUserReward(obj).then( response => {
+          this.$set(this,'recordList',response.data.records);
+          this.$set(this,'total',response.data.total);
+          this.loading = false;
+        });
+      }else if(this.queryParams.pointsType == 2){
+        creditMainGetUserCre(obj).then( response => {
+          this.$set(this,'recordList',response.data.records);
+          this.$set(this,'total',response.data.total);
+          this.loading = false;
+        });
+      }
     },
     /** 搜索按钮操作 */
     handleQuery() {