diff --git a/src/views/equipmentCenter/videoManage/videoConfig.vue b/src/views/equipmentCenter/videoManage/videoConfig.vue
index 6c0c77de..40c4aa93 100644
--- a/src/views/equipmentCenter/videoManage/videoConfig.vue
+++ b/src/views/equipmentCenter/videoManage/videoConfig.vue
@@ -2,7 +2,7 @@
   <div class="fullHeight">
     <div class="changeVideoTypeBox whiteBlock" v-if="COMPANY != 'zhongjian'">
       <!--#{{videoType}}-->
-      <p class="tips">{{ $t('message.videoManage.video_type_tips') }}</p>
+      <p class="tips">{{ $t("message.videoManage.video_type_tips") }}</p>
       <div class="videoType">
         <p
           v-for="(item, index) in videoTypeList"
@@ -33,7 +33,7 @@
         <div class="videoGroupBox fullHeight whiteBlock">
           <div class="title">
             <!-- 视频分组 -->
-            <span>{{ $t('message.videoManage.videoGrouping') }}</span>
+            <span>{{ $t("message.videoManage.videoGrouping") }}</span>
           </div>
           <div class="list_content">
             <el-tree
@@ -46,9 +46,7 @@
               @node-click="checkVideo"
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
-                <span :title="data.groupName">{{
-                  data.groupName
-                }}</span>
+                <span :title="data.groupName">{{ data.groupName }}</span>
                 <!-- 企业删除与修改 -->
                 <div class="flex2">
                   <img
@@ -116,27 +114,31 @@
           <div
             class="addFirm"
             @click="
-              addGroupDialog = true
-              isAddGroup = true
-              addGroupForm.groupName = ''
-              selectVal = ''
-              selectTreeData = {}
+              addGroupDialog = true;
+              isAddGroup = true;
+              addGroupForm.groupName = '';
+              selectVal = '';
+              selectTreeData = {};
             "
           >
             <!-- 新增分组 -->
-            {{ $t('message.videoManage.newGrouping') }}
+            {{ $t("message.videoManage.newGrouping") }}
           </div>
         </div>
         <div class="rightVideo whiteBlock">
           <div>
-            <el-button type="primary" @click="addVideoBtn" size="medium" :disabled="groupList.length == 0"
-              >{{ $t('message.videoManage.dialog_newVideo.operation.add') }}
+            <el-button
+              type="primary"
+              @click="addVideoBtn"
+              size="medium"
+              :disabled="!currentGroupInfo"
+              >{{ $t("message.videoManage.dialog_newVideo.operation.add") }}
               <!-- {{$t('message.videoManage.add')}}{{$t('message.videoManage.video')}} -->
             </el-button>
             <el-button type="primary" @click="accountServerObj" size="medium"
-              >{{ $t('message.videoManage.configAccount') }}
+              >{{ $t("message.videoManage.configAccount") }}
             </el-button>
-             <!-- AI布防 -->
+            <!-- AI布防 -->
             <!-- <el-button
               v-if="videoType == 3"
               type="primary"
@@ -168,7 +170,7 @@
               size="medium"
               >{{ $t('message.videoManage.configPlayMode') }}
             </el-button> -->
-             <!-- 上传第三方平台 -->
+            <!-- 上传第三方平台 -->
             <!-- <el-button
               v-if="videoType != 7"
               type="primary"
@@ -242,7 +244,7 @@
         <el-table-column prop="ip" label="硬件ip"></el-table-column>
         <el-table-column prop="deviceState" label="设备状态">
           <template slot-scope="scope">
-            {{ scope.row.deviceState == 1 ? '在线' : '离线' }}
+            {{ scope.row.deviceState == 1 ? "在线" : "离线" }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -378,7 +380,7 @@
         ></el-table-column>
         <el-table-column prop="deviceState" label="设备状态" align="center">
           <template slot-scope="scope">
-            {{ scope.row.deviceState == 1 ? '在线' : '离线' }}
+            {{ scope.row.deviceState == 1 ? "在线" : "离线" }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center">
@@ -472,7 +474,7 @@
       :show-close="false"
     >
       <div class="dialog_content">
-        <p>{{ $t('message.videoManage.dialog_video_config.content') }}</p>
+        <p>{{ $t("message.videoManage.dialog_video_config.content") }}</p>
         <el-radio-group v-model="videoType" class="videoTypeGroup">
           <el-radio
             :label="index + 1"
@@ -483,7 +485,7 @@
           >
         </el-radio-group>
         <p style="opacity: 0.5; font-size: 13px">
-          {{ $t('message.videoManage.dialog_video_config.tips') }}
+          {{ $t("message.videoManage.dialog_video_config.tips") }}
         </p>
         <div class="dialog-footer">
           <el-button
@@ -491,7 +493,7 @@
             icon="el-icon-circle-check"
             @click="saveVideoConfigFn"
             size="medium"
-            >{{ $t('message.companyDiagram.determine') }}
+            >{{ $t("message.companyDiagram.determine") }}
           </el-button>
         </div>
       </div>
@@ -516,6 +518,28 @@
         >
           <!-- 所属分组 -->
           <el-form-item :label="$t('message.videoManage.group')" prop="groupId">
+            <el-select
+              v-model="selectFormVal"
+              placeholder="请选择"
+              clearable
+              @change="selectFormChange"
+            >
+              <el-option style="height: auto" :value="[]">
+                <el-tree
+                  :data="videoTreeData"
+                  node-key="id"
+                  ref="groupFormTree"
+                  highlight-current
+                  :props="defaultProps"
+                  :default-expand-all="false"
+                  @node-click="treeFormClick"
+                >
+                </el-tree>
+                <!-- :default-expanded-keys="defaultExpandArr" -->
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- <el-form-item :label="$t('message.videoManage.group')" prop="groupId">
             <el-select
               v-model="currentVideoTypeDetail.groupId"
               :placeholder="$t('message.videoManage.pleaseSelect')"
@@ -529,7 +553,7 @@
               >
               </el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item
             :label="$t('message.videoManage.dialog_newVideo.equipment_name')"
             prop="videoName"
@@ -724,7 +748,7 @@
                 <el-link type="primary" @click="toGetLocalFn">
                   {{
                     $t(
-                      'message.companyDiagram.dialog_ProjectPop_up.coordinatePicking'
+                      "message.companyDiagram.dialog_ProjectPop_up.coordinatePicking"
                     )
                   }}
                 </el-link>
@@ -776,7 +800,7 @@
           >
             <div>
               <img src="../../../assets/images/cancel.png" alt="" />
-              <span>{{ $t('message.videoManage.btn_cancel') }}</span>
+              <span>{{ $t("message.videoManage.btn_cancel") }}</span>
             </div>
           </el-button>
           <!--确定-->
@@ -785,7 +809,7 @@
             icon="el-icon-circle-check"
             @click="awaitAddVideo"
             size="medium"
-            >{{ $t('message.videoManage.btn_determine') }}
+            >{{ $t("message.videoManage.btn_determine") }}
           </el-button>
         </div>
       </div>
@@ -853,28 +877,19 @@
             ></el-input>
           </el-form-item>
 
-          <el-form-item
-            v-if="videoType == '3'"
-            label="外网IP"
-          >
+          <el-form-item v-if="videoType == '3'" label="外网IP">
             <el-input
               v-model="currentVideoTypeDetail.outip"
               placeholder="请输入外网IP"
             ></el-input>
           </el-form-item>
-          <el-form-item
-          v-if="videoType == '3'"
-            label="外网端口"
-          >
+          <el-form-item v-if="videoType == '3'" label="外网端口">
             <el-input
               v-model="currentVideoTypeDetail.outport"
               placeholder="请输入外网端口"
             ></el-input>
           </el-form-item>
 
-
-
-
           <el-form-item v-if="videoType == '7'" label="ip">
             <el-input
               v-model="currentVideoTypeDetail.appId"
@@ -896,7 +911,7 @@
           >
             <div>
               <img src="../../../assets/images/cancel.png" alt="" />
-              <span>{{ $t('message.videoManage.btn_cancel') }}</span>
+              <span>{{ $t("message.videoManage.btn_cancel") }}</span>
             </div>
           </el-button>
           <el-button
@@ -904,7 +919,7 @@
             icon="el-icon-circle-check"
             @click="saveAccountConfig"
             size="medium"
-            >{{ $t('message.videoManage.btn_determine') }}
+            >{{ $t("message.videoManage.btn_determine") }}
           </el-button>
         </div>
       </div>
@@ -938,7 +953,7 @@
             <div>
               <img src="../../../assets/images/cancel.png" alt="" />
               <!-- 取消 -->
-              <span>{{ $t('message.videoManage.btn_cancel') }}</span>
+              <span>{{ $t("message.videoManage.btn_cancel") }}</span>
             </div>
           </el-button>
           <el-button
@@ -948,7 +963,7 @@
             size="medium"
           >
             <!-- 拉取设备 -->
-            {{ $t('message.videoManage.pullingEquipment') }}
+            {{ $t("message.videoManage.pullingEquipment") }}
           </el-button>
         </div>
       </div>
@@ -985,7 +1000,7 @@
           >
             <div>
               <img src="../../../assets/images/cancel.png" alt="" />
-              <span>{{ $t('message.videoManage.btn_cancel') }}</span>
+              <span>{{ $t("message.videoManage.btn_cancel") }}</span>
             </div>
           </el-button>
           <el-button
@@ -993,7 +1008,7 @@
             icon="el-icon-circle-check"
             @click="saveAccountConfig"
             size="medium"
-            >{{ $t('message.videoManage.btn_determine') }}
+            >{{ $t("message.videoManage.btn_determine") }}
           </el-button>
         </div>
       </div>
@@ -1007,12 +1022,12 @@
     >
       <div class="dialog_content">
         <div class="platforms-title">
-          {{ $t('message.videoManage.switch_platforms.platformsTitle') }}"{{
+          {{ $t("message.videoManage.switch_platforms.platformsTitle") }}"{{
             Popup.name
           }}"？
         </div>
         <div class="platforms-msg">
-          {{ $t('message.videoManage.switch_platforms.platformsMsg') }}
+          {{ $t("message.videoManage.switch_platforms.platformsMsg") }}
         </div>
         <div class="dialog-footer">
           <el-button
@@ -1022,7 +1037,7 @@
           >
             <div>
               <img src="../../../assets/images/cancel.png" alt="" />
-              <span>{{ $t('message.videoManage.btn_cancel') }}</span>
+              <span>{{ $t("message.videoManage.btn_cancel") }}</span>
             </div>
           </el-button>
           <el-button
@@ -1030,7 +1045,7 @@
             icon="el-icon-circle-check"
             @click="cut"
             size="medium"
-            >{{ $t('message.videoManage.btn_determine') }}
+            >{{ $t("message.videoManage.btn_determine") }}
           </el-button>
         </div>
       </div>
@@ -1057,17 +1072,14 @@
           label-width="120px"
           class="dialogFormBox"
         >
-        <el-form-item
-            label="选择父级"
-            prop="parentId"
-          >
+          <el-form-item label="选择父级" prop="parentId">
             <el-select
               v-model="selectVal"
               placeholder="请选择"
               clearable
               @change="selectChange"
             >
-              <el-option style="height:auto" :value="[]">
+              <el-option style="height: auto" :value="[]">
                 <el-tree
                   :data="videoTreeData"
                   node-key="id"
@@ -1078,7 +1090,7 @@
                   @node-click="treeClick"
                 >
                 </el-tree>
-                  <!-- :default-expanded-keys="defaultExpandArr" -->
+                <!-- :default-expanded-keys="defaultExpandArr" -->
               </el-option>
             </el-select>
           </el-form-item>
@@ -1098,14 +1110,14 @@
               @click="addGroupDialog = false"
               icon="el-icon-circle-close"
               size="medium"
-              >{{ $t('message.personnelPosition.cancel') }}
+              >{{ $t("message.personnelPosition.cancel") }}
             </el-button>
             <el-button
               type="primary"
               icon="el-icon-circle-check"
               @click="saveGroupFn"
               size="medium"
-              >{{ $t('message.personnelPosition.determine') }}
+              >{{ $t("message.personnelPosition.determine") }}
             </el-button>
           </div>
         </el-form>
@@ -1121,7 +1133,7 @@
   </div>
 </template>
 <script>
-import gdMap from '@/components/map/gd-map.vue'
+import gdMap from "@/components/map/gd-map.vue";
 import {
   addVideoItemApi,
   editVideoItemApi,
@@ -1148,11 +1160,11 @@ import {
   getPluginApi,
   editPluginApi,
   delPluginApi,
-  getAllNvrApi
-} from '@/assets/js/api/equipmentCenter/cameraList'
-import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage'
-import cameraList from './cameraList'
-import cameraListLc from './cameraList_lc'
+  getAllNvrApi,
+} from "@/assets/js/api/equipmentCenter/cameraList";
+import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
+import cameraList from "./cameraList";
+import cameraListLc from "./cameraList_lc";
 export default {
   data() {
     return {
@@ -1164,32 +1176,34 @@ export default {
       selectTreeData: {},
       selectVal: "",
       videoTreeData: [],
+      selectFormTreeData: {},
+      selectFormVal: "",
       configInfoParams: {}, //储存配置信息参数，给新增和编辑使用
-      operation: 'add', //新增或者编辑的判断
+      operation: "add", //新增或者编辑的判断
       Popup: {
         platforms: false,
         newVideo: false,
         accountConfig: false,
         equipment: false,
         playPattern: false,
-        name: '',
+        name: "",
         accountServer: false,
       },
       nvrDevice: false, //nvr弹窗
       formInline: {
-        name: '',
-        nvrSn: '',
-        ip: ''
+        name: "",
+        nvrSn: "",
+        ip: "",
       },
       addFormData: {
-        ip: '',
-        deviceState: '', //设备在线状态
-        name: '',
-        nvrSn: ''
+        ip: "",
+        deviceState: "", //设备在线状态
+        name: "",
+        nvrSn: "",
       },
       addDevice: false,
-      nvrTitle: '',
-      pluginTitle: '',
+      nvrTitle: "",
+      pluginTitle: "",
       mode: 1,
       pageNo: 1,
       pageSizes: [5, 10, 20, 50],
@@ -1202,149 +1216,148 @@ export default {
       tableData1: [],
       pluginDevice: false, // 插件弹窗
       formInline1: {
-        name: '',
-        ip: '',
-        sn: ''
+        name: "",
+        ip: "",
+        sn: "",
       },
       timeRange: [],
       addPlugin: false,
       addPluginData: {
-        name: '',
-        ip: '',
-        sn: '',
-        deviceState: ''
+        name: "",
+        ip: "",
+        sn: "",
+        deviceState: "",
       },
       rules1: {
         ip: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
         ],
         deviceState: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
         ],
         name: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
         ],
         nvrSn: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
-        ]
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
+        ],
       },
       rules2: {
         ip: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
         ],
         deviceState: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
         ],
         name: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
         ],
         sn: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          }
-        ]
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          },
+        ],
       },
       account_Config: {},
       projectVideoConfigList: [],
       configDialog: false,
-      deviceType: '',
-      deviceTypeList: this.$t('message.videoManage.deviceType'), //['枪机', '球机', '热成像', '单兵', '全景', '无人机']
-      videoTypeList: this.$t('message.videoManage.videoTypeList'), //['萤石云', '乐橙', 'ISC', '大华', '宇视', '国标']
-      playTypeList: this.$t('message.videoManage.playTypeList'), //['RTMP（高清）', 'RTMP（流畅）', 'HLS（高清）', 'HLS（流畅）', '高清轻量级插件（高清）', '流畅轻量级插件（流畅）']
+      deviceType: "",
+      deviceTypeList: this.$t("message.videoManage.deviceType"), //['枪机', '球机', '热成像', '单兵', '全景', '无人机']
+      videoTypeList: this.$t("message.videoManage.videoTypeList"), //['萤石云', '乐橙', 'ISC', '大华', '宇视', '国标']
+      playTypeList: this.$t("message.videoManage.playTypeList"), //['RTMP（高清）', 'RTMP（流畅）', 'HLS（高清）', 'HLS（流畅）', '高清轻量级插件（高清）', '流畅轻量级插件（流畅）']
       videoType: 1, //默认为1吗?
       currentVideoTypeDetail: {
-        videoName: '',
+        videoName: "",
         alarmPushWorkerId: [],
-        sortNum: '',
-        groupId: '',
-        ip: '',
-        nvrId: '',
+        sortNum: "",
+        groupId: "",
+        ip: "",
+        nvrId: "",
         aiFunctionType: 0,
-        latitude: '', //纬度
-        longitude: '', //经度
-        coverUr: '',
-        outip:"",
-        outport:''
+        latitude: "", //纬度
+        longitude: "", //经度
+        coverUr: "",
+        outip: "",
+        outport: "",
         // appSecret: '0a5836c68a7edabcc78e6a18f05bb317'
-
       },
       isCreateNewUser: [
-        { label: this.$t('message.videoManage.yes'), value: 1 }, // 是
-        { label: this.$t('message.videoManage.deny'), value: 0 } // 否
+        { label: this.$t("message.videoManage.yes"), value: 1 }, // 是
+        { label: this.$t("message.videoManage.deny"), value: 0 }, // 否
       ],
       formRules: {
         groupId: [
-         {
+          {
             required: true,
-            message: '请选择',
-            trigger: 'change'
-          } // 必
+            message: "请选择",
+            trigger: "blur",
+          }, // 必
         ],
         videoName: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          } // 必填
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          }, // 必填
         ],
         latitude: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          } // 必填
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          }, // 必填
         ],
         longitude: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          } // 必填
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          }, // 必填
         ],
         monitoringPointCode: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          } // 必填
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          }, // 必填
         ],
         monitoringPointLocation: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          } // 必填
-        ]
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          }, // 必填
+        ],
 
         // ip:[
         //     { required: true, message: this.$t('message.videoManage.required'), trigger: 'blur' }, // 必填
@@ -1355,7 +1368,7 @@ export default {
       },
       COMPANY: COMPANY,
       accountList: [],
-      organizationID: '',
+      organizationID: "",
       groupList: [],
       nvrList: [],
       activeGroupIndex: 0,
@@ -1363,106 +1376,123 @@ export default {
       isAddGroup: true,
       addGroupDialog: false,
       addGroupForm: {
-        groupName: '',
-        parentId: ""
+        groupName: "",
+        parentId: "",
       },
       addGroupFormRules: {
         groupName: [
           {
             required: true,
-            message: this.$t('message.videoManage.required'),
-            trigger: 'blur'
-          } // 必填
-        ]
+            message: this.$t("message.videoManage.required"),
+            trigger: "blur",
+          }, // 必填
+        ],
       },
-      projectSn: '',
+      projectSn: "",
       monitorinList: [
         {
-          label: '作业面',
-          value: 'JKDWZ001'
+          label: "作业面",
+          value: "JKDWZ001",
         },
         {
-          label: '料场',
-          value: 'JKDWZ002'
+          label: "料场",
+          value: "JKDWZ002",
         },
         {
-          label: '车辆出入口',
-          value: 'JKDWZ003'
+          label: "车辆出入口",
+          value: "JKDWZ003",
         },
         {
-          label: '人员出入口',
-          value: 'JKDWZ004'
+          label: "人员出入口",
+          value: "JKDWZ004",
         },
         {
-          label: '洗轮机',
-          value: 'JKDWZ005'
+          label: "洗轮机",
+          value: "JKDWZ005",
         },
         {
-          label: '围墙',
-          value: 'JKDWZ006'
+          label: "围墙",
+          value: "JKDWZ006",
         },
         {
-          label: '塔吊',
-          value: 'JKDWZ007'
+          label: "塔吊",
+          value: "JKDWZ007",
         },
         {
-          label: '其他',
-          value: 'JKDWZ008'
-        }
+          label: "其他",
+          value: "JKDWZ008",
+        },
       ], //监控点位置（结构化数据）
       showMap: false,
       addProjectForm: {
-        placeCode: '',
-        areaCode: '',
-        buildingNum: '',
-        bulidStatus: '',
-        cityCode: '',
-        companySn: '',
-        constructionStage: '',
-        engineeringPurpose: '',
-        households: '',
-        latitude: '',
-        layoutImage: '',
-        longitude: '',
-        projectAcreage: '',
-        projectAddress: '',
-        projectName: '',
-        projectNumber: '',
-        projectType: '',
-        provincesCode: '',
-        saleAcreage: '',
-        startWorkDate: '',
-        structureType: '',
-        projectManage: '',
-        projectTel: '',
+        placeCode: "",
+        areaCode: "",
+        buildingNum: "",
+        bulidStatus: "",
+        cityCode: "",
+        companySn: "",
+        constructionStage: "",
+        engineeringPurpose: "",
+        households: "",
+        latitude: "",
+        layoutImage: "",
+        longitude: "",
+        projectAcreage: "",
+        projectAddress: "",
+        projectName: "",
+        projectNumber: "",
+        projectType: "",
+        provincesCode: "",
+        saleAcreage: "",
+        startWorkDate: "",
+        structureType: "",
+        projectManage: "",
+        projectTel: "",
         majorProjectType: 0,
-        constructionPermit: '',
-        streetTownshipTownCode: '',
-        streetTownshipTown: ''
+        constructionPermit: "",
+        streetTownshipTownCode: "",
+        streetTownshipTown: "",
       },
       COMPANY: COMPANY,
       isRouterAlive: false,
-    }
+    };
   },
   created() {
-    this.projectSn = this.$store.state.projectSn
+    this.projectSn = this.$store.state.projectSn;
     // this.getVideoGroup()
-    this.getVideoTreeGroup()
-    this.getAccountList()
-    this.getAll()
+    this.getVideoTreeGroup();
+    this.getAccountList();
+    this.getAll();
   },
   components: { cameraList, cameraListLc, gdMap },
   methods: {
+    // 树形控件点击
+    treeFormClick(data) {
+      console.log(data, 888999);
+      this.selectFormVal = data.groupName;
+      this.selectFormTreeData = data;
+      this.currentVideoTypeDetail.groupId = data.id;
+      console.log(this.currentVideoTypeDetail.groupId,777888)
+      this.$refs.addVideoDialog.validateField("groupId");
+    },
     // 树形控件点击
     treeClick(data) {
-      console.log(data,777888);
       this.selectVal = data.groupName;
       this.selectTreeData = data;
       this.addGroupForm.parentId = data.id;
     },
     // 选择父级组件框值修改
-    selectChange(e){
-      if(!e){
+    selectFormChange(e) {
+      if (!e) {
+        this.selectFormVal = "";
+        this.selectFormTreeData = {};
+        this.currentVideoTypeDetail.groupId = "";
+        this.$refs.groupFormTree.setCurrentKey(null);
+      }
+    },
+    // 选择父级组件框值修改
+    selectChange(e) {
+      if (!e) {
         this.selectVal = "";
         this.selectTreeData = {};
         this.addGroupForm.parentId = "";
@@ -1471,476 +1501,481 @@ export default {
     },
     // 切换视频分组
     checkVideo(value) {
-      this.currentGroupInfo = value
-      this.getVideoList()
+      this.currentGroupInfo = value;
+      this.getVideoList();
     },
     //获取视频分组列表
     getVideoTreeGroup() {
       getVideoTreeGroupApi({ projectSn: this.$store.state.projectSn }).then(
         (res) => {
-          console.log('获取视频分组列表', res)
-          this.videoTreeData = res.result
+          console.log("获取视频分组列表", res);
+          this.videoTreeData = res.result;
+          this.getProjectVideoConfigList();
         }
-      )
+      );
     },
     //打开配置服务器弹框
     accountServerObj() {
-      this.getProjectVideoConfigList()
-      this.Popup.accountServer = true
+      this.getProjectVideoConfigList();
+      this.Popup.accountServer = true;
       this.currentVideoTypeDetail.account = this.currentVideoTypeDetail.account;
-      this.currentVideoTypeDetail.password = this.currentVideoTypeDetail.password;
+      this.currentVideoTypeDetail.password =
+        this.currentVideoTypeDetail.password;
       this.currentVideoTypeDetail.appId = this.currentVideoTypeDetail.appId;
-      this.currentVideoTypeDetail.appSecret = this.currentVideoTypeDetail.appSecret;
+      this.currentVideoTypeDetail.appSecret =
+        this.currentVideoTypeDetail.appSecret;
     },
     // 保存
     awaitAddVideo() {
-      this.$refs.addVideoDialog.validate(valid => {
+      this.$refs.addVideoDialog.validate((valid) => {
         if (valid) {
-          this.addVideo()
+          this.addVideo();
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
 
     closeImg() {
-      this.currentVideoTypeDetail.coverUr = ''
-      this.isRouterAlive = false
+      this.currentVideoTypeDetail.coverUr = "";
+      this.isRouterAlive = false;
     },
     getLngLat(v) {
-      this.showMap = false
+      this.showMap = false;
       if (this.Popup.newVideo) {
-        this.currentVideoTypeDetail.longitude = v.lng
-        this.currentVideoTypeDetail.latitude = v.lat
+        this.currentVideoTypeDetail.longitude = v.lng;
+        this.currentVideoTypeDetail.latitude = v.lat;
       } else {
-        this.addProjectForm.longitude = v.lng
-        this.addProjectForm.latitude = v.lat
+        this.addProjectForm.longitude = v.lng;
+        this.addProjectForm.latitude = v.lat;
       }
     },
     closeMap(val) {
-      this.showMap = val
-      console.log('打印子组件', val)
+      this.showMap = val;
+      console.log("打印子组件", val);
     },
     //打开地图
     toGetLocalFn() {
-      this.showMap = true
+      this.showMap = true;
     },
     // nvr设备管理弹窗
     nvrDeviceManage() {
-      this.nvrDevice = true
-      this.getvideoNvrList()
+      this.nvrDevice = true;
+      this.getvideoNvrList();
     },
     addVideoBtn() {
-      this.Popup.newVideo = true
-      this.getAll()
-      this.currentVideoTypeDetail.coverUr = ''
-      this.isRouterAlive = false
+      this.selectFormVal = "";
+      this.selectFormTreeData = {};
+      this.Popup.newVideo = true;
+      this.getAll();
+      this.currentVideoTypeDetail.coverUr = "";
+      this.isRouterAlive = false;
+      this.$nextTick(() => {
+        this.$refs.addVideoDialog.clearValidate();
+      });
     },
     //获取nvr列表
     getAll() {
       getAllNvrApi({ projectSn: this.projectSn }).then((res) => {
         this.nvrList = res.result.map((item, index) => {
-          return { value: item.id, label: index }
-        })
-      })
+          return { value: item.id, label: index };
+        });
+      });
     },
     getvideoNvrList() {
-      let data = this.formInline
-      data.projectSn = this.projectSn
-      data.size = this.pageSize
-        ; (data.current = this.pageNo),
-          getvideoNvrApi(data).then((res) => {
-            this.tableData = res.result.records
-            this.total = res.result.total
-          })
+      let data = this.formInline;
+      data.projectSn = this.projectSn;
+      data.size = this.pageSize;
+      (data.current = this.pageNo),
+        getvideoNvrApi(data).then((res) => {
+          this.tableData = res.result.records;
+          this.total = res.result.total;
+        });
     },
     handleSizeChange(val) {
-      this.pageSize = val
-      this.getvideoNvrList()
+      this.pageSize = val;
+      this.getvideoNvrList();
     },
     handleCurrentChange(val) {
-      this.pageNo = val
-      this.getvideoNvrList()
+      this.pageNo = val;
+      this.getvideoNvrList();
     },
     onSearch() {
-      this.getvideoNvrList()
+      this.getvideoNvrList();
     },
     onAdd() {
-      this.addFormData = {}
-        ; (this.addDevice = true), (this.nvrTitle = '新增nvr设备')
-      this.mode = 1
-
+      this.addFormData = {};
+      (this.addDevice = true), (this.nvrTitle = "新增nvr设备");
+      this.mode = 1;
     },
     editBtn(val, type) {
       if (type == 1) {
-        this.addFormData = val
-          ; (this.addDevice = true), (this.nvrTitle = '编辑nvr设备')
-        this.mode = 2
+        this.addFormData = val;
+        (this.addDevice = true), (this.nvrTitle = "编辑nvr设备");
+        this.mode = 2;
       } else {
-        this.addPluginData.ip = val.ip
-        this.addPluginData.deviceState = val.deviceState
-        this.addPluginData.sn = val.sn
-        this.addPluginData.name = val.name
-        this.addPluginData.id = val.id
-        console.log('this.addPluginData', this.addPluginData)
-        this.addPlugin = true
-        this.pluginTitle = '编辑监控插件'
-        this.mode = 4
+        this.addPluginData.ip = val.ip;
+        this.addPluginData.deviceState = val.deviceState;
+        this.addPluginData.sn = val.sn;
+        this.addPluginData.name = val.name;
+        this.addPluginData.id = val.id;
+        console.log("this.addPluginData", this.addPluginData);
+        this.addPlugin = true;
+        this.pluginTitle = "编辑监控插件";
+        this.mode = 4;
       }
     },
     deleteBtn(val, type) {
       if (type == 1) {
         this.$confirm(
-          '删除当前nvr设备,相关联的摄像头也将被删除,确认删除吗？, 是否继续?',
-          '提示',
+          "删除当前nvr设备,相关联的摄像头也将被删除,确认删除吗？, 是否继续?",
+          "提示",
           {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
           }
         )
           .then(() => {
             delvideoNvrApi({ id: val.id }).then((res) => {
               if (res.code == 200) {
                 this.$message({
-                  type: 'success',
-                  message: '删除成功!'
-                })
-                this.getvideoNvrList()
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.getvideoNvrList();
               }
-            })
+            });
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消删除'
-            })
-          })
+              type: "info",
+              message: "已取消删除",
+            });
+          });
       } else {
         this.$confirm(
-          '删除当前插件会导致对应编号工地推送数据异常,确认删除吗？, 是否继续?',
-          '提示',
+          "删除当前插件会导致对应编号工地推送数据异常,确认删除吗？, 是否继续?",
+          "提示",
           {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
           }
         )
           .then(() => {
             delPluginApi({ id: val.id }).then((res) => {
               if (res.code == 200) {
                 this.$message({
-                  type: 'success',
-                  message: '删除成功!'
-                })
-                this.getPluginList()
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.getPluginList();
               }
-            })
+            });
           })
           .catch(() => {
             this.$message({
-              type: 'info',
-              message: '已取消删除'
-            })
-          })
+              type: "info",
+              message: "已取消删除",
+            });
+          });
       }
     },
-    close(){
+    close() {
       this.$nextTick(() => {
-        this.$refs.addNvrForm.clearValidate()
-      })
+        this.$refs.addNvrForm.clearValidate();
+      });
       this.$nextTick(() => {
-        this.$refs.videoPlugin.clearValidate()
-      })
+        this.$refs.videoPlugin.clearValidate();
+      });
       this.$nextTick(() => {
-        this.$refs.addGroupForm.clearValidate()
-      })
+        this.$refs.addGroupForm.clearValidate();
+      });
     },
     // 新增nvr 验证
     awaitAddNvr() {
-      this.$refs.addNvrForm.validate(valid => {
+      this.$refs.addNvrForm.validate((valid) => {
         if (valid) {
-          this.addDeviceSubmit()
+          this.addDeviceSubmit();
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
 
     addDeviceSubmit() {
-      let data = this.addFormData
-      data.projectSn = this.projectSn
+      let data = this.addFormData;
+      data.projectSn = this.projectSn;
       if (this.mode == 1) {
         addvideoNvrApi(data).then((res) => {
           if (res.code == 200) {
-            this.$message.success('新增成功!')
-            this.getvideoNvrList()
-            this.addDevice = false
-
+            this.$message.success("新增成功!");
+            this.getvideoNvrList();
+            this.addDevice = false;
           }
-        })
+        });
       } else if (this.mode == 2) {
         editvideoNvrApi(data).then((res) => {
           if (res.code == 200) {
-            this.$message.success('编辑成功!')
-            this.getvideoNvrList()
-            this.addDevice = false
+            this.$message.success("编辑成功!");
+            this.getvideoNvrList();
+            this.addDevice = false;
           }
-        })
+        });
       }
     },
     // 插件
     pluginManage() {
-      this.pluginDevice = true
-      this.getPluginList()
+      this.pluginDevice = true;
+      this.getPluginList();
     },
     getPluginList() {
-      let data = this.formInline1
-      data.projectSn = this.projectSn
-      data.size = this.pageSize1
-        ; (data.current = this.pageNo1),
-          (data.startLastDataTime =
-            this.timeRange != null ? this.timeRange[0] : ''),
-          (data.endLastDataTime =
-            this.timeRange != null ? this.timeRange[1] : ''),
-          getPluginApi(data).then((res) => {
-            console.log('查询结果', res)
-            if (res.code == 200) {
-              this.tableData1 = res.result.records
-              this.total1 = res.result.total
-            }
-          })
+      let data = this.formInline1;
+      data.projectSn = this.projectSn;
+      data.size = this.pageSize1;
+      (data.current = this.pageNo1),
+        (data.startLastDataTime =
+          this.timeRange != null ? this.timeRange[0] : ""),
+        (data.endLastDataTime =
+          this.timeRange != null ? this.timeRange[1] : ""),
+        getPluginApi(data).then((res) => {
+          console.log("查询结果", res);
+          if (res.code == 200) {
+            this.tableData1 = res.result.records;
+            this.total1 = res.result.total;
+          }
+        });
     },
     onSearch1() {
-      this.getPluginList()
+      this.getPluginList();
     },
     handleSizeChange1(val) {
-      this.pageSize1 = val
-      this.getPluginList()
+      this.pageSize1 = val;
+      this.getPluginList();
     },
     handleCurrentChange1(val) {
-      this.pageNo1 = val
-      this.getPluginList()
+      this.pageNo1 = val;
+      this.getPluginList();
     },
     onAdd1() {
-      this.addPluginData = {}
-      this.addPlugin = true
-      this.pluginTitle = '新增监控插件'
-      this.mode = 3
-      this.currentVideoTypeDetail.coverUr = ''
-      this.isRouterAlive = false
+      this.addPluginData = {};
+      this.addPlugin = true;
+      this.pluginTitle = "新增监控插件";
+      this.mode = 3;
+      this.currentVideoTypeDetail.coverUr = "";
+      this.isRouterAlive = false;
     },
 
     awaitPluginSubmit() {
-      this.$refs.videoPlugin.validate(valid => {
+      this.$refs.videoPlugin.validate((valid) => {
         if (valid) {
-          this.addPluginSubmit()
+          this.addPluginSubmit();
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
 
     addPluginSubmit() {
-      let data = this.addPluginData
-      data.projectSn = this.projectSn
+      let data = this.addPluginData;
+      data.projectSn = this.projectSn;
       if (this.mode == 3) {
         addPluginApi(data).then((res) => {
           if (res.code == 200) {
-            this.$message.success('新增成功！')
+            this.$message.success("新增成功！");
           }
-          this.addPlugin = false
-          this.getPluginList()
-        })
+          this.addPlugin = false;
+          this.getPluginList();
+        });
       } else if (this.mode == 4) {
-        console.log('编辑参数', data)
+        console.log("编辑参数", data);
         editPluginApi(data).then((res) => {
           if (res.code == 200) {
-            console.log('编辑的结果', res)
-            this.$message.success('编辑成功!')
-            this.getPluginList()
-            this.addPlugin = false
+            console.log("编辑的结果", res);
+            this.$message.success("编辑成功!");
+            this.getPluginList();
+            this.addPlugin = false;
           }
-        })
+        });
       }
     },
     uploadThirdParty() {
       sendVideoInfoApi({ projectSn: this.projectSn }).then((res) => {
         // console.log(res)
         if (res.code == 200) {
-          this.$message.success(this.$t('message.videoManage.uploadSuccess')) // 上传成功！
+          this.$message.success(this.$t("message.videoManage.uploadSuccess")); // 上传成功！
         }
-      })
+      });
     },
     editGroupFn(item) {
-      console.log(item,888999)
-      this.isAddGroup = false
-      this.addGroupDialog = true
-      this.addGroupForm = JSON.parse(JSON.stringify(item))
+      console.log(item, 888999);
+      this.isAddGroup = false;
+      this.addGroupDialog = true;
+      this.addGroupForm = JSON.parse(JSON.stringify(item));
       this.$nextTick(() => {
-        if (this.addGroupForm.parentId) {
-            this.selectVal = item.groupName;
-            this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId);
+        if (this.addGroupForm.parentObj) {
+          this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName;
+          this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId);
         }
       });
     },
     deleteGroupFn(item) {
       // 确定删除分组
       this.$confirm(
-        this.$t('message.videoManage.determineDelGroup') +
-        '【' +
-        item.groupName +
-        '】?',
-        this.$t('message.personnelPosition.mapManage.Tips'),
+        this.$t("message.videoManage.determineDelGroup") +
+          "【" +
+          item.groupName +
+          "】?",
+        this.$t("message.personnelPosition.mapManage.Tips"),
         {
           //确定删除楼栋
           confirmButtonText: this.$t(
-            'message.personnelPosition.confirmButtonText'
+            "message.personnelPosition.confirmButtonText"
           ),
           cancelButtonText: this.$t(
-            'message.personnelPosition.cancelButtonText'
+            "message.personnelPosition.cancelButtonText"
           ),
-          type: 'warning'
+          type: "warning",
         }
       ).then(() => {
         deleteVideoGroupApi({ id: item.id }).then((res) => {
-          let a = parseInt(this.activeGroupIndex)
+          let a = parseInt(this.activeGroupIndex);
           if (a == this.groupList.length - 1) {
-            a--
-            this.activeGroupIndex = a
-            this.getVideoList()
+            a--;
+            this.activeGroupIndex = a;
+            this.getVideoList();
           }
           if (this.activeGroupIndex === -1) {
-            this.activeGroupIndex = ''
+            this.activeGroupIndex = "";
           }
-    // this.getVideoGroup()
-    this.getVideoTreeGroup()
+          // this.getVideoGroup()
+          this.getVideoTreeGroup();
 
           this.$message.success(
-            this.$t('message.personnelPosition.delete_success')
-          ) //删除成功!
-        })
-      })
+            this.$t("message.personnelPosition.delete_success")
+          ); //删除成功!
+        });
+      });
     },
     //新增或编辑楼栋
     saveGroupFn() {
-      this.$refs['addGroupForm'].validate((valid) => {
+      this.$refs["addGroupForm"].validate((valid) => {
         if (valid) {
-          let requestData = {...this.addGroupForm}
+          let requestData = { ...this.addGroupForm };
           requestData.parentObj = JSON.stringify(this.selectTreeData);
           if (this.isAddGroup) {
-            requestData.projectSn = this.$store.state.projectSn
+            requestData.projectSn = this.$store.state.projectSn;
             addVideoGroupApi(requestData).then((res) => {
-              this.addGroupDialog = false
+              this.addGroupDialog = false;
               // this.getVideoGroup()
-              this.getVideoTreeGroup()
+              this.getVideoTreeGroup();
               this.$message.success(
-                this.$t('message.personnelPosition.add_success')
-              ) //添加成功！
-            })
+                this.$t("message.personnelPosition.add_success")
+              ); //添加成功！
+            });
           } else {
             editVideoGroupApi(requestData).then((res) => {
-              this.addGroupDialog = false
-    // this.getVideoGroup()
-    this.getVideoTreeGroup()
+              this.addGroupDialog = false;
+              // this.getVideoGroup()
+              this.getVideoTreeGroup();
               this.$message.success(
-                this.$t('message.personnelPosition.edit_success')
-              ) //编辑成功！
-            })
+                this.$t("message.personnelPosition.edit_success")
+              ); //编辑成功！
+            });
           }
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     //切换分组
     changeGroupFn(item, index) {
-      this.activeGroupIndex = index
-      this.currentGroupInfo = item
-      this.getVideoList()
+      this.activeGroupIndex = index;
+      this.currentGroupInfo = item;
+      this.getVideoList();
     },
     //获取视频分组列表
     getVideoGroup() {
       getVideoGroupApi({ projectSn: this.$store.state.projectSn }).then(
         (res) => {
-          console.log('获取视频分组列表', res)
-          this.groupList = res.result
-          if(this.groupList.length > 0){
-            this.currentGroupInfo = this.groupList[0]
-            this.getProjectVideoConfigList()
+          console.log("获取视频分组列表", res);
+          this.groupList = res.result;
+          if (this.groupList.length > 0) {
+            this.currentGroupInfo = this.groupList[0];
+            this.getProjectVideoConfigList();
           }
         }
-      )
+      );
     },
     getOrganizationID() {
       getHikVideoRegionsApi({ projectSn: this.$store.state.projectSn }).then(
         (result) => {
-          var dw
-          dw = window.open()
-          dw.document.open()
+          var dw;
+          dw = window.open();
+          dw.document.open();
           // 一个新的窗口
           dw.document.write(
-            '<html><head><title>' +
-            this.$t('message.videoManage.aNewWindow') +
-            '</title>'
-          )
-          dw.document.write('<body>')
+            "<html><head><title>" +
+              this.$t("message.videoManage.aNewWindow") +
+              "</title>"
+          );
+          dw.document.write("<body>");
           //  dw.document.write("<img name='i1' src='Temp.jpg'> <br>")
-          dw.document.write(result.result + '<br>')
-          dw.document.write('</body></html>')
-          dw.document.close()
+          dw.document.write(result.result + "<br>");
+          dw.document.write("</body></html>");
+          dw.document.close();
         }
-      )
+      );
     },
     pullEquipmentFn() {
       saveHikVideoCamerasInfoListApi({
         projectSn: this.$store.state.projectSn,
-        regionIndexCode: this.organizationID
+        regionIndexCode: this.organizationID,
       }).then((result) => {
-        this.$message.success(this.$t('message.videoManage.success1')) // 拉取设备成功！
-        this.Popup.equipment = false
-        this.$refs.cameralc.getSelectVideoItemListByTypeApi()
-      })
+        this.$message.success(this.$t("message.videoManage.success1")); // 拉取设备成功！
+        this.Popup.equipment = false;
+        this.$refs.cameralc.getSelectVideoItemListByTypeApi();
+      });
     },
     getAccountList() {
       getProjectChilderSystemUserListApi({
-        projectSn: this.$store.state.projectSn
+        projectSn: this.$store.state.projectSn,
       }).then((result) => {
-        this.accountList = result.result
-      })
+        this.accountList = result.result;
+      });
     },
     aiOperate() {
       setHikSubscriptionByEventApi({
-        projectSn: this.$store.state.projectSn
+        projectSn: this.$store.state.projectSn,
       }).then((res) => {
-        this.$message.success(this.$t('message.videoManage.success2')) // AI布防成功！
-      })
+        this.$message.success(this.$t("message.videoManage.success2")); // AI布防成功！
+      });
     },
     beforeAvatarUpload(file) {
       if (
-        file.type != 'image/jpeg' &&
-        file.type != 'image/png' &&
-        file.type != 'image/jpg' &&
-        file.type != 'image/bmp'
+        file.type != "image/jpeg" &&
+        file.type != "image/png" &&
+        file.type != "image/jpg" &&
+        file.type != "image/bmp"
       ) {
-        this.$message.error(this.$t('message.companyDiagram.uploadMsg')) //只能上传图片
-        return false
+        this.$message.error(this.$t("message.companyDiagram.uploadMsg")); //只能上传图片
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     handleUploadSuccess(res) {
       this.isRouterAlive = false;
       this.$nextTick(() => {
         this.currentVideoTypeDetail.coverUrl =
-          this.$store.state.FILEURL + res.data[0].imageUrl
+          this.$store.state.FILEURL + res.data[0].imageUrl;
         this.isRouterAlive = true;
-      })
-
+      });
     },
     //获取视频列表
     getVideoList() {
@@ -1953,7 +1988,7 @@ export default {
       this.$nextTick(() => {
         if (this.videoType === 1) {
           //萤石云
-          this.$refs.camera.getSelectVideoItemListByTypeApi(id)
+          this.$refs.camera.getSelectVideoItemListByTypeApi(id);
         }
         if (
           this.videoType === 2 ||
@@ -1961,42 +1996,44 @@ export default {
           this.videoType === 7
         ) {
           //乐橙云、isc
-          this.$refs.cameralc.getSelectVideoItemListByTypeApi(id)
+          this.$refs.cameralc.getSelectVideoItemListByTypeApi(id);
         }
-      })
+      });
     },
     //查询项目各类型的视频配置信息
     getProjectVideoConfigList() {
       projectVideoConfigListApi({
-        projectSn: this.$store.state.projectSn
+        projectSn: this.$store.state.projectSn,
       }).then((res) => {
         // this.projectVideoConfigList = res.result;
         //
         if (!res.result) {
-          if (COMPANY == 'zhongjian') {
-            this.videoType = 3
-            this.saveVideoConfigFn()
+          if (COMPANY == "zhongjian") {
+            this.videoType = 3;
+            this.saveVideoConfigFn();
           } else {
-            this.configDialog = true
+            this.configDialog = true;
           }
         } else {
           // this.currentVideoTypeDetail = res.result[0];
-          this.currentVideoTypeDetail = res.result
-          console.log('配置信息', this.currentVideoTypeDetail)
+          this.currentVideoTypeDetail = res.result;
+          console.log("配置信息", this.currentVideoTypeDetail);
           localStorage.setItem(
-            'configInfo',
+            "configInfo",
             JSON.stringify(this.currentVideoTypeDetail)
-          )
-          this.configInfoParams = res.result
+          );
+          this.configInfoParams = res.result;
           // this.videoType = res.result[0].videoType;
-          this.videoType = res.result.videoType
+          this.videoType = res.result.videoType;
           // console.log('查询项目各类型的视频配置信息', res.result)
-          if(!this.Popup.accountServer){
+          if (!this.Popup.accountServer) {
             this.$nextTick(() => {
               if (this.videoType === 1) {
                 //萤石云
-                this.$refs.camera.setVideoInfo(res.result)
-                this.$refs.camera.getSelectVideoItemListByTypeApi(this.currentGroupInfo.id);
+                this.$refs.camera.setVideoInfo(res.result);
+                this.$refs.camera.getSelectVideoItemListByTypeApi(
+                  this.currentGroupInfo.id
+                );
               }
               if (
                 this.videoType === 2 ||
@@ -2004,22 +2041,24 @@ export default {
                 this.videoType === 7
               ) {
                 //乐橙云、isc 、xiongmai
-                this.$refs.cameralc.setVideoInfo(res.result)
-                this.$refs.cameralc.getSelectVideoItemListByTypeApi(this.currentGroupInfo.id);
+                this.$refs.cameralc.setVideoInfo(res.result);
+                this.$refs.cameralc.getSelectVideoItemListByTypeApi(
+                  this.currentGroupInfo.id
+                );
               }
-            })
+            });
           }
         }
-      })
+      });
     },
     saveVideoConfigFn() {
       updateVideoConfigEnableApi({
         projectSn: this.$store.state.projectSn,
-        videoType: this.videoType
+        videoType: this.videoType,
       }).then((res) => {
-        this.configDialog = false
-        this.getProjectVideoConfigList()
-      })
+        this.configDialog = false;
+        this.getProjectVideoConfigList();
+      });
     },
     addVideo() {
       // this.currentVideoTypeDetail.videoId = this.currentVideoTypeDetail.id;
@@ -2042,41 +2081,42 @@ export default {
         monitoringPointLocation:
           this.currentVideoTypeDetail.monitoringPointLocation,
         latitude: this.currentVideoTypeDetail.latitude,
-        longitude: this.currentVideoTypeDetail.longitude
-      }
-      console.log('传入的参数', params)
-      console.log(this.currentVideoTypeDetail.aiFunctionType)
+        longitude: this.currentVideoTypeDetail.longitude,
+      };
+      console.log("传入的参数", params);
+      console.log(this.currentVideoTypeDetail.aiFunctionType);
       if (
         this.currentVideoTypeDetail.alarmPushWorkerId &&
         this.currentVideoTypeDetail.alarmPushWorkerId.length > 0
       ) {
         params.alarmPushWorkerId =
-          this.currentVideoTypeDetail.alarmPushWorkerId.join(',')
+          this.currentVideoTypeDetail.alarmPushWorkerId.join(",");
       }
 
-      if (this.operation === 'edit') {
+      if (this.operation === "edit") {
         //编辑
-        params.projectSn = this.configInfoParams.projectSn
-        params.itemId = this.currentVideoTypeDetail.itemId
-        console.log('编辑内容', this.currentVideoTypeDetail)
+        params.projectSn = this.configInfoParams.projectSn;
+        params.itemId = this.currentVideoTypeDetail.itemId;
+        console.log("编辑内容", this.currentVideoTypeDetail);
         editVideoItemApi(params).then((res) => {
-          console.log('编辑成功', res)
+          console.log("编辑成功", res);
           if (res.success) {
-            this.$message.success(res.message)
-            this.Popup.newVideo = false
-            this.getVideoList()
+            this.$message.success(res.message);
+            this.Popup.newVideo = false;
+            this.getVideoList();
           }
-        })
+        });
       } else {
         //新增
+        params.parentObj = JSON.stringify(this.selectFormTreeData);
         addVideoItemApi(params).then((res) => {
-          console.log('新增成功', res)
+          console.log("新增成功", res);
           if (res.success) {
-            this.$message.success(res.message)
-            this.Popup.newVideo = false
-            this.getVideoList()
+            this.$message.success(res.message);
+            this.Popup.newVideo = false;
+            this.getVideoList();
           }
-        })
+        });
       }
     },
     saveAccountConfig() {
@@ -2086,55 +2126,70 @@ export default {
       // this.currentVideoTypeDetail.appId = '66b4fc1d6703468c8ee93b2919a3f20b';
       // this.currentVideoTypeDetail.appSecret = '0a5836c68a7edabcc78e6a18f05bb317';
       editProjectVideoConfigApi(this.currentVideoTypeDetail).then((res) => {
-        console.log('新添加服务配置', res)
-        this.Popup.playPattern = false
-        this.Popup.accountConfig = false
-        this.Popup.accountServer = false
-      })
+        console.log("新添加服务配置", res);
+        this.Popup.playPattern = false;
+        this.Popup.accountConfig = false;
+        this.Popup.accountServer = false;
+      });
       // console.log('this.currentVideoTypeDetail', this.currentVideoTypeDetail)
     },
     beforeCut(index, item) {
       if (index !== this.videoType) {
-        this.Popup.platforms = true
-        this.Popup.name = item
-        this.Popup.videoType = index
+        this.Popup.platforms = true;
+        this.Popup.name = item;
+        this.Popup.videoType = index;
       }
     },
     cut() {
-      this.videoType = this.Popup.videoType
-      this.Popup.platforms = false
-      console.log('当前videoType', this.videoType)
-      this.saveVideoConfigFn()
+      this.videoType = this.Popup.videoType;
+      this.Popup.platforms = false;
+      console.log("当前videoType", this.videoType);
+      this.saveVideoConfigFn();
     },
     edit(obj) {
-      this.operation = 'edit'
-      this.Popup.newVideo = true
-      this.currentVideoTypeDetail = JSON.parse(JSON.stringify(obj))
+      console.log(obj, 777888);
+      this.operation = "edit";
+      this.selectFormVal = "";
+      this.selectFormTreeData = {};
+      this.Popup.newVideo = true;
+      this.currentVideoTypeDetail = JSON.parse(JSON.stringify(obj));
       if (this.currentVideoTypeDetail.alarmPushWorkerId) {
-        if (this.currentVideoTypeDetail.alarmPushWorkerId.indexOf(',') != -1) {
+        if (this.currentVideoTypeDetail.alarmPushWorkerId.indexOf(",") != -1) {
           this.currentVideoTypeDetail.alarmPushWorkerId =
-            this.currentVideoTypeDetail.alarmPushWorkerId.split(',')
+            this.currentVideoTypeDetail.alarmPushWorkerId.split(",");
         } else {
           this.currentVideoTypeDetail.alarmPushWorkerId = [
-            this.currentVideoTypeDetail.alarmPushWorkerId
-          ]
+            this.currentVideoTypeDetail.alarmPushWorkerId,
+          ];
         }
       } else {
-        this.currentVideoTypeDetail.alarmPushWorkerId = []
+        this.currentVideoTypeDetail.alarmPushWorkerId = [];
       }
-      console.log('编辑内容', obj)
+      this.$nextTick(() => {
+        if (this.currentVideoTypeDetail.parentObj) {
+          this.selectFormVal = JSON.parse(
+            this.currentVideoTypeDetail.parentObj
+          ).groupName;
+          this.selectFormTreeData = JSON.parse(
+            this.currentVideoTypeDetail.parentObj
+          );
+          this.$refs.groupFormTree.setCurrentKey(
+            this.currentVideoTypeDetail.parentId
+          );
+        }
+      });
+      console.log("编辑内容", obj);
     },
     emptyInfo() {
-      this.operation = 'add' //关闭弹窗就默认设置为add，编辑会设置edit
-      this.currentVideoTypeDetail = {} //关闭弹窗就清除数据避免影响了编辑被禁止修改的内容
+      this.operation = "add"; //关闭弹窗就默认设置为add，编辑会设置edit
+      this.currentVideoTypeDetail = {}; //关闭弹窗就清除数据避免影响了编辑被禁止修改的内容
       // console.log('查看', this.currentVideoTypeDetail, '和', this.configInfoParams);
       this.$nextTick(() => {
-        this.$refs.addVideoDialog.clearValidate()
-      })
-      
-    }
-  }
-}
+        this.$refs.addVideoDialog.clearValidate();
+      });
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
 .flex {
@@ -2286,6 +2341,16 @@ export default {
     width: 90%;
     padding-right: 10px;
     box-sizing: border-box;
+    > span {
+      width: 95px;
+      display: inline-block;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+  }
+  /deep/.el-tree-node.is-current > .el-tree-node__content {
+    background-color: rgba(168, 191, 230, 0.69) !important;
   }
 }
 
@@ -2301,7 +2366,7 @@ export default {
     background-color: rgba(81, 129, 246, 0.1);
 
     &::after {
-      content: '';
+      content: "";
       position: absolute;
       top: 0;
       left: 0;
@@ -2335,7 +2400,7 @@ export default {
     display: inline-block;
 
     &::before {
-      content: '';
+      content: "";
       position: absolute;
       bottom: -1px;
       left: 0;
@@ -2363,4 +2428,10 @@ export default {
 ::v-deep .el-input-number .el-input-number--medium {
   margin-left: -10px !important;
 }
+// 下拉框样式修改
+/deep/.el-select-dropdown__item.hover,
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: transparent;
+}
 </style>
diff --git a/src/views/projectFront/videoManage/overview.vue b/src/views/projectFront/videoManage/overview.vue
index 6da498fe..cef392e2 100644
--- a/src/views/projectFront/videoManage/overview.vue
+++ b/src/views/projectFront/videoManage/overview.vue
@@ -29,7 +29,7 @@
           </vue-scroll>
         </div>
         <div class="videoBox" v-else>
-          <vue-scroll>
+          <vue-scroll style="width: 100%;">
             <el-collapse v-model="activeNames" style="padding: 0 20px">
               <el-collapse-item
                 :title="item.name"