diff --git a/pages/index/menu.js b/pages/index/menu.js index f1ec0ff..c175b31 100644 --- a/pages/index/menu.js +++ b/pages/index/menu.js @@ -220,6 +220,71 @@ const menus = { ], }, + // { + // title: '安环管理', + // children: [ + // { + // key: "spotCheck", + // title: "安全点检", + // url: "../safe/spotCheck", + // bgColor: '', + // limit: 'RB2315', + // icon: { + // size: 20, + // color: '#00b7ee', + // type: '' + // } + // }, + // { + // key: "inspection", + // title: "安全巡检", + // url: "../safe/inspection", + // bgColor: '', + // limit: 'RB2316', + // icon: { + // size: 20, + // color: '#00b7ee', + // type: '' + // } + // }, + // { + // key: "waterInspection", + // title: "环保巡检", + // url: "../sanitation/waterInspection", + // bgColor: '', + // limit: 'RB2318', + // icon: { + // size: 20, + // color: '#00b7ee', + // type: '' + // } + // }, + // // { + // // key: "gasInspection", + // // title: "废气巡检", + // // url: "../sanitation/gasInspection", + // // bgColor: '', + // // limit: 'RB2319', + // // icon: { + // // size: 20, + // // color: '#00b7ee', + // // type: '' + // // } + // // }, + // { + // key: "bsTower", + // title: "酸雾塔", + // url: "../sanitation/bsTower", + // bgColor: '', + // limit: 'RB2319', + // icon: { + // size: 20, + // color: '#00b7ee', + // type: '' + // } + // }, + // ] + // }, { title: '物流配送', children: [ diff --git a/pages/logistics/site.vue b/pages/logistics/site.vue index 8c655df..a85bad6 100644 --- a/pages/logistics/site.vue +++ b/pages/logistics/site.vue @@ -117,7 +117,7 @@ {{ confirmDialog.newStatus }} @@ -340,12 +340,21 @@ export default { // 获取状态样式类 getStatusClass(status) { - return status == 1 ? "status-occupied" : "status-available"; + return status == 1||status == 2 ? "status-occupied" : "status-available"; }, // 获取状态标签 getStatusLabel(status) { - return status == 0 ? "闲置" : "占用"; + if (status == 0) { + return "闲置"; + } + if (status == 1) { + return "占用"; + } + if (status == 2) { + return "预占用"; + } + // return status == 0 ? "闲置" : "占用"; }, // 打开状态变更确认对话框 diff --git a/static/images/menus/bsTower.png b/static/images/menus/bsTower.png index 6fed2dc..45bf7f5 100644 Binary files a/static/images/menus/bsTower.png and b/static/images/menus/bsTower.png differ diff --git a/static/images/menus/inspection.png b/static/images/menus/inspection.png index 8c9443c..e99d39d 100644 Binary files a/static/images/menus/inspection.png and b/static/images/menus/inspection.png differ diff --git a/static/images/menus/spotCheck.png b/static/images/menus/spotCheck.png index 3e5527f..6466bcb 100644 Binary files a/static/images/menus/spotCheck.png and b/static/images/menus/spotCheck.png differ diff --git a/static/images/menus/waterInspection.png b/static/images/menus/waterInspection.png index 834b50b..c9e2480 100644 Binary files a/static/images/menus/waterInspection.png and b/static/images/menus/waterInspection.png differ