diff --git a/package.json b/package.json index 89cab22..cba6a07 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@smallwei/avue": "^2.9.15", "axios": "0.18.1", "core-js": "3.6.5", - "echarts": "^4.2.1", + "echarts": "^4.9.0", "element-ui": "2.13.2", "js-cookie": "2.2.0", "less-loader": "^5.0.0", diff --git a/public/favicon.ico b/public/favicon.ico index f4298a6..f83b751 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/logo-mini.png b/src/assets/logo-mini.png index e00f8e9..f83b751 100644 Binary files a/src/assets/logo-mini.png and b/src/assets/logo-mini.png differ diff --git a/src/assets/logo-title.png b/src/assets/logo-title.png new file mode 100644 index 0000000..f4ecdb1 Binary files /dev/null and b/src/assets/logo-title.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png index 004347f..f83b751 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue index f82c9d3..1cff8f7 100644 --- a/src/components/LxHeader/index.vue +++ b/src/components/LxHeader/index.vue @@ -40,12 +40,12 @@ export default { // padding-top: 10px; font-weight: bold; font-size: 15px; - color: #444140; + color: #147d38; white-space: nowrap; - border-bottom: 2px solid #444140; + border-bottom: 2px solid #147d38; > span { position: relative; - + } } .content { diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue index 7ead59f..f8e9f4e 100644 --- a/src/components/XyTable/index.vue +++ b/src/components/XyTable/index.vue @@ -645,13 +645,19 @@ export default { ["expand-change"]: this.expandChange, }} > + + {this.tableFormat.map((item, index) => { if ($scopedSlots[item.prop]) { return $scopedSlots[item.prop](item, index); } return (