diff --git a/package.json b/package.json index 4d0d5f4..354786e 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "core-js": "3.6.5", "element-ui": "2.13.2", "html2canvas": "^1.4.1", + "echarts": "^4.2.1", "js-cookie": "2.2.0", "less": "^3.13.1", "moment": "^2.29.4", diff --git a/src/layout/components/worker/index.vue b/src/layout/components/worker/index.vue index b03502a..f4731d1 100644 --- a/src/layout/components/worker/index.vue +++ b/src/layout/components/worker/index.vue @@ -1,13 +1,89 @@ @@ -36,7 +352,7 @@ export default { .card{ flex-shrink: 0; flex-grow: 1; - min-width: 20vw; + //min-width: 25vw; margin-right: 10px; margin-bottom: 10px; diff --git a/src/layout/index.vue b/src/layout/index.vue index 407eb60..e73b3b1 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -181,6 +181,7 @@ import worker from "./components/worker" white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + cursor: pointer; padding: 0 20px; position: relative; diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 88dd260..cfb2bd8 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -146,6 +146,10 @@ const actions = { case '/contract': item.redirect = '/contract/dashboard' break; + default: + if(item.children.length > 0){ + item.redirect = item.children[0]?.path + } } item.hidden = true return item