diff --git a/src/views/auth/menu/popupMenu.vue b/src/views/auth/menu/popupMenu.vue
index 402aa97..7f24ecd 100644
--- a/src/views/auth/menu/popupMenu.vue
+++ b/src/views/auth/menu/popupMenu.vue
@@ -1,107 +1,108 @@
-<template>
-    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
-                <el-form-item label="上级菜单">
-                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps"
-                        style="width: 100%" />
-                </el-form-item>
-                <el-form-item label="菜单名称">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="图标">
-                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
-                </el-form-item>
-                <el-form-item label="菜单路由">
-                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
-                </el-form-item>
-                <el-form-item label="组件路径">
-                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
-                </el-form-item>
-                <el-form-item label="排序">
-                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
-                </el-form-item>
-                <el-form-item label="菜单描述">
-                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
-                        placeholder="请输入描述" />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import IconSelector from '@/components/baInput/components/iconSelector.vue'
-import { updateMenu, addMenu } from '@/api/systerm'
-
-defineOptions({
-    name: 'auth/menu/popupMenu'
-})
-const emits = defineEmits<{
-    (e: 'init'): void
-}>()
-const tableStore = inject('tableStore') as TableStore
-const cascaderProps = {
-    label: 'title',
-    value: 'id',
-    checkStrictly: true,
-    emitPath: false
-}
-const form: any = reactive({
-    code: '',
-    icon: '',
-    id: '',
-    name: '',
-    path: '',
-    pid: '0',
-    remark: '',
-    routeName: '',
-    sort: 100,
-    type: 0
-})
-
-const dialogVisible = ref(false)
-const title = ref('新增菜单')
-const open = (text: string, data: anyObj) => {
-    title.value = text
-    // 重置表单
-    for (let key in form) {
-        form[key] = ''
-    }
-    form.pid = data.pid || '0'
-    form.sort = 100
-    form.type = 0
-
-    if (data.id) {
-        for (let key in form) {
-            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
-        }
-        form.path = data.routePath || ''
-        form.name = data.title || ''
-    }
-    dialogVisible.value = true
-}
-const submit = async () => {
-    if (form.id) {
-        await updateMenu(form)
-    } else {
-        form.code = 'menu'
-        let obj = JSON.parse(JSON.stringify(form))
-        delete obj.id
-        await addMenu(obj)
-    }
-    emits('init')
-    dialogVisible.value = false
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog class="cn-operate-dialog" width="700px" v-model.trim="dialogVisible" :title="title">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one">
+                <el-form-item label="上级菜单">
+                    <el-cascader v-model.trim="form.pid" :options="tableStore.table.data" :props="cascaderProps" clearable
+                        style="width: 100%" />
+                </el-form-item>
+                <el-form-item label="菜单名称">
+                    <el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="图标">
+                    <IconSelector v-model.trim="form.icon" placeholder="请选择图标" />
+                </el-form-item>
+                <el-form-item label="菜单路由">
+                    <el-input v-model.trim="form.path" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="组件路径">
+                    <el-input v-model.trim="form.routeName" placeholder="请输入组件路径，如/src/views/dashboard/index.vue" />
+                </el-form-item>
+                <el-form-item label="排序">
+                    <el-input maxlength="32" show-word-limit-number v-model.trim="form.sort" :min="0" />
+                </el-form-item>
+                <el-form-item label="菜单描述">
+                    <el-input maxlength="300" show-word-limit v-model.trim="form.remark" :rows="2" type="textarea"
+                        placeholder="请输入描述" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import { updateMenu, addMenu } from '@/api/systerm'
+
+defineOptions({
+    name: 'auth/menu/popupMenu'
+})
+const emits = defineEmits<{
+    (e: 'init'): void
+}>()
+const tableStore = inject('tableStore') as TableStore
+const cascaderProps = {
+    label: 'title',
+    value: 'id',
+    checkStrictly: true,
+    emitPath: false
+}
+const form: any = reactive({
+    code: '',
+    icon: '',
+    id: '',
+    name: '',
+    path: '',
+    pid: '0',
+    remark: '',
+    routeName: '',
+    sort: 100,
+    type: 0
+})
+
+const dialogVisible = ref(false)
+const title = ref('新增菜单')
+const open = (text: string, data: anyObj) => {
+    title.value = text
+    // 重置表单
+    for (let key in form) {
+        form[key] = ''
+    }
+    form.pid = data.pid || '0'
+    form.sort = 100
+    form.type = 0
+
+    if (data.id) {
+        for (let key in form) {
+            form[key] = data[key] ? data[key] : data[key] === 0 ? 0 : ''
+        }
+        form.path = data.routePath || ''
+        form.name = data.title || ''
+    }
+    dialogVisible.value = true
+}
+const submit = async () => {
+    if (form.id) {
+        form.pid =  form.pid||'0'
+        await updateMenu(form)
+    } else {
+        form.code = 'menu'
+        let obj = JSON.parse(JSON.stringify(form))
+        delete obj.id
+        await addMenu(obj)
+    }
+    emits('init')
+    dialogVisible.value = false
+}
+
+defineExpose({ open })
+</script>
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index bb394e3..9ca8ec6 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -108,6 +108,7 @@
                                 id="id200"
                                 class="form-item"
                                 label="省:"
+                                 prop="engineeringParam.province" 
                                 v-if="nodeLevel > 0 || pageStatus == 2"
                                 :rules="{ required: true, message: '请选择省', trigger: 'change' }"
                             >
@@ -133,6 +134,7 @@
                                 id="id200"
                                 class="form-item"
                                 label="市:"
+                                  prop="engineeringParam.city" 
                                 v-if="nodeLevel > 0 || pageStatus == 2"
                                 :rules="{ required: true, message: '请选择市', trigger: 'change' }"
                             >
@@ -156,8 +158,9 @@
                                 id="id300"
                                 class="form-item"
                                 label="工程名称:"
+                                
                                 v-if="nodeLevel > 0 || pageStatus == 2"
-                                :prop="'name'"
+                                prop="engineeringParam.name"
                                 :rules="{ required: true, message: '请输入工程名称', trigger: 'blur' }"
                             >
                                 <el-input
@@ -172,6 +175,7 @@
                                 id="id300"
                                 class="form-item"
                                 label="描述:"
+                                 prop="engineeringParam.description"
                                 v-if="nodeLevel > 0 || pageStatus == 2"
                             >
                                 <el-input
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index c821ae8..c69824f 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -979,10 +979,10 @@ const getRealDataMqttMsg = async () => {
                     })
                 }, 30000)
                 mqttRef.value.on('message', (topic: any, message: any) => {
-                    // console.log(
-                    //     '实时数据&实时趋势---mqtt接收到消息',
-                    //     JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
-                    // )
+                    console.log(
+                        '实时数据&实时趋势---mqtt接收到消息',
+                        JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
+                    )
                     let obj = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
                   
                     if (lineId.value != obj.lineId || adminInfo.userIndex != obj.userId) return