diff --git a/xiuosiot-frontend/src/api/terminal/plc.js b/xiuosiot-frontend/src/api/terminal/plc.js new file mode 100644 index 0000000..28376f2 --- /dev/null +++ b/xiuosiot-frontend/src/api/terminal/plc.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +export function getList(data) { + return request({ + url: '/protocolProduct/selectAll', + method: 'get', + params: data || {} + }) +} + +export function add(data) { + return request({ + url: '/protocolProduct/add', + method: 'post', + data + }) +} + +export function remove(data) { + return request({ + url: '/protocolProduct/delete', + method: 'post', + data + }) +} diff --git a/xiuosiot-frontend/src/assets/images/O.png b/xiuosiot-frontend/src/assets/images/O.png new file mode 100644 index 0000000..f2e73b7 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/O.png differ diff --git a/xiuosiot-frontend/src/assets/images/S.png b/xiuosiot-frontend/src/assets/images/S.png new file mode 100644 index 0000000..674d880 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/S.png differ diff --git a/xiuosiot-frontend/src/assets/images/arrow_down.png b/xiuosiot-frontend/src/assets/images/arrow_down.png new file mode 100644 index 0000000..fd093e0 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/arrow_down.png differ diff --git a/xiuosiot-frontend/src/assets/images/arrow_up.png b/xiuosiot-frontend/src/assets/images/arrow_up.png new file mode 100644 index 0000000..29fd038 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/arrow_up.png differ diff --git a/xiuosiot-frontend/src/assets/images/basket.png b/xiuosiot-frontend/src/assets/images/basket.png new file mode 100644 index 0000000..e955a43 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/basket.png differ diff --git a/xiuosiot-frontend/src/assets/images/download_orange.png b/xiuosiot-frontend/src/assets/images/download_orange.png new file mode 100644 index 0000000..46de0f0 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/download_orange.png differ diff --git a/xiuosiot-frontend/src/assets/images/general.png b/xiuosiot-frontend/src/assets/images/general.png new file mode 100644 index 0000000..96d04b5 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/general.png differ diff --git a/xiuosiot-frontend/src/assets/images/import_orange.png b/xiuosiot-frontend/src/assets/images/import_orange.png new file mode 100644 index 0000000..0920c79 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/import_orange.png differ diff --git a/xiuosiot-frontend/src/assets/images/minus_orange.png b/xiuosiot-frontend/src/assets/images/minus_orange.png new file mode 100644 index 0000000..88f304c Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/minus_orange.png differ diff --git a/xiuosiot-frontend/src/assets/images/mufg.png b/xiuosiot-frontend/src/assets/images/mufg.png new file mode 100644 index 0000000..5862e72 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/mufg.png differ diff --git a/xiuosiot-frontend/src/assets/images/omron.png b/xiuosiot-frontend/src/assets/images/omron.png new file mode 100644 index 0000000..3706d8f Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/omron.png differ diff --git a/xiuosiot-frontend/src/assets/images/pie-chart.png b/xiuosiot-frontend/src/assets/images/pie-chart.png new file mode 100644 index 0000000..66a4129 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/pie-chart.png differ diff --git a/xiuosiot-frontend/src/assets/images/plus.png b/xiuosiot-frontend/src/assets/images/plus.png new file mode 100644 index 0000000..f8c44a6 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/plus.png differ diff --git a/xiuosiot-frontend/src/assets/images/plus_orange.png b/xiuosiot-frontend/src/assets/images/plus_orange.png new file mode 100644 index 0000000..f10f68c Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/plus_orange.png differ diff --git a/xiuosiot-frontend/src/assets/images/remove_orange.png b/xiuosiot-frontend/src/assets/images/remove_orange.png new file mode 100644 index 0000000..8381ed1 Binary files /dev/null and b/xiuosiot-frontend/src/assets/images/remove_orange.png differ diff --git a/xiuosiot-frontend/src/icons/svg/arrow_down.svg b/xiuosiot-frontend/src/icons/svg/arrow_down.svg new file mode 100644 index 0000000..95bbf3a --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/arrow_down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/xiuosiot-frontend/src/icons/svg/arrow_up.svg b/xiuosiot-frontend/src/icons/svg/arrow_up.svg new file mode 100644 index 0000000..3dddea3 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/arrow_up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/xiuosiot-frontend/src/icons/svg/general.svg b/xiuosiot-frontend/src/icons/svg/general.svg new file mode 100644 index 0000000..7bf8a35 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/general.svg @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/mufg.svg b/xiuosiot-frontend/src/icons/svg/mufg.svg new file mode 100644 index 0000000..372b25b --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/mufg.svg @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/xiuosiot-frontend/src/icons/svg/omron.svg b/xiuosiot-frontend/src/icons/svg/omron.svg new file mode 100644 index 0000000..1b82055 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/omron.svg @@ -0,0 +1,14 @@ + + + + + O + diff --git a/xiuosiot-frontend/src/icons/svg/siemens.svg b/xiuosiot-frontend/src/icons/svg/siemens.svg new file mode 100644 index 0000000..7872ad0 --- /dev/null +++ b/xiuosiot-frontend/src/icons/svg/siemens.svg @@ -0,0 +1,14 @@ + + + + + S + diff --git a/xiuosiot-frontend/src/layout/index.vue b/xiuosiot-frontend/src/layout/index.vue index 6c13768..f221cad 100644 --- a/xiuosiot-frontend/src/layout/index.vue +++ b/xiuosiot-frontend/src/layout/index.vue @@ -48,7 +48,7 @@ export default { } }, showBreadcrumb() { - const whiteList = ['overview', 'terminal/add', 'data/value', 'configuration/development'] + const whiteList = ['overview', 'terminal/add', 'terminal/plc', 'data/value', 'configuration/development'] return whiteList.every((item) => this.$route.path.indexOf(item) === -1) } }, diff --git a/xiuosiot-frontend/src/router/index.js b/xiuosiot-frontend/src/router/index.js index ee2a4c6..bcf4332 100644 --- a/xiuosiot-frontend/src/router/index.js +++ b/xiuosiot-frontend/src/router/index.js @@ -130,12 +130,14 @@ export const constantRoutes = [ { path: 'alarm', name: 'Alarm', + component: () => import('@/views/terminal/alarm/index'), meta: { title: '设备告警', disabled: true } }, { path: 'plc', name: 'PLC', - meta: { title: 'PLC管理', disabled: true } + component: () => import('@/views/terminal/PLC/index'), + meta: { title: 'PLC管理' } }, { path: 'ota', diff --git a/xiuosiot-frontend/src/views/configuration/development/index.vue b/xiuosiot-frontend/src/views/configuration/development/index.vue index 6825950..628a7a6 100644 --- a/xiuosiot-frontend/src/views/configuration/development/index.vue +++ b/xiuosiot-frontend/src/views/configuration/development/index.vue @@ -154,7 +154,7 @@ export default { } } - + diff --git a/xiuosiot-frontend/src/views/terminal/add/index.vue b/xiuosiot-frontend/src/views/terminal/add/index.vue index 2652d13..9c018d7 100644 --- a/xiuosiot-frontend/src/views/terminal/add/index.vue +++ b/xiuosiot-frontend/src/views/terminal/add/index.vue @@ -202,6 +202,7 @@ export default { remove(device, index) { remove({ no: device.no }).then(res => { if (res.code === '200000') { + console.log('activatedDevice', this.$refs.activatedDevice[index]) this.$refs.activatedDevice[index].classList.add('fadeOut') setTimeout(() => { this.activeList.splice(index, 1) diff --git a/xiuosiot-frontend/src/views/terminal/alarm/index.vue b/xiuosiot-frontend/src/views/terminal/alarm/index.vue new file mode 100644 index 0000000..9a69fc0 --- /dev/null +++ b/xiuosiot-frontend/src/views/terminal/alarm/index.vue @@ -0,0 +1,64 @@ + + + + +