From e9382fc53c9cbd4236cf900a1e70532bd6cba3d9 Mon Sep 17 00:00:00 2001 From: bobi Date: Sat, 24 Aug 2019 22:09:42 +0800 Subject: [PATCH] del:user.json --- data/user.json | 154 ------------------------------ js/console.js | 77 +++++++++++++++ js/home.js | 86 ----------------- lib/layui/lay/okmodules/okMock.js | 1 + pages/console.html | 2 +- pages/operation.html | 2 +- 6 files changed, 80 insertions(+), 242 deletions(-) delete mode 100644 data/user.json create mode 100644 js/console.js delete mode 100644 js/home.js diff --git a/data/user.json b/data/user.json deleted file mode 100644 index c11cfc2..0000000 --- a/data/user.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "code": 0, - "status": true, - "msg": "访问成功", - "data": { - "count": 16, - "list": [ - { - "id": 1, - "u_name": "智走", - "u_email": "315464879@layui.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "超级会员", - "u_endtime": "2018-08-09T16:00:00.000Z" - }, - { - "id": 2, - "u_name": "风中叶", - "u_email": "4887989@qq.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "高级会员", - "u_endtime": "2018-09-01T16:00:00.000Z" - }, - { - "id": 3, - "u_name": "王天成", - "u_email": "4887989@qq.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "高级会员", - "u_endtime": "2018-04-01T16:00:00.000Z" - }, - { - "id": 4, - "u_name": "楼天成", - "u_email": "213123@dasf.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-05-01T16:00:00.000Z" - }, - { - "id": 5, - "u_name": "王玉华", - "u_email": "26345231@dasf.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-05-01T16:00:00.000Z" - }, - { - "id": 6, - "u_name": "红俊风", - "u_email": "213123@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-05-01T16:00:00.000Z" - }, - { - "id": 7, - "u_name": "宗骊雪", - "u_email": "213123@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-05-01T16:00:00.000Z" - }, - { - "id": 8, - "u_name": "项幻珊", - "u_email": "213123@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-05-01T16:00:00.000Z" - }, - { - "id": 9, - "u_name": "濮月朗", - "u_email": "213123@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-05-01T16:00:00.000Z" - }, - { - "id": 10, - "u_name": "皮又青", - "u_email": "213123@dasf.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-09-01T16:00:00.000Z" - }, - { - "id": 11, - "u_name": "务初柳", - "u_email": "8489879@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2018-11-01T16:00:00.000Z" - }, - { - "id": 12, - "u_name": "富梅花", - "u_email": "213123@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2011-03-01T16:00:00.000Z" - }, - { - "id": 13, - "u_name": "性丽雅", - "u_email": "213123@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2013-09-01T16:00:00.000Z" - }, - { - "id": 14, - "u_name": "阎碧玉", - "u_email": "23523453@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2019-01-01T16:00:00.000Z" - }, - { - "id": 15, - "u_name": "飞云心", - "u_email": "213123@dasf.com", - "u_sex": "男", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2015-02-01T16:00:00.000Z" - }, - { - "id": 16, - "u_name": "汪欣可", - "u_email": "23523453@dasf.com", - "u_sex": "女", - "u_status": "1", - "u_grade": "普通会员", - "u_endtime": "2011-05-01T16:00:00.000Z" - } - ] - } -} diff --git a/js/console.js b/js/console.js new file mode 100644 index 0000000..7de410d --- /dev/null +++ b/js/console.js @@ -0,0 +1,77 @@ +"use strict"; +var useModel = ["form", "okUtils", "table", "laytpl", "laydate", "element", "jquery", "countUp", "echartsData", "okMock"]; +layui.config({ + base: "../js/" +}).use(useModel, function () { + var $form = layui.form; + var countUp = layui.countUp; + var laydate = layui.laydate; + var element = layui.element; + var table = layui.table; + var okUtils = layui.okUtils; + var okMock = layui.okMock; + var $ = layui.jquery; + var laytpl = layui.laytpl; + /**静态数据**/ + var echartsData = layui.echartsData; + init(); + + function init() { + /** + * 今日访问量 + */ + var elem_nums = $(".stat-text"); + elem_nums.each(function (i, j) { + let ran = parseInt(Math.random() * 99 + 1); + !new countUp({ + target: j, + endVal: 20 * ran + }).start(); + }); + + /**图表**/ + var mapTree = echarts.init($("#mapOne")[0], "mytheme"); + var mapChina = echarts.init($('#mapChina')[0]); + okUtils.echartsResize([mapTree, mapChina]); + + mapTree.setOption(echartsData.mapTree);//数据图 + + echartsData.mapChina.series[0].data = echartsData.Address;//地图数据 + + // visualMap + mapChina.setOption(echartsData.mapChina);//地图 + + /** + * 表格 + */ + table.render({ + method: "get", + url: okMock.api.user.list2, + elem: '#userData', + height: 340, + page: true, + limit: 7, + cols: [[ + {field: "id", title: "id", width: 50}, + {field: "u_name", title: "姓名"}, + {field: "u_sex", title: "性别", width: 80}, + {field: "u_email", title: "邮箱"}, + {field: "u_endtime", title: "时间",}, + {field: "u_grade", title: "等级"} + ]], + parseData: function (res) { + res.data.list.forEach(function (i, j) { + var dateTime = new Date(i.u_endtime); + i.u_endtime = dateTime.getFullYear() + "-" + dateTime.getMonth() + "-" + dateTime.getDay(); + }); + return { + "code": res.code, + "count": res.data.count, + "data": res.data.list //解析数据列表 + } + } + }); + } +}); + + diff --git a/js/home.js b/js/home.js deleted file mode 100644 index 971bcff..0000000 --- a/js/home.js +++ /dev/null @@ -1,86 +0,0 @@ -"use strict"; -var useModel = ["form", "okUtils", "table", "laytpl", "laydate", - "element", "jquery", "countUp", "echartsData"];//需要引入的模块 -layui.config({ - base: "../js/" -}).use(useModel, function () { - var $form = layui.form, - countUp = layui.countUp, - laydate = layui.laydate, - element = layui.element, - table = layui.table, - okUtils = layui.okUtils, - $ = layui.jquery, - laytpl = layui.laytpl; - /**静态数据**/ - var echartsData = layui.echartsData; - init(); - - function init() { - /**今日访问量**/ - var elem_nums = $(".stat-text"); - elem_nums.each(function (i, j) { - let ran = parseInt(Math.random() * 99 + 1); - !new countUp({ - target: j, - endVal: 20 * ran - }).start(); - }); - - /**图表**/ - var mapTree = echarts.init($("#mapOne")[0], "mytheme"); - var mapChina = echarts.init($('#mapChina')[0]); - okUtils.echartsResize([mapTree, mapChina]); - - mapTree.setOption(echartsData.mapTree);//数据图 - - echartsData.mapChina.series[0].data = echartsData.Address;//地图数据 - - // visualMap - mapChina.setOption(echartsData.mapChina);//地图 - - /**表格**/ - table.render({ - method: "GET", - url: "../data/user.json",// - elem: '#userData', //指定原始表格元素选择器（推荐id选择器） - height: 340, //容器高度 - page: true, - limit: 7, - parseData: function (res) { - res.data.list.forEach(function (i, j) { - var dateTime = new Date(i.u_endtime); - i.u_endtime = dateTime.getFullYear() + "-" + dateTime.getMonth() + "-" + dateTime.getDay(); - }); - return { - "code": res.code, - "count": res.data.count, - "data": res.data.list //解析数据列表 - } - }, - cols: [[ - {field: "id", title: "id", width: 50}, - {field: "u_name", title: "姓名"}, - {field: "u_sex", title: "性别", width: 80}, - {field: "u_email", title: "邮箱"}, - {field: "u_endtime", title: "时间",},//templet: '#titleDate' - {field: "u_grade", title: "等级"} - ]], //设置表头 - }); - - /**日历**/ - laydate.render({ - elem: '#calendar', - position: 'static', - show: true, - btns: ['now'], - calendar: true,//显示节日 - change: function (value, date) { //监听日期 - - } - }); - } - -}); - - diff --git a/lib/layui/lay/okmodules/okMock.js b/lib/layui/lay/okmodules/okMock.js index 3bba4af..1a36dc9 100644 --- a/lib/layui/lay/okmodules/okMock.js +++ b/lib/layui/lay/okmodules/okMock.js @@ -8,6 +8,7 @@ layui.define([], function(exprots) { }, user: { list: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/list", + list2: "https://www.easy-mock.com/mock/5d5d0dd46cfcbd1b8627bf1d/ok-admin-v2.0/user/list2", batchNormal: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchNormal", batchStop: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchStop", batchDel: "https://easy-mock.com/mock/5d0ce725424f15399a6c2068/okadmin/user/batchDel", diff --git a/pages/console.html b/pages/console.html index f65140f..47cafe9 100644 --- a/pages/console.html +++ b/pages/console.html @@ -164,7 +164,7 @@ - + diff --git a/pages/operation.html b/pages/operation.html index 1414bce..bbc4635 100644 --- a/pages/operation.html +++ b/pages/operation.html @@ -171,7 +171,7 @@ - +