From dfdcb2783c6256612bb22f778c88adf9435ff144 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 13 Aug 2024 15:34:24 +0800
Subject: [PATCH] =?UTF-8?q?iot=E5=AE=9A=E4=BD=8D=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../machinery/coding/component/BindIOT.vue | 4 ++--
.../machinery/coding/component/MapDIalog.vue | 8 +++++---
src/views/warehouseManage/machinery/coding/index.vue | 2 +-
vue.config.js | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/warehouseManage/machinery/coding/component/BindIOT.vue b/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
index c1a6ee6..7053d3b 100644
--- a/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
+++ b/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
@@ -279,7 +279,7 @@ export default {
const isType = this.typeList.some((e) => e == this.IOTForm.iotType)
if (isType) {
this.$message.error(
- '当前机具已绑定改IOT类型设备，不可重复绑定！',
+ '当前机具已绑定该IOT类型设备，不可重复绑定！',
)
return
}
@@ -327,7 +327,7 @@ export default {
const isType = this.typeList.some((e) => e == iotTypeId)
if (isType) {
this.$message.error(
- '当前机具已绑定改IOT类型设备，不可重复绑定！',
+ '当前机具已绑定该IOT类型设备，不可重复绑定！',
)
this.codeOptions = []
return
diff --git a/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue b/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
index 0b0fa17..ce092c8 100644
--- a/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
+++ b/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
@@ -95,7 +95,9 @@
- {{ loadingData ? '数据加载中...' : 暂无数据 }}
+ {{
+ loadingData ? '数据加载中...' : '暂无数据 '
+ }}
@@ -267,8 +269,8 @@ export default {
iotId: this.iotCode,
})
// 获取经纬度并赋值
- this.calLon = res.callon
- this.calLat = res.callat
+ this.calLon = res.callon || 116.404
+ this.calLat = res.callat || 39.915
}
},
/** 查询按钮 */
diff --git a/src/views/warehouseManage/machinery/coding/index.vue b/src/views/warehouseManage/machinery/coding/index.vue
index 423a61c..8b9c074 100644
--- a/src/views/warehouseManage/machinery/coding/index.vue
+++ b/src/views/warehouseManage/machinery/coding/index.vue
@@ -833,7 +833,7 @@ export default {
/** 导出按钮操作 */
handleExport() {
this.download(
- '/material/basemachine/export',
+ '/material/base/machine/export',
{
...this.queryParams,
dataCondition: this.ids,
diff --git a/vue.config.js b/vue.config.js
index fb53ef7..71d7560 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,7 +46,7 @@ module.exports = {
// target: `http://10.40.92.81:8080`, //韩/
// target: `http://192.168.2.81:28080`,//旭/
// target: `http://192.168.2.248:28080`, //帅
- // target: `http://192.168.2.225:49080`, //福
+ target: `http://192.168.2.216:49080`, //福
//******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;