From 1a1ad07c532fa006d39e40535527665a85f92828 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 13 Aug 2024 15:35:26 +0800
Subject: [PATCH] =?UTF-8?q?iot=E5=AE=9A=E4=BD=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouseManage/machinery/coding/component/BindIOT.vue  | 4 ++--
 .../machinery/coding/component/MapDIalog.vue                | 6 +++---
 sgzb-ui/vue.config.js                                       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
index 44fcf12d..15d45115 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
+++ b/sgzb-ui/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/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
index 0eb8fd67..8309a0cc 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
@@ -95,7 +95,7 @@
                                 </div>
                             </template>
                             <template v-else>
-                                {{ loadingData ? '数据加载中...' : 暂无数据 }}
+                                {{ loadingData ? '数据加载中...' : '暂无数据' }}
                             </template>
                         </el-tab-pane>
                         <el-tab-pane label="停留点">
@@ -267,8 +267,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/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 6f92d0a2..c51fe257 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -43,12 +43,12 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://192.168.2.154:28080`, //超
+        target: `http://192.168.2.160:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
         // target: `http://192.168.2.82:28080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅
         // target: `http://192.168.2.209:28080`, //福
-        target: `http://192.168.2.125:39080`, //王
+        // target: `http://192.168.2.125:39080`, //王
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;