From e10f7c9d1e4d5f97c3fd756614bacbec65c08832 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Mon, 28 Aug 2023 10:55:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=B5=8B=E8=AF=95=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 +- .gitignore | 3 +- src/api/model/modelparamrela.js | 53 +++++++++++++++++++ src/views/model/alert/deviceparamalert.vue | 14 +++-- src/views/model/alert/method.vue | 6 ++- src/views/model/alert/policy.vue | 16 ++++++ src/views/model/device/index.vue | 6 +-- .../transerver/kingcodetransform/index.vue | 3 -- 8 files changed, 92 insertions(+), 13 deletions(-) create mode 100644 src/api/model/modelparamrela.js diff --git a/.env.production b/.env.production index 3dd692f..9cea954 100644 --- a/.env.production +++ b/.env.production @@ -5,8 +5,8 @@ VITE_APP_TITLE = 联美管理驾驶舱 VITE_APP_ENV = 'production' # 若依管理系统/生产环境 -VITE_APP_BASE_API = 'https://tmsdata.hongxianggroup.com.cn' -VITE_APP_BASE_API_IMAGE = 'https://tms.hongxianggroup.com.cn' +VITE_APP_BASE_API = 'http://localhost:9000' +VITE_APP_BASE_API_IMAGE = 'http://localhost:9000' # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip \ No newline at end of file diff --git a/.gitignore b/.gitignore index 28f979d..9dd9cb8 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ bin-release/ *.DS_Store node_modules/ -package-lock.json \ No newline at end of file +package-lock.json +dist/ \ No newline at end of file diff --git a/src/api/model/modelparamrela.js b/src/api/model/modelparamrela.js new file mode 100644 index 0000000..4a03ca3 --- /dev/null +++ b/src/api/model/modelparamrela.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询设备模型参数明细列表 +export function listModelparamrela(query) { + return request({ + url: '/model/dcModelDeviceParam/list', + method: 'get', + params: query + }) +} + +// 查询设备模型参数明细详细 +export function getModelparamrela(id) { + return request({ + url: '/model/dcModelDeviceParam/' + id, + method: 'get' + }) +} + +// 新增设备模型参数明细 +export function addModelparamrela(data) { + return request({ + url: '/model/dcModelDeviceParam', + method: 'post', + data: data + }) +} + +// 修改设备模型参数明细 +export function updateModelparamrela(data) { + return request({ + url: '/model/dcModelDeviceParam', + method: 'put', + data: data + }) +} + +// 删除设备模型参数明细 +export function delModelparamrela(id) { + return request({ + url: '/model/dcModelDeviceParam/' + id, + method: 'delete' + }) +} + +// 导出设备模型参数明细 +export function exportModelparamrela(query) { + return request({ + url: '/${baseUrl}/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/views/model/alert/deviceparamalert.vue b/src/views/model/alert/deviceparamalert.vue index 223c64e..ae797c8 100644 --- a/src/views/model/alert/deviceparamalert.vue +++ b/src/views/model/alert/deviceparamalert.vue @@ -161,7 +161,15 @@ - + + + + @@ -262,7 +270,7 @@ import { ElMessageBox } from 'element-plus'; import { listPolicy,listPolicyInfo,updatePolicy,updatePolicyBatch,addPolicy,addPolicyBatch,newDelPolicy } from "@/api/model/policy"; const { proxy } = getCurrentInstance(); const router = useRouter(); -const { operator_sign,dc_param_value_type } = proxy.useDict('operator_sign','dc_param_value_type'); +const { operator_sign,dc_param_value_type,alert_value } = proxy.useDict('operator_sign','dc_param_value_type','alert_value'); const alertList = ref([]); const open = ref(false); const openPolicy = ref(false); @@ -620,7 +628,7 @@ function getModelListSwitch(row){ formPolicy.value.statusType = response.data[0].statusType; formPolicy.value.methodId = response.data[0].methodId; formPolicy.value.alertFlag = response.data[0].alertFlag; - formPolicy.value.value = response.data[0].beginValue; + formPolicy.value.beginValue = response.data[0].beginValue; formPolicy.value.alertId = row.id; formPolicy.value.deviceId = row.deviceUuid; formPolicy.value.id = 1; diff --git a/src/views/model/alert/method.vue b/src/views/model/alert/method.vue index ffe1645..42af865 100644 --- a/src/views/model/alert/method.vue +++ b/src/views/model/alert/method.vue @@ -61,7 +61,11 @@ - + + +