diff --git a/pages.json b/pages.json index d381e93..0a54f03 100644 --- a/pages.json +++ b/pages.json @@ -148,7 +148,7 @@ } }, { - "path" : "pages/menuChouse/menuChouse", + "path" : "pages/menu-choose/menuChouse", "style" : { "navigationBarTitleText" : "功能选择", diff --git a/pages/index/index.vue b/pages/index/index.vue index 53fff61..cbcc500 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -40,112 +40,112 @@ export default { // 页面按钮参数 gridItemList: [{ name: '成品入库', - icon: '入库/成品入库', + icon: 'inbound/finished-product-inbound', url: '/pages/inWarehouse/inWarehouse?isStrict=true', type: 1, index: 1 }, { name: '油漆入库', - icon: '入库/油漆入库', + icon: 'inbound/paint-inbound', url: '', type: 1, index: 2 }, { name: '毛坯入库', - icon: '入库/毛坯入库', + icon: 'inbound/rough-casting-inbound', url: '', type: 1, index: 3 }, { name: '备件入库', - icon: '入库/备件入库', + icon: 'inbound/spare-parts-inbound', url: '', type: 1, index: 4 }, { name: '无校验入库', - icon: '入库/无校验入库', + icon: 'inbound/no-validation-inbound', url: '/pages/inWarehouse/inWarehouse?isStrict=false', type: 1, index: 14 }, { name: '成品出库', - icon: '出库/成品出库', + icon: 'outbound/finished-product-outbound', url: '/pages/outWarehouse/outWarehouse', type: 2, index: 5 }, { name: '无校验出库', - icon: '出库/无出库单出库', + icon: 'outbound/no-outbound-order', url: '/pages/returnWarehouse/returnWarehouse', type: 2, index: 15 }, { name: '出货', - icon: '出库/出货', + icon: 'outbound/shipping', url: '', type: 2, index: 6 }, { name: '退货', - icon: '出库/退货', + icon: 'outbound/return', url: '', type: 2, index: 7 }, { name: '盘点', - icon: '库存管理/盘点', + icon: 'inventory-management/stocktake', url: '/pages/stocktake/stocktake', type: 3, index: 8 }, { name: '库存查询', - icon: '库存管理/库存查询', + icon: 'inventory-management/inventory-query', url: '/pages/watchGoods/watchGoods', type: 3, index: 9 }, { name: '操作记录', - icon: '库存管理/操作记录', + icon: 'inventory-management/operation-record', url: '/pages/warehoseActionList/warehoseActionList', type: 3, index: 10 }, { name: '扫描管理', - icon: '库存管理/扫描管理', + icon: 'inventory-management/scan-management', url: '/pages/scan/scan', type: 3, index: 14 }, { name: '拼箱', - icon: '库内管理/拼箱', + icon: 'warehouse-management/consolidation', url: '/pages/consolidation/consolidation', type: 4, index: 11 }, { name: '拆箱', - icon: '库内管理/拆箱', + icon: 'warehouse-management/unpacking', url: '/pages/unpacking/unpacking', type: 4, index: 12 }, { name: '移库', - icon: '库内管理/移库', + icon: 'warehouse-management/relocation', url: '/pages/relocation/relocation', type: 4, index: 13 diff --git a/pages/materialManagement/materialManagement.vue b/pages/materialManagement/materialManagement.vue index 32d4507..58f4423 100644 --- a/pages/materialManagement/materialManagement.vue +++ b/pages/materialManagement/materialManagement.vue @@ -37,37 +37,37 @@ // 页面按钮参数 gridItemList: [{ name: '仓库配料', - icon: '仓库配料', + icon: 'warehouse-material', url: '/pages/materialManagement/MaterialProductionInput/MaterialProductionInput', type: 1, }, { name: '车间叫料', - icon: '车间叫料', + icon: 'workshop-call-material', url: '/pages/materialManagement/MaterialRequisition/MaterialRequisition', type: 1, }, { name: '车间进料', - icon: '车间进料', + icon: 'workshop-feed-material', url: '/pages/materialManagement/MaterialFeeding/MaterialFeeding', type: 1, }, { name: '成品入库', - icon: '成品入库', + icon: 'finished-product-inbound', url: '/pages/materialManagement/MaterialWarehousing/MaterialWarehousing', type: 2, }, { name: '进箱', - icon: '进箱', + icon: 'into-box', url: '/pages/materialManagement/package/package', type: 3, }, { name: '全点位移动', - icon: '全点位移动', + icon: 'full-position-move', url: '/pages/materialManagement/AGVRemoteControl/AGVRemoteControl', type: 4, }, diff --git a/pages/menuChouse/menuChouse.vue b/pages/menu-choose/menuChouse.vue similarity index 100% rename from pages/menuChouse/menuChouse.vue rename to pages/menu-choose/menuChouse.vue diff --git a/static/font/刀隶体/AlimamaDaoLiTi.ttf b/static/font/daoli-ti/AlimamaDaoLiTi.ttf similarity index 100% rename from static/font/刀隶体/AlimamaDaoLiTi.ttf rename to static/font/daoli-ti/AlimamaDaoLiTi.ttf diff --git a/static/font/刀隶体/AlimamaDaoLiTi.woff b/static/font/daoli-ti/AlimamaDaoLiTi.woff similarity index 100% rename from static/font/刀隶体/AlimamaDaoLiTi.woff rename to static/font/daoli-ti/AlimamaDaoLiTi.woff diff --git a/static/font/刀隶体/AlimamaDaoLiTi.woff2 b/static/font/daoli-ti/AlimamaDaoLiTi.woff2 similarity index 100% rename from static/font/刀隶体/AlimamaDaoLiTi.woff2 rename to static/font/daoli-ti/AlimamaDaoLiTi.woff2 diff --git a/static/font/刀隶体/INSTRUCTION.txt b/static/font/daoli-ti/INSTRUCTION.txt similarity index 100% rename from static/font/刀隶体/INSTRUCTION.txt rename to static/font/daoli-ti/INSTRUCTION.txt diff --git a/static/font/刀隶体/LICENSE.txt b/static/font/daoli-ti/LICENSE.txt similarity index 100% rename from static/font/刀隶体/LICENSE.txt rename to static/font/daoli-ti/LICENSE.txt diff --git a/static/font/东方大楷/AlimamaDongFangDaKai-Regular.otf b/static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.otf similarity index 100% rename from static/font/东方大楷/AlimamaDongFangDaKai-Regular.otf rename to static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.otf diff --git a/static/font/东方大楷/AlimamaDongFangDaKai-Regular.ttf b/static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.ttf similarity index 100% rename from static/font/东方大楷/AlimamaDongFangDaKai-Regular.ttf rename to static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.ttf diff --git a/static/font/东方大楷/AlimamaDongFangDaKai-Regular.woff b/static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.woff similarity index 100% rename from static/font/东方大楷/AlimamaDongFangDaKai-Regular.woff rename to static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.woff diff --git a/static/font/东方大楷/AlimamaDongFangDaKai-Regular.woff2 b/static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.woff2 similarity index 100% rename from static/font/东方大楷/AlimamaDongFangDaKai-Regular.woff2 rename to static/font/dongfang-dakai/AlimamaDongFangDaKai-Regular.woff2 diff --git a/static/font/东方大楷/INSTRUCTION.txt b/static/font/dongfang-dakai/INSTRUCTION.txt similarity index 100% rename from static/font/东方大楷/INSTRUCTION.txt rename to static/font/dongfang-dakai/INSTRUCTION.txt diff --git a/static/font/东方大楷/LICENSE.txt b/static/font/dongfang-dakai/LICENSE.txt similarity index 100% rename from static/font/东方大楷/LICENSE.txt rename to static/font/dongfang-dakai/LICENSE.txt diff --git a/static/font/global-font.css b/static/font/global-font.css index 8ebe78e..1f5da3c 100644 --- a/static/font/global-font.css +++ b/static/font/global-font.css @@ -1,18 +1,18 @@ @font-face { - font-family: '数黑体'; - src: url('@/static/font/数黑体/AlimamaShuHeiTi-Bold.ttf') format('truetype'), - url('@/static/font/数黑体/AlimamaShuHeiTi-Bold.woff') format('woff'), - url('@/static/font/数黑体/AlimamaShuHeiTi-Bold.woff2') format('woff2'); + font-family: 'SHT'; + src: url('@/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.ttf') format('truetype'), + url('@/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.woff') format('woff'), + url('@/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.woff2') format('woff2'); font-weight: normal; font-style: normal; } /* 设置全局默认字体 */ body, page { - font-family: '数黑体', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: 'SHT', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; } /* 为所有元素设置默认字体 */ * { - font-family: '数黑体', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; + font-family: 'SHT', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif; } \ No newline at end of file diff --git a/static/font/数黑体/AlimamaShuHeiTi-Bold.otf b/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.otf similarity index 100% rename from static/font/数黑体/AlimamaShuHeiTi-Bold.otf rename to static/font/shuhe-ti/AlimamaShuHeiTi-Bold.otf diff --git a/static/font/数黑体/AlimamaShuHeiTi-Bold.ttf b/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.ttf similarity index 100% rename from static/font/数黑体/AlimamaShuHeiTi-Bold.ttf rename to static/font/shuhe-ti/AlimamaShuHeiTi-Bold.ttf diff --git a/static/font/数黑体/AlimamaShuHeiTi-Bold.woff b/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.woff similarity index 100% rename from static/font/数黑体/AlimamaShuHeiTi-Bold.woff rename to static/font/shuhe-ti/AlimamaShuHeiTi-Bold.woff diff --git a/static/font/数黑体/AlimamaShuHeiTi-Bold.woff2 b/static/font/shuhe-ti/AlimamaShuHeiTi-Bold.woff2 similarity index 100% rename from static/font/数黑体/AlimamaShuHeiTi-Bold.woff2 rename to static/font/shuhe-ti/AlimamaShuHeiTi-Bold.woff2 diff --git a/static/font/数黑体/INSTRUCTION.txt b/static/font/shuhe-ti/INSTRUCTION.txt similarity index 100% rename from static/font/数黑体/INSTRUCTION.txt rename to static/font/shuhe-ti/INSTRUCTION.txt diff --git a/static/font/数黑体/LICENSE.txt b/static/font/shuhe-ti/LICENSE.txt similarity index 100% rename from static/font/数黑体/LICENSE.txt rename to static/font/shuhe-ti/LICENSE.txt diff --git a/static/images/index-icons/入库/成品入库.svg b/static/images/index-icons/inbound/finished-product-inbound.svg similarity index 100% rename from static/images/index-icons/入库/成品入库.svg rename to static/images/index-icons/inbound/finished-product-inbound.svg diff --git a/static/images/index-icons/入库/无校验入库.svg b/static/images/index-icons/inbound/no-validation-inbound.svg similarity index 100% rename from static/images/index-icons/入库/无校验入库.svg rename to static/images/index-icons/inbound/no-validation-inbound.svg diff --git a/static/images/index-icons/入库/油漆入库.svg b/static/images/index-icons/inbound/paint-inbound.svg similarity index 100% rename from static/images/index-icons/入库/油漆入库.svg rename to static/images/index-icons/inbound/paint-inbound.svg diff --git a/static/images/index-icons/入库/毛坯入库.svg b/static/images/index-icons/inbound/rough-casting-inbound.svg similarity index 100% rename from static/images/index-icons/入库/毛坯入库.svg rename to static/images/index-icons/inbound/rough-casting-inbound.svg diff --git a/static/images/index-icons/入库/备件入库.svg b/static/images/index-icons/inbound/spare-parts-inbound.svg similarity index 100% rename from static/images/index-icons/入库/备件入库.svg rename to static/images/index-icons/inbound/spare-parts-inbound.svg diff --git a/static/images/index-icons/库存管理/库存查询.svg b/static/images/index-icons/inventory-management/inventory-query.svg similarity index 100% rename from static/images/index-icons/库存管理/库存查询.svg rename to static/images/index-icons/inventory-management/inventory-query.svg diff --git a/static/images/index-icons/库存管理/操作记录.svg b/static/images/index-icons/inventory-management/operation-record.svg similarity index 100% rename from static/images/index-icons/库存管理/操作记录.svg rename to static/images/index-icons/inventory-management/operation-record.svg diff --git a/static/images/index-icons/库存管理/扫描管理.svg b/static/images/index-icons/inventory-management/scan-management.svg similarity index 100% rename from static/images/index-icons/库存管理/扫描管理.svg rename to static/images/index-icons/inventory-management/scan-management.svg diff --git a/static/images/index-icons/库存管理/盘点.svg b/static/images/index-icons/inventory-management/stocktake.svg similarity index 100% rename from static/images/index-icons/库存管理/盘点.svg rename to static/images/index-icons/inventory-management/stocktake.svg diff --git a/static/images/index-icons/出库/成品出库.svg b/static/images/index-icons/outbound/finished-product-outbound.svg similarity index 100% rename from static/images/index-icons/出库/成品出库.svg rename to static/images/index-icons/outbound/finished-product-outbound.svg diff --git a/static/images/index-icons/出库/无出库单出库.svg b/static/images/index-icons/outbound/no-outbound-order.svg similarity index 100% rename from static/images/index-icons/出库/无出库单出库.svg rename to static/images/index-icons/outbound/no-outbound-order.svg diff --git a/static/images/index-icons/出库/出库扫描.svg b/static/images/index-icons/outbound/outbound-scan.svg similarity index 100% rename from static/images/index-icons/出库/出库扫描.svg rename to static/images/index-icons/outbound/outbound-scan.svg diff --git a/static/images/index-icons/出库/退货.svg b/static/images/index-icons/outbound/return.svg similarity index 100% rename from static/images/index-icons/出库/退货.svg rename to static/images/index-icons/outbound/return.svg diff --git a/static/images/index-icons/出库/出货.svg b/static/images/index-icons/outbound/shipping.svg similarity index 100% rename from static/images/index-icons/出库/出货.svg rename to static/images/index-icons/outbound/shipping.svg diff --git a/static/images/index-icons/出库/调拨出库装箱.svg.svg b/static/images/index-icons/outbound/transfer-outbound-packing.svg similarity index 100% rename from static/images/index-icons/出库/调拨出库装箱.svg.svg rename to static/images/index-icons/outbound/transfer-outbound-packing.svg diff --git a/static/images/index-icons/出库/调拨出库录单.svg.svg b/static/images/index-icons/outbound/transfer-outbound-record.svg similarity index 100% rename from static/images/index-icons/出库/调拨出库录单.svg.svg rename to static/images/index-icons/outbound/transfer-outbound-record.svg diff --git a/static/images/index-icons/库内管理/拼箱.svg b/static/images/index-icons/warehouse-management/consolidation.svg similarity index 100% rename from static/images/index-icons/库内管理/拼箱.svg rename to static/images/index-icons/warehouse-management/consolidation.svg diff --git a/static/images/index-icons/库内管理/移库.svg b/static/images/index-icons/warehouse-management/relocation.svg similarity index 100% rename from static/images/index-icons/库内管理/移库.svg rename to static/images/index-icons/warehouse-management/relocation.svg diff --git a/static/images/index-icons/库内管理/拆箱.svg b/static/images/index-icons/warehouse-management/unpacking.svg similarity index 100% rename from static/images/index-icons/库内管理/拆箱.svg rename to static/images/index-icons/warehouse-management/unpacking.svg diff --git a/static/images/index-icons/出库/调拨申请出库.svg.svg b/static/images/index-icons/出库/调拨申请出库.svg.svg deleted file mode 100644 index a97dea2..0000000 --- a/static/images/index-icons/出库/调拨申请出库.svg.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/images/material-icons/成品入库.svg b/static/images/material-icons/finished-product-inbound.svg similarity index 100% rename from static/images/material-icons/成品入库.svg rename to static/images/material-icons/finished-product-inbound.svg diff --git a/static/images/material-icons/全点位移动.svg b/static/images/material-icons/full-position-move.svg similarity index 100% rename from static/images/material-icons/全点位移动.svg rename to static/images/material-icons/full-position-move.svg diff --git a/static/images/material-icons/进箱.svg b/static/images/material-icons/into-box.svg similarity index 100% rename from static/images/material-icons/进箱.svg rename to static/images/material-icons/into-box.svg diff --git a/static/images/material-icons/仓库配料.svg b/static/images/material-icons/warehouse-material.svg similarity index 100% rename from static/images/material-icons/仓库配料.svg rename to static/images/material-icons/warehouse-material.svg diff --git a/static/images/material-icons/车间叫料.svg b/static/images/material-icons/workshop-call-material.svg similarity index 100% rename from static/images/material-icons/车间叫料.svg rename to static/images/material-icons/workshop-call-material.svg diff --git a/static/images/material-icons/车间进料.svg b/static/images/material-icons/workshop-feed-material.svg similarity index 100% rename from static/images/material-icons/车间进料.svg rename to static/images/material-icons/workshop-feed-material.svg