dedsudiyu 1 gadu atpakaļ
vecāks
revīzija
0d3192ed80

+ 4 - 3
src/layout/components/Sidebar/SidebarItem.vue

@@ -67,9 +67,10 @@ export default {
       })
 
       // When there is only one child router, the child router is displayed by default
-      if (showingChildren.length === 1) {
-        return true
-      }
+      // 目录下只有一个菜单时,直接显示菜单
+      // if (showingChildren.length === 1) {
+      //   return true
+      // }
 
       // Show parent if there are no child router to display
       if (showingChildren.length === 0) {

+ 0 - 454
src/views/creditViolation/credit/negativeListRecords/index.vue

@@ -1,454 +0,0 @@
-<!--负面清单列表-->
-<template>
-  <div class="app-container negative-list-records">
-    <div class="negative-list-records-page" v-if="pageType == 1">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-        <el-form-item label="关键字" prop="searchValue" label-width="60px">
-          <el-input
-            v-model="queryParams.searchValue"
-            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-option
-              v-for="dict in deptOptions"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item >
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="negativeListRecordsList" @sort-change="handleSelectionChange">
-        <!--<el-table-column type="selection" width="55" align="center" />-->
-        <!--<el-table-column label="序号" align="center" prop="id" />-->
-        <el-table-column label="姓名" align="left" prop="userName" />
-        <el-table-column label="学号" align="left" prop="stuNo" />
-        <el-table-column label="学院" align="left" prop="deptName" />
-        <el-table-column label="违规次数" align="left" sortable="custom" prop="violationNum" />
-        <el-table-column label="负面清单次数" align="left" sortable="custom" prop="negativeListNum" />
-        <el-table-column label="黑名单次数" align="left" sortable="custom" prop="blackListNum" />
-        <el-table-column label="信用分" align="left" prop="ceditScore" />
-        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="350" v-if="tableButtonType">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p"
-                 @click="goPage(2,scope.row)"
-                 v-hasPermi="['laboratory:negativeListHistory:list']"
-              >历史记录</p>
-              <p v-show="scope.row.isBlackList != 1"
-                 class="table-button-p"
-                 @click="blacklistClick(scope.row)"
-                 v-hasPermi="['laboratory:blacklist:add']"
-              >加入黑名单</p>
-              <p class="table-button-p"
-                 @click="checklistClick(scope.row)"
-                 v-hasPermi="['laboratory:negativeListRecords:remove']"
-              >移除负面清单</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-    <page-info :propsData="propsData" v-if="pageType == 2"></page-info>
-    <!-- 移除负面清单 -->
-    <el-dialog :title="title" :visible.sync="checklistOpen" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="姓名:">
-          <el-input v-model="form.userName" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="学号:">
-          <el-input v-model="form.stuNo" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="学院:">
-          <el-input v-model="form.deptName" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="原因:" prop="reason">
-          <el-input
-            type="textarea"
-            :autosize="{ minRows: 6, maxRows: 6}"
-            placeholder="请输入原因"
-            maxLength="50"
-            resize="none"
-            v-model="form.reason">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="">
-          <p style="font-size:14px;color:#999;margin:0;">提交后,该人员信用分自动恢复到合格分。</p>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!-- 加入黑名单 -->
-    <el-dialog :title="title" :visible.sync="blacklistOpen" width="720px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="姓名:" style="width:600px;">
-          <el-input v-model="form.userName" :disabled="true" placeholder="请输入姓名"/>
-        </el-form-item>
-        <el-form-item label="学号:" style="width:600px;">
-          <el-input v-model="form.stuNo" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="学院:" style="width:600px;">
-          <el-input v-model="form.deptName" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="原因:" prop="reason" style="width:600px;">
-          <el-input
-            type="textarea"
-            :autosize="{ minRows: 6, maxRows: 6}"
-            placeholder="请输入原因"
-            maxLength="50"
-            resize="none"
-            v-model="form.reason">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="处理天数时限" prop="handleDay" style="margin-bottom:0;">
-          <el-input
-            v-model="form.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">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listNegativeListRecords, getNegativeListRecords, delNegativeListRecords, addNegativeListRecords, updateNegativeListRecords, delBlacklist, delNegivelist,blackAdd } from "@/api/creditViolation/index";
-import { listDepartments } from "@/api/commonality/noPermission";
-import pageInfo from "./info.vue";
-export default {
-  name: "NegativeListRecords",
-  components: {
-    pageInfo,
-  },
-  data() {
-    return {
-      tableButtonType:this.hasPermiDom(['laboratory:negativeListHistory:list','laboratory:blacklist:add','laboratory:negativeListRecords:remove']),
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 负面清单列表表格数据
-      negativeListRecordsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示移除负面清单弹出层
-      checklistOpen: false,
-      // 是否显示移除加入黑名单弹出层
-      blacklistOpen: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize:20,
-        searchValue: null,
-        stuName: null,
-        stuNo: null,
-        belongCollege: null,
-        reason: null,
-        status: null,
-        violationNum: null,
-        negativeListNum: null,
-        blackListNum: null,
-        ceditScore: null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        reason:[
-          {required: true, message: '请输入原因', trigger: 'blur'},
-          { required: true, message: "请输入原因", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-        checkListTwo: [
-          { required: true, message: "请在考试/学习/做题中至少选择一种", trigger: "blur" }
-        ],
-        handleDay: [
-          { required: true, message: "请输入处理天数时限", trigger: "blur" },
-          { required: true, message: "请输入处理天数时限", validator: this.spaceJudgment, trigger: "blur" },
-          { required: true, message: "只能输入数字", validator: this.isNum, trigger: "blur" },
-        ],
-
-      },
-      // 学院
-      deptOptions: [],
-      //传参数据
-      propsData:{},
-      //页面状态
-      pageType:1,
-    };
-  },
-  created() {
-    this.getList();
-    this.getDeptList();
-  },
-  methods: {
-    //勾选方法
-    checkClickOne(data,name){
-      if(name == 'xx'){
-        let num = 0;
-        for(let i=0;i<data.length;i++){
-          if('learnStatus' == data[i]){
-            num++
-          }
-        }
-        this.form.learnStatusType = num != 0;
-      }
-    },
-    checkClickTwo(data,name){
-      if(name == 'zt'){
-        let num = 0;
-        for(let i=0;i<data.length;i++){
-          if('practiceStatus' == data[i]){
-            num++
-          }
-        }
-        this.form.practiceStatusType = num != 0;
-      }
-    },
-    //页面切换
-    goPage(type,row){
-      if(this.pageType != type){
-        if(type == 1){
-          this.pageType = type;
-          this.getList();
-        }else if(type == 2){
-          this.propsData.userId = row.joinUserId
-          this.pageType = type;
-        }
-      }
-    },
-    /** 查询负面清单列表列表 */
-    getList() {
-      this.loading = true;
-      listNegativeListRecords(this.queryParams).then( response => {
-        this.negativeListRecordsList =  response.rows;
-        this.total =  response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.blacklistOpen = false;
-      this.checklistOpen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {};
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      // this.resetForm("queryForm");
-      this.$set(this,'queryParams',{
-        pageNum: 1,
-        pageSize:20,
-        searchValue:"",
-        deptId: '',
-      });
-      this.queryParams.searchValue='';
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(type) {
-      if(type.order == 'ascending'){
-        this.queryParams.order = type.prop;//降
-        this.queryParams.orderType = 'asc';//升ascending
-      }else if(type.order == 'descending'){
-        this.queryParams.order = type.prop;//降
-        this.queryParams.orderType = 'desc';//降
-      }else{
-        this.queryParams.order = null;//无
-        this.queryParams.orderType = null;//无
-      }
-      this.getList();
-    },
-    //负面清单按钮
-    checklistClick(row){
-      row.buttonType = 2;
-      this.$set(this,"form",row);
-      this.title = "移除负面清单";
-      this.checklistOpen = true;
-    },
-    //黑名单按钮
-    blacklistClick(row){
-        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,"form",obj);
-        this.blacklistOpen = true;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if(this.form.buttonType == 1){
-            //移除黑名单
-            let obj = {
-              id:this.form.id,
-              userId:this.form.joinUserId,
-              reason:this.form.reason,
-            };
-            delBlacklist(obj).then(response => {
-              this.checklistOpen = false;
-              this.msgSuccess("操作成功");
-              this.getList();
-            });
-          }else if(this.form.buttonType == 2){
-            //移除负面清单
-            let obj = {
-              id:this.form.id,
-              userId:this.form.joinUserId,
-              reason:this.form.reason,
-            };
-            delNegivelist(obj).then(response => {
-              this.checklistOpen = false;
-              this.msgSuccess("操作成功");
-              this.getList();
-            });
-          }else if(this.form.buttonType == 3){
-            let obj = {
-              id:this.form.id,
-              joinUserId:this.form.joinUserId,
-              reason:this.form.reason,
-              // deductionVal:this.form.deductionVal,
-              handleDay:this.form.handleDay,
-            };
-            /*
-            //处理二级多选--警告/约谈
-            let warningStatusNum = 0;
-            let interviewStatusNum = 0;
-            for(let o=0;o<this.form.checkList.length;o++){
-              if(this.form.checkList[o] == 'warningStatus'){
-                warningStatusNum++
-              }
-              if(this.form.checkList[o] == 'interviewStatus'){
-                interviewStatusNum++
-              }
-            }
-            if(warningStatusNum == 0){
-              obj.warningStatus = "";
-            }else{
-              obj.warningStatus = 1;
-            }
-            if(interviewStatusNum == 0){
-              obj.interviewStatus = "";
-            }else{
-              obj.interviewStatus = 1;
-            }
-            //处理二级多选--考试
-            let testStatusNum = 0;
-            for(let o=0;o<this.form.checkListTwo.length;o++){
-              if(this.form.checkListTwo[o] == 'testStatus'){
-                testStatusNum++
-              }
-            }
-            if(testStatusNum == 0){
-              obj.testStatus = "";
-            }else{
-              obj.testStatus = 1;
-            }
-            //处理二级多选--学习
-            if(this.form.learnStatusType){
-              obj.learnStatus = 1;
-              obj.learnHour = this.form.learnHour;
-              obj.learnMinute = this.form.learnMinute;
-            }else{
-              obj.learnStatus = "";
-              obj.learnHour = "";
-              obj.learnMinute = "";
-            }
-            //处理二级多选--做题
-            if(this.form.practiceStatusType){
-              obj.practiceStatus = 1;
-              obj.numberTopics = this.form.numberTopics;
-              obj.numberAccuracy = this.form.numberAccuracy;
-            }else{
-              obj.practiceStatus = "";
-              obj.numberTopics = "";
-              obj.numberAccuracy = "";
-            }
-            */
-            blackAdd(obj).then(response => {
-              this.blacklistOpen = false;
-              this.msgSuccess("操作成功");
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 查询学院列表 */
-    getDeptList() {
-      listDepartments().then(response => {
-        this.$set(this, 'deptOptions', response.data)
-      });
-    },
-  }
-};
-</script>
-
-<style scoped lang="scss">
-  .negative-list-records {
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
-    overflow: hidden;
-    .negative-list-records-page{
-      flex:1;
-      display: flex!important;
-      flex-direction: column;
-      overflow: hidden;
-      .button-box{
-        display: flex;
-        width:380px;
-        margin:0 auto;
-      }
-    }
-  }
-</style>

+ 0 - 209
src/views/creditViolation/credit/negativeListRecords/info.vue

@@ -1,209 +0,0 @@
-<!--负面清单历史记录-->
-<template>
-    <div class="page-info">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item class="button-box">
-          <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-        </el-form-item>
-        <el-form-item label="状态" prop="overStatus" label-width="50px">
-          <el-select v-model="queryParams.overStatus" clearable placeholder="请选择状态">
-            <el-option
-              v-for="dict in bonusTypeOptions"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="学期" prop="semesterId" label-width="50px">
-          <el-select v-model="queryParams.semesterId" clearable placeholder="请选择学期">
-            <el-option
-              v-for="dict in semesterList"
-              :key="dict.id"
-              :label="dict.semesterName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="时间段" prop="dateRange" label-width="65px">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="recordList">
-        <el-table-column label="姓名" align="left" prop="userName" />
-        <el-table-column label="违规原因" align="left" prop="reason" />
-        <el-table-column label="实验室" align="left" prop="laboratoryName" />
-        <el-table-column label="时间" align="left"  prop="createTime" />
-        <el-table-column label="扣分值" align="left"  prop="deductionVal"/>
-        <el-table-column label="处理方式" align="left"  prop="treatmentMethod"/>
-        <el-table-column label="处理状态" align="left">
-          <template slot-scope="scope">
-            <div class="scope-big-box" v-if="scope.row.learnStatus == 0 || scope.row.learnStatus == 1">
-              <p>学习</p>
-              <p :class="scope.row.learnStatus == 0 ?'scopeColorA':(scope.row.learnStatus == 1 ?'scopeColorB':'')">{{scope.row.learnStatus == 0 ?'未完成':(scope.row.learnStatus == 1 ?'已完成':'')}}</p>
-            </div>
-            <div class="scope-big-box" v-if="scope.row.testStatus == 0 || scope.row.testStatus == 1">
-              <p>考试</p>
-              <p :class="scope.row.testStatus == 0 ?'scopeColorA':(scope.row.testStatus == 1 ?'scopeColorB':'')">{{scope.row.testStatus == 0 ?'未完成':(scope.row.testStatus == 1 ?'已完成':'')}}</p>
-            </div>
-            <div class="scope-big-box" v-if="scope.row.practiceStatus == 0 || scope.row.practiceStatus == 1">
-              <p>做题</p>
-              <p :class="scope.row.practiceStatus == 0 ?'scopeColorA':(scope.row.practiceStatus == 1 ?'scopeColorB':'')">{{scope.row.practiceStatus == 0 ?'未完成':(scope.row.practiceStatus == 1 ?'已完成':'')}}</p>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="信用分" align="left"  prop="creditScore" />
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-</template>
-
-<script>
-  import { getSemesterList,negativeListHistory } from "@/api/creditViolation/index";
-    export default {
-      props:{
-        propsData:{},
-      },
-      name: "pageInfo",
-      data() {
-        return {
-          //加载状态
-          loading:false,
-          // 显示搜索条件
-          showSearch: true,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize:20,
-            overStatus:null,
-            semesterId:null,
-            points: null,
-            joinUserId: null,
-            mode: null,
-            deptName: null,
-            deptId: null,
-            userId: null,
-          },
-          //状态条件
-          bonusTypeOptions:[
-            {id:1,name:"已完成"},
-            {id:0,name:"未完成"},
-          ],
-          //列表数据
-          recordList:[],
-          total:0,
-          // 日期范围
-          dateRange: [],
-          //学期
-          semesterList:[]
-        }
-      },
-      created(){
-        this.getList()
-        this.getSemesterList();
-      },
-      methods:{
-        getSemesterList(){
-          getSemesterList({}).then( res => {
-            this.semesterList = res.data;
-          });
-        },
-        //返回上级页面
-        backPage(){
-          this.$parent.goPage(1);
-        },
-        /** 查询数据 */
-        getList() {
-          this.loading = true;
-          if(this.dateRange&&this.dateRange.length>0)
-          {
-            this.queryParams.statTime=this.dateRange[0]
-            this.queryParams.endTime=this.dateRange[1]
-          }
-          else
-          {
-            this.queryParams.statTime=null;
-            this.queryParams.endTime=null
-          }
-          this.queryParams.userId = this.propsData.userId;
-          negativeListHistory(this.queryParams).then( response => {
-            this.recordList =  response.rows;
-            this.total =  response.total;
-            this.loading = false;
-          });
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryParams");
-          this.queryParams.overStatus = null;
-          this.queryParams.semesterId = null;
-          this.queryParams.statTime = null
-          this.queryParams.endTime = null
-          this.dateRange = [];
-          this.recordList = [];
-          this.handleQuery();
-        },
-      },
-    }
-</script>
-
-<style scoped lang="scss">
-  .page-info {
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    .scope-big-box{
-      display: flex;
-      p{
-        font-size:14px;
-        height:20px;
-        line-height:20px;
-        margin:4px 0;
-      }
-      p:nth-child(1){
-        margin-right:10px;
-      }
-      p:nth-child(2){
-
-      }
-      .scopeColorA{
-        padding:0 4px;
-        border-radius:4px;
-        color:#999;
-        background: #dedede;
-      }
-      .scopeColorB{
-        padding:0 4px;
-        border-radius:4px;
-        color:#fff;
-        background: #39A922;
-      }
-    }
-  }
-</style>

+ 12 - 10
src/views/creditViolation/credit/record/index.vue

@@ -1,7 +1,7 @@
 <!--积分管理-->
 <template>
   <div class="app-container points-record">
-    <div class="page-one-box" v-if="pageType == 1">
+    <div class="page-form-title-box" v-if="pageType == 1">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="关键字" prop="searchValue">
           <el-input
@@ -25,11 +25,13 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" border :data="recordList" @sort-change="handleSelectionChange">
+    </div>
+    <div class="page-content-box">
+      <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" />
@@ -53,12 +55,12 @@
         </el-table-column>
       </el-table>
       <pagination :page-sizes="[20, 30, 40, 50]"
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+                  v-show="total>0"
+                  :total="total"
+                  layout="total, prev, pager, next, sizes, jumper"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
       />
     </div>
     <credit-score-list v-if="pageType == 2" :propsData="propsData"></credit-score-list>

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


src/views/creditViolation/violation/violation/violationInfo.vue → src/views/creditViolation/credit/violation/violationInfo.vue


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


+ 0 - 207
src/views/creditViolation/violation/violationHistoryRecord/index.vue

@@ -1,207 +0,0 @@
-<!--黑名单历史记录-->
-<template>
-<div class="blackListInfo">
-<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-<el-form-item class="button-box">
-<p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-</el-form-item>
-<el-form-item label="状态" prop="overStatus" label-width="50px">
-<el-select v-model="queryParams.overStatus" placeholder="请选择状态">
-<el-option
-v-for="dict in overStatusOptions"
-:key="dict.id"
-:label="dict.name"
-:value="dict.id"
-></el-option>
-</el-select>
-</el-form-item>
-<el-form-item label="学期" prop="semesterId" label-width="50px">
-<el-select v-model="queryParams.semesterId" placeholder="请选择学期">
-<el-option
-v-for="dict in semesterOptions"
-:key="dict.id"
-:label="dict.semesterName"
-:value="dict.id"
-></el-option>
-</el-select>
-</el-form-item>
-<el-form-item label="创建时间" prop="dateRange" style="margin-left:10px;">
-<el-date-picker
-  :clearable="false"
-v-model="dateRange"
-size="small"
-style="width: 240px"
-value-format="yyyy-MM-dd"
-type="daterange"
-range-separator="-"
-start-placeholder="开始日期"
-end-placeholder="结束日期"
-></el-date-picker>
-</el-form-item>
-<el-form-item>
-<p class="inquire-button-one" @click="handleQuery">查询</p>
-<p class="reset-button-one" @click="resetQuery">重置</p>
-</el-form-item>
-</el-form>
-<el-table v-loading="loading" border :data="recordList">
-<el-table-column label="姓名" align="left" prop="nickName" />
-<el-table-column label="原因" align="left" prop="reason" />
-<el-table-column label="时间" align="left" prop="createTime" />
-<el-table-column label="处理方式" align="left"  prop="treatmentMethod" />
-<el-table-column label="处理状态" align="left"  prop="surplusPoints">
-<template slot-scope="scope">
-<div class="scope-big-box" v-if="scope.row.learnStatus == 0 || scope.row.learnStatus == 1">
-<p>学习</p>
-<p :class="scope.row.learnStatus == 0 ?'scopeColorA':(scope.row.learnStatus == 1 ?'scopeColorB':'')">{{scope.row.learnStatus == 0 ?'未完成':(scope.row.learnStatus == 1 ?'已完成':'')}}</p>
-</div>
-<div class="scope-big-box" v-if="scope.row.testStatus == 0 || scope.row.testStatus == 1">
-<p>考试</p>
-<p :class="scope.row.testStatus == 0 ?'scopeColorA':(scope.row.testStatus == 1 ?'scopeColorB':'')">{{scope.row.testStatus == 0 ?'未完成':(scope.row.testStatus == 1 ?'已完成':'')}}</p>
-</div>
-<div class="scope-big-box" v-if="scope.row.practiceStatus == 0 || scope.row.practiceStatus == 1">
-<p>做题</p>
-<p :class="scope.row.practiceStatus == 0 ?'scopeColorA':(scope.row.practiceStatus == 1 ?'scopeColorB':'')">{{scope.row.practiceStatus == 0 ?'未完成':(scope.row.practiceStatus == 1 ?'已完成':'')}}</p>
-</div>
-</template>
-</el-table-column>
-<el-table-column label="信用分" align="left"  prop="creditScore" />
-</el-table>
-<pagination :page-sizes="[20, 30, 40, 50]"
-v-show="total>0"
-:total="total"
-layout="total, prev, pager, next, sizes, jumper"
-:page.sync="queryParams.pageNum"
-:limit.sync="queryParams.pageSize"
-@pagination="getList"
-/>
-</div>
-</template>
-
-<script>
-import { getBlackDetail,getSemesterList } from "@/api/creditViolation/index";
-export default {
-props: {
-propsData:{},
-},
-name: "blackListInfo",
-data() {
-return {
-//加载状态
-loading:false,
-// 显示搜索条件
-showSearch: true,
-// 查询参数
-queryParams: {
-pageNum: 1,
-pageSize:20,
-points: null,
-joinUserId: null,
-mode: null,
-deptName: null,
-deptId: null,
-userId: null,
-semesterId: null,
-overStatus: null
-},
-//状态条件
-overStatusOptions:[
-{id:'',name:"全部"},
-{id:1,name:"已完成"},
-{id:0,name:"未完成"},
-{id:-1,name:"无"},
-],
-//列表数据
-recordList:[],
-total:0,
-// 日期范围
-dateRange: [],
-//学期列表
-semesterOptions:[],
-}
-},
-created(){
-this.getList()
-},
-mounted(){
-this.getSemesterList()
-},
-methods:{
-//返回上级页面
-backPage(){
-this.$parent.goPage(1);
-},
-/** 查询数据 */
-getList() {
-this.loading = true;
-if(this.dateRange&&this.dateRange.length>0)
-{
-this.queryParams.beginTime=this.dateRange[0]
-this.queryParams.endTime=this.dateRange[1]
-}
-else
-{
-this.queryParams.beginTime=null;
-this.queryParams.endTime=null
-}
-this.queryParams.blackId = this.propsData.userId;
-getBlackDetail(this.queryParams).then( response => {
-this.recordList =  response.rows;
-this.total =  response.total;
-this.loading = false;
-});
-},
-/** 查询学期列表 */
-getSemesterList() {
-getSemesterList().then(response => {
-this.$set(this, 'semesterOptions', response.data)
-});
-},
-/** 搜索按钮操作 */
-handleQuery() {
-this.queryParams.pageNum = 1;
-this.getList();
-},
-/** 重置按钮操作 */
-resetQuery() {
-this.resetForm("queryParams");
-this.recordList = [];
-this.handleQuery();
-},
-},
-}
-</script>
-
-<style scoped lang="scss">
-.blackListInfo{
-flex:1;
-display: flex!important;
-flex-direction: column;
-.scope-big-box{
-display: flex;
-p{
-font-size:14px;
-height:20px;
-line-height:20px;
-margin:4px 0;
-}
-p:nth-child(1){
-margin-right:10px;
-}
-p:nth-child(2){
-
-}
-.scopeColorA{
-padding:0 4px;
-border-radius:4px;
-color:#999;
-background: #dedede;
-}
-.scopeColorB{
-padding:0 4px;
-border-radius:4px;
-color:#fff;
-background: #39A922;
-}
-}
-}
-</style>