diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index f5a1225f..a96a2486 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -637,9 +637,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu @Override @Transactional(rollbackFor = Exception.class) public void update(Instruction dto) { - Instruction entity = this.findById(dto.getInstruction_id()); - if (entity == null) throw new BadRequestException("被删除或无权限,操作失败!"); - String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); dto.setUpdate_time(now); diff --git a/wcs/qd/src/assets/acs/一.png b/wcs/qd/src/assets/acs/一.png new file mode 100644 index 00000000..22cb9a3a Binary files /dev/null and b/wcs/qd/src/assets/acs/一.png differ diff --git a/wcs/qd/src/assets/acs/三.png b/wcs/qd/src/assets/acs/三.png new file mode 100644 index 00000000..c4c90337 Binary files /dev/null and b/wcs/qd/src/assets/acs/三.png differ diff --git a/wcs/qd/src/assets/acs/下.png b/wcs/qd/src/assets/acs/下.png new file mode 100644 index 00000000..bd19330a Binary files /dev/null and b/wcs/qd/src/assets/acs/下.png differ diff --git a/wcs/qd/src/assets/acs/仓.png b/wcs/qd/src/assets/acs/仓.png new file mode 100644 index 00000000..0f268f57 Binary files /dev/null and b/wcs/qd/src/assets/acs/仓.png differ diff --git a/wcs/qd/src/assets/acs/伸.png b/wcs/qd/src/assets/acs/伸.png new file mode 100644 index 00000000..b6201061 Binary files /dev/null and b/wcs/qd/src/assets/acs/伸.png differ diff --git a/wcs/qd/src/assets/acs/体.png b/wcs/qd/src/assets/acs/体.png new file mode 100644 index 00000000..b1564239 Binary files /dev/null and b/wcs/qd/src/assets/acs/体.png differ diff --git a/wcs/qd/src/assets/acs/储.png b/wcs/qd/src/assets/acs/储.png new file mode 100644 index 00000000..04df2eb7 Binary files /dev/null and b/wcs/qd/src/assets/acs/储.png differ diff --git a/wcs/qd/src/assets/acs/刻.png b/wcs/qd/src/assets/acs/刻.png new file mode 100644 index 00000000..58c035ee Binary files /dev/null and b/wcs/qd/src/assets/acs/刻.png differ diff --git a/wcs/qd/src/assets/acs/加.png b/wcs/qd/src/assets/acs/加.png new file mode 100644 index 00000000..13136473 Binary files /dev/null and b/wcs/qd/src/assets/acs/加.png differ diff --git a/wcs/qd/src/assets/acs/包.png b/wcs/qd/src/assets/acs/包.png new file mode 100644 index 00000000..4345bbee Binary files /dev/null and b/wcs/qd/src/assets/acs/包.png differ diff --git a/wcs/qd/src/assets/acs/压.png b/wcs/qd/src/assets/acs/压.png new file mode 100644 index 00000000..771154e3 Binary files /dev/null and b/wcs/qd/src/assets/acs/压.png differ diff --git a/wcs/qd/src/assets/acs/品.png b/wcs/qd/src/assets/acs/品.png new file mode 100644 index 00000000..9c30f05a Binary files /dev/null and b/wcs/qd/src/assets/acs/品.png differ diff --git a/wcs/qd/src/assets/acs/孔.png b/wcs/qd/src/assets/acs/孔.png new file mode 100644 index 00000000..80ea23e6 Binary files /dev/null and b/wcs/qd/src/assets/acs/孔.png differ diff --git a/wcs/qd/src/assets/acs/字.png b/wcs/qd/src/assets/acs/字.png new file mode 100644 index 00000000..028c269f Binary files /dev/null and b/wcs/qd/src/assets/acs/字.png differ diff --git a/wcs/qd/src/assets/acs/屑.png b/wcs/qd/src/assets/acs/屑.png new file mode 100644 index 00000000..516eec77 Binary files /dev/null and b/wcs/qd/src/assets/acs/屑.png differ diff --git a/wcs/qd/src/assets/acs/工.png b/wcs/qd/src/assets/acs/工.png new file mode 100644 index 00000000..d707bf9c Binary files /dev/null and b/wcs/qd/src/assets/acs/工.png differ diff --git a/wcs/qd/src/assets/acs/弯.png b/wcs/qd/src/assets/acs/弯.png new file mode 100644 index 00000000..9be15ae1 Binary files /dev/null and b/wcs/qd/src/assets/acs/弯.png differ diff --git a/wcs/qd/src/assets/acs/成.png b/wcs/qd/src/assets/acs/成.png new file mode 100644 index 00000000..ef38c167 Binary files /dev/null and b/wcs/qd/src/assets/acs/成.png differ diff --git a/wcs/qd/src/assets/acs/拉.png b/wcs/qd/src/assets/acs/拉.png new file mode 100644 index 00000000..16065d44 Binary files /dev/null and b/wcs/qd/src/assets/acs/拉.png differ diff --git a/wcs/qd/src/assets/acs/推.png b/wcs/qd/src/assets/acs/推.png new file mode 100644 index 00000000..2f153867 Binary files /dev/null and b/wcs/qd/src/assets/acs/推.png differ diff --git a/wcs/qd/src/assets/acs/料.png b/wcs/qd/src/assets/acs/料.png new file mode 100644 index 00000000..dbfb82bb Binary files /dev/null and b/wcs/qd/src/assets/acs/料.png differ diff --git a/wcs/qd/src/assets/acs/旋.png b/wcs/qd/src/assets/acs/旋.png new file mode 100644 index 00000000..236b38fa Binary files /dev/null and b/wcs/qd/src/assets/acs/旋.png differ diff --git a/wcs/qd/src/assets/acs/无.png b/wcs/qd/src/assets/acs/无.png new file mode 100644 index 00000000..98ca792b Binary files /dev/null and b/wcs/qd/src/assets/acs/无.png differ diff --git a/wcs/qd/src/assets/acs/机.png b/wcs/qd/src/assets/acs/机.png new file mode 100644 index 00000000..79cfdc17 Binary files /dev/null and b/wcs/qd/src/assets/acs/机.png differ diff --git a/wcs/qd/src/assets/acs/桶.png b/wcs/qd/src/assets/acs/桶.png new file mode 100644 index 00000000..a36d65de Binary files /dev/null and b/wcs/qd/src/assets/acs/桶.png differ diff --git a/wcs/qd/src/assets/acs/洗.png b/wcs/qd/src/assets/acs/洗.png new file mode 100644 index 00000000..3d659ec8 Binary files /dev/null and b/wcs/qd/src/assets/acs/洗.png differ diff --git a/wcs/qd/src/assets/acs/清.png b/wcs/qd/src/assets/acs/清.png new file mode 100644 index 00000000..b7d515f5 Binary files /dev/null and b/wcs/qd/src/assets/acs/清.png differ diff --git a/wcs/qd/src/assets/acs/盘.png b/wcs/qd/src/assets/acs/盘.png new file mode 100644 index 00000000..874f2ad5 Binary files /dev/null and b/wcs/qd/src/assets/acs/盘.png differ diff --git a/wcs/qd/src/assets/acs/直.png b/wcs/qd/src/assets/acs/直.png new file mode 100644 index 00000000..71a63b62 Binary files /dev/null and b/wcs/qd/src/assets/acs/直.png differ diff --git a/wcs/qd/src/assets/acs/码.png b/wcs/qd/src/assets/acs/码.png new file mode 100644 index 00000000..1d718b47 Binary files /dev/null and b/wcs/qd/src/assets/acs/码.png differ diff --git a/wcs/qd/src/assets/acs/管.png b/wcs/qd/src/assets/acs/管.png new file mode 100644 index 00000000..05d1797c Binary files /dev/null and b/wcs/qd/src/assets/acs/管.png differ diff --git a/wcs/qd/src/assets/acs/装.png b/wcs/qd/src/assets/acs/装.png new file mode 100644 index 00000000..27d5c4c2 Binary files /dev/null and b/wcs/qd/src/assets/acs/装.png differ diff --git a/wcs/qd/src/assets/acs/镗.png b/wcs/qd/src/assets/acs/镗.png new file mode 100644 index 00000000..8108275d Binary files /dev/null and b/wcs/qd/src/assets/acs/镗.png differ diff --git a/wcs/qd/src/router/routers.js b/wcs/qd/src/router/routers.js index 3b8ae314..29a28f53 100644 --- a/wcs/qd/src/router/routers.js +++ b/wcs/qd/src/router/routers.js @@ -13,10 +13,10 @@ export const constantRouterMap = [ }, { - path: '/bigscreen/task', - component: (resolve) => require(['@/views/bigscreen/task'], resolve), + path: '/bigscreen/monitor', + component: (resolve) => require(['@/views/acs/monitor/device/index'], resolve), hidden: true, - meta: { title: '呼叫看板' } + meta: { title: '设备监控' } }, { path: '/bigscreen/request', @@ -24,12 +24,6 @@ export const constantRouterMap = [ hidden: true, meta: { title: '叫料看板' } }, - { - path: '/bigscreen/ndxy_two', - component: (resolve) => require(['@/views/bigscreen/ndxy_two'], resolve), - hidden: true, - meta: { title: '纽迪希亚' } - }, { path: '/404', component: (resolve) => require(['@/views/features/404'], resolve), diff --git a/wcs/qd/src/views/acs/stage/editor/index.vue b/wcs/qd/src/views/acs/stage/editor/index.vue index 04fa93b0..5c0be4c6 100644 --- a/wcs/qd/src/views/acs/stage/editor/index.vue +++ b/wcs/qd/src/views/acs/stage/editor/index.vue @@ -234,7 +234,39 @@ export default { { id: 13, name: '专机', img1: '专机' }, { id: 14, name: '激', img1: '激' }, { id: 15, name: '光', img1: '光' }, - { id: 16, name: '区', img1: '区' } + { id: 16, name: '区', img1: '区' }, + { id: 17, name: '一', img1: '一' }, + { id: 18, name: '三', img1: '三' }, + { id: 19, name: '下', img1: '下' }, + { id: 20, name: '仓', img1: '仓' }, + { id: 21, name: '伸', img1: '伸' }, + { id: 22, name: '体', img1: '体' }, + { id: 23, name: '储', img1: '储' }, + { id: 24, name: '刻', img1: '刻' }, + { id: 25, name: '加', img1: '加' }, + { id: 26, name: '包', img1: '包' }, + { id: 27, name: '压', img1: '压' }, + { id: 28, name: '品', img1: '品' }, + { id: 29, name: '孔', img1: '孔' }, + { id: 30, name: '字', img1: '字' }, + { id: 31, name: '屑', img1: '屑' }, + { id: 32, name: '工', img1: '工' }, + { id: 33, name: '弯', img1: '弯' }, + { id: 34, name: '拉', img1: '拉' }, + { id: 35, name: '推', img1: '推' }, + { id: 36, name: '料', img1: '料' }, + { id: 37, name: '旋', img1: '旋' }, + { id: 38, name: '无', img1: '无' }, + { id: 39, name: '机', img1: '机' }, + { id: 40, name: '桶', img1: '桶' }, + { id: 41, name: '洗', img1: '洗' }, + { id: 42, name: '清', img1: '清' }, + { id: 43, name: '盘', img1: '盘' }, + { id: 44, name: '直', img1: '直' }, + { id: 45, name: '码', img1: '码' }, + { id: 46, name: '管', img1: '管' }, + { id: 47, name: '装', img1: '装' }, + { id: 48, name: '镗', img1: '镗' } ], arr2: [], stageSelectList: [],