Merge branch 'hdw' of http://118.89.139.230:10101/r/admin_manage into hdw

whychdw

2020-09-16 40aad70b8f14d34496564bcc7966b7873e345791

Merge branch 'hdw' of http://118.89.139.230:10101/r/admin_manage into hdw

 src/pages/userMager/operationRecord.vue

@@ -3,11 +3,11 @@
    <flex-layout>
        <div class="table-layout filter-box-table" slot="header">
            <div class="table-row">
                <div class="table-cell text-right">操作方式：</div>
                <div class="table-cell text-right">操作人姓名：</div>
                <div class="table-cell">
                    <el-select v-model="formObj.czfs"  size="small" placeholder="请选择操作方式" class="select_box">
                    <el-select v-model="formObj.czrxm"  size="small" placeholder="请选择操作人姓名" class="select_box">
                        <el-option
                        v-for="item in czfsList"
                        v-for="item in czrxmList"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -34,12 +34,12 @@
        </div>
        <div class="flex-page-content">
            <el-table border size="mini" header-row-class-name="header-primary" height="100%" :data="userList">
                <el-table-column prop="yhid" align="center" label="用户ID"></el-table-column>
                <el-table-column prop="czrxm" align="center" label="操作人姓名"></el-table-column>
                <el-table-column prop="czlx" align="center" label="操作类型"></el-table-column>
                <el-table-column prop="czsj" align="center" label="操作时间"></el-table-column>
                <el-table-column prop="zdip" align="center" label="终端IP"></el-table-column>
                <el-table-column prop="cztime" align="center" label="操作事件"></el-table-column>
                <el-table-column prop="uId" align="center" label="用户ID"></el-table-column>
                <el-table-column prop="UName" align="center" label="操作人姓名"></el-table-column>
                <el-table-column prop="uOprateType" align="center" label="操作类型"></el-table-column>
                <el-table-column prop="uOprateDay" align="center" label="操作时间"></el-table-column>
                <el-table-column prop="uTerminalIp" align="center" label="终端IP"></el-table-column>
                <el-table-column prop="uOprateMsg" align="center" label="操作事件"></el-table-column>
            </el-table>
        </div>
        <div class="flex-page-footer" slot="footer">
@@ -58,34 +58,26 @@
</template>

<script>
import { const_operation } from '../../assets/js/const'
export default {
    data() {
        let thistime = new Date();
        let yy = thistime.getFullYear();       
        let MM = thistime.getMonth()+1;          
        let dd = thistime.getDate(); 
        let day1 = yy + '-' + MM + '-' + dd;

        return {
            userList:[
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
                {yhid:"1001",czrxm:"admin",czlx:"系统登陆",czsj:"2020-09-15 14:00:21",zdip:"127.0.0.1",cztime:"登录PC系统"},
            ],
            czfsList:[],
            userList:[],//列表数据
            czrxmList:[],
            czlxList:[],
            formObj:{
                czfs:'',
                czlx:'',
                startDrsj:'',
                endDrsj:'',
                czrxm:'',
                czlx:0,
                startDrsj:'2000-01-01',
                endDrsj:day1,
                currentPage:1,
                pagesize:10,
                

            },
            totalNum:0,
            pickerOptions0: {
@@ -96,7 +88,6 @@
                        } else {
                            // return time.getTime() > Date.now();
                        }
	
                    }
                },
                pickerOptions1: {
@@ -104,50 +95,71 @@
                        return new Date(time.getTime()+24*60*60*1000) < new Date(this.formObj.startDrsj);
                    }
                },


        }
    },
    components:{

        
    },
    created() {
        let vm = this;
        vm.totalNum = vm.userList.length;
            vm.czlxList = const_operation.types;
    },
    mounted() {
        let vm = this;
        
        this.queryData();
    },
    methods: {
        // 显示条数改变时
        handleSizeChange(val) {
            this.formObj.pagesize = val;
            // this.zjdrList();
            this.queryData();
        },
        // 翻页
        handleCurrentChange(val) {
            this.formObj.currentPage = val;
            // this.zjdrList();
            this.queryData();
        },
        // 查询列表数据
        queryData:function(){
            let vm = this;
            if(vm.formObj.startDrsj ==''|| vm.formObj.endDrsj ==''){
                return false
            }
            let data = {
                page:{
                    pageCurr:"1",
                    pageSize:"10"
                    pageCurr:vm.formObj.currentPage,
                    pageSize:vm.formObj.pagesize
                },
                uinf:{
                    UName:""
                    UName:vm.formObj.czrxm
                },
                ulog:{
                    uOprateType:"0",
                    uOprateDay:"2000-1-1 00:00:00",
                    uOprateDay1:"2020-9-16 23:59:59"
                    uOprateDay:vm.formObj.startDrsj + ' 00:00:00',
                    uOprateDay1:vm.formObj.endDrsj + ' 23:59:59',
                    uOprateType:'0',
                    // uOprateType:vm.formObj.czlx, 
                }
            };
            // console.log(this.$apis.userMager)

            vm.$apis.userMager.operationRecord.search(data).then(res=>{
                console.log('成功'+res)
                let arr = JSON.parse(res.data.result).data;
                vm.totalNum = arr[arr.length-1].page.pageAll;
                // console.log(arr)
                const  arrList  =  arr.map((item,index)=>{
                        return {
                            uId: item.ulog.uId,
                            uOprateDay :item.ulog.uOprateDay,
                            uOprateMsg:item.ulog.uOprateMsg,
                            uOprateType:item.ulog.uOprateType,
                            uTerminalIp:item.ulog.uTerminalIp,
                            UName:item.uinf.UName
                        }
                    })
                vm.userList = arrList;
                // console.log(arrList)
            }).catch(error=>{
                console.log('失败'+res)
                // console.log('失败'+error)
            });
        }
    },

 src/pages/userMager/userInfo.vue

@@ -3,20 +3,20 @@
    <flex-layout>
        <div class="table-layout filter-box-table header-box" slot="header">
            <el-table border size="mini" header-row-class-name="header-primary" style="width: 100%" max-height='350px' :data="userList">
                <el-table-column prop="yhid" align="center" width="120px" label="用户ID"></el-table-column>
                <el-table-column prop="czrxm" align="center" width="120px"  label="操作人姓名"></el-table-column>
                <el-table-column prop="czlx" align="center" width="120px"  label="操作类型"></el-table-column>
                <el-table-column prop="czsj" align="center" width="120px"  label="操作时间"></el-table-column>
                <el-table-column prop="zdip" align="center" width="120px"  label="终端IP"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="120px"  label="固定列"></el-table-column>
                <el-table-column prop="yhid" align="center" width="200px" label="用户ID"></el-table-column>
                <el-table-column prop="czrxm" align="center" width="200px"  label="操作人姓名"></el-table-column>
                <el-table-column prop="czlx" align="center" width="200px"  label="操作类型"></el-table-column>
                <el-table-column prop="czsj" align="center" width="200px"  label="操作时间"></el-table-column>
                <el-table-column prop="zdip" align="center" width="200px"  label="终端IP"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="操作事件"></el-table-column>
                <el-table-column prop="cztime" align="center" width="200px"  label="固定列"></el-table-column>
            </el-table>
        </div>
        <div class="flex-page-content">