From a8158aa0c656d59357be9682e24c21f7c8ba59bb Mon Sep 17 00:00:00 2001
From: DIAMOND <276397553@qq.com>
Date: Wed, 28 Dec 2022 16:40:53 +0800
Subject: [PATCH] UI

---
 src/views/page/VideoControl/VideoControlSimple.vue |  5 +++--
 src/views/page/aside/rightMenuItem/userEdit.vue    | 14 ++++++++++----
 .../page/aside/rightMenuItem/userEditModal.vue     | 10 +++++++---
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/page/VideoControl/VideoControlSimple.vue b/src/views/page/VideoControl/VideoControlSimple.vue
index 23829e4..4316cbf 100644
--- a/src/views/page/VideoControl/VideoControlSimple.vue
+++ b/src/views/page/VideoControl/VideoControlSimple.vue
@@ -307,13 +307,13 @@ function wheel(e: any) {
 <style scoped lang="less">
 .camera-control {
   /* color: #080000; */
-  position: absolute;
+  // position: absolute;
   width: 100vw;
   height: 100vh;
   left: 0;
   top: 0;
   // background: blue;
-  z-index: 0;
+  // z-index: 0;
 }
 
 .camera-control .camera-operate {
@@ -458,6 +458,7 @@ input[type='range']::-webkit-slider-thumb:active {
   transform: translateX(-50%);
   height: 5vh;
   width: 60vw;
+  top: 0;
   // background: red;
 }
 
diff --git a/src/views/page/aside/rightMenuItem/userEdit.vue b/src/views/page/aside/rightMenuItem/userEdit.vue
index e74eec3..39315c6 100644
--- a/src/views/page/aside/rightMenuItem/userEdit.vue
+++ b/src/views/page/aside/rightMenuItem/userEdit.vue
@@ -16,7 +16,7 @@
     </div>
 
     <!-- 弹出框 -->
-    <a-modal v-model:visible="visible" title="设置表单" width="40%" @ok="handleOk" destroyOnClose>
+    <a-modal v-model:visible="visible" title="设置表单" width="40%" @ok="handleOk" @cancel="handelCancel" destroyOnClose>
         <userEditModal ref="childRef" :editData="editData"></userEditModal>
     </a-modal>
 </template>
@@ -37,9 +37,9 @@ const columns = [
     { title: '相机IP', dataIndex: 'ip' },
     { title: '登录名', dataIndex: 'userName' },
     { title: '密码', dataIndex: 'password' },
-    { title: '用户类型', dataIndex: 'userType' },
-    { title: '是否启用', dataIndex: 'flag' },
-    { title: '备注', dataIndex: 'remarks' },
+    // { title: '用户类型', dataIndex: 'userType' },
+    // { title: '是否启用', dataIndex: 'flag' },
+    // { title: '备注', dataIndex: 'remarks' },
     {
         title: "操作",
         dataIndex: "",
@@ -183,6 +183,12 @@ function edit_(item: any) {
     editData.value = item
     visible.value = true
 }
+//返回
+function handelCancel(){
+    editData.value = null;
+    visible.value = false
+}
+
 
 //添加
 let visible = ref();
diff --git a/src/views/page/aside/rightMenuItem/userEditModal.vue b/src/views/page/aside/rightMenuItem/userEditModal.vue
index 07192d6..76b895f 100644
--- a/src/views/page/aside/rightMenuItem/userEditModal.vue
+++ b/src/views/page/aside/rightMenuItem/userEditModal.vue
@@ -15,7 +15,7 @@
     <a-form-item label="密码">
       <a-input-password v-model:value="formState.password" />
     </a-form-item>
-    <a-form-item label="用户类型">
+    <!-- <a-form-item label="用户类型">
       <a-select v-model:value="formState.userType" placeholder="请选择用户类型">
         <a-select-option value="shanghai">Zone one</a-select-option>
         <a-select-option value="beijing">Zone two</a-select-option>
@@ -26,7 +26,7 @@
     </a-form-item>
     <a-form-item label="备注">
       <a-input v-model:value="formState.remark" type="textarea" />
-    </a-form-item>
+    </a-form-item> -->
     <!-- <a-form-item :wrapper-col="{ span: 14, offset: 4 }">
       <a-button type="primary" @click="onSubmit">Create</a-button>
       <a-button style="margin-left: 10px">Cancel</a-button>
@@ -102,7 +102,11 @@ defineExpose({
 onMounted(() => {
   console.log("收到了", props.editData);
   if (props.editData != null || props.editData != undefined){
-    
+    formState.name = props.editData.name;
+    formState.ip = props.editData.ip;
+    formState.CbCameraParamsId = props.editData.cbCameraParamsId;
+    formState.userName = props.editData.userName;
+    formState.password = props.editData.password;
   }
 
 })