From cd802abe94fed573b516568f8678899c9fdc7d37 Mon Sep 17 00:00:00 2001 From: yangzongjia Date: Fri, 2 Jun 2023 19:09:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/device/device.js | 14 +- .../shebeitaizhang/shebeitaizhangAdd.vue | 293 +++--- .../shebeitaizhang/shebeitaizhangInfo.vue | 175 ++-- .../shebeitaizhang/shebeitaizhangList.vue | 867 ++++++++---------- 4 files changed, 583 insertions(+), 766 deletions(-) diff --git a/src/api/device/device.js b/src/api/device/device.js index 5845dd4..11cd5fc 100644 --- a/src/api/device/device.js +++ b/src/api/device/device.js @@ -12,16 +12,18 @@ export function getDevicePage(data) { return request({ url: '/device/getDevicePage', method: 'GET', params: data }) } -// 子系统布防 -export function getCallArm() { - return request({ url: '/call/getCallArm', method: 'GET', }) +// 更新设备信息 +export function updateDevice(data) { + return request({ url: '/device/updateDevice', method: 'post', params: data }) } -// 子系统撤防 -export function getCallDisArm() { - return request({ url: '/call/getCallDisArm', method: 'GET', }) +// 根据ID获取单条 +export function getInfoById(data) { + return request({ url: '/device/getInfoById', method: 'GET', params: data }) } + + // 创建消息消费者 export function createCallConsumer() { return request({ url: '/call/createCallConsumer', method: 'GET', }) diff --git a/src/views/shebeitaizhang/shebeitaizhangAdd.vue b/src/views/shebeitaizhang/shebeitaizhangAdd.vue index 2778b40..c942531 100644 --- a/src/views/shebeitaizhang/shebeitaizhangAdd.vue +++ b/src/views/shebeitaizhang/shebeitaizhangAdd.vue @@ -28,8 +28,7 @@ - + @@ -66,26 +65,6 @@ - @@ -93,150 +72,154 @@ \ No newline at end of file diff --git a/src/views/shebeitaizhang/shebeitaizhangInfo.vue b/src/views/shebeitaizhang/shebeitaizhangInfo.vue index 7b6d097..9e85d65 100644 --- a/src/views/shebeitaizhang/shebeitaizhangInfo.vue +++ b/src/views/shebeitaizhang/shebeitaizhangInfo.vue @@ -14,11 +14,11 @@ - 设备编码 + 设备验证码 - {{ infoForm.manufacturerName }} + {{ infoForm.vCode }} @@ -26,7 +26,7 @@ - {{ infoForm.manufacturerAs }} + {{ infoForm.position }} @@ -36,55 +36,29 @@ - {{ getSupplierType(infoForm.manufacturerCode) }} + {{ getSupplierType(infoForm.type) }} - 安装时间 + 备注 - {{ infoForm.supplierTypeValue }} + {{ infoForm.remarks }} - 出厂时间 + 设备名称 - {{ infoForm.manufacturer }} - - - - 供货商 - - - - {{ infoForm.manufacturerAddress }} + {{ infoForm.name }} - - - 生产厂家 - - - - {{ infoForm.manufacturerTelePhone }} - - - - 保修截止日期 - - - - {{ infoForm.manufacturerFax }} - - - - + - - - + --> @@ -127,73 +81,58 @@ - + diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue index cccc59b..785d41e 100644 --- a/src/views/shebeitaizhang/shebeitaizhangList.vue +++ b/src/views/shebeitaizhang/shebeitaizhangList.vue @@ -43,7 +43,7 @@ - + @@ -71,15 +71,8 @@ :disabled="!row.isShow && (row.supplierTypeValue === '主机厂' || row.supplierTypeValue === '分公司')" @click="handleEdit(row)">编辑 详情 - - -