diff --git a/src/assets/companyFile/default.png b/src/assets/companyFile/default.png
new file mode 100644
index 0000000..ae0202a
Binary files /dev/null and b/src/assets/companyFile/default.png differ
diff --git a/src/views/systemManagement/companyList/components/companyDataDialog.vue b/src/views/systemManagement/companyList/components/companyDataDialog.vue
index 0355a57..88ae0af 100644
--- a/src/views/systemManagement/companyList/components/companyDataDialog.vue
+++ b/src/views/systemManagement/companyList/components/companyDataDialog.vue
@@ -267,8 +267,8 @@ export default {
         { id: "8", label: "创安单位" },
         { id: "9", label: "外资合资" },
       ],
-      arr:[],
-      cancel_arr:[],
+      arr: [],
+      cancel_arr: [],
       // 企业工商信息上半部分
       form: {
         // 企业工商信息上半部分
@@ -434,18 +434,20 @@ export default {
         this.form.jurisdiction = res.data;
       });
     },
-    company_choice(e, item) { 
+    company_choice(e, item) {
       // this.form.companyType是后台传送过来的字符串，我们需要转成数组
-      const company_arr = this.form.companyType.split(",") 
+      const company_arr = this.form.companyType.split(",");
       if (e) {
-        this.arr.push(item.id); 
-        company_arr.concat(this.arr) // 已选中的，和本次点击选中的
-        const new_arr = Array.from(new Set(company_arr.concat(this.arr))) // 去重
-        const sort_arr = new_arr.sort() // 重新排序
-        this.form.companyType = sort_arr.toString() 
+        this.arr.push(item.id);
+        company_arr.concat(this.arr); // 已选中的，和本次点击选中的
+        const new_arr = Array.from(new Set(company_arr.concat(this.arr))); // 去重
+        const sort_arr = new_arr.sort(); // 重新排序
+        this.form.companyType = sort_arr.toString();
       } else {
-        company_arr.filter(val =>val != item.id) // 点击取消选中复选框时删除对应的
-        this.form.companyType = company_arr.filter(val =>val != item.id).toString() 
+        company_arr.filter((val) => val != item.id); // 点击取消选中复选框时删除对应的
+        this.form.companyType = company_arr
+          .filter((val) => val != item.id)
+          .toString();
       }
     },
     // 确定数据
@@ -493,7 +495,7 @@ export default {
   background-image: url("~@/assets/companyFile/dialogBack.png");
   background-size: 100% 100%;
   background-repeat: no-repeat;
-  height: 720px;
+  height: 750px;
 
   /* 关闭弹窗叉号 */
   .el-dialog__headerbtn {
@@ -533,6 +535,7 @@ export default {
   }
 
   .form_body {
+    margin-top: 2.5vh;
     height: 600px;
     overflow-y: scroll;
   }
@@ -592,7 +595,9 @@ export default {
     background: url("~@/assets/companyFile/242112.png") no-repeat !important;
     background-size: 100% 100% !important;
   }
-
+  .commerceMessage {
+    margin-top: -17px;
+  }
   /* 为适应上传图片表单布局把企业工商表单拆分 */
   .commerceMessage_one {
     display: flex;
diff --git a/src/views/systemManagement/companyList/index.vue b/src/views/systemManagement/companyList/index.vue
index 3400191..91a3c5b 100644
--- a/src/views/systemManagement/companyList/index.vue
+++ b/src/views/systemManagement/companyList/index.vue
@@ -75,7 +75,7 @@ import CompanyDataDialog from "./components/companyDataDialog";
 import ClearDialog from "./components/clearDialog";
 import { getCompanyList } from "@/api/systemManagement";
 import { debounce } from "@/utils/publicMethod_lxy/debounce.js";
-import defaultImage from "@/assets/companyFile/defaultimage.png";
+import defaultImage from "@/assets/companyFile/default.png";
 export default {
   name: "companyList",
   components: {
@@ -448,23 +448,23 @@ export default {
         }
 
         li:hover .shewei {
-          opacity: 0;
+          opacity: 1;
         }
 
         li:hover .zhongdian {
-          opacity: 0;
+          opacity: 1;
         }
 
         li:hover .zhibao {
-          opacity: 0;
+          opacity: 1;
         }
 
         li:hover .zhian {
-          opacity: 0;
+          opacity: 1;
         }
 
         li:hover span {
-          opacity: 0;
+          opacity: 1;
         }
       }
     }
diff --git a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
index 2826cc3..236d078 100644
--- a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
+++ b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
@@ -71,7 +71,7 @@
     <!-- 表格 -->
     <div class="equipment_data_table">
       <el-table
-        :cell-style="{ background: 'revert', 'text-align': 'center' }"
+        :cell-style="{ background: 'revert' }"
         :header-cell-style="table_header"
         :data="pushTableData"
         :highlight-current-row="true"
@@ -107,7 +107,8 @@
         :background="true"
         @current-change="handleCurrentChange"
         :page-sizes="[4]"
-        :page-size="100"
+        :page-size="PageSize"
+        :current-page="pageNum"
         layout="total, sizes, prev, pager, next, jumper"
         :total="pushTableData.length"
       >
@@ -136,6 +137,7 @@ export default {
   },
   props: {
     pushTableData: [],
+    only_params: {},
   },
   data() {
     return {
@@ -176,6 +178,9 @@ export default {
         // { prop: "latitude", label: "设备维度" },
         { prop: "orientationCn", label: "进出方向" },
       ],
+      table_params: {}, // 本页面查询入参
+      pageSize: 4,
+      pageNum: 1,
       total: 0, // 信息总数
     };
   },
@@ -193,70 +198,72 @@ export default {
         this.tableColumn = this.tableColumn_preception;
       }
       this.pushTableData = data.pushTableData;
+      this.only_params = data.search_params; // 如果点击了标签查询
+      console.log("this.pushTableData", this.pushTableData);
       this.search_params_table = data.search_params;
     });
   },
   methods: {
     // 智能搜索
     onSubmit() {
-      const val = {
-        pageSize: 4,
-        pageNum: 1,
+      this.only_params = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
         deviceIp: this.search.ip,
         deviceName: this.search.equipment,
       };
-      getPerceptionList(val).then((res) => {
+      Object.assign(this.only_params, this.search_params_table);
+      getPerceptionList(this.only_params).then((res) => {
         // res.row传给右下方表格数据
         this.pushTableData = res.rows;
       });
     },
+    // 智能搜索重置
     reset() {
-      // 重置
       (this.search.equipment = ""), (this.search.ip = "");
-      const val = {
-        pageSize: 4,
-        pageNum: 1,
+      this.only_params = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
+        deviceIp: this.search.ip,
+        deviceName: this.search.equipment,
       };
-      getPerceptionList(val).then((res) => {
-        if (res.code === 200) {
-          // res.row传给右下方表格数据
-          this.pushTableData = res.rows;
-        } else {
-          this.$message.warning("查询智能感知设备列表失败");
-        }
+      Object.assign(this.only_params, this.search_params_table);
+      getPerceptionList(this.only_params).then((res) => {
+        // res.row传给右下方表格数据
+        this.pushTableData = res.rows;
       });
     },
     // 视频搜索
     onSubmitVideo() {
-      const val = {
-        pageSize: 4,
-        pageNum: 1,
+      this.only_params = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
         gbsChannelNo: this.search.channel_code,
         deviceIp: this.search.equipemnt_ip,
         deviceName: this.search.equipment,
       };
-      Object.assign(val, this.search_params_table);
-      getVideoList(val).then((res) => {
+      Object.assign(this.only_params, this.search_params_table);
+      getVideoList(this.only_params).then((res) => {
         // res.row传给右下方表格数据
         this.pushTableData = res.rows;
       });
     },
+     // 视频搜索重置
     resetVideo() {
-      // 重置
       (this.search.channel_code = ""),
         (this.search.equipemnt_ip = ""),
         (this.search.equipment = "");
-      const val = {
-        pageSize: 4,
-        pageNum: 1,
+      this.only_params = {
+        pageSize: this.pageSize,
+        pageNum: this.pageNum,
         gbsChannelNo: this.search.channel_code,
         deviceIp: this.search.equipemnt_ip,
         deviceName: this.search.equipment,
       };
-      Object.assign(val, this.search_params_table);
-      getVideoList(val).then((res) => {
-          // res.row传给右下方表格数据
-          this.pushTableData = res.rows;
+      Object.assign(this.only_params, this.search_params_table);
+      getVideoList(this.only_params).then((res) => {
+        // res.row传给右下方表格数据
+        this.pushTableData = res.rows;
       });
     },
     openDialog(num, row) {
@@ -297,11 +304,23 @@ export default {
       console.log(row);
       console.log(rowIndex);
       return {
-        "text-align": "center",
         color: "#fff",
       };
     },
-    handleCurrentChange() {},
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.only_params.pageNum = val
+      console.log('this.only_params', this.only_params);
+      if (this.table_title === "视频监控设备列表") {
+         getVideoList(this.only_params).then((res) => {
+        this.pushTableData = res.rows;
+      });
+      } else if (this.table_title === "智能感知设备列表") {
+        getPerceptionList(this.only_params).then((res) => {
+        this.pushTableData = res.rows;
+      });
+      }
+    },
   },
 };
 </script>
@@ -356,7 +375,7 @@ export default {
     width: calc(100% - 30px);
     margin-top: 12px;
     margin-left: 12px;
-    height: 100%;
+    height: 27vh;
 
     .el-table,
     .el-table__expanded-cell {
@@ -416,7 +435,7 @@ export default {
   }
 
   .el-pagination {
-    margin-left: 60%;
+    margin-left: 50%;
     /deep/.el-pagination__total {
       color: #fff;
     }
diff --git a/src/views/systemManagement/correlationEquipment/components/searchBox.vue b/src/views/systemManagement/correlationEquipment/components/searchBox.vue
index 684283e..b8d1040 100644
--- a/src/views/systemManagement/correlationEquipment/components/searchBox.vue
+++ b/src/views/systemManagement/correlationEquipment/components/searchBox.vue
@@ -41,6 +41,7 @@ export default {
       },
       types_params_list: [], // 选中视频企业类型对应的id
       per_types_params_list: [], // 选中智能企业类型对应的id
+      back_types:'', // 通知树形，是视频检索还是智能检索
     };
   },
   created() {},
@@ -53,6 +54,8 @@ export default {
         // 切换表格标题
         console.log("item123", item);
         if (item === "1") {
+          this.back_types = item
+          this.$emit('backTypes', this.back_types) // 通知树形
           this.types_params_list.push(value);
           this.pushValue.title = "视频监控设备列表";
           // 根据企业标签查询视频数据
@@ -68,6 +71,8 @@ export default {
             this.pushValue.pushTableData = res.rows;
           });
         } else if (item === "2") {
+          this.back_types = item
+          this.$emit('backTypes', this.back_types) // 通知树形
           this.per_types_params_list.push(value);
           this.pushValue.title = "智能感知设备列表";
           this.pushValue.search_params = {
@@ -92,6 +97,8 @@ export default {
         // 切换表格标题
         console.log("item123", item);
         if (item === "1") {
+          this.back_types = item
+          this.$emit('backTypes', this.back_types) // 通知树形
           console.log("this.types_params_list2", this.types_params_list);
           console.log("value", value);
           this.types_params_list = this.types_params_list.filter(
@@ -112,6 +119,8 @@ export default {
             this.pushValue.pushTableData = res.rows;
           });
         } else if (item === "2") {
+          this.back_types = item
+          this.$emit('backTypes', this.back_types) // 通知树形
           this.per_types_params_list = this.per_types_params_list.filter(
             (item) => item != value
           );
@@ -140,6 +149,8 @@ export default {
       this.searchBoxData.company_types = [];
       if (num === "1") {
         // 视频监控全标签查
+        this.back_types = num
+        this.$emit('backTypes', this.back_types) // 通知树形
         this.pushValue.title = "视频监控设备列表";
         this.pushValue.search_params = {
           pageSize: 4,
@@ -153,6 +164,8 @@ export default {
         });
       } else if (num === "2") {
         console.log("num123", num);
+        this.back_types = num
+        this.$emit('backTypes', this.back_types) // 通知树形
         // 智能感知全标签查
         this.pushValue.title = "智能感知设备列表";
         this.pushValue.search_params = {
diff --git a/src/views/systemManagement/correlationEquipment/index.vue b/src/views/systemManagement/correlationEquipment/index.vue
index 528da9a..f577fc6 100644
--- a/src/views/systemManagement/correlationEquipment/index.vue
+++ b/src/views/systemManagement/correlationEquipment/index.vue
@@ -40,23 +40,6 @@
                   :title="node.label"
                   class="el-tree-node__label node-label"
                 >
-                  <!-- <span>
-                    <img
-                      v-if="
-                        companyTreeData[0].children &&
-                        companyTreeData[0].children.length > 0
-                      "
-                      src="@/assets/companyFile/minus.png"
-                      style="width: 23px; height: 23px"
-                      alt
-                    />
-                    <img
-                      v-else
-                      src="@/assets/companyFile/add.png"
-                      style="width: 23px; height: 23px"
-                      alt
-                    />
-                  </span> -->
                   {{ node.label }}
                 </span>
               </el-tree>
@@ -72,6 +55,7 @@
                   ref="searchBox"
                   :searchBoxData="searchBox_left_text"
                   @clearList="clearList('1')"
+                  @backTypes="backTypes"
                 ></SearchBox>
               </div>
               <div class="intelligence">
@@ -79,12 +63,14 @@
                   ref="searchBox"
                   :searchBoxData="searchBox_right_text"
                   @clearList="clearList('2')"
+                  @backTypes="backTypes"
                 ></SearchBox>
               </div>
             </div>
             <EquipmentTable
               ref="equipmentTable"
               :pushTableData="pushTableData"
+              :only_params="only_params"
             ></EquipmentTable>
           </div>
         </div>
@@ -95,7 +81,11 @@
 <script>
 import SearchBox from "./components/searchBox.vue";
 import EquipmentTable from "./components/equipmentTable.vue";
-import { getAllData, getVideoList } from "@/api/correlationEquipment";
+import {
+  getAllData,
+  getVideoList,
+  getPerceptionList,
+} from "@/api/correlationEquipment";
 export default {
   name: "correlationEquipment",
   components: {
@@ -114,30 +104,31 @@ export default {
       searchBox_right_text: {},
       pushTableData: [],
       defaultExpandAll: true, // 控制公司树默认展开
+      obtain_types: "", // 获得通知树形查询视频或者智能
+      only_params:{}, // 承接本页面最新状态下的查询入参，传给表格分页
     };
   },
   created() {
     // 默认打开宁波查询
-    const params = {
+    this.only_params = {
       areaName: "宁波",
     };
-    getAllData(params).then((res) => {
+    getAllData(this.only_params).then((res) => {
       if (res.code === 200) {
         console.log("resning", res);
         // 树形赋值
         this.companyTreeData = res.data;
         console.log("this.companyTreeData1", this.companyTreeData);
         // 树形数据生成后，默认展示右下方表格数据
-        const val = {
+        this.only_params = {
           pageSize: 4,
           pageNum: 1,
+          deviceVideoSubTypes: "1,2,3,4,5,6,7,8,9",
         };
-        getVideoList(val).then((res) => {
-          if (res.code === 200) {
-            console.log("resVideoList", res.rows);
-            // res.row传给右下方表格数据
-            this.pushTableData = res.rows;
-          }
+        getVideoList(this.only_params).then((res) => {
+          console.log("resVideoList", res.rows);
+          // res.row传给右下方表格数据
+          this.pushTableData = res.rows;
         });
       } else {
         this.$message.warning("企业名称查询失败");
@@ -184,44 +175,49 @@ export default {
   methods: {
     // 企业名称放大镜查询
     searchCom() {
-      const params = {
+      this.only_params = {
         areaName: this.searchCompany,
       };
-      getAllData(params).then((res) => {
-        if (res.code === 200) {
-          console.log("res", res);
-          // 树形赋值
-          this.companyTreeData = res.data;
-          console.log("this.companyTreeData", this.companyTreeData);
-        } else {
-          this.$message.warning("企业名称查询失败");
-        }
+      getAllData(this.only_params).then((res) => {
+        // 树形赋值
+        this.companyTreeData = res.data;
+        console.log("this.companyTreeData", this.companyTreeData);
       });
     },
     handleNodeClick(data) {
-      console.log("data", data);
+      console.log("data123", data);
       // 视频查询List
-      const params = {
-        pageSize: 4,
-        pageNum: 1,
-        deviceVideoSubType: data.subAreaCode,
-      };
-      getVideoList(params).then((res) => {
-        if (res.code === 200) {
+      this.searchBox_right_text.company_types = []; // 把视频和智能的已选标签清空
+      this.searchBox_left_text.company_types = [];
+      if (this.obtain_types === "" || this.obtain_types === "1") {
+        // 携带公司名查视频全部
+        this.only_params = {
+          pageSize: 4,
+          pageNum: 1,
+          company_id: data.subAreaCode, // 按选中公司名字检索视频监控数据
+          deviceVideoSubTypes: "1,2,3,4,5,6,7,8,9",
+        };
+        getVideoList(this.only_params).then((res) => {
           console.log("resVideoList", res.rows);
           // res.row传给右下方表格数据
           this.pushTableData = res.rows;
-        }
-      });
-      // 智能查询List
-      // const paramsPerception = {
-      //   devicePerceptionSubType: data.subAreaCode,
-      // };
-      // getPerceptionList(paramsPerception).then((res) => {
-      //   if (res.code === 200) {
-      //     console.log("resPerceptionList", res);
-      //   }
-      // });
+        });
+      } else if (this.obtain_types === "2") {
+        // 携带公司名查智能全部
+        this.only_params = {
+          pageSize: 4,
+          pageNum: 1,
+          company_id: data.subAreaCode, // 按选中公司名字检索视频监控数据
+          devicePerceptionSubTypes: "1,2,3,4,6,7,8,10,11",
+        };
+        getPerceptionList(this.only_params).then((res) => {
+          if (res.code === 200) {
+            console.log("resVideoList", res.rows);
+            // res.row传给右下方表格数据
+            this.pushTableData = res.rows;
+          }
+        });
+      }
     },
     clearList(num) {
       console.log("num", num);
@@ -231,6 +227,10 @@ export default {
         this.searchBox_left_text.company_types = [];
       }
     },
+    backTypes(num) {
+      console.log("num0000", num);
+      this.obtain_types = num;
+    },
   },
 };
 </script>
@@ -267,8 +267,8 @@ export default {
     .cardBodyLeft {
       width: 25%;
       height: 100%;
-      background: rgba(23, 36, 36, .4);
-      border: 0.5px solid #485F6C;
+      background: rgba(23, 36, 36, 0.4);
+      border: 0.5px solid #485f6c;
       border-radius: 4px;
       .cardBodyLeft_search {
         display: flex;
@@ -316,7 +316,7 @@ export default {
         height: 69vh;
         .el-tree {
           /* 树形数据过长添加滚动条 */
-          height: 100%;
+          height: 95%;
           overflow: auto;
           // box-shadow: 5px 5px 10px #126a58;
           border-radius: 4px;
@@ -414,8 +414,8 @@ export default {
       width: 75%;
       height: 100%;
       border-radius: 4px;
-      background: rgba(31, 45, 49, .4);
-      border: 0.5px solid #485F6C;
+      background: rgba(31, 45, 49, 0.4);
+      border: 0.5px solid #485f6c;
       .cardBodyRight_search {
         display: flex;
         justify-content: space-evenly;