Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-16 f78b7d0461e58dc76837195750f03a20ca552ecc

 src/views/system/data-manage/equipment/index.vue

@@ -167,6 +167,7 @@

<script>
import { videoCount, listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
import { dataCenter } from "@/api/platform/data-center";
export default {
  name: "Monitor",
  dicts: ['sys_normal_disable', 'platform_yes_no','camera_state'],
@@ -248,8 +249,8 @@
    /** 查询设备资产列表 */
    getList() {
      this.loading = true;
      listMonitor(this.queryParams).then(response => {
        this.monitorList = response.rows;
      dataCenter('assetManagement', this.queryParams).then(response => {
        this.monitorList = response.data;
        this.total = response.total;
        this.loading = false;
      });
@@ -370,7 +371,7 @@
  display: flex;
  justify-content: center;
  align-items: center;
  border-radius: 20px;
  border-radius: 10px;
  width: 20%;
  height: 80px;
  margin-left: 5%;