diff --git a/src/views/basic/device-manage/index.vue b/src/views/basic/device-manage/index.vue
index fb461be..2281710 100644
--- a/src/views/basic/device-manage/index.vue
+++ b/src/views/basic/device-manage/index.vue
@@ -13,10 +13,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="设备编号" prop="deviceCode">
+      <el-form-item label="设备编码" prop="deviceCode">
         <el-input
           clearable
-          placeholder="请输入设备编号"
+          placeholder="请输入设备编码"
           v-model="queryParams.deviceCode"
           @keyup.enter.native="handleQuery"
         />
@@ -59,10 +59,10 @@
       <el-table-column label="序号" align="center" type="index"/>
       <!-- 设备类型 -->
       <el-table-column label="设备类型" align="center" prop="deviceTypeName" />
-      <!-- 设备编号 -->
-      <el-table-column label="设备编号" align="center" prop="deviceCode" />
-      <!-- 所属保管人 -->
-      <el-table-column label="所属保管人" align="center" prop="userName" />
+      <!-- 设备编码 -->
+      <el-table-column label="设备编码" align="center" prop="deviceCode" />
+      <!-- 设备保管人 -->
+      <el-table-column label="设备保管人" align="center" prop="userName" />
       <!-- 设备状态：特殊处理 -->
       <el-table-column label="设备状态" align="center">
         <template slot-scope="scope">
@@ -195,11 +195,11 @@ export default {
           prop: 'deviceTypeName',
         },
         {
-          label: '设备编号',
+          label: '设备编码',
           prop: 'deviceCode',
         },
         {
-          label: '所属保管人',
+          label: '设备保管人',
           prop: 'userName',
         },
         {
diff --git a/src/views/basic/device-manage/useRecordTable.vue b/src/views/basic/device-manage/useRecordTable.vue
index ca6713c..c8e4d71 100644
--- a/src/views/basic/device-manage/useRecordTable.vue
+++ b/src/views/basic/device-manage/useRecordTable.vue
@@ -82,7 +82,7 @@ export default {
       userList: [],
       columnList: [
         {prop: 'deviceTypeName', label: '设备类型'},
-        {prop: 'deviceCode', label: '设备编号'},
+        {prop: 'deviceCode', label: '设备编码'},
         {prop: 'userName', label: '领用人'},
         {prop: 'startTime', label: '领用日期'},
         {prop: 'endTime', label: '归还日期'},
diff --git a/src/views/basic/model-manage/index.vue b/src/views/basic/model-manage/index.vue
index a847e3e..6ca559f 100644
--- a/src/views/basic/model-manage/index.vue
+++ b/src/views/basic/model-manage/index.vue
@@ -26,14 +26,24 @@
                           @keyup.enter.native="handleQuery"
                       />
                   </el-form-item>-->
-      <el-form-item label="负责人" prop="chargePerson">
+<!--      <el-form-item label="负责人" prop="chargePerson">-->
+<!--        <el-input-->
+<!--          clearable-->
+<!--          placeholder="请输入负责人"-->
+<!--          v-model="queryParams.chargePerson"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+      <el-form-item label="设计人" prop="designer">
         <el-input
           clearable
-          placeholder="请输入负责人"
-          v-model="queryParams.chargePerson"
+          placeholder="请输入设计人"
+          v-model="queryParams.designer"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -62,6 +72,9 @@
       </el-table-column>
       <el-table-column label="所属项目" align="center" prop="proName"/>
       <el-table-column label="层级名称" align="center" prop="levelName"/>
+      <el-table-column label="模型版本" align="center" prop="version"/>
+      <el-table-column label="版本说明" align="center" prop="remark"/>
+      <el-table-column label="设计人" align="center" prop="designer"/>
       <el-table-column label="操作" align="center" width="180">
         <template slot-scope="{ row }">
           <el-button
@@ -237,6 +250,7 @@ export default {
         projectId: undefined,
         unit: undefined,
         chargePerson: undefined,
+        designer:undefined
       },
       projectSelectList: [],
       list: [
diff --git a/src/views/basic/model-manage/useOrReturnFormNew.vue b/src/views/basic/model-manage/useOrReturnFormNew.vue
index f6fec02..c0d3a20 100644
--- a/src/views/basic/model-manage/useOrReturnFormNew.vue
+++ b/src/views/basic/model-manage/useOrReturnFormNew.vue
@@ -1,662 +1,701 @@
 <template>
-    <div>
-        <!-- 上传表单 -->
-        <el-form
-            :model="useOrReturnForm"
-            :rules="useOrReturnFormRules"
-            ref="useOrReturnFormRef"
-            label-width="120px"
-            v-show="!showLayerDialog"
+  <div>
+    <!-- 上传表单 -->
+    <el-form
+      :model="useOrReturnForm"
+      :rules="useOrReturnFormRules"
+      ref="useOrReturnFormRef"
+      label-width="120px"
+      v-show="!showLayerDialog"
+    >
+      <el-form-item label="模型文件" prop="files">
+        <el-upload
+          class="upload-demo"
+          action="/dev-api/common/upload"
+          :on-success="handleSuccess"
+          :on-remove="handleRemove"
+          :before-upload="beforeUpload"
+          :headers="uploadHeaders"
+          :file-list="fileList"
+          :limit="1"
+          :auto-upload="true"
+          :show-file-list="true"
+          :disabled="fileList.length >= 1"
         >
-            <el-form-item label="模型文件" prop="files">
-                <el-upload
-                    class="upload-demo"
-                    action="/dev-api/common/upload"
-                    :on-success="handleSuccess"
-                    :on-remove="handleRemove"
-                    :before-upload="beforeUpload"
-                    :headers="uploadHeaders"
-                    :file-list="fileList"
-                    :limit="1"
-                    :auto-upload="true"
-                    :show-file-list="true"
-                    :disabled="fileList.length >= 1"
-                >
-                    <div v-if="fileList.length < 1" class="upload-demo">
-                        <el-button size="small" icon="el-icon-paperclip">上传模型</el-button>
-                        <div class="upload-demo-tip">仅支持上传dxf文件</div>
-                    </div>
-                </el-upload>
-            </el-form-item>
-            <el-form-item>
-                <el-button @click="cancel">取消</el-button>
-                <el-button type="primary" @click="goToNextStep" :disabled="!fileList.length">下一步</el-button>
-            </el-form-item>
-        </el-form>
+          <div v-if="fileList.length < 1" class="upload-demo">
+            <el-button size="small" icon="el-icon-paperclip">上传模型</el-button>
+            <div class="upload-demo-tip">仅支持上传dxf文件</div>
+          </div>
+        </el-upload>
+      </el-form-item>
 
-        <!-- 图层和实体预览 -->
-        <div v-if="showLayerDialog" class="layer-container">
-            <div class="all-select">
-                <div class="item-index"> </div>
-                <el-checkbox v-model="allSelect">全选</el-checkbox>
-            </div>
-            <div class="layer-item" :key="layer.layerName" v-for="(layer, index) in layerList">
-                <div class="item-index">
-                    {{ index + 1 }}
-                </div>
-                <el-checkbox v-model="layer.checked" style="margin-right: 10px" />
-                <span @click="handleLayerSelectNew(layer)">
+      <el-form-item label=" 模型版本" prop="version">
+        <el-row>
+          <el-col :span="20">
+            <el-input v-model="useOrReturnForm.version" placeholder="请输入模型版本"/>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <el-form-item label="设计人员" prop="designer">
+        <el-row>
+          <el-col :span="20">
+            <el-input v-model="useOrReturnForm.designer" placeholder="请输入设计人员"/>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <el-form-item label="版本描述" prop="remark">
+        <el-row>
+          <el-col :span="20">
+            <el-input type="textarea" v-model="useOrReturnForm.remark" placeholder="请输入版本描述"/>
+          </el-col>
+        </el-row>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="goToNextStep" :disabled="!fileList.length">下一步</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 图层和实体预览 -->
+    <div v-if="showLayerDialog" class="layer-container">
+      <div class="all-select">
+        <div class="item-index"></div>
+        <el-checkbox v-model="allSelect">全选</el-checkbox>
+      </div>
+      <div class="layer-item" :key="layer.layerName" v-for="(layer, index) in layerList">
+        <div class="item-index">
+          {{ index + 1 }}
+        </div>
+        <el-checkbox v-model="layer.checked" style="margin-right: 10px"/>
+        <span @click="handleLayerSelectNew(layer)">
                     {{ layer.layerName }}
                 </span>
-            </div>
+      </div>
 
-            <div class="btn-group">
-                <el-button type="primary" @click="onHandleBack">上一步</el-button>
-                <el-button type="primary" @click="onHandleConfirm">确认</el-button>
-            </div>
-        </div>
+      <div class="btn-group">
+        <el-button type="primary" @click="onHandleBack">上一步</el-button>
+        <el-button type="primary" @click="onHandleConfirm">确认</el-button>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
-import { getToken } from '@/utils/auth'
-import { addModel } from '@/api/basic/model'
+import {getToken} from '@/utils/auth'
+import {addModel} from '@/api/basic/model'
 
 export default {
-    name: 'UseOrReturnForm',
-    props: {
-        projectId: {
-            type: String,
-            default: '',
-        },
+  name: 'UseOrReturnForm',
+  props: {
+    projectId: {
+      type: String,
+      default: '',
     },
-    data() {
-        return {
-            useOrReturnForm: {
-                modelName: '',
-                modelType: '',
-                version: '',
-                designer: '',
-                user: '',
-                files: [],
-                modelUrl: '',
-                projectId: '',
-            },
-            useOrReturnFormRules: {
-                files: [{ required: true, message: '请上传模型文件', trigger: 'change' }],
-            },
-            fileList: [],
-            showLayerDialog: false,
-            layerList: [],
-            selectedLayerEntities: [],
-            selectedLayerIndex: 0,
-            selectedEntities: [],
-            cadData: [],
-            svgSize: 400,
-            zoomLevel: 1,
-            panning: false,
-            panStartX: 0,
-            panStartY: 0,
-            panX: 0,
-            panY: 0,
-            originX: 200,
-            originY: 200,
-            viewBox: { x: 0, y: 0 },
+  },
+  data() {
+    return {
+      useOrReturnForm: {
+        modelName: '',
+        modelType: '',
+        version: '',
+        designer: '',
+        remark: '',
+        user: '',
+        files: [],
+        modelUrl: '',
+        projectId: '',
+      },
+      useOrReturnFormRules: {
+        files: [{required: true, message: '请上传模型文件', trigger: 'change'}],
+        version: [{required: true, message: '请输入模型版本', trigger: 'blur'}],
+        designer: [{required: true, message: '请输入设计人员', trigger: 'blur'}],
+        remark: [{required: true, message: '请输入版本描述', trigger: 'blur'}],
+      },
+      fileList: [],
+      showLayerDialog: false,
+      layerList: [],
+      selectedLayerEntities: [],
+      selectedLayerIndex: 0,
+      selectedEntities: [],
+      cadData: [],
+      svgSize: 400,
+      zoomLevel: 1,
+      panning: false,
+      panStartX: 0,
+      panStartY: 0,
+      panX: 0,
+      panY: 0,
+      originX: 200,
+      originY: 200,
+      viewBox: {x: 0, y: 0},
+    }
+  },
+  computed: {
+    uploadHeaders() {
+      return {
+        Authorization: 'Bearer ' + getToken(),
+      }
+    },
+    previewEntities() {
+      return this.getAllSelectedEntities()
+    },
+
+    allSelect: {
+      get() {
+        return this.layerList.every((layer) => layer.checked)
+      },
+      set(value) {
+        this.layerList.forEach((layer) => (layer.checked = value))
+      },
+    },
+  },
+  mounted() {
+    this.useOrReturnForm.projectId = this.projectId
+    window.addEventListener('resize', this.adjustSVGSize)
+    this.adjustSVGSize()
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.adjustSVGSize)
+  },
+  methods: {
+    adjustSVGSize() {
+      if (this.$refs.previewWrapper) {
+        const width = this.$refs.previewWrapper.clientWidth
+        this.svgSize = Math.min(600, Math.max(400, width - 40))
+      }
+    },
+
+    getAllSelectedEntities() {
+      const allEntities = []
+      this.layerList.forEach((layer) => {
+        layer.entities.forEach((entity) => {
+          if (this.selectedEntities.includes(entity.id)) {
+            allEntities.push(entity)
+          }
+        })
+      })
+      return allEntities
+    },
+
+    getPolylinePoints(entity) {
+      if (!entity.points || !Array.isArray(entity.points)) return ''
+      return entity.points
+        .map((point) => {
+          return `${point.x},${point.y}`
+        })
+        .join(' ')
+    },
+
+    zoomIn() {
+      this.zoomLevel = Math.min(5, this.zoomLevel + 0.1)
+    },
+
+    zoomOut() {
+      this.zoomLevel = Math.max(0.1, this.zoomLevel - 0.1)
+    },
+
+    handleWheel(event) {
+      event.preventDefault()
+      const delta = Math.sign(event.deltaY)
+      if (delta > 0) {
+        this.zoomOut()
+      } else {
+        this.zoomIn()
+      }
+    },
+
+    fitToView() {
+      this.zoomLevel = 1
+      this.panX = 0
+      this.panY = 0
+      this.viewBox = {x: 0, y: 0}
+    },
+
+    startPan(event) {
+      this.panning = true
+      this.panStartX = event.clientX
+      this.panStartY = event.clientY
+    },
+
+    pan(event) {
+      if (!this.panning) return
+      const dx = event.clientX - this.panStartX
+      const dy = event.clientY - this.panStartY
+      this.panX += dx / this.zoomLevel
+      this.panY += dy / this.zoomLevel
+      this.panStartX = event.clientX
+      this.panStartY = event.clientY
+      this.viewBox.x = -this.panX
+      this.viewBox.y = -this.panY
+    },
+
+    endPan() {
+      this.panning = false
+    },
+
+    cancel() {
+      this.$emit('closeUseOrReturnFormDialog')
+    },
+
+    goToNextStep() {
+
+      this.$refs.useOrReturnFormRef.validate((valid) => {
+        if (!valid) {
+          // 校验失败，Element 会自动显示错误提示
+          return false;
         }
+
+        this.showLayerDialog = true
+
+        if (!this.cadData || !this.cadData.length) {
+          this.$message.error('无效的CAD数据，无法进入下一步')
+          return
+        }
+
+        const map = {}
+        this.cadData.forEach((entity) => {
+          if (!map[entity.layerName]) {
+            map[entity.layerName] = {layerName: entity.layerName, entities: []}
+          }
+          if (!entity.id) {
+            entity.id = entity.layerName + '_' + Math.random().toString(36).substr(2, 9)
+          }
+          map[entity.layerName].entities.push(entity)
+        })
+
+        this.layerList = Object.values(map)
+        this.layerList.forEach((layer) => {
+          // layer.checked = false
+
+          this.$set(layer, 'checked', false)
+        })
+
+        console.log(this.layerList, 'layerList---！！！！')
+        this.selectedLayerIndex = 0
+        this.selectedLayerEntities = this.layerList[0].entities || []
+        this.selectedEntities = []
+      });
     },
-    computed: {
-        uploadHeaders() {
-            return {
-                Authorization: 'Bearer ' + getToken(),
-            }
-        },
-        previewEntities() {
-            return this.getAllSelectedEntities()
-        },
 
-        allSelect: {
-            get() {
-                return this.layerList.every((layer) => layer.checked)
-            },
-            set(value) {
-                this.layerList.forEach((layer) => (layer.checked = value))
-            },
-        },
+    handleLayerSelect(index) {
+      this.selectedLayerIndex = parseInt(index)
+      this.selectedLayerEntities = this.layerList[this.selectedLayerIndex].entities
     },
-    mounted() {
-        this.useOrReturnForm.projectId = this.projectId
-        window.addEventListener('resize', this.adjustSVGSize)
-        this.adjustSVGSize()
+
+    selectEntity(entity) {
+      entity.selected = !entity.selected
+      const idx = this.selectedEntities.indexOf(entity.id)
+      console.log(JSON.stringify(this.selectedEntities))
+      if (entity.selected) {
+        if (idx === -1) this.selectedEntities.push(entity.id)
+      } else {
+        if (idx !== -1) this.selectedEntities.splice(idx, 1)
+      }
     },
-    beforeDestroy() {
-        window.removeEventListener('resize', this.adjustSVGSize)
-    },
-    methods: {
-        adjustSVGSize() {
-            if (this.$refs.previewWrapper) {
-                const width = this.$refs.previewWrapper.clientWidth
-                this.svgSize = Math.min(600, Math.max(400, width - 40))
-            }
-        },
 
-        getAllSelectedEntities() {
-            const allEntities = []
-            this.layerList.forEach((layer) => {
-                layer.entities.forEach((entity) => {
-                    if (this.selectedEntities.includes(entity.id)) {
-                        allEntities.push(entity)
-                    }
-                })
-            })
-            return allEntities
-        },
+    async submitForm() {
+      this.$refs.useOrReturnFormRef.validate(async (valid) => {
+        if (!valid) return
+        const selectedEntities = []
 
-        getPolylinePoints(entity) {
-            if (!entity.points || !Array.isArray(entity.points)) return ''
-            return entity.points
-                .map((point) => {
-                    return `${point.x},${point.y}`
-                })
-                .join(' ')
-        },
-
-        zoomIn() {
-            this.zoomLevel = Math.min(5, this.zoomLevel + 0.1)
-        },
-
-        zoomOut() {
-            this.zoomLevel = Math.max(0.1, this.zoomLevel - 0.1)
-        },
-
-        handleWheel(event) {
-            event.preventDefault()
-            const delta = Math.sign(event.deltaY)
-            if (delta > 0) {
-                this.zoomOut()
-            } else {
-                this.zoomIn()
-            }
-        },
-
-        fitToView() {
-            this.zoomLevel = 1
-            this.panX = 0
-            this.panY = 0
-            this.viewBox = { x: 0, y: 0 }
-        },
-
-        startPan(event) {
-            this.panning = true
-            this.panStartX = event.clientX
-            this.panStartY = event.clientY
-        },
-
-        pan(event) {
-            if (!this.panning) return
-            const dx = event.clientX - this.panStartX
-            const dy = event.clientY - this.panStartY
-            this.panX += dx / this.zoomLevel
-            this.panY += dy / this.zoomLevel
-            this.panStartX = event.clientX
-            this.panStartY = event.clientY
-            this.viewBox.x = -this.panX
-            this.viewBox.y = -this.panY
-        },
-
-        endPan() {
-            this.panning = false
-        },
-
-        cancel() {
-            this.$emit('closeUseOrReturnFormDialog')
-        },
-
-        goToNextStep() {
-            this.showLayerDialog = true
-
-            if (!this.cadData || !this.cadData.length) {
-                this.$message.error('无效的CAD数据，无法进入下一步')
-                return
-            }
-
-            const map = {}
-            this.cadData.forEach((entity) => {
-                if (!map[entity.layerName]) {
-                    map[entity.layerName] = { layerName: entity.layerName, entities: [] }
-                }
-                if (!entity.id) {
-                    entity.id = entity.layerName + '_' + Math.random().toString(36).substr(2, 9)
-                }
-                map[entity.layerName].entities.push(entity)
-            })
-
-            this.layerList = Object.values(map)
-            this.layerList.forEach((layer) => {
-                // layer.checked = false
-
-                this.$set(layer, 'checked', false)
-            })
-
-            console.log(this.layerList, 'layerList---！！！！')
-            this.selectedLayerIndex = 0
-            this.selectedLayerEntities = this.layerList[0].entities || []
-            this.selectedEntities = []
-        },
-
-        handleLayerSelect(index) {
-            this.selectedLayerIndex = parseInt(index)
-            this.selectedLayerEntities = this.layerList[this.selectedLayerIndex].entities
-        },
-
-        selectEntity(entity) {
-            entity.selected = !entity.selected
-            const idx = this.selectedEntities.indexOf(entity.id)
-            console.log(JSON.stringify(this.selectedEntities))
+        this.layerList.forEach((layer) => {
+          layer.entities.forEach((entity) => {
             if (entity.selected) {
-                if (idx === -1) this.selectedEntities.push(entity.id)
-            } else {
-                if (idx !== -1) this.selectedEntities.splice(idx, 1)
+              selectedEntities.push({
+                entityId: entity.entityId || entity.id || '',
+                entityType: entity.entityType || '',
+                color: entity.color || '',
+                lineweight: entity.lineweight || '',
+                thickness: entity.thickness || '',
+                startPoint: entity.startPoint || null,
+                endPoint: entity.endPoint || null,
+                centerPoint: entity.centerPoint || null,
+                radius: entity.radius != null ? entity.radius : null,
+                // points: entity.points || [],
+                geometry: entity.geometry || {}, // 你如果还有geometry字段也保留
+                layerName: layer.layerName || '',
+              })
             }
-        },
+          })
+        })
 
-        async submitForm() {
-            this.$refs.useOrReturnFormRef.validate(async (valid) => {
-                if (!valid) return
-                const selectedEntities = []
+        const formData = {
+          projectId: this.useOrReturnForm.projectId,
+          modelName: this.useOrReturnForm.modelName,
+          modelUrl: this.useOrReturnForm.modelUrl,
+          fileName: this.useOrReturnForm.fileName,
+          version: this.useOrReturnForm.version,
+          designer: this.useOrReturnForm.designer,
+          designerName: this.useOrReturnForm.designerName,
+          remark: this.useOrReturnForm.remark,
+          modelType: this.useOrReturnForm.modelType,
+          modelIds: this.useOrReturnForm.modelIds,
+          createBy: this.useOrReturnForm.createBy,
+          createTime: this.useOrReturnForm.createTime,
+          selectedEntities: selectedEntities,
+        }
 
-                this.layerList.forEach((layer) => {
-                    layer.entities.forEach((entity) => {
-                        if (entity.selected) {
-                            selectedEntities.push({
-                                entityId: entity.entityId || entity.id || '',
-                                entityType: entity.entityType || '',
-                                color: entity.color || '',
-                                lineweight: entity.lineweight || '',
-                                thickness: entity.thickness || '',
-                                startPoint: entity.startPoint || null,
-                                endPoint: entity.endPoint || null,
-                                centerPoint: entity.centerPoint || null,
-                                radius: entity.radius != null ? entity.radius : null,
-                                // points: entity.points || [],
-                                geometry: entity.geometry || {}, // 你如果还有geometry字段也保留
-                                layerName: layer.layerName || '',
-                            })
-                        }
-                    })
-                })
-
-                const formData = {
-                    projectId: this.useOrReturnForm.projectId,
-                    modelName: this.useOrReturnForm.modelName,
-                    modelUrl: this.useOrReturnForm.modelUrl,
-                    fileName: this.useOrReturnForm.fileName,
-                    version: this.useOrReturnForm.version,
-                    designer: this.useOrReturnForm.designer,
-                    designerName: this.useOrReturnForm.designerName,
-                    remark: this.useOrReturnForm.remark,
-                    modelType: this.useOrReturnForm.modelType,
-                    modelIds: this.useOrReturnForm.modelIds,
-                    createBy: this.useOrReturnForm.createBy,
-                    createTime: this.useOrReturnForm.createTime,
-                    selectedEntities: selectedEntities,
-                }
-
-                try {
-                    const res = await addModel(formData)
-                    if (res.code === 200) {
-                        this.$modal.msgSuccess('模型添加成功')
-                        this.$emit('closeUseOrReturnFormDialog')
-                        this.$emit('refreshParentList')
-                        this.resetForm()
-                    } else {
-                        this.$modal.msgError(res.msg || '提交失败')
-                    }
-                } catch (error) {
-                    this.$modal.msgError('提交异常: ' + error.message)
-                }
-            })
-        },
-
-        // 确认
-        async onHandleConfirm() {
-            // this.submitForm()
-
-            const isSelect = this.layerList.some((layer) => layer.checked)
-            if (!isSelect) {
-                this.$modal.msgError('请选择图层')
-                return
-            }
-
-            const selectedEntities = []
-
-            this.layerList.forEach((layer) => {
-                if (layer.checked) {
-                    layer.entities.forEach((entity) => {
-                        selectedEntities.push({
-                            entityId: entity.entityId || entity.id || '',
-                            entityType: entity.entityType || '',
-                            color: entity.color || '',
-                            lineweight: entity.lineweight || '',
-                            thickness: entity.thickness || '',
-                            startPoint: entity.startPoint || null,
-                            endPoint: entity.endPoint || null,
-                            centerPoint: entity.centerPoint || null,
-                            radius: entity.radius != null ? entity.radius : null,
-                            // points: entity.points || [],
-                            geometry: entity.geometry || {}, // 你如果还有geometry字段也保留
-                            layerName: layer.layerName || '',
-                        })
-                    })
-                }
-            })
-
-            const formData = {
-                projectId: this.useOrReturnForm.projectId,
-                modelName: this.useOrReturnForm.modelName,
-                modelUrl: this.useOrReturnForm.modelUrl,
-                fileName: this.useOrReturnForm.fileName,
-                version: this.useOrReturnForm.version,
-                designer: this.useOrReturnForm.designer,
-                designerName: this.useOrReturnForm.designerName,
-                remark: this.useOrReturnForm.remark,
-                modelType: this.useOrReturnForm.modelType,
-                modelIds: this.useOrReturnForm.modelIds,
-                createBy: this.useOrReturnForm.createBy,
-                createTime: this.useOrReturnForm.createTime,
-                selectedEntities: selectedEntities,
-            }
-
-            try {
-                const res = await addModel(formData)
-                if (res.code === 200) {
-                    this.$modal.msgSuccess('模型添加成功')
-                    this.$emit('closeUseOrReturnFormDialog')
-                    this.$emit('refreshParentList')
-                    this.resetForm()
-                } else {
-                    this.$modal.msgError(res.msg || '提交失败')
-                }
-            } catch (error) {
-                this.$modal.msgError('提交异常: ' + error.message)
-            }
-        },
-        // 上一步
-        onHandleBack() {
-            this.showLayerDialog = false
-        },
-
-        resetForm() {
-            this.$refs.useOrReturnFormRef.resetFields()
-            this.fileList = []
-            this.useOrReturnForm.files = []
-            this.selectedEntities = []
-            this.showLayerDialog = false
-            this.fitToView()
-        },
-
-        handleSuccess(response, file, fileList) {
-            if (response.code === 200) {
-                console.log(response, '上传结果---')
-                this.cadData = response.data.cadData || []
-                const uploaded = response.data || {
-                    name: file.name,
-                    url: response.fileUrl || response.url,
-                    uid: file.uid,
-                }
-                this.fileList = fileList
-                this.useOrReturnForm.files = [uploaded]
-                this.useOrReturnForm.modelUrl = uploaded.url
-                this.$refs.useOrReturnFormRef.validateField('files')
-            } else {
-                this.$message.error(response.msg || '文件上传失败')
-                this.handleRemove(file)
-            }
-        },
-
-        handleRemove(file, fileList) {
-            this.fileList = fileList
-            this.useOrReturnForm.files = []
-            this.useOrReturnForm.modelUrl = ''
-            this.cadData = []
-            this.$refs.useOrReturnFormRef.validateField('files')
-        },
-
-        beforeUpload(file) {
-            const isDxf = file.name.toLowerCase().endsWith('.dxf')
-            if (!isDxf) this.$message.error('只能上传DXF格式的文件!')
-            return isDxf
-        },
-
-        handleLayerSelectNew(item) {
-            this.$set(item, 'checked', !item.checked)
-        },
+        try {
+          const res = await addModel(formData)
+          if (res.code === 200) {
+            this.$modal.msgSuccess('模型添加成功')
+            this.$emit('closeUseOrReturnFormDialog')
+            this.$emit('refreshParentList')
+            this.resetForm()
+          } else {
+            this.$modal.msgError(res.msg || '提交失败')
+          }
+        } catch (error) {
+          this.$modal.msgError('提交异常: ' + error.message)
+        }
+      })
     },
+
+    // 确认
+    async onHandleConfirm() {
+      // this.submitForm()
+
+      const isSelect = this.layerList.some((layer) => layer.checked)
+      if (!isSelect) {
+        this.$modal.msgError('请选择图层')
+        return
+      }
+
+      const selectedEntities = []
+
+      this.layerList.forEach((layer) => {
+        if (layer.checked) {
+          layer.entities.forEach((entity) => {
+            selectedEntities.push({
+              entityId: entity.entityId || entity.id || '',
+              entityType: entity.entityType || '',
+              color: entity.color || '',
+              lineweight: entity.lineweight || '',
+              thickness: entity.thickness || '',
+              startPoint: entity.startPoint || null,
+              endPoint: entity.endPoint || null,
+              centerPoint: entity.centerPoint || null,
+              radius: entity.radius != null ? entity.radius : null,
+              // points: entity.points || [],
+              geometry: entity.geometry || {}, // 你如果还有geometry字段也保留
+              layerName: layer.layerName || '',
+            })
+          })
+        }
+      })
+
+      const formData = {
+        projectId: this.useOrReturnForm.projectId,
+        modelName: this.useOrReturnForm.modelName,
+        modelUrl: this.useOrReturnForm.modelUrl,
+        fileName: this.useOrReturnForm.fileName,
+        version: this.useOrReturnForm.version,
+        designer: this.useOrReturnForm.designer,
+        designerName: this.useOrReturnForm.designerName,
+        remark: this.useOrReturnForm.remark,
+        modelType: this.useOrReturnForm.modelType,
+        modelIds: this.useOrReturnForm.modelIds,
+        createBy: this.useOrReturnForm.createBy,
+        createTime: this.useOrReturnForm.createTime,
+        selectedEntities: selectedEntities,
+      }
+
+      try {
+        const res = await addModel(formData)
+        if (res.code === 200) {
+          this.$modal.msgSuccess('模型添加成功')
+          this.$emit('closeUseOrReturnFormDialog')
+          this.$emit('refreshParentList')
+          this.resetForm()
+        } else {
+          this.$modal.msgError(res.msg || '提交失败')
+        }
+      } catch (error) {
+        this.$modal.msgError('提交异常: ' + error.message)
+      }
+    },
+    // 上一步
+    onHandleBack() {
+      this.showLayerDialog = false
+    },
+
+    resetForm() {
+      this.$refs.useOrReturnFormRef.resetFields()
+      this.fileList = []
+      this.useOrReturnForm.files = []
+      this.selectedEntities = []
+      this.showLayerDialog = false
+      this.fitToView()
+    },
+
+    handleSuccess(response, file, fileList) {
+      if (response.code === 200) {
+        console.log(response, '上传结果---')
+        this.cadData = response.data.cadData || []
+        const uploaded = response.data || {
+          name: file.name,
+          url: response.fileUrl || response.url,
+          uid: file.uid,
+        }
+        this.fileList = fileList
+        this.useOrReturnForm.files = [uploaded]
+        this.useOrReturnForm.modelUrl = uploaded.url
+        this.$refs.useOrReturnFormRef.validateField('files')
+      } else {
+        this.$message.error(response.msg || '文件上传失败')
+        this.handleRemove(file)
+      }
+    },
+
+    handleRemove(file, fileList) {
+      this.fileList = fileList
+      this.useOrReturnForm.files = []
+      this.useOrReturnForm.modelUrl = ''
+      this.cadData = []
+      this.$refs.useOrReturnFormRef.validateField('files')
+    },
+
+    beforeUpload(file) {
+      const isDxf = file.name.toLowerCase().endsWith('.dxf')
+      if (!isDxf) this.$message.error('只能上传DXF格式的文件!')
+      return isDxf
+    },
+
+    handleLayerSelectNew(item) {
+      this.$set(item, 'checked', !item.checked)
+    },
+  },
 }
 </script>
 
 <style scoped lang="scss">
 .upload-demo {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
+
 .upload-demo-tip {
-    margin-left: 10px;
-    color: #f56c6c;
+  margin-left: 10px;
+  color: #f56c6c;
 }
 
 .layer-container {
-    max-height: 76vh;
+  max-height: 76vh;
 
-    overflow-y: auto;
+  overflow-y: auto;
 
-    /* 滚动条样式优化 */
-    &::-webkit-scrollbar {
-        width: 8px;
-    }
-    &::-webkit-scrollbar-thumb {
-        background-color: #dcdfe6;
-        border-radius: 4px;
+  /* 滚动条样式优化 */
+  &::-webkit-scrollbar {
+    width: 8px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: #dcdfe6;
+    border-radius: 4px;
+  }
+
+  .layer-item {
+    display: flex;
+    align-items: center;
+    padding: 8px 0;
+    margin-bottom: 10px;
+    border-radius: 6px;
+    box-shadow: 0 2px 8px rgb(0 0 0 / 0.05);
+    background-color: #fff;
+    cursor: pointer;
+
+    & span {
+      flex: 1;
     }
+  }
 
-    .layer-item {
-        display: flex;
-        align-items: center;
-        padding: 8px 0;
-        margin-bottom: 10px;
-        border-radius: 6px;
-        box-shadow: 0 2px 8px rgb(0 0 0 / 0.05);
-        background-color: #fff;
-        cursor: pointer;
-
-        & span {
-            flex: 1;
-        }
-    }
-
-    .layer-item:hover {
-        background-color: #e6f2ff;
-        color: #409eff;
-    }
+  .layer-item:hover {
+    background-color: #e6f2ff;
+    color: #409eff;
+  }
 }
 
 .left-panel {
-    width: 260px;
-    background: #f7f9fc;
-    border-right: 1px solid #dcdfe6;
-    padding: 20px 15px;
-    overflow-y: auto;
+  width: 260px;
+  background: #f7f9fc;
+  border-right: 1px solid #dcdfe6;
+  padding: 20px 15px;
+  overflow-y: auto;
 }
 
 .panel-title {
-    font-weight: 600;
-    font-size: 18px;
-    margin-bottom: 20px;
-    color: #303133;
-    border-bottom: 2px solid #409eff;
-    padding-bottom: 6px;
+  font-weight: 600;
+  font-size: 18px;
+  margin-bottom: 20px;
+  color: #303133;
+  border-bottom: 2px solid #409eff;
+  padding-bottom: 6px;
 }
 
 .layer-menu {
-    background: transparent;
-    border: none;
+  background: transparent;
+  border: none;
 }
 
 .layer-menu-item {
-    font-size: 15px;
-    padding: 8px 15px !important;
-    display: flex;
-    justify-content: space-between;
-    color: #606266;
-    cursor: pointer;
+  font-size: 15px;
+  padding: 8px 15px !important;
+  display: flex;
+  justify-content: space-between;
+  color: #606266;
+  cursor: pointer;
 }
 
 .layer-menu-item:hover {
-    background-color: #e6f2ff;
-    color: #409eff;
+  background-color: #e6f2ff;
+  color: #409eff;
 }
 
 .el-menu-item.is-active {
-    background-color: #409eff !important;
-    color: #fff !important;
-    font-weight: 600;
+  background-color: #409eff !important;
+  color: #fff !important;
+  font-weight: 600;
 }
 
 .entity-count {
-    color: #909399;
-    font-weight: 400;
+  color: #909399;
+  font-weight: 400;
 }
 
 .right-panel {
-    flex: 1;
-    padding: 20px 25px;
-    background: #fff;
-    overflow-y: auto;
-    display: flex;
-    flex-direction: column;
+  flex: 1;
+  padding: 20px 25px;
+  background: #fff;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
 }
 
 .entity-row {
-    margin-bottom: 15px;
-    flex-wrap: wrap;
-    display: flex;
-    gap: 15px;
+  margin-bottom: 15px;
+  flex-wrap: wrap;
+  display: flex;
+  gap: 15px;
 }
 
 .entity-card {
-    cursor: pointer;
-    border-radius: 6px;
-    transition: all 0.3s ease;
-    margin-bottom: 15px;
-    box-shadow: 0 2px 8px rgb(0 0 0 / 0.05);
-    width: 30%;
-    min-width: 200px;
+  cursor: pointer;
+  border-radius: 6px;
+  transition: all 0.3s ease;
+  margin-bottom: 15px;
+  box-shadow: 0 2px 8px rgb(0 0 0 / 0.05);
+  width: 30%;
+  min-width: 200px;
 }
 
 .entity-card:hover {
-    transform: translateY(-3px);
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  transform: translateY(-3px);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
 }
 
 .entity-card.active {
-    border: 2px solid #409eff;
-    background-color: #f0f7ff;
+  border: 2px solid #409eff;
+  background-color: #f0f7ff;
 }
 
 .entity-info {
-    font-size: 13px;
-    color: #4a4a4a;
+  font-size: 13px;
+  color: #4a4a4a;
 }
 
 .entity-info div {
-    margin-bottom: 4px;
-    line-height: 1.3;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+  margin-bottom: 4px;
+  line-height: 1.3;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .preview-container {
-    margin-top: 20px;
-    padding: 15px;
-    background: #f8fafc;
-    border: 1px solid #e4e7ed;
-    border-radius: 6px;
+  margin-top: 20px;
+  padding: 15px;
+  background: #f8fafc;
+  border: 1px solid #e4e7ed;
+  border-radius: 6px;
 }
 
 .preview-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10px;
 }
 
 .zoom-controls {
-    display: flex;
-    align-items: center;
-    gap: 10px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
 }
 
 .zoom-controls span {
-    min-width: 50px;
-    text-align: center;
-    font-size: 14px;
+  min-width: 50px;
+  text-align: center;
+  font-size: 14px;
 }
 
 .preview-wrapper {
-    height: 300px;
-    width: 100%;
-    background: white;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    overflow: hidden;
-    position: relative;
+  height: 300px;
+  width: 100%;
+  background: white;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  overflow: hidden;
+  position: relative;
 }
 
 .preview-svg {
-    width: 100%;
-    height: 100%;
-    background: #f9f9f9;
-    cursor: move;
+  width: 100%;
+  height: 100%;
+  background: #f9f9f9;
+  cursor: move;
 }
 
 .coordinate-indicator {
-    margin-top: 10px;
-    display: flex;
-    justify-content: space-between;
-    font-size: 12px;
-    color: #666;
+  margin-top: 10px;
+  display: flex;
+  justify-content: space-between;
+  font-size: 12px;
+  color: #666;
 }
 
 .layer-footer {
-    text-align: right;
-    margin-top: 20px;
-    padding-top: 10px;
-    border-top: 1px solid #eee;
+  text-align: right;
+  margin-top: 20px;
+  padding-top: 10px;
+  border-top: 1px solid #eee;
 }
 
 .layer-footer button {
-    min-width: 100px;
-    margin-left: 15px;
-    font-weight: 600;
+  min-width: 100px;
+  margin-left: 15px;
+  font-weight: 600;
 }
 
 /* ------------------------------ */
 
 .all-select {
-    display: flex;
-    align-items: center;
-    padding: 8px 0;
+  display: flex;
+  align-items: center;
+  padding: 8px 0;
 }
 
 .item-index {
-    width: 30px;
-    text-align: center;
-    margin-right: 10px;
+  width: 30px;
+  text-align: center;
+  margin-right: 10px;
 }
 
 .btn-group {
-    display: flex;
-    justify-content: flex-end;
-    margin-top: 20px;
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px;
 }
 </style>
diff --git a/src/views/basic/owner-manage/addOrEditForm.vue b/src/views/basic/owner-manage/addOrEditForm.vue
index 5bdc2f4..b338431 100644
--- a/src/views/basic/owner-manage/addOrEditForm.vue
+++ b/src/views/basic/owner-manage/addOrEditForm.vue
@@ -16,26 +16,26 @@
         </el-row>
       </el-form-item>
 
-      <el-form-item label="主单位负责人" prop="unitMan">
+      <el-form-item label="业主单位负责人" prop="unitMan">
         <el-row>
           <el-col :span="20">
-            <el-input v-model="addOrEditForm.unitMan" placeholder="请输入主单位负责人"/>
+            <el-input v-model="addOrEditForm.unitMan" placeholder="请输入业主单位负责人"/>
           </el-col>
         </el-row>
       </el-form-item>
 
-      <el-form-item label="主单位负责人电话" prop="phone">
+      <el-form-item label="业主单位负责人电话" prop="phone">
         <el-row>
           <el-col :span="20">
-            <el-input v-model="addOrEditForm.phone" placeholder="请输入主单位负责人电话"/>
+            <el-input v-model="addOrEditForm.phone" placeholder="请输入业主单位负责人电话"/>
           </el-col>
         </el-row>
       </el-form-item>
 
-      <el-form-item label="主单位地址" prop="address">
+      <el-form-item label="业主单位地址" prop="address">
         <el-row>
           <el-col :span="20">
-            <el-input v-model="addOrEditForm.address" placeholder="请输入主单位地址"/>
+            <el-input v-model="addOrEditForm.address" placeholder="请输入业主单位地址"/>
           </el-col>
         </el-row>
       </el-form-item>
@@ -74,7 +74,7 @@ export default {
       },
       addOrEditFormRules: {
         unitName: [{required: true, message: '请输入业主单位名称', trigger: 'blur'}],
-        unitMan: [{required: true, message: '请输入主单位负责人', trigger: 'blur'}],
+        unitMan: [{required: true, message: '请输入业主单位负责人', trigger: 'blur'}],
       },
     }
   },