diff --git a/package.json b/package.json index f70e7baf..7a369398 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "nprogress": "^0.2.0", "vue": "^3.0.0", "vue-router": "^4.0.0-0", + "vuedraggable": "^4.0.1", "vuex": "^4.0.0-0" }, "devDependencies": { diff --git a/src/router/index.js b/src/router/index.js index 881f713e..fe9e51e0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -27,7 +27,7 @@ const routes = [{ title: "控制台", affix: true }, - component: () => import(/* webpackChunkName: "home" */ '@/views/home'), + component: () => import(/* webpackChunkName: "home" */ '@/views/home/index'), } ] } diff --git a/src/views/home/components/C1.vue b/src/views/home/components/C1.vue new file mode 100644 index 00000000..0d33f58e --- /dev/null +++ b/src/views/home/components/C1.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/views/home/components/C2.vue b/src/views/home/components/C2.vue new file mode 100644 index 00000000..36f6f136 --- /dev/null +++ b/src/views/home/components/C2.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/views/home/components/C3.vue b/src/views/home/components/C3.vue new file mode 100644 index 00000000..4ccf1e4d --- /dev/null +++ b/src/views/home/components/C3.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/views/home/components/C4.vue b/src/views/home/components/C4.vue new file mode 100644 index 00000000..1746bda5 --- /dev/null +++ b/src/views/home/components/C4.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/views/home/components/index.js b/src/views/home/components/index.js new file mode 100644 index 00000000..ec097fb4 --- /dev/null +++ b/src/views/home/components/index.js @@ -0,0 +1,12 @@ +import {markRaw} from 'vue'; +const resultComps = {} +let requireComponent = require.context( + './', // 在当前目录下查找 + false, // 不遍历子文件夹 + /\.vue$/ // 正则匹配 以 .vue结尾的文件 +) +requireComponent.keys().forEach(fileName => { + let comp = requireComponent(fileName) + resultComps[fileName.replace(/^\.\/(.*)\.\w+$/, '$1')] = comp.default +}) +export default markRaw(resultComps) diff --git a/src/views/home.vue b/src/views/home/index.vue similarity index 59% rename from src/views/home.vue rename to src/views/home/index.vue index d9ad516d..21dd7ead 100644 --- a/src/views/home.vue +++ b/src/views/home/index.vue @@ -32,7 +32,7 @@ - + user.add user.edit user.delete @@ -42,20 +42,72 @@ + +
+ + + + + + + + + + + + +
+ +
{{ grid }}
+ + @@ -71,4 +123,10 @@ .welTop .icons {margin-left:auto;text-align: center;} .welTop .icons p {font-size: 12px;} .avatar-list .avatar {margin-left: -10px;border: 3px solid #fff;cursor: pointer;} + + .diy-grid-layout .el-card {margin-bottom:15px;} + .sortable-ghost { + opacity: 0.5; + background: #c8ebfb; + }