Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-29 296b5e8d29199a14b29666562574a09a58f97c24

 src/views/operate/myWait/index.vue

@@ -1,24 +1,17 @@
<template>
    <div class="userList">
        <div class="headerTitle">
            运营管理》基础设置》违规事项设置
            运营管理》我的待办
        </div>
        <header>
            <div class="headerContent">
                <div class="search">
                    <span>筛选条件:</span>
                    <el-input placeholder="请输入内容" v-model="context"></el-input>
                    <span>事件编号:</span>
                    <el-input placeholder="请输入事件编号" v-model="context"></el-input>
                    <div class="findBtn">
                        <el-button type="primary" @click="getUserList">查询</el-button>
                        <el-button type="primary" @click="getTableData">查询</el-button>
                    </div>
                </div>
                <!-- <div class="addUser">
                    <el-button class="addBtn" type="primary" @click="dialogCreate = true">新增违规类型</el-button>
                    <el-dialog :visible.sync="dialogCreate" title="新增违规类型" width="45%" v-if="dialogCreate"
                        :before-close="handleClose">
                        <createUser :refresh="getUserList" />
                    </el-dialog>
                </div> -->
            </div>
        </header>
        <main>
@@ -30,35 +23,32 @@
                    @selection-change="tableChange">
                    <el-table-column type="selection" min-width="5">
                    </el-table-column>
                    <el-table-column prop="number" label="事件编号" min-width="10">
                    <el-table-column prop="code" label="事件编号" min-width="10">
                    </el-table-column>
                    <el-table-column prop="typeThird" label="问题小类" min-width="10">
                    <el-table-column prop="eventSource" label="问题来源" min-width="10">
                        <template slot-scope="scope" v-if="scope.row">
                            <span>{{ getEventSource(scope.row.eventSource)?.label }}</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="typeSecond" label="问题描述" min-width="10">
                    <el-table-column prop="category" label="问题类别" min-width="10">
                        <template slot-scope="scope" v-if="scope.row">
                            <span>{{ getCategory(scope.row.category)?.label }}</span>
                        </template>
                    </el-table-column>
                    <el-table-column prop="typeFirst" label="创建时间" min-width="10">
                    <el-table-column prop="createTime" label="创建时间" min-width="10">
                    </el-table-column>
                    <el-table-column prop="type" label="剩余时间" min-width="10">
                    <el-table-column prop="limitTime" label="剩余时间" min-width="10">
                    </el-table-column>
                    <el-table-column prop="type" label="问题状态" min-width="10">
                    <el-table-column prop="stepName" label="问题状态" min-width="10">
                    </el-table-column>
                    <el-table-column  min-width="10">
                    </el-table-column>
                    <!-- <el-table-column prop="operation" label="操作" min-width="10">
                        <template slot-scope="scope">
                            <div class="operation">
                                <span @click="handleFind(scope.row)">查看</span>
                                <span class="line">|</span>
                                <span @click="handleDelete(scope.row)">删除</span>
                            </div>
                        </template>
                    </el-table-column> -->
                </el-table>
                <!-- 查看修改页面 -->
                <el-dialog :visible.sync="dialogUpdate" width="45%" :title="updateFlag ? '权限设置' :'查看角色信息'"
                    v-if="dialogUpdate" :before-close="handleClose">
                    <updateUser :updateFlag="updateFlag" :userInfo=userInfo
                        :getUserList=" context ? getUserList : getUserList" @changeDialog="changeDialog" />
                    :destroy-on-close="true" :key="updateFlag" :before-close="handleClose">
                    <updateUser v-if="dialogUpdate" :updateFlag="updateFlag" :userInfo=userInfo
                        :getTableData=" context ? getTableData : getTableData" @changeDialog="changeDialog" />
                </el-dialog>
                <!-- tools -->
                <div class="tools">
@@ -79,8 +69,7 @@
                    </div>
                    <div class="pagination">
                        <el-pagination background :current-page="currentPage" layout="prev, pager, next"
                            :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage"
                            @prev-click="handlePrev" @next-click="handleNext">
                            :total="totalNum" :page-size="pageSize" @current-change="changeCurrentPage">
                        </el-pagination>
                    </div>
                </div>
@@ -91,6 +80,11 @@
<script>
import updateUser from "./updateUser"
import createUser from "./createUser"
import {computeTime} from '@/utils/helper'
import filterTime from '@/utils/mydate'
import myWait from "@/api/operate/myWait";
import { CATEGOTY, RESOURCE_TYPE } from "@/utils/helper";

export default {
    components: {
        updateUser,createUser
@@ -98,7 +92,7 @@
    data() {
        return {
            tableData: [],
            context: "",
            context: null,
            dialogCreate: false,
            dialogUpdate: false,
            updateFlag: false,
@@ -132,22 +126,20 @@
        }
    },
    created() {
        this.getUserList();
      this.getTableData();
    },
    methods: {
        // 批量删除
        mulDelete(idArr){
            console.log(idArr);
            this.$axios({
                method:'delete',
                url:'sccg/violations/batch_delete?ids='+idArr,
            }).then(res=>{
                this.getUserList();
                this.$message({
                    message:res.message,
                    type:res.code === 200 ? 'success' : 'warning'
                })
      getTableData() {
        myWait.getMybackLog({ num: this.context })
            .then(res => {
              this.tableData = res;
              this.tableData = this.tableData.filter(item => !!item);
            })
            .catch(err => this.$message({ type: 'error', message: err }))
      },

      // 批量删除
        mulDelete(idArr){
        },
        // 执行下拉框操作
        selectChange(val) {
@@ -169,11 +161,7 @@
        // 监听表格选中状态
        tableChange(list) {
            this.tempList = list;
            if (list.length === this.tableData.length) {
                this.all = true;
            } else {
                this.all = false
            }
            this.all = list.length === this.tableData.length;
        },
        // 全选
        selectAll() {
@@ -187,78 +175,14 @@
        },
        // 删除单条数据
        handleDelete({ number }) {
            console.log(number);
            this.$confirm('确认删除？')
                .then(_ => {
                    console.log(1);
                    this.$axios({
                        method: 'delete',
                        url: `sccg/violations/delete?id=${number}`,
                    })
                        .then(res => {
                            console.log(res);
                            this.$message({
                                type: res.code === 200 ? 'success' : 'warning',
                                message: res.message
                            })

                            this.getUserList();
                        })
                })
                .catch(_ => { console.log(2) });
        },
        // 获取用户列表
        getUserList() {
            const { currentPage, pageSize, context } = this;
            // 获取所有用户信息
            this.$axios({
                method: 'get',
                url: `sccg/violations/query?current=${currentPage}&size=${pageSize}&keyWord=${context}`,
            })
                .then(res => {
                    this.tableData = res.data.records;
                    this.totalNum = res.data.total;
                })
        },
        // search() {
        //     const that = this;
        //     const { currentPage, pageSize, context } = this;
        //     // 获取所有用户信息
        //     if (context == '') {
        //         this.$axios.get('sccg/role/list?keyword=' + '&pageNum=' + currentPage + '&pageSize=' + pageSize).then(res => {
        //             if (res.code === 200) {
        //                 console.log(res);
        //                 res.data.list.forEach(item => {
        //                     // item.createTime = helper(item.createTime);
        //                     item.status == 1 ? item.status = true : item.status = false;
        //                 })
        //                 that.tableData = res.data.list;
        //                 this.totalNum = res.data.list.length;
        //             }
        //         })
        //     } else {
        //         this.$axios({
        //             method: 'get',
        //             url: 'sccg/role/list?keyword=' + context + '&pageNum=' + currentPage + '&pageSize=' + pageSize,
        //         }).then(res => {
        //             if (res.code === 200) {
        //                 res.data.list.forEach(item => {
        //                     item.status == 1 ? item.status = true : item.status = false;
        //                 })
        //                 that.tableData = res.data.list
        //                 this.totalNum = res.data.list.length;
        //             }
        //         })
        //     }
        // },
        // 设置表格斑马纹
        tableRowClassName({ row, rowIndex }) {
            if ((rowIndex + 1) % 2 == 0) {
            if ((rowIndex + 1) % 2 === 0) {
                return 'warning-row';
            } else {
                return 'success-row';
            }
            return '';
        },
        // 查看用户信息(不可修改)
        handleFind(rowData) {
@@ -269,31 +193,37 @@
        // 当前页改变触发事件
        changeCurrentPage(page) {
            this.currentPage = page;
            this.getUserList();
        },
        // 上一页点击事件
        handlePrev(page) {
            this.currentPage = page;
            this.getUserList();
        },
        // 下一页点击事件
        handleNext(page) {
            this.currentPage = page;
            this.getUserList();
            this.getTableData();
        },
        changeDialog(val) {
            this.dialogUpdate = val.dialogUpdate;
            console.log(val);
        },
        handleClose(done) {
            this.$confirm('确认关闭？')
                .then(_ => {
                .then(() => {
                    this.dialogCreate = false;
                    this.dialogUpdate = false;
                    done();
                })
                .catch(_ => { });
        }
                .catch(() => { });
        },
        // 计算时间
        getRestTime(time2){
            return computeTime(time2);
        },
        // 改变日期格式
        changeTime(time){
            if(time){
                return filterTime(time);
            }
        },
      getCategory(code) {
        return CATEGOTY.find(item => item.value === code);
      },

      getEventSource(code) {
        return RESOURCE_TYPE.find(item => item.value === code);
      }
    }
}
</script>
@@ -309,7 +239,6 @@

    header {
        background-color: #09152f;
        border: 1pox solid #fff;

        .headerContent {
            padding: 0 40px;
@@ -364,7 +293,6 @@
        background-color: #09152f;
        margin-top: 20px;
        padding-bottom: 50px;
        border: 1pox solid #fff;

        .mainTitle {
            line-height: 60px;