diff --git a/src/views/page/Aside/cameraRightMenu.vue b/src/views/page/Aside/cameraRightMenu.vue
index 2ca5f82..9d7e6d0 100644
--- a/src/views/page/Aside/cameraRightMenu.vue
+++ b/src/views/page/Aside/cameraRightMenu.vue
@@ -28,9 +28,9 @@
         <a-modal 
             v-model:visible="visible" 
             title="用户设置" 
-            @ok="handleOk"
             width="90%"
             wrapClassName="full-modal"
+            :footer="null"
         >
             <userEdit></userEdit>
         </a-modal>
@@ -45,9 +45,7 @@ const visible = ref(false)
 function openUserEdit(){  
     visible.value = !visible.value
 }
-function handleOk(){
-    visible.value = false;
-}
+
 </script>
 
 <style scoped lang='less'>
diff --git a/src/views/page/aside/rightMenuItem/userEdit.vue b/src/views/page/aside/rightMenuItem/userEdit.vue
index 3405b84..b0a38b7 100644
--- a/src/views/page/aside/rightMenuItem/userEdit.vue
+++ b/src/views/page/aside/rightMenuItem/userEdit.vue
@@ -1,38 +1,28 @@
 <template>
-<div class="user-edit">
-    <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
-    <Table
-        class="ant-table-striped"
-        size="middle"
-        :columns="columns"
-        :data-source="data"
-        :rowClassName="(record:any, index:number) => (index % 2 === 1 ? 'table-striped' : undefined)"
-        :pagination="pagination"
-    >
-        <template #action="{ record }">
-            <a href="#" @click="edit_(record)">编辑</a>
-            <Popconfirm v-if="data.length" title="确定删除吗?" ok-text="确定" cancel-text="取消"
-                @confirm="del_(record.id, record.key-1)">
-                <Divider type="vertical" />
-                <a href="#" >删除</a>
-            </Popconfirm>
-        </template>
-    </Table>
-</div>
+    <div class="user-edit">
+        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <Table class="ant-table-striped" size="middle" :columns="columns" :data-source="data"
+            :rowClassName="(record: any, index: number) => (index % 2 === 1 ? 'table-striped' : undefined)"
+            :pagination="pagination">
+            <template #action="{ record }">
+                <a href="#" @click="edit_(record)">编辑</a>
+                <Popconfirm v-if="data.length" title="确定删除吗?" ok-text="确定" cancel-text="取消"
+                    @confirm="del_(record.id, record.key - 1)">
+                    <Divider type="vertical" />
+                    <a href="#">删除</a>
+                </Popconfirm>
+            </template>
+        </Table>
+    </div>
 
     <!-- 弹出框 -->
-    <a-modal 
-        v-model:visible="visible" 
-        title="设置表单" 
-        width="40%"
-        @ok="handleOk"
-    >
-    <userEditModal @handleOk='handleOk'></userEditModal>
+    <a-modal v-model:visible="visible" title="设置表单" width="40%" @ok="handleOk" destroyOnClose>
+        <userEditModal ref="childRef" :editData="editData"></userEditModal>
     </a-modal>
 </template>
 
 <script setup lang='ts'>
-import { ref } from"vue";
+import { onMounted, ref, watch } from "vue";
 import * as cameraApi from '@/axios/cameraBase/cameraApi';
 import userEditModal from '@/views/page/aside/rightMenuItem/userEditModal.vue'
 import {
@@ -42,15 +32,15 @@ import {
 } from "ant-design-vue";
 import Msg from "@/utils/message";
 const columns = [
-  { title: '序号', dataIndex: 'key' },
-  { title: '相机名称', dataIndex: 'name' },
-  { title: '相机IP', dataIndex: 'ip' },
-  { title: '登录名', dataIndex: 'userName' },
-  { title: '密码', dataIndex: 'password' },
-  { title: '用户类型', dataIndex: 'userType' }, 
-  { title: '是否启用', dataIndex: 'flag' },
-  { title: '备注', dataIndex: 'remarks' },
-  {
+    { title: '序号', dataIndex: 'key' },
+    { title: '相机名称', dataIndex: 'name' },
+    { title: '相机IP', dataIndex: 'ip' },
+    { title: '登录名', dataIndex: 'userName' },
+    { title: '密码', dataIndex: 'password' },
+    { title: '用户类型', dataIndex: 'userType' },
+    { title: '是否启用', dataIndex: 'flag' },
+    { title: '备注', dataIndex: 'remarks' },
+    {
         title: "操作",
         dataIndex: "",
         key: "x",
@@ -59,7 +49,7 @@ const columns = [
         },
     },
 ];
-let data =ref();
+let data = ref();
 // let data =  [
 //   {
 //     key: '1',
@@ -165,41 +155,70 @@ const pagination = ref({
 function loadTreeData() {
     cameraApi.GetList().then((res: any) => {
         let list: Array<any> = res.data.data;
-       if(list.length!=0){
-        list=list.map((item:any,index:number)=>{
-            item.key=index+1
-            return item
-        })
-        pagination.value.total=list.length
-        console.log(list);
-        
-        data.value=list
-       }
+        if (list.length != 0) {
+            list = list.map((item: any, index: number) => {
+                item.key = index + 1
+                return item
+            })
+            pagination.value.total = list.length
+            // console.log(list);
+
+            data.value = list
+        }
     });
 }
-loadTreeData()
-function edit_(item:any){
-    
+
+
+onMounted(() => {
+    loadTreeData()
+})
+
+
+
+//编辑
+let editData = ref()
+function edit_(item: any) {
+    // console.log(item);
+    editData.value = item
+    visible.value = true
 }
+
 //添加
 let visible = ref();
-function handleAdd(){
+function handleAdd() {
     visible.value = true;
 }
 //模态框方法
-const handleOk = (e: MouseEvent) => {
-      console.log(e);
-      visible.value = false;
-    };
-
-function del_(key:any,index:number){
-    cameraApi.Delete({id:key}).then((res:any)=>{
-        let resData=res.data
-        if(resData){
+const childRef = ref(null);
+const handleOk = async (e: MouseEvent) => {
+    //   console.log(e);
+    let result
+    if (editData.value == null) {
+        result = await childRef.value.add();
+    }
+    else {
+        result = await childRef.value.edit();
+    }
+    //   console.log("result",result);
+    if (result) { //成功关闭弹窗
+        visible.value = false;
+       
+    }
+    else {
+        visible.value = true;
+    }
+    //清空
+    editData.value = null
+};
+//删除
+function del_(key: any, index: number) {
+    cameraApi.Delete({ id: key }).then((res: any) => {
+        let resData = res.data
+        if (resData) {
             Msg.success("删除成功")
-            data.value.splice(index,1)
-            data.value=data.value.map((item:any,i:number)=>{
-                if(index<item.key){
+            data.value.splice(index, 1)
+            data.value = data.value.map((item: any, i: number) => {
+                if (index < item.key) {
                     item.key--
                 }
                 return item
@@ -207,18 +226,27 @@ function del_(key:any,index:number){
         }
     })
 }
+
+
+//监听 重新获取
+watch(visible, (nv, ov) => {
+    loadTreeData()
+})
+
 </script>
 
 <style scoped lang='less'>
-.user-edit{
+.user-edit {
     padding: 20px;
     // background-color: #001529;
     height: 100%;
 }
+
 .ant-table-striped :deep(.table-striped) td {
-  background-color: #fafafa;
+    background-color: #fafafa;
 }
-:deep(.ant-table-cell){
+
+:deep(.ant-table-cell) {
     color: #000 !important;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/page/aside/rightMenuItem/userEditModal.vue b/src/views/page/aside/rightMenuItem/userEditModal.vue
index 241f62f..07192d6 100644
--- a/src/views/page/aside/rightMenuItem/userEditModal.vue
+++ b/src/views/page/aside/rightMenuItem/userEditModal.vue
@@ -1,5 +1,5 @@
 <template>
-<a-form :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
+  <a-form :model="formState" :label-col="labelCol" :wrapper-col="wrapperCol">
     <a-form-item label="相机名称">
       <a-input v-model:value="formState.name" />
     </a-form-item>
@@ -38,7 +38,9 @@
 </template>
 
 <script setup lang='ts'>
-import { reactive, toRaw, UnwrapRef } from 'vue';
+import { onMounted, reactive, toRaw, UnwrapRef, watch } from 'vue';
+import * as cameraApi from '@/axios/cameraBase/cameraApi';
+import Msg from '@/utils/message';
 interface FormState {
   name: string;
   ip: string;
@@ -50,37 +52,65 @@ interface FormState {
   remark: string;
 }
 const props = defineProps({
-    handleOk: Function
+  editData: Object
 });
 
-let labelCol= { span: 6 }
-let wrapperCol= { span: 14 }
+let labelCol = { span: 6 }
+let wrapperCol = { span: 14 }
 const formState: UnwrapRef<FormState> = reactive({
-      name: '',
-      ip: '',
-      CbCameraParamsId: '',
-      userName: '',
-      password: '',
-      userType: undefined,
-      state: false,
-      remark: '',
-    });
-    const onSubmit = () => {
-      console.log('submit!', toRaw(formState));
-    };
-
-//提交
-function submit(){
+  name: '',
+  ip: '',
+  CbCameraParamsId: '',
+  userName: '',
+  password: '',
+  userType: undefined,
+  state: false,
+  remark: '',
+});
 
+//新增
+function add() {
+  console.log('新增!', toRaw(formState));
+  return cameraApi.Add(toRaw(formState)).then(res => {
+    console.log(res);
+    if (res.data.code == 200) {
+      Msg.success('添加成功')
+      return true
+    }
+    else {
+      Msg.error('添加失败,' + res.data.message)
+      return false
+    }
+  }).catch((err: any) => {
+    Msg.error('添加失败,' + err)
+    return false
+  })
+}
 
+//编辑
+function edit() {
+  console.log('编辑!', toRaw(formState));
 }
 
+//暴露方法
+defineExpose({
+  add,
+  edit
+})
+
+//编辑/新增
+onMounted(() => {
+  console.log("收到了", props.editData);
+  if (props.editData != null || props.editData != undefined){
+    
+  }
+
+})
 
 </script>
 
 <style lang="less" scoped>
-
-:deep(.ant-input ){
-    color: #000;
+:deep(.ant-input) {
+  color: #000;
 }
 </style>
\ No newline at end of file