From 217d977a9a5e2a477c31a22c0ed66e754b11468c Mon Sep 17 00:00:00 2001 From: zhizou Date: Tue, 27 Aug 2019 15:10:13 +0800 Subject: [PATCH] up: css --- css/common.css | 29 +- css/{sub.css => oksub.css} | 17 + data/navs.json | 2 - js/console.js | 2 +- js/console1.js | 2 +- lib/echarts/echarts.theme.js | 531 -------------------------------- pages/article/article-add.html | 2 +- pages/article/article-edit.html | 2 +- pages/article/article.html | 14 +- pages/console.html | 412 ++++++++++++++----------- pages/console1.html | 5 +- pages/member/permission.html | 8 +- pages/member/role-add.html | 4 +- pages/member/role-edit.html | 2 +- pages/member/role.html | 10 +- pages/member/user-add.html | 4 +- pages/member/user-edit.html | 6 +- pages/member/user-info.html | 2 +- pages/member/user-pwd.html | 2 +- pages/member/user.html | 10 +- pages/txtedit/CKEditor.html | 2 +- pages/txtedit/Neditor.html | 2 +- pages/txtedit/TinyMCE.html | 2 +- pages/txtedit/UEditor.html | 2 +- pages/txtedit/layedit.html | 2 +- pages/txtedit/wangEditor.html | 2 +- 26 files changed, 307 insertions(+), 771 deletions(-) rename css/{sub.css => oksub.css} (80%) delete mode 100644 lib/echarts/echarts.theme.js diff --git a/css/common.css b/css/common.css index 8a62a83..fee1e31 100644 --- a/css/common.css +++ b/css/common.css @@ -206,35 +206,23 @@ .per-bg-a { background: #00c292 !important; } - .per-bg-b { - background: #ab8ce4 !important; + background: #9a66e4 !important; } - .per-bg-c { background: #03a9f3 !important; } - .per-bg-d { background: #fb9678 !important; } - - -/*减去220是左侧的菜单宽度为220*/ - -@media screen and (max-width: 750px) { - /*当屏幕宽度小于970-220时执行*/ - .ok-in-hide-md { - display: none !important; - } +.per-bg-e { + background: #ed4014 !important; } - -@media screen and (max-width: 548px) { - /*当屏幕宽度小于768-220时执行*/ - [ok-pc-in-show], - .ok-in-hide-xs { - display: none !important; - } +.per-bg-f { + background: #ab8ce4 !important; +} +.per-bg-g { + background: #e46cbb !important; } @@ -253,4 +241,3 @@ - diff --git a/css/sub.css b/css/oksub.css similarity index 80% rename from css/sub.css rename to css/oksub.css index eb859c4..752d096 100644 --- a/css/sub.css +++ b/css/oksub.css @@ -1,3 +1,4 @@ +@import "../css/common.css"; /**页面的公共样式**/ @import "../lib/layui/css/layui.css"; /********************************************* * (*^__^*) 子页面公共样式 (*^__^*) * @@ -30,3 +31,19 @@ ::-webkit-scrollbar-thumb:vertical:hover{background-color: rgba(0,0,0,.35);} ::-webkit-scrollbar-thumb:vertical:active{background-color: rgba(0,0,0,.38);} + +/*响应样式*/ +@media screen and (max-width: 750px) { + /*控制台*/ + .ok-in-hide-md { + display: none !important; + } +} + +@media screen and (max-width: 548px) { + /**显隐样式**/ + [ok-pc-in-show], + .ok-in-hide-xs { + display: none !important; + } +} diff --git a/data/navs.json b/data/navs.json index bdca44a..f8ab9a0 100644 --- a/data/navs.json +++ b/data/navs.json @@ -4,7 +4,6 @@ "href": "pages/console.html", "fontFamily": "ok-icon", "icon": "", - "isClose": false, "spread": true, "isCheck": true }, @@ -13,7 +12,6 @@ "href": "", "fontFamily": "ok-icon", "icon": "", - "spread": false, "children": [ { "title": "控制台一", diff --git a/js/console.js b/js/console.js index eb84d22..d0a9a2d 100644 --- a/js/console.js +++ b/js/console.js @@ -41,7 +41,7 @@ layui.use(["okUtils", "table", "countUp", "okMock"], function () { * 用户访问 */ function userSource() { - var userSourceMap = echarts.init($("#userSourceMap")[0], "mytheme"); + var userSourceMap = echarts.init($("#userSourceMap")[0], "themez"); userSourceMap.setOption(userSourceOption); okUtils.echartsResize([userSourceMap]); } diff --git a/js/console1.js b/js/console1.js index 3c8ba18..15e4401 100644 --- a/js/console1.js +++ b/js/console1.js @@ -94,7 +94,7 @@ layui.use(["okUtils", "countUp"], function () { } var userSourceWeekChartOption = { - title: {show: true, text: '本周用户访问来源'}, + title: {show: true, text: ''}, tooltip: {trigger: 'axis', axisPointer: {type: 'cross', label: {backgroundColor: '#6a7985'}}}, legend: {data: ['邮件营销', '联盟广告', '视频广告', '直接访问', '搜索引擎']}, toolbox: {show: false, feature: {saveAsImage: {}}}, diff --git a/lib/echarts/echarts.theme.js b/lib/echarts/echarts.theme.js deleted file mode 100644 index 867f4f1..0000000 --- a/lib/echarts/echarts.theme.js +++ /dev/null @@ -1,531 +0,0 @@ -/*** - * echarts主题颜色 - **/ - -!function (root, factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as an anonymous module. - define(['exports', 'echarts'], factory); - } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') { - // CommonJS - factory(exports, require('echarts')); - } else { - // Browser globals - factory({}, root.echarts); - } -}(this, function (exports, echarts) { - var log = function (msg) { - if (typeof console !== 'undefined') { - console && console.error && console.error(msg); - } - }; - if (!echarts) { - log('ECharts is not Loaded'); - return; - } - echarts.registerTheme('mytheme', { - // "color":[ - // "#2D8CF0", - // "#19BE6B", - // "#FF9900", - // "#E46CBB", - // "#9A66E4", - // "#ED3F14", - // ], - "color": [ - "#3fb1e3", - "#6be6c1", - "#626c91", - "#a0a7e6", - "#c4ebad", - "#96dee8" - ], - "backgroundColor": "rgba(252,252,252,0)", - "textStyle": {}, - "title": { - "textStyle": { - "color": "#666666" - }, - "subtextStyle": { - "color": "#999999" - } - }, - "line": { - "itemStyle": { - "normal": { - "borderWidth": "2" - } - }, - "lineStyle": { - "normal": { - "width": "3" - } - }, - "symbolSize": "8", - "symbol": "emptyCircle", - "smooth": false - }, - "radar": { - "itemStyle": { - "normal": { - "borderWidth": "2" - } - }, - "lineStyle": { - "normal": { - "width": "3" - } - }, - "symbolSize": "8", - "symbol": "emptyCircle", - "smooth": false - }, - "bar": { - "itemStyle": { - "normal": { - "barBorderWidth": 0, - "barBorderColor": "#ccc" - }, - "emphasis": { - "barBorderWidth": 0, - "barBorderColor": "#ccc" - } - } - }, - "pie": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "scatter": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "boxplot": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "parallel": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "sankey": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "funnel": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "gauge": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - }, - "emphasis": { - "borderWidth": 0, - "borderColor": "#ccc" - } - } - }, - "candlestick": { - "itemStyle": { - "normal": { - "color": "#e6a0d2", - "color0": "transparent", - "borderColor": "#e6a0d2", - "borderColor0": "#3fb1e3", - "borderWidth": "2" - } - } - }, - "graph": { - "itemStyle": { - "normal": { - "borderWidth": 0, - "borderColor": "#ccc" - } - }, - "lineStyle": { - "normal": { - "width": "1", - "color": "#cccccc" - } - }, - "symbolSize": "8", - "symbol": "emptyCircle", - "smooth": false, - // "color":[ - // "#2D8CF0", - // "#19BE6B", - // "#FF9900", - // "#E46CBB", - // "#9A66E4", - // "#ED3F14", - // ], - "color": [ - "#3fb1e3", - "#6be6c1", - "#626c91", - "#a0a7e6", - "#c4ebad", - "#96dee8" - ], - "label": { - "normal": { - "textStyle": { - "color": "#ffffff" - } - } - } - }, - "map": { - "itemStyle": { - "normal": { - "areaColor": "#eeeeee", - "borderColor": "#aaaaaa", - "borderWidth": 0.5 - }, - "emphasis": { - "areaColor": "rgba(63,177,227,0.25)", - "borderColor": "#3fb1e3", - "borderWidth": 1 - } - }, - "label": { - "normal": { - "textStyle": { - "color": "#ffffff" - } - }, - "emphasis": { - "textStyle": { - "color": "rgb(63,177,227)" - } - } - } - }, - "geo": { - "itemStyle": { - "normal": { - "areaColor": "#eeeeee", - "borderColor": "#aaaaaa", - "borderWidth": 0.5 - }, - "emphasis": { - "areaColor": "rgba(63,177,227,0.25)", - "borderColor": "#3fb1e3", - "borderWidth": 1 - } - }, - "label": { - "normal": { - "textStyle": { - "color": "#ffffff" - } - }, - "emphasis": { - "textStyle": { - "color": "rgb(63,177,227)" - } - } - } - }, - "categoryAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "textStyle": { - "color": "#999999" - } - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": [ - "#eeeeee" - ] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": [ - "rgba(250,250,250,0.05)", - "rgba(200,200,200,0.02)" - ] - } - } - }, - "valueAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "textStyle": { - "color": "#999999" - } - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": [ - "#eeeeee" - ] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": [ - "rgba(250,250,250,0.05)", - "rgba(200,200,200,0.02)" - ] - } - } - }, - "logAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "textStyle": { - "color": "#999999" - } - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": [ - "#eeeeee" - ] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": [ - "rgba(250,250,250,0.05)", - "rgba(200,200,200,0.02)" - ] - } - } - }, - "timeAxis": { - "axisLine": { - "show": true, - "lineStyle": { - "color": "#cccccc" - } - }, - "axisTick": { - "show": false, - "lineStyle": { - "color": "#333" - } - }, - "axisLabel": { - "show": true, - "textStyle": { - "color": "#999999" - } - }, - "splitLine": { - "show": true, - "lineStyle": { - "color": [ - "#eeeeee" - ] - } - }, - "splitArea": { - "show": false, - "areaStyle": { - "color": [ - "rgba(250,250,250,0.05)", - "rgba(200,200,200,0.02)" - ] - } - } - }, - "toolbox": { - "iconStyle": { - "normal": { - "borderColor": "#999999" - }, - "emphasis": { - "borderColor": "#666666" - } - } - }, - "legend": { - "textStyle": { - "color": "#999999" - } - }, - "tooltip": { - "axisPointer": { - "lineStyle": { - "color": "#cccccc", - "width": 1 - }, - "crossStyle": { - "color": "#cccccc", - "width": 1 - } - } - }, - "timeline": { - "lineStyle": { - "color": "#626c91", - "width": 1 - }, - "itemStyle": { - "normal": { - "color": "#626c91", - "borderWidth": 1 - }, - "emphasis": { - "color": "#626c91" - } - }, - "controlStyle": { - "normal": { - "color": "#626c91", - "borderColor": "#626c91", - "borderWidth": 0.5 - }, - "emphasis": { - "color": "#626c91", - "borderColor": "#626c91", - "borderWidth": 0.5 - } - }, - "checkpointStyle": { - "color": "#3fb1e3", - "borderColor": "rgba(63,177,227,0.15)" - }, - "label": { - "normal": { - "textStyle": { - "color": "#626c91" - } - }, - "emphasis": { - "textStyle": { - "color": "#626c91" - } - } - } - }, - "visualMap": { - "color": [ - "#2a99c9", - "#afe8ff" - ] - }, - "dataZoom": { - "backgroundColor": "rgba(255,255,255,0)", - "dataBackgroundColor": "rgba(222,222,222,1)", - "fillerColor": "rgba(114,230,212,0.25)", - "handleColor": "#cccccc", - "handleSize": "100%", - "textStyle": { - "color": "#999999" - } - }, - "markPoint": { - "label": { - "normal": { - "textStyle": { - "color": "#ffffff" - } - }, - "emphasis": { - "textStyle": { - "color": "#ffffff" - } - } - } - } - }); -}); diff --git a/pages/article/article-add.html b/pages/article/article-add.html index 128dcbc..e01f6f6 100644 --- a/pages/article/article-add.html +++ b/pages/article/article-add.html @@ -4,7 +4,7 @@ 添加文章 - +
diff --git a/pages/article/article-edit.html b/pages/article/article-edit.html index 4dc7a2e..922b36a 100644 --- a/pages/article/article-edit.html +++ b/pages/article/article-edit.html @@ -4,7 +4,7 @@ 编辑文章 - +
diff --git a/pages/article/article.html b/pages/article/article.html index 5eef9e8..71c3376 100644 --- a/pages/article/article.html +++ b/pages/article/article.html @@ -4,7 +4,7 @@ 文章列表 - +
@@ -117,7 +117,7 @@ var idsStr = okUtils.table.batchCheck(table); if (idsStr) { okUtils.ajax("/article/batchNormal", "post", {idsStr: idsStr}).done(function (response) { - console.log(response) + console.log(response); okUtils.table.successMsg("批量上架成功"); }).fail(function (error) { console.log(error) @@ -132,7 +132,7 @@ var idsStr = okUtils.table.batchCheck(table); if (idsStr) { okUtils.ajax("/article/batchStop", "post", {idsStr: idsStr}).done(function (response) { - console.log(response) + console.log(response); okUtils.table.successMsg("批量下架成功"); }).fail(function (error) { console.log(error) @@ -147,7 +147,7 @@ var idsStr = okUtils.table.batchCheck(table); if (idsStr) { okUtils.ajax("/article/batchDel", "post", {idsStr: idsStr}).done(function (response) { - console.log(response) + console.log(response); okUtils.table.successMsg("批量删除成功"); }).fail(function (error) { console.log(error) @@ -171,7 +171,7 @@ function del (id) { okLayer.confirm("确定要删除吗？", function () { okUtils.ajax("/article/batchDel", "post", {idsStr: id}).done(function (response) { - console.log(response) + console.log(response); okUtils.table.successMsg("删除成功"); }).fail(function (error) { console.log(error) @@ -215,8 +215,8 @@ diff --git a/pages/console.html b/pages/console.html index 63256ea..8cac153 100644 --- a/pages/console.html +++ b/pages/console.html @@ -1,203 +1,265 @@ - - ok-admin v2.0 | 很赞的后台模版 - - - - - - - - - - - - - - + .ok-card-body { + padding: 20px; + position: relative; + width: 100%; + box-sizing: border-box + } +
-
-
-
-
- none -
-
-
0
-
收入
-
+
+
+
+
+ none
-
-
+
+
0
+
收入
+
+
+
+
-
-
-
-
- none -
-
-
0
-
商品
-
+
+
+
+
+ none
-
-
+
+
0
+
商品
+
+
+
+
-
-
-
-
- none -
-
-
0
-
博客
-
+
+
+
+
+ none
-
-
+
+
0
+
博客
+
+
+
+
-
-
-
-
- none -
-
-
0
-
用户
-
+
+
+
+
+ none
-
-
+
+
0
+
用户
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+ +
+
+
+
用户排行榜
+
+
+
+
+ none +
+
+

Visits

+
用户比例
+
+
+
+
-
-
-
-
-
-
用户排行榜
+
+
+ none +
+
+

Visits

+
用户比例
+
+
+
+
-
-
-
- none -
-
-

Visits

-
用户比例
-
-
-
-
-
-
-
- none -
-
-

Visits

-
用户比例
-
-
-
-
-
- -
-
- none -
-
-

Visits

-
用户比例
-
-
-
-
-
- -
-
- none -
-
-

Visits

-
用户比例
-
-
-
-
-
+
+
+ none +
+
+

Visits

+
用户比例
+
+
+
+
-
-
+ +
+
+ none +
+
+

Visits

+
用户比例
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/console1.html b/pages/console1.html index a243de3..7f085b7 100644 --- a/pages/console1.html +++ b/pages/console1.html @@ -14,7 +14,7 @@ - +