From a5abbc578e9db7a68800ce95cf39536b82099861 Mon Sep 17 00:00:00 2001 From: sakuya <81883387@qq.com> Date: Fri, 7 May 2021 22:04:47 +0800 Subject: [PATCH] UP --- public/json/user.json | 18 +- src/components/scEcharts/echarts-theme-T.js | 8 +- src/style/fix.less | 1 + src/views/home/gridLayout.vue | 2 +- src/views/template/list.vue | 318 ++++++++++++++------ src/views/template/normallist.vue | 245 --------------- src/views/template/sideList.vue | 127 ++++++++ 7 files changed, 363 insertions(+), 356 deletions(-) delete mode 100644 src/views/template/normallist.vue create mode 100644 src/views/template/sideList.vue diff --git a/public/json/user.json b/public/json/user.json index 55f980f0..b5c7f227 100644 --- a/public/json/user.json +++ b/public/json/user.json @@ -55,22 +55,22 @@ }, "component": "template/blank" }, - { - "path": "/template/normallist", - "name": "normallist", - "meta": { - "title": "普通列表" - }, - "component": "template/normallist" - }, { "path": "/template/list", "name": "list", "meta": { - "title": "列表" + "title": "普通列表" }, "component": "template/list" }, + { + "path": "/template/sideList", + "name": "sideList", + "meta": { + "title": "分栏列表" + }, + "component": "template/sideList" + }, { "path": "/template/show/:id", "name": "show", diff --git a/src/components/scEcharts/echarts-theme-T.js b/src/components/scEcharts/echarts-theme-T.js index b5032db4..b315941c 100644 --- a/src/components/scEcharts/echarts-theme-T.js +++ b/src/components/scEcharts/echarts-theme-T.js @@ -18,7 +18,8 @@ const T = { "axisLine": { "show": true, "lineStyle": { - "color": "#999" + "color": "#eee", + "width": 1 } }, "axisTick": { @@ -27,6 +28,11 @@ const T = { "color": "#333" } }, + "axisLabel": { + "textStyle": { + "color": "#999" + } + }, "splitLine": { "show": true, "lineStyle": { diff --git a/src/style/fix.less b/src/style/fix.less index f6a9ce41..3c54d4cc 100644 --- a/src/style/fix.less +++ b/src/style/fix.less @@ -14,3 +14,4 @@ .el-main.nopadding {padding:0;background: #fff;} .el-drawer__body {overflow: auto;} .el-popconfirm__main {margin: 14px 0;} +.el-card__header {border-bottom: 0} \ No newline at end of file diff --git a/src/views/home/gridLayout.vue b/src/views/home/gridLayout.vue index 19029309..32ec1a5c 100644 --- a/src/views/home/gridLayout.vue +++ b/src/views/home/gridLayout.vue @@ -22,7 +22,7 @@ - + diff --git a/src/views/template/list.vue b/src/views/template/list.vue index b8757f64..3a22659a 100644 --- a/src/views/template/list.vue +++ b/src/views/template/list.vue @@ -1,127 +1,245 @@ - - diff --git a/src/views/template/normallist.vue b/src/views/template/normallist.vue deleted file mode 100644 index c674d574..00000000 --- a/src/views/template/normallist.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - diff --git a/src/views/template/sideList.vue b/src/views/template/sideList.vue new file mode 100644 index 00000000..bb645daa --- /dev/null +++ b/src/views/template/sideList.vue @@ -0,0 +1,127 @@ + + + + +