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 f0f9595c..c099d075 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/BindIOT.vue
@@ -115,7 +115,7 @@
                         />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="设备编号" prop="iotId">
+                <el-form-item label="设备编号">
                     <el-select
                         v-model="IOTForm.iotId"
                         filterable
@@ -276,6 +276,13 @@ export default {
         },
         // 提交
         submit() {
+            const isType = this.typeList.some((e) => e == this.IOTForm.iotType)
+            if (isType) {
+                this.$message.error(
+                    '当前机具已绑定改IOT类型设备，不可重复绑定！',
+                )
+                return
+            }
             try {
                 // 校验
                 this.$refs.IOTForm.validate(async (valid) => {
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 d977fbaf..0eb8fd67 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
@@ -40,18 +40,21 @@
                 <el-col :span="6">
                     <el-tabs type="border-card" class="map-left">
                         <el-tab-pane label="行程">
-                            <div
-                                class="trip-container"
-                                @click="handlePreviewTrip(item, index)"
-                                v-for="(item, index) in tripList"
-                                :key="index"
-                            >
-                                <div class="left-num">{{ index + 1 }}</div>
+                            <template v-if="tripList.length > 0">
                                 <div
-                                    class="right-info"
-                                    :class="{ active: activeIndex === index }"
+                                    class="trip-container"
+                                    @click="handlePreviewTrip(item, index)"
+                                    v-for="(item, index) in tripList"
+                                    :key="index"
                                 >
-                                    <!-- <ul>
+                                    <div class="left-num">{{ index + 1 }}</div>
+                                    <div
+                                        class="right-info"
+                                        :class="{
+                                            active: activeIndex === index,
+                                        }"
+                                    >
+                                        <!-- <ul>
                                         <li>{{ item.tripdistance }}KM</li>
                                         <li>{{ item.drivingDuration }}秒</li>
                                         <li>{{ item.maxspeed }}KM/h</li>
@@ -64,63 +67,77 @@
                                         <li>平均速度</li>
                                     </ul> -->
 
-                                    <div style="margin-top: 10px">
-                                        <div class="time-container">
-                                            <span class="radius-span">始</span>
-                                            <span>{{ item.startTime }}</span>
+                                        <div style="margin-top: 10px">
+                                            <div class="time-container">
+                                                <span class="radius-span"
+                                                    >始</span
+                                                >
+                                                <span>{{
+                                                    item.startTime
+                                                }}</span>
+                                            </div>
+                                            <h3>{{ item.startAddress }}</h3>
                                         </div>
-                                        <h3>{{ item.startAddress }}</h3>
-                                    </div>
-                                    <div style="margin-top: 10px">
-                                        <div class="time-container">
-                                            <span
-                                                class="radius-span"
-                                                style="
-                                                    background-color: #e6a23c;
-                                                "
-                                                >终</span
-                                            >
-                                            <span>{{ item.endTime }}</span>
+                                        <div style="margin-top: 10px">
+                                            <div class="time-container">
+                                                <span
+                                                    class="radius-span"
+                                                    style="
+                                                        background-color: #e6a23c;
+                                                    "
+                                                    >终</span
+                                                >
+                                                <span>{{ item.endTime }}</span>
+                                            </div>
+                                            <h3>{{ item.endAddress }}</h3>
                                         </div>
-                                        <h3>{{ item.endAddress }}</h3>
                                     </div>
                                 </div>
-                            </div>
+                            </template>
+                            <template v-else>
+                                {{ loadingData ? '数据加载中...' : 暂无数据 }}
+                            </template>
                         </el-tab-pane>
                         <el-tab-pane label="停留点">
-                            <div
-                                class="point-container"
-                                v-for="(item, index) in parkList"
-                                :key="index"
-                            >
-                                <div class="time-container">
-                                    <span class="radius-span">{{
-                                        index + 1
-                                    }}</span>
-                                    <span>{{ item.startTime }}</span>
-                                    <span
-                                        >{{ item.hours }}时{{
-                                            item.mints
-                                        }}分</span
-                                    >
+                            <template v-if="parkList.length > 0">
+                                <div
+                                    class="point-container"
+                                    v-for="(item, index) in parkList"
+                                    :key="index"
+                                >
+                                    <div class="time-container">
+                                        <span class="radius-span">{{
+                                            index + 1
+                                        }}</span>
+                                        <span>{{ item.startTime }}</span>
+                                        <span
+                                            >{{ item.hours }}时{{
+                                                item.mints
+                                            }}分</span
+                                        >
+                                    </div>
+                                    <h3>{{ item.address }}</h3>
                                 </div>
-                                <h3>{{ item.address }}</h3>
-                            </div>
+                            </template>
+                            <template v-else> 暂无数据 </template>
                         </el-tab-pane>
                         <el-tab-pane label="报警">
-                            <div
-                                class="point-container"
-                                v-for="(item, index) in warningList"
-                                :key="index"
-                            >
-                                <div class="time-container">
-                                    <span class="radius-span">{{
-                                        index + 1
-                                    }}</span>
-                                    <span>{{ item.warnTime }}</span>
+                            <template v-if="warningList.length > 0">
+                                <div
+                                    class="point-container"
+                                    v-for="(item, index) in warningList"
+                                    :key="index"
+                                >
+                                    <div class="time-container">
+                                        <span class="radius-span">{{
+                                            index + 1
+                                        }}</span>
+                                        <span>{{ item.warnTime }}</span>
+                                    </div>
+                                    <h3>{{ item.startAlarm }}</h3>
                                 </div>
-                                <h3>{{ item.startAlarm }}</h3>
-                            </div>
+                            </template>
+                            <template v-else> 暂无数据 </template>
                         </el-tab-pane>
                     </el-tabs>
                 </el-col>
@@ -193,6 +210,7 @@ export default {
             trackAni: null, // 轨迹实例
             calLon: '',
             calLat: '',
+
             // 查询设备行程信息的参数
             tripParams: {
                 beginTime: moment()
@@ -206,18 +224,20 @@ export default {
             activeIndex: '',
             // 停留点信息
             parkList: [],
+            warningList: [],
+            loadingData: true,
         }
     },
-    created() {
-        this.handleQuery()
-    },
+    created() {},
     mounted() {
-        Promise.all([this.getIotDeviceLocation()])
+        Promise.all([this.getIotDeviceLocation(), this.handleQuery()])
             .then((res) => {
+                this.loadingData = false
                 this.initMap()
             })
             .catch((err) => {
                 console.log(err)
+                this.loadingData = false
             })
 
         // this.getIotDeviceLocation()
@@ -231,9 +251,12 @@ export default {
             this.trackAni.cancel()
         }
         // 2. 清除地图上面的标点覆盖物 并清除地图实例
-        this.map.clearOverlays()
-        this.map.destroy()
-        this.map = null
+
+        if (this.map) {
+            this.map.clearOverlays()
+            this.map.destroy()
+            this.map = null
+        }
     },
 
     methods: {
@@ -250,6 +273,10 @@ export default {
         },
         /** 查询按钮 */
         async handleQuery() {
+            if (!this.queryForm.date) {
+                this.$message.error('请选择时间范围！')
+                return
+            }
             this.tripParams.iotId = this.iotCode
             const res = await getIotDeviceTripApi({ ...this.tripParams })
             console.log(res, '行程信息--')
@@ -448,8 +475,10 @@ export default {
         },
         /** 时间选择器 */
         onChangeTime(val) {
-            this.tripParams.beginTime = val[0]
-            this.tripParams.endTime = val[1]
+            if (val) {
+                this.tripParams.beginTime = val[0]
+                this.tripParams.endTime = val[1]
+            }
         },
     },
 }