diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue
index 316597ea..359e3f72 100644
--- a/front/src/views/home/infrastructurePageXha.vue
+++ b/front/src/views/home/infrastructurePageXha.vue
@@ -406,166 +406,7 @@
       <div class="map-contain" v-if="showMap">
         <video-surveillance></video-surveillance>
       </div>
-      <!-- 功能行 -->
-      <div class="infrastructrue-content" v-if="!wrjFlag">
-        <!-- 表格数据统计 -->
-        <div class="contentNum">
-          <p v-if="selectType !== '视频会议' && isXiHaiAn">
-            备选
-            <span>{{ pagination.total || 0 }}</span>
-            个
-          </p>
-          <p v-if="selectType !== '视频会议' && isXiHaiAn">
-            已选
-            <span>{{ selectedRowKeys.length }}</span>
-            个
-          </p>
-        </div>
-        <!-- 右侧 -->
-        <div class="contentRight">
-          <div class="searchInput" v-if="isXiHaiAn">
-            <a-input-search
-              v-model:value="mapSearchParam.cameraName"
-              placeholder="请输入关键词"
-              enter-button="搜索"
-              size="large"
-              @change="(e) => getCamera(true, e.target.value)"
-            />
-            <a-button
-              type="primary"
-              style="width: 0.8rem; height: 0.36rem; margin-left: 0.7rem"
-              @click="clean"
-            >
-              重置
-            </a-button>
-          </div>
-          <i></i>
-          <!-- 批量预览 -->
-          <a-button
-            type="primary"
-            @click="batchPreview"
-            class="buttonAdd"
-            v-if="isXiHaiAn"
-          >
-            批量预览
-          </a-button>
-          <!-- 添加至申购车 -->
-          <a-button
-            v-if="isXiHaiAn"
-            type="primary"
-            @click="addShoppingCart"
-            class="buttonAdd"
-          >
-            添加至申购车
-          </a-button>
-          <a
-            style="
-              display: inline-block;
-              width: 100px;
-              height: 36px;
-              line-height: 36px;
-              text-align: center;
-              background: #0558e1;
-              border-radius: 5px;
-              font-size: 14px;
-              color: #fff;
-            "
-            v-if="selectType == '视频会议'"
-            href="/static/download/金宏视频会议系统参会终端(10.1.101.504)_20200211.rar"
-          >
-            客户端下载
-          </a>
-          <!-- 一键申请 -->
-          <a-button
-            v-if="isXiHaiAn"
-            type="primary"
-            @click="apply"
-            class="buttonAdd"
-          >
-            一键申请
-          </a-button>
-          <a-button v-else type="primary" @click="goToWeb" class="buttonAdd">
-            <template v-if="selectType == '视频会议'">一键组会</template>
-            <template v-else>我要申请{{ selectType }}</template>
-          </a-button>
-        </div>
-      </div>
       <!-- 表格 -->
-      <div
-        class="infrastructrue-table"
-        v-if="!wrjFlag && selectType !== '视频会议' && isXiHaiAn"
-      >
-        <a-table
-          class="ant-table-striped"
-          :dataSource="dataSource"
-          :columns="columns"
-          :scroll="{ y: tableHeight }"
-          rowKey="channelId"
-          :rowClassName="
-            (record, index) => (index % 2 === 1 ? 'table-striped' : null)
-          "
-          :pagination="pagination"
-          @change="handleTableChange"
-          :row-selection="{
-            selectedRowKeys: selectedRowKeys,
-            onSelect: onSelectChange,
-            onSelectAll: onSelectAll,
-          }"
-          :loading="loadingCamera"
-        >
-          <template #bodyCell="{ column, record }">
-            <template v-if="isXiHaiAn && column.dataIndex === 'status'">
-              <span>{{ statusText[record.status] || '' }}</span>
-            </template>
-            <template v-if="column.dataIndex === 'operation'">
-              <!-- 离线 -->
-              <a v-if="record.status != 1" class="disabled-text">预览</a>
-              <a-tooltip v-else placement="top">
-                <template #title>请申请后在我的申请中观看视频!</template>
-                <a
-                  @click="
-                    openVideo(
-                      record.channelCode ||
-                        record.channelId ||
-                        record.channelCode.channelId,
-                      record
-                    )
-                  "
-                >
-                  预览
-                </a>
-              </a-tooltip>
-            </template>
-          </template>
-        </a-table>
-      </div>
-      <div
-        class="infrastructrue-table"
-        v-if="!wrjFlag && selectType == '视频会议'"
-      >
-        <a-table
-          class="ant-table-striped"
-          :dataSource="meetingList"
-          :columns="meetingColumns"
-          :scroll="{ y: tableHeight }"
-          rowKey="key"
-          :rowClassName="
-            (record, index) => (index % 2 === 1 ? 'table-striped' : null)
-          "
-          :pagination="meetingPagination"
-          :row-selection="{
-            selectedRowKeys: meetingSelect.data,
-            onChange: meetingOnSelectChange,
-          }"
-          @change="handleMeeting"
-        ></a-table>
-      </div>
-      <div
-        class="infrastructrue-table"
-        v-if="!wrjFlag && selectType == '政务云资源'"
-      >
-        <GovernmentCloudResources></GovernmentCloudResources>
-      </div>
       <!-- 西海岸-无人机、单兵设备 -->
       <div class="infrastructrue-table" v-else-if="isXiHaiAn && wrjFlag">
         <a-table
@@ -2523,8 +2364,8 @@
 
     .map-contain {
       // width: 9.46rem;
-      height: 4.1rem;
-      margin-left: 0.16rem;
+      height: 6.9rem;
+      margin-left:0;
       position: relative;
     }
   }
diff --git a/front/src/views/home/videoSurveillance/index.vue b/front/src/views/home/videoSurveillance/index.vue
index 7f7c128a..de1bee18 100644
--- a/front/src/views/home/videoSurveillance/index.vue
+++ b/front/src/views/home/videoSurveillance/index.vue
@@ -156,13 +156,15 @@
       // 初始化地址检索服务
       this.initAddressMatchService()
       this.getCameraAllLabel()
-      // 初始化展示所有摄像头
-      // this.getCameraAllPage()
+      // 初始化展示所有摄像头,地图上扎点
+       this.getCameraAllPage()
       // this.getMapPoint()
-      // 根据parentId查询摄像头列表
+      // 点击左侧根据parentId查询摄像头列表
       mybus.off('getCameraByParentId')
       mybus.on('getCameraByParentId', (parentId) => {
         this.mapSearchParam.parentId = parentId
+        this.mapSearchParam.type = "1"
+        this.mapSearchParam.pageSize = 10000
         this.getCameraByParentId()
       })
       //表格勾选
@@ -179,6 +181,12 @@
         }
         //this.addResourceTomap('videoMap', this.pointAllData);
       })
+
+      //摄像头数据上图
+       mybus.off('cameraDataOnMap')
+      mybus.on('cameraDataOnMap', (data) => {
+          this.addResourceTomap('videoMap', data)
+      })
     },
     methods: {
       selectedAddress(item, index) {
@@ -271,14 +279,14 @@
         })
       },
       getCameraByParentId(type) {
+        debugger
         if (!this.whoShow1.itShowXiHaiAn) {
-          debugger
           getCameraByParentId(this.mapSearchParam).then((res) => {
-            debugger
             console.log('根据parent查询摄像头', res.data.data)
             this.addResourceTomap('videoMap', res.data.data)
           })
         } else {
+            console.log('根据parent查询摄像头111111',this.mapSearchParam)
           let params = {
             regionId:
               this.mapSearchParam.parentId ||
@@ -307,8 +315,9 @@
               }
             }
           }
+           params.type='0';
           getCameraByCondition(params).then((res) => {
-            console.log('根据parent查询摄像头', res.data.data)
+            //console.log('根据parent查询摄像头44444', res.data.data)
             if(type=='map'){
               let params = this.mapSearchParam;
               params.dataSource = res.data.data||0;
@@ -316,10 +325,12 @@
               mybus.emit('getListByMap', params);
             }
             this.pointAllData = res.data.data;
-            if(this.mapSearchParam.type!=0)
+            if(this.mapSearchParam.type!=0){
               this.addResourceTomap('videoMap', res.data.data)
+            }  
             else
-              this.addResourceTomap('videoMap', [])   //查询全部时不打点
+            {this.addResourceTomap('videoMap', []) }  //查询全部时不打点}
+              
           })
         }
       },
@@ -418,14 +429,16 @@
       },
       getCameraAllPage(page) {
         let params = {
-          name: '',
-          page: page,
-          pageSize: 20000,
-        }
-        getCameraAll(params).then((res) => {
+        regionId: "70be8c5b664f4bcf869d82f2e8335051",
+        pageNum: "1",
+        pageSize: 30000,
+        type: 0,
+        borderPolygonList: []
+}
+        getCameraByCondition(params).then((res) => {
           // let t1 = new Date().getTime();
           // this.cameraAllData = res.data.data
-          this.addResourceTomap('videoMap', res.data)
+          this.addResourceTomap('videoMap', res.data.data)
           // let t2 = new Date().getTime();
           // console.log("时间#############" + (t2 - t1));
         })
@@ -463,6 +476,7 @@
       },
 
       addResourceTomap(type, data) {
+        console.log('datadatadata',data);
         const dataEvent = []
         if(data&&data.length>0){
           data.forEach((item) => {
@@ -481,7 +495,7 @@
         this.getMapPoint(dataEvent, 'icon_camare.png', type)
       },
       getMapPoint(data, img, type) {
-        // this.hiMapFun.clearAllLayers();
+         this.hiMapFun.clearAllLayers();
         const features = data
         // debugger
         this.hiMapFun.addResourceOnMapWithoutSuperMapCluster(