From 8aac72612ea099a0e49bd8675ef391de200b10f2 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 24 Jul 2024 10:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=A4=84=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machinery/coding/index.vue                | 27 ++++++++++---------
 sgzb-ui/vue.config.js                         |  4 +--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
index 3be6b012..003cd344 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
@@ -220,21 +220,16 @@
                     >
                 </template>
             </el-table-column>
-            <!-- <el-table-column
-                label="IOT设备"
-                align="center"
-                prop="ownHouseName"
-            /> -->
+            <el-table-column label="IOT设备" align="center" prop="ownHouseName">
+                <el-button type="text" @click="handleBindIOT">未绑定</el-button>
+            </el-table-column>
             <el-table-column
-                label="所在仓库"
+                label="位置信息"
                 align="center"
                 prop="ownHouseName"
-            />
-            <!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
-            <!--        <template slot-scope="scope">-->
-            <!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
-            <!--        </template>-->
-            <!--      </el-table-column>-->
+            >
+                <i class="el-icon-location location-icon" @click="handleMap" />
+            </el-table-column>
             <el-table-column
                 label="操作"
                 align="center"
@@ -822,6 +817,7 @@ export default {
                 `编码设备管理_${new Date().getTime()}.xlsx`,
             )
         },
+        // iot设备绑定
         handleBindIOT(row) {
             console.log('🚀 ~ handleBindIOT ~ row:', row)
             this.props = {
@@ -830,6 +826,7 @@ export default {
                 maCode: row.maCode,
             }
         },
+        // 查看设备地图
         handleMap(row) {
             console.log('~ handleMap ~ 地图', row)
             const params = {
@@ -867,4 +864,10 @@ export default {
     width: 60px !important;
     margin-bottom: 10px;
 }
+
+.location-icon {
+    font-size: 20px;
+    cursor: pointer;
+    color: #409eff;
+}
 </style>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 7f98f0e2..ef31311a 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,9 +42,9 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        // target: `http://192.168.2.76:28080`, //超
+        target: `http://192.168.2.134:48080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
-        target: `http://192.168.2.81:28080`,//旭/
+        // target: `http://192.168.2.81:28080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅
         // target: `http://10.40.92.253:28080`, //福