diff --git a/public/favicon.ico b/public/favicon.ico index cf48032..1fe714d 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/model/home.js b/src/api/model/home.js new file mode 100644 index 0000000..453e591 --- /dev/null +++ b/src/api/model/home.js @@ -0,0 +1,19 @@ +import config from "@/config"; +import http from "@/utils/request"; + +export default { + quickList: { + url: `${config.API_URL}/user.quick.function`, + name: "用户快捷功能列表", + post: async function (params) { + return await http.post(this.url, params); + }, + }, + quickSave: { + url: `${config.API_URL}/user.quick.function.save`, + name: "用户快捷功能列表", + post: async function (params) { + return await http.post(this.url, params); + }, + }, +}; diff --git a/src/assets/icons/index.js b/src/assets/icons/index.js index c5b3577..fc286eb 100644 --- a/src/assets/icons/index.js +++ b/src/assets/icons/index.js @@ -111,6 +111,9 @@ export { default as FinanceMag } from './menu/Finance.vue' export { default as Reports } from './menu/ReportForms.vue' export { default as ShipmentMag } from './menu/Shipment.vue' export { default as Inventory } from './menu/Stock.vue' +// 二层菜单 +export { default as AccountInfo } from './menu/UserInfo.vue' +export { default as OrderList } from './menu/WorkOrder.vue' export { default as Gather } from './home/gather.vue' export { default as HomeChart } from './home/chart.vue' diff --git a/src/style/home.scss b/src/style/home.scss index ce9f4d2..492d17e 100644 --- a/src/style/home.scss +++ b/src/style/home.scss @@ -16,59 +16,68 @@ flex: 1; display: flex; overflow: hidden; - .boxScrollbar{ + } +} + +.inletView{ + display: flex; + align-items: flex-start; + flex-wrap: wrap; + .leftBox{ + display: flex; + align-items: center; + flex-wrap: wrap; + } + .item{ + display: flex; + align-items: center; + flex-direction: column; + margin:0 18px 0 0; + padding-bottom: 20px; + width: 50px; + .img{ + width: 50px;height: 50px;background: var(--el-color-primary);border-radius: 8px; + display: flex;align-items: center;justify-content: center; + cursor: pointer; + } + .text{ + margin-top: 8px; + width: 100%; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + } + } + .add{ + display: flex; + justify-content: center; + align-items: center; + margin:0; + padding-bottom: 20px; + .addBack{ + background: #f2f2f2; + border-radius: 8px; + width: 50px; + height: 50px; display: flex; align-items: center; + justify-content: center; + cursor: pointer; + } + .icon{ + width: 30px; + height: 30px; + color: #888; + } + .text{ + width: 50px; + text-align: center; } } } .headerBox{ .cardBox{ - .inletView{ - display: flex; - align-items: center; - .leftBox{ - display: flex; - align-items: center; - } - .item{ - display: flex; - align-items: center; - flex-direction: column; - margin-right: 30px; - .img{ - width: 50px; - } - .text{ - margin-top: 8px; - } - } - .add{ - display: flex; - justify-content: center; - align-items: center; - margin: 0; - .addBack{ - background: #f2f2f2; - border-radius: 8px; - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; - } - .icon{ - width: 30px; - height: 30px; - color: #888; - } - .text{ - width: 50px; - text-align: center; - } - } - } .newBell{ display: flex; flex-wrap: wrap; @@ -161,13 +170,6 @@ } } -.boxScrollbar{ - .el-scrollbar__wrap{ - display: flex; - align-items: center; - } -} - @media (max-width: 992px){ .consoleView{ diff --git a/src/views/home/console/components/shortcuts.vue b/src/views/home/console/components/shortcuts.vue new file mode 100644 index 0000000..e933870 --- /dev/null +++ b/src/views/home/console/components/shortcuts.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/src/views/home/console/index.vue b/src/views/home/console/index.vue index 33ded0c..e1cbfe7 100644 --- a/src/views/home/console/index.vue +++ b/src/views/home/console/index.vue @@ -5,22 +5,9 @@
-
快捷功能入口
-
- -
-
- - {{item.name}} -
-
-
-
-
- -
- 添加 -
+
占位
+
+
@@ -103,9 +90,9 @@
-
占位
+
快捷功能入口
- +
@@ -120,23 +107,20 @@ import progressBox from "./components/progress"; import barBox from "./components/bar"; import ringBox from "./components/ring"; import pointBox from "./components/point"; +import shortcuts from "./components/shortcuts"; + export default { name: "index", components:{ progressBox, barBox, ringBox, - pointBox + pointBox, + shortcuts }, data(){ return{ - inletList:[ - {name:'日报',url:'https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/home1.png'}, - {name:'销售订单',url:'https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/home2.png'}, - {name:'库存列表',url:'https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/home3.png'}, - {name:'统计',url:'https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/home4.png'}, - {name:'维修订单',url:'https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/home4.png'}, - ], + briefing:[ {num:189376,name:'数据采集条数',icon:'sc-icon-Gather'}, {num:12496,name:'维保待维修',icon:'sc-icon-HomeSetup'}, @@ -185,6 +169,7 @@ export default { } .footerBox{ flex: 5; + overflow: hidden; padding-top: 5px; } .colRow{ diff --git a/src/views/setting/company/see.vue b/src/views/setting/company/see.vue index 4cca31b..d136e40 100644 --- a/src/views/setting/company/see.vue +++ b/src/views/setting/company/see.vue @@ -20,10 +20,22 @@ {{form.owner}} {{form.mobile}} - + + + - + + +