From 2eeb3bf456d3e3105f90b0730b0d726ec3758bf6 Mon Sep 17 00:00:00 2001 From: ailanyin Date: Wed, 29 Mar 2023 11:11:06 +0800 Subject: [PATCH] dict tag --- src/api/device/alertLog.js | 50 +- src/api/iot/device.js | 50 +- src/assets/icons/svg/devices.svg | 1 + src/assets/icons/svg/model.svg | 1 + src/assets/icons/svg/product.svg | 1 + src/assets/icons/svg/rules.svg | 1 + src/assets/icons/svg/settings.svg | 1 + src/assets/icons/svg/template.svg | 1 + src/components/DictTag/index.vue | 22 +- src/components/TableSelect/index.vue | 48 +- src/components/UserTreeSelect/index.vue | 2 +- src/constant/dict.js | 226 ++++- src/constant/status.js | 12 - .../components/model-type-tags/index.vue | 21 - src/views/device/alertLog/index.vue | 658 ++++++------ src/views/iot/device/index.vue | 228 +++-- src/views/product/alertRule/index.vue | 377 ++++--- src/views/product/firmware/index.vue | 19 +- src/views/product/product/edit.vue | 49 +- src/views/product/product/index.vue | 30 +- src/views/product/product/panes/alert.vue | 939 ------------------ src/views/product/product/panes/firmware.vue | 387 -------- src/views/product/product/panes/model.vue | 57 +- src/views/system/tenant/index.vue | 15 +- src/views/thingsmodel/model/index.vue | 9 +- src/views/thingsmodel/template/index.vue | 20 +- 26 files changed, 1127 insertions(+), 2098 deletions(-) create mode 100644 src/assets/icons/svg/devices.svg create mode 100644 src/assets/icons/svg/model.svg create mode 100644 src/assets/icons/svg/product.svg create mode 100644 src/assets/icons/svg/rules.svg create mode 100644 src/assets/icons/svg/settings.svg create mode 100644 src/assets/icons/svg/template.svg delete mode 100644 src/constant/status.js delete mode 100644 src/views/components/model-type-tags/index.vue delete mode 100644 src/views/product/product/panes/alert.vue delete mode 100644 src/views/product/product/panes/firmware.vue diff --git a/src/api/device/alertLog.js b/src/api/device/alertLog.js index f9c8bf5..3c9ef9e 100644 --- a/src/api/device/alertLog.js +++ b/src/api/device/alertLog.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 查询设备告警日志列表 export function listAlertLog(query) { - return request({ - url: '/device/alertLog/list', - method: 'get', - params: query - }) + return request({ + url: "/device/alertLog/list", + method: "get", + params: query, + }); } // 查询设备告警日志详细 export function getAlertLog(alertLogId) { - return request({ - url: '/device/alertLog/' + alertLogId, - method: 'get' - }) + return request({ + url: "/device/alertLog/" + alertLogId, + method: "get", + }); } // 新增设备告警日志 export function addAlertLog(data) { - return request({ - url: '/device/alertLog', - method: 'post', - data: data - }) + return request({ + url: "/device/alertLog", + method: "post", + data: data, + }); } // 修改设备告警日志 export function updateAlertLog(data) { - return request({ - url: '/device/alertLog', - method: 'put', - data: data - }) + return request({ + url: "/device/alertLog", + method: "put", + data: data, + }); } // 删除设备告警日志 export function delAlertLog(alertLogId) { - return request({ - url: '/device/alertLog/' + alertLogId, - method: 'delete' - }) -} \ No newline at end of file + return request({ + url: "/device/alertLog/" + alertLogId, + method: "delete", + }); +} diff --git a/src/api/iot/device.js b/src/api/iot/device.js index 3673f0a..1afe112 100644 --- a/src/api/iot/device.js +++ b/src/api/iot/device.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 查询设备列表 export function listDevice(query) { - return request({ - url: '/iot/device/list', - method: 'get', - params: query - }) + return request({ + url: "/iot/device/list", + method: "get", + params: query, + }); } // 查询设备详细 export function getDevice(deviceId) { - return request({ - url: '/iot/device/' + deviceId, - method: 'get' - }) + return request({ + url: "/iot/device/" + deviceId, + method: "get", + }); } // 新增设备 export function addDevice(data) { - return request({ - url: '/iot/device', - method: 'post', - data: data - }) + return request({ + url: "/iot/device", + method: "post", + data: data, + }); } // 修改设备 export function updateDevice(data) { - return request({ - url: '/iot/device', - method: 'put', - data: data - }) + return request({ + url: "/iot/device", + method: "put", + data: data, + }); } // 删除设备 export function delDevice(deviceId) { - return request({ - url: '/iot/device/' + deviceId, - method: 'delete' - }) -} \ No newline at end of file + return request({ + url: "/iot/device/" + deviceId, + method: "delete", + }); +} diff --git a/src/assets/icons/svg/devices.svg b/src/assets/icons/svg/devices.svg new file mode 100644 index 0000000..aaecb74 --- /dev/null +++ b/src/assets/icons/svg/devices.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/model.svg b/src/assets/icons/svg/model.svg new file mode 100644 index 0000000..155a9b4 --- /dev/null +++ b/src/assets/icons/svg/model.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/product.svg b/src/assets/icons/svg/product.svg new file mode 100644 index 0000000..b1f2821 --- /dev/null +++ b/src/assets/icons/svg/product.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/rules.svg b/src/assets/icons/svg/rules.svg new file mode 100644 index 0000000..be71619 --- /dev/null +++ b/src/assets/icons/svg/rules.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/settings.svg b/src/assets/icons/svg/settings.svg new file mode 100644 index 0000000..2e5ae4a --- /dev/null +++ b/src/assets/icons/svg/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/svg/template.svg b/src/assets/icons/svg/template.svg new file mode 100644 index 0000000..b5d4551 --- /dev/null +++ b/src/assets/icons/svg/template.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index a02568d..02c6104 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -5,19 +5,21 @@ {{ item.label }} {{ item.label }} + :disable-transitions="true" + :effect="effect" + :index="index" + :size="size" + :type="item.elTagType === 'primary' ? '' : item.elTagType" + >{{ item.label }} + @@ -32,6 +34,14 @@ const props = defineProps({ }, // 当前的值 value: [Number, String, Array], + effect: { + type: String, + default: "light", + }, + size: { + type: String, + default: "default", + }, }); const values = computed(() => { diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue index 966f54f..20ca3a2 100644 --- a/src/components/TableSelect/index.vue +++ b/src/components/TableSelect/index.vue @@ -6,11 +6,13 @@ - + @@ -28,22 +30,25 @@ import Pagination from "@/components/Pagination/index.vue"; const props = defineProps({ list: { type: Array, - default: [{ - deviceId: 40 - }, { - deviceId: 38 - }] + default: [ + { + deviceId: 40, + }, + { + deviceId: 38, + }, + ], }, requestMethod: { type: Function, - required: true + required: true, }, selectKey: { - required: true + required: true, }, modelValue: { - type: Boolean - } + type: Boolean, + }, }); const { list } = toRefs(props); @@ -58,8 +63,8 @@ const ids = ref([]); const data = reactive({ queryParams: { pageNum: 1, - pageSize: 10 - } + pageSize: 10, + }, }); const { queryParams } = toRefs(data); @@ -89,11 +94,14 @@ const cancel = () => { const handleSelect = (selection, row) => { const isCheck = - selection.findIndex((el) => el[props.selectKey] === row[props.selectKey]) > -1; + selection.findIndex((el) => el[props.selectKey] === row[props.selectKey]) > + -1; if (isCheck) { /*添加选中*/ const isIdNotExist = - list.value.findIndex((el) => el[props.selectKey] === row[props.selectKey]) === -1; + list.value.findIndex( + (el) => el[props.selectKey] === row[props.selectKey] + ) === -1; if (isIdNotExist) { selectedProperties.value.push(row); } @@ -127,6 +135,4 @@ const confirmSelect = () => { getList(); - \ No newline at end of file + diff --git a/src/components/UserTreeSelect/index.vue b/src/components/UserTreeSelect/index.vue index acd40dc..8b47ed4 100644 --- a/src/components/UserTreeSelect/index.vue +++ b/src/components/UserTreeSelect/index.vue @@ -70,7 +70,7 @@ - - diff --git a/src/views/device/alertLog/index.vue b/src/views/device/alertLog/index.vue index 97aff19..306e2bd 100644 --- a/src/views/device/alertLog/index.vue +++ b/src/views/device/alertLog/index.vue @@ -1,319 +1,387 @@ \ No newline at end of file +getList(); + diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue index 1d8479b..16bfeff 100644 --- a/src/views/iot/device/index.vue +++ b/src/views/iot/device/index.vue @@ -1,6 +1,12 @@