Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-20 e1a0d9a35c8d91db02d1123ea1f6d4538b7c27fe

 src/views/system/video/index.vue

@@ -45,10 +45,10 @@
    </el-card>

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="设备名称" prop="name">
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          placeholder="请输入关键字"
          clearable
          @keyup.enter.native="handleQuery"
        />
@@ -107,6 +107,7 @@
      <el-table-column label="设备名称" align="center" prop="name" width="280" fixed/>
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180"/>
      <el-table-column label="标签" align="center" prop="tag" width="180"/>
      <el-table-column label="区域" align="center" prop="region" width="180"/>
      <el-table-column label="设备状态" align="center" prop="onState">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
@@ -150,6 +151,7 @@
            <el-form-item label="设备编码：">{{ form.serialNumber }}</el-form-item>
            <el-form-item label="设备名称：">{{ form.name }} </el-form-item>
            <el-form-item label="标签：">{{ form.tag }} </el-form-item>
            <el-form-item label="区域：">{{ form.region }} </el-form-item>
            <el-form-item label="设备状态：">
              <div v-if="form.onState === 1">可用</div>
              <div v-else-if="form.onState === 2">不可用</div>
@@ -170,6 +172,15 @@
          <el-col :span="24">
            <el-form-item label="管理单位：">{{ form.managementUnit }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="信令时延(ms)：">{{ form.sipDelay }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="视频时延(ms)：">{{ form.videoDelay }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="关键帧时延(ms)：">{{ form.iframeDelay }}</el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -181,7 +192,7 @@

<script>
import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/video-monitor";

import {getCountyList} from "@/api/platform/region";
export default {
  name: "Monitor",
  dicts: ['sys_normal_disable', 'platform_yes_no','camera_state'],
@@ -246,6 +257,8 @@
  },
  created() {
    this.getList();
    this.getCountyList();

  },
  methods: {
    /** 查询设备资产列表 */