diff --git a/src/views/sensitivePerception/Model.vue b/src/views/sensitivePerception/Model.vue
index de95b25..4ace30b 100644
--- a/src/views/sensitivePerception/Model.vue
+++ b/src/views/sensitivePerception/Model.vue
@@ -149,7 +149,7 @@
         v-model="show"
         top="4vh"
     >
-        <el-form label-width="130" ref="formRef" :model="form">
+        <el-form label-width="130" ref="formRef" :model="form" v-loading="editLoading">
             <el-form-item
                 label="模型名称"
                 prop="modelName"
@@ -222,7 +222,7 @@
                     <el-select
                         v-model="form.clueTableName"
                         style="width: 340px"
-                        @change="handleSelectClueTableName"
+                        clearable
                     >
                         <el-option
                             v-for="item in clueMappingData"
@@ -1140,6 +1140,7 @@ import {
     delModel,
     listModel,
     listClueMappingData,
+    getModel
 } from "@/api/sensitivePerception/model";
 import { listModelClue } from "@/api/sensitivePerception/modelClue";
 import { listTopModelClueRecords } from "@/api/sensitivePerception/modelClue";
@@ -1245,15 +1246,22 @@ async function handleAdd() {
     clueMappingData.value = await listClueMappingData();
 }
 
-function handleEdit() {
+const editLoading = ref(false)
+async function handleEdit() {
     show.value = true;
     mode.value = "edit";
-    form.value = { ...activeModel.value };
-    if (activeModel.value.involveProblem) {
-        form.value.involveProblem = activeModel.value.involveProblem.split(",");
-    } else {
-        form.value.involveProblem = [];
+    editLoading.value = true
+    const data = await getModel(activeModel.value.id)
+    clueMappingData.value = await listClueMappingData();
+    if (data.modelingMethod === '2') {
+        form.value = { ...data };
+        modelClueTargetColumns.value[0].columnName = form.value.modelGeneration.involveDepartName
+        modelClueTargetColumns.value[1].columnName = form.value.modelGeneration.involveDepartId
+        modelClueTargetColumns.value[2].columnName = form.value.modelGeneration.involvePoliceName
+        modelClueTargetColumns.value[3].columnName = form.value.modelGeneration.involvePoliceEmpNo
+        modelClueTargetColumns.value[4].columnName = form.value.modelGeneration.happenTime 
     }
+    editLoading.value = false
 }
 
 function handleAddProblem() {
@@ -1372,21 +1380,26 @@ const modelClueColumns = [
 ];
 
 function handleChangeColumn(val, row) {
-    const item = fields.value.find((item) => item.columnName === val);
-
-    row.dataType = item.dataType;
-    row.columnComment = item.columnComment;
+    if (val) {
+        const item = fields.value.find((item) => item.columnName === val);
+        row.dataType = item.dataType;
+        row.columnComment = item.columnComment;
+    } else {
+        row.dataType = null;
+        row.columnComment = null;
+    }
 }
+    
 const modelClueTargetColumns = ref([{}, {}, {}, {}, {}]);
 
 const fields = ref([]);
-function handleSelectClueTableName(val) {
+watch(() => form.value.clueTableName, (val) => {
     if (val) {
         fields.value = clueMappingData.value.filter(
             (item) => item.tableName === val
         )[0].fields;
     }
-}
+})
 </script>
 <style lang="scss" scoped>
 .menu {