diff --git a/.env.dev b/.env.dev index dbfa1b3..ae83de4 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-09-27 14:04:02 + # @LastEditTime: 2024-04-18 14:12:38 # @LastEditors: zwq # @Description: ### @@ -9,10 +9,11 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 爱协林管理系统 +VUE_APP_TITLE = 热处理立库管理系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.12:48080' +VUE_APP_BASE_API = 'http://192.168.1.180:48080' +VUE_APP_JM_API = 'http://192.168.1.180:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.front b/.env.front index f8f08ec..3e87412 100644 --- a/.env.front +++ b/.env.front @@ -2,7 +2,7 @@ ENV = 'development' # 页面标题 -VUE_APP_TITLE = 爱协林管理系统 +VUE_APP_TITLE = 热处理立库管理系统 # 芋道管理系统/本地环境 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn' diff --git a/.env.prod b/.env.prod index f36e0b7..9fdd6e5 100644 --- a/.env.prod +++ b/.env.prod @@ -2,21 +2,24 @@ # @Author: zwq # @Date: 2023-09-14 13:44:22 # @LastEditors: zwq - # @LastEditTime: 2023-11-17 14:57:46 + # @LastEditTime: 2023-12-15 10:51:16 # @Description: ### # 生产环境配置 ENV = 'production' # 页面标题 -VUE_APP_TITLE = 爱协林管理系统 +VUE_APP_TITLE = 热处理立库管理系统 # 芋道管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' +VUE_APP_JM_API = 'http://10.10.100.219:48080' # 根据服务器或域名修改 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/' PUBLIC_PATH = 'http://10.10.100.219:8888/' +# PUBLIC_PATH = 'http://192.168.0.127:8888/' +# PUBLIC_PATH = 'http://192.168.1.55:8888/' # 二级部署路径 VUE_APP_APP_NAME ='yudao-admin' diff --git a/.env.stage b/.env.stage index 7da5b98..3ce46d8 100644 --- a/.env.stage +++ b/.env.stage @@ -1,7 +1,7 @@ NODE_ENV = production # 页面标题 -VUE_APP_TITLE = 爱协林管理系统 +VUE_APP_TITLE = 热处理立库管理系统 # 测试环境配置 ENV = 'staging' diff --git a/.env.static b/.env.static index a1e1d49..5997472 100644 --- a/.env.static +++ b/.env.static @@ -4,7 +4,7 @@ NODE_ENV = development ENV = 'staging' # 页面标题 -VUE_APP_TITLE = 爱协林管理系统 +VUE_APP_TITLE = 热处理立库管理系统 # 芋道管理系统/测试环境 VUE_APP_BASE_API = 'http://127.0.0.1:48080' diff --git a/package.json b/package.json index 8fc97ef..9e6f77d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "yudao-ui-admin", "version": "1.7.3-snapshot", - "description": "爱协林管理系统", + "description": "热处理立库管理系统", "author": "爱协林", "license": "MIT", "scripts": { @@ -63,7 +63,7 @@ "nprogress": "0.2.0", "qrcode.vue": "^1.7.0", "quill": "1.3.7", - "screenfull": "5.0.2", + "screenfull": "^5.0.2", "sortablejs": "1.10.2", "throttle-debounce": "2.1.0", "vue": "2.7.14", diff --git a/public/index.html b/public/index.html index f7deebd..a51817a 100644 --- a/public/index.html +++ b/public/index.html @@ -1,215 +1,221 @@ - - - - - - - <%= webpackConfig.name %> - - - + #loader-wrapper .load_title span { + font-weight: normal; + font-style: italic; + font-size: 13px; + color: #fff; + opacity: 0.5; + } + + + + +
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+
+ + + + - -
-
-
-
-
-
正在加载系统资源，请耐心等待
-
-
- diff --git a/src/api/axl/alarmLog.js b/src/api/axl/alarmLog.js index 16544eb..cbdb425 100644 --- a/src/api/axl/alarmLog.js +++ b/src/api/axl/alarmLog.js @@ -8,7 +8,20 @@ export function createAlarmLog(data) { data: data }) } - +// 大屏看板数据 +export function screenData() { + return request({ + url: '/axl/screen/screenData', + method: 'post' + }) +} +// 大屏看板数据 +export function screenStatus() { + return request({ + url: '/axl/screen/status', + method: 'post' + }) +} // 更新报警记录 export function updateAlarmLog(data) { return request({ diff --git a/src/api/axl/product.js b/src/api/axl/product.js index 3e050dc..a2c81da 100644 --- a/src/api/axl/product.js +++ b/src/api/axl/product.js @@ -9,6 +9,13 @@ export function createProduct(data) { }) } +// 获得产品规格列表 +export function getProductList() { + return request({ + url: '/axl/product/list', + method: 'get', + }) +} // 更新产品规格 export function updateProduct(data) { return request({ diff --git a/src/api/axl/warehousestorehouse.js b/src/api/axl/warehousestorehouse.js index f32f853..2b173fd 100644 --- a/src/api/axl/warehousestorehouse.js +++ b/src/api/axl/warehousestorehouse.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-09-13 16:08:14 * @LastEditors: zwq - * @LastEditTime: 2023-11-01 16:16:19 + * @LastEditTime: 2023-12-20 14:52:46 * @Description: */ import request from '@/utils/request' @@ -47,10 +47,17 @@ export function getProductList(id) { method: 'get' }) } -// 出库 +// 出库输送线 export function outWare(id) { return request({ - url: '/axl/warehousestorehouse/out?id=' + id, + url: '/axl/warehousestorehouse/outLine?id=' + id, + method: 'get' + }) +} +// 出库载货台 +export function outWare2(id) { + return request({ + url: '/axl/warehousestorehouse/outPlatform?id=' + id, method: 'get' }) } @@ -63,6 +70,13 @@ export function getWarehousestorehousePage(query) { }) } +// 获得立库库位list +export function getWarehousestorehouseListById() { + return request({ + url: '/axl/warehousestorehouse/listById', + method: 'get' + }) +} // 获得立库库位分页 export function getWarehousestorehouseList() { return request({ @@ -70,6 +84,14 @@ export function getWarehousestorehouseList() { method: 'get', }) } +// 根据货物信息查询立库库位列表 +export function getWarehousestorehouseNList(query) { + return request({ + url: '/axl/warehousestorehouse/listByProduct', + method: 'get', + params: query + }) +} // 导出立库库位 Excel export function exportWarehousestorehouseExcel(query) { return request({ diff --git a/src/assets/axl/1.png b/src/assets/axl/1.png new file mode 100644 index 0000000..5d17ecd Binary files /dev/null and b/src/assets/axl/1.png differ diff --git a/src/assets/axl/2.png b/src/assets/axl/2.png new file mode 100644 index 0000000..65da111 Binary files /dev/null and b/src/assets/axl/2.png differ diff --git a/src/assets/axl/3.png b/src/assets/axl/3.png new file mode 100644 index 0000000..16aa86e Binary files /dev/null and b/src/assets/axl/3.png differ diff --git a/src/assets/axl/4.png b/src/assets/axl/4.png new file mode 100644 index 0000000..f10c4e0 Binary files /dev/null and b/src/assets/axl/4.png differ diff --git a/src/assets/axl/5.png b/src/assets/axl/5.png new file mode 100644 index 0000000..2b4b344 Binary files /dev/null and b/src/assets/axl/5.png differ diff --git a/src/assets/axl/bg.png b/src/assets/axl/bg.png new file mode 100644 index 0000000..f3034bc Binary files /dev/null and b/src/assets/axl/bg.png differ diff --git a/src/assets/axl/div2.png b/src/assets/axl/div2.png new file mode 100644 index 0000000..8db29c8 Binary files /dev/null and b/src/assets/axl/div2.png differ diff --git a/src/assets/axl/title.png b/src/assets/axl/title.png new file mode 100644 index 0000000..d4b4b5e Binary files /dev/null and b/src/assets/axl/title.png differ diff --git a/src/assets/axl/窑炉信息框(2).png b/src/assets/axl/窑炉信息框(2).png new file mode 100644 index 0000000..8db29c8 Binary files /dev/null and b/src/assets/axl/窑炉信息框(2).png differ diff --git a/src/assets/axl/窑炉信息框(3).png b/src/assets/axl/窑炉信息框(3).png new file mode 100644 index 0000000..8db29c8 Binary files /dev/null and b/src/assets/axl/窑炉信息框(3).png differ diff --git a/src/assets/axl/窑炉信息框(4).png b/src/assets/axl/窑炉信息框(4).png new file mode 100644 index 0000000..8db29c8 Binary files /dev/null and b/src/assets/axl/窑炉信息框(4).png differ diff --git a/src/assets/axl/窑炉信息框(5).png b/src/assets/axl/窑炉信息框(5).png new file mode 100644 index 0000000..8db29c8 Binary files /dev/null and b/src/assets/axl/窑炉信息框(5).png differ diff --git a/src/assets/axl/窑炉信息框.png b/src/assets/axl/窑炉信息框.png new file mode 100644 index 0000000..8db29c8 Binary files /dev/null and b/src/assets/axl/窑炉信息框.png differ diff --git a/src/assets/axl/编组 27.png b/src/assets/axl/编组 27.png new file mode 100644 index 0000000..c00fff4 Binary files /dev/null and b/src/assets/axl/编组 27.png differ diff --git a/src/assets/axl/编组 54.png b/src/assets/axl/编组 54.png new file mode 100644 index 0000000..5714044 Binary files /dev/null and b/src/assets/axl/编组 54.png differ diff --git a/src/assets/icons/svg/div1.svg b/src/assets/icons/svg/div1.svg new file mode 100644 index 0000000..e636380 --- /dev/null +++ b/src/assets/icons/svg/div1.svg @@ -0,0 +1,12 @@ + + + 物料信息 + + + + + + + + + diff --git a/src/assets/icons/svg/div3.svg b/src/assets/icons/svg/div3.svg new file mode 100644 index 0000000..ba9ecfd --- /dev/null +++ b/src/assets/icons/svg/div3.svg @@ -0,0 +1,18 @@ + + + 总览 + + + + + + + + + + + + + + + diff --git a/src/assets/icons/svg/div4.svg b/src/assets/icons/svg/div4.svg new file mode 100644 index 0000000..345970a --- /dev/null +++ b/src/assets/icons/svg/div4.svg @@ -0,0 +1,12 @@ + + + 编组 3 + + + + + + + + + diff --git a/src/assets/icons/svg/div5.svg b/src/assets/icons/svg/div5.svg new file mode 100644 index 0000000..3dcab2d --- /dev/null +++ b/src/assets/icons/svg/div5.svg @@ -0,0 +1,17 @@ + + + 订单管理 + + + + + + + + + + + + + + diff --git a/src/assets/icons/svg/fullScreenView.svg b/src/assets/icons/svg/fullScreenView.svg new file mode 100644 index 0000000..5358b48 --- /dev/null +++ b/src/assets/icons/svg/fullScreenView.svg @@ -0,0 +1,12 @@ + + + 编组 54 + + + + + + + + + diff --git a/src/assets/icons/svg/unFullScreenView.svg b/src/assets/icons/svg/unFullScreenView.svg new file mode 100644 index 0000000..6013a93 --- /dev/null +++ b/src/assets/icons/svg/unFullScreenView.svg @@ -0,0 +1,10 @@ + + + 编组 54备份 + + + + + + + diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index e8cae0d..cf82b84 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -4,7 +4,7 @@ :class="{ collapse: collapse }" :style="{ backgroundColor: - sideTheme === 'theme-dark' ? '#1f2d3d' : variables.menuLightBackground, + sideTheme === 'theme-dark' ? 'white' : variables.menuLightBackground, }"> diff --git a/src/views/axl/taskProductsAssociate/index.vue b/src/views/axl/taskProductsAssociate/index.vue index e8d869a..3a2c8bf 100644 --- a/src/views/axl/taskProductsAssociate/index.vue +++ b/src/views/axl/taskProductsAssociate/index.vue @@ -1,282 +1,288 @@ + diff --git a/src/views/axl/communLog/index1.vue b/src/views/axl/taskProductsAssociate/index1.vue similarity index 60% rename from src/views/axl/communLog/index1.vue rename to src/views/axl/taskProductsAssociate/index1.vue index 49084ef..e8d869a 100644 --- a/src/views/axl/communLog/index1.vue +++ b/src/views/axl/taskProductsAssociate/index1.vue @@ -3,10 +3,20 @@ - - - - + + + + + + + + + + + + + + + + + 搜索 重置 @@ -29,22 +42,23 @@ 新增 + v-hasPermi="['axl:task-products-associate:create']">新增 导出 + v-hasPermi="['axl:task-products-associate:export']">导出 - - - - - + + + + + + + @@ -72,19 +87,20 @@ - - - - + + - - + + - - + + - - + + + + + @@ -95,6 +111,9 @@ + + +
确 定 @@ -105,13 +124,11 @@ @@ -237,6 +335,8 @@ export default { align-items: center; justify-content: center; position: relative; + background: #9dfffe; + float: left; .dashboard-layout-item-cricle { display: inline-block; width: 12px; @@ -273,6 +373,6 @@ export default { .tips { position: absolute; top: 22px; - left: 120px; + right: 120px; } diff --git a/src/views/axl/warehouseStorehouseRecord/index.vue b/src/views/axl/warehouseStorehouseRecord/index.vue index 6f840a4..e01307b 100644 --- a/src/views/axl/warehouseStorehouseRecord/index.vue +++ b/src/views/axl/warehouseStorehouseRecord/index.vue @@ -153,6 +153,14 @@ export default { name: 'search', color: 'primary', }, + { + type: 'separate', + }, + { + type: 'button', + btnName: '重置', + name: 'reset', + }, // { // type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '', // }, diff --git a/src/views/chart/BarChart.vue b/src/views/chart/BarChart.vue new file mode 100644 index 0000000..420c09e --- /dev/null +++ b/src/views/chart/BarChart.vue @@ -0,0 +1,175 @@ + + + diff --git a/src/views/chart/PieChart.vue b/src/views/chart/PieChart.vue new file mode 100644 index 0000000..5aa1818 --- /dev/null +++ b/src/views/chart/PieChart.vue @@ -0,0 +1,293 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index 6ccf732..96c55c1 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,98 +1,545 @@ + + + diff --git a/src/views/login.vue b/src/views/login.vue index 08813b8..fe52028 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -131,13 +131,13 @@ export default { mobileCodeTimer: 0, loginForm: { loginType: "uname", - username: "admin", - password: "admin123", + username: "", + password: "", captchaVerification: "", mobile: "", mobileCode: "", rememberMe: false, - tenantName: "爱协林热处理", + tenantName: "系统管理员", }, scene: 21, diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue index 3b96810..e7dea03 100644 --- a/src/views/report/jmreport/index.vue +++ b/src/views/report/jmreport/index.vue @@ -1,3 +1,10 @@ +