Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-03 7f356bf22e4fe731e2b79ca3877e7c702eaf0704

 src/views/system/video/index.vue

@@ -12,31 +12,31 @@
        <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
          <div class="dashboard">
            <div class="dashboard-item">
              <h3 style="color: #5C9BF8">{{ totalPosts }}</h3>
              <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
              <p>设备总数</p >
            </div>
            <div class="dashboard-item">
              <h3 style="color: #3eba45">{{ totalMembers }}</h3>
              <h3 style="color: #3eba45">{{ count.totalMembers }}</h3>
              <p>正常数</p >
            </div>
            <div class="dashboard-item">
              <h3 style="color: #fe640d">{{ postsPercentage }}</h3>
              <h3 style="color: #fe640d">{{ count.postsPercentage }}</h3>
              <p>异常数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ totalViews }}</h3>
              <h3>{{ count.totalViews }}</h3>
              <p>生成异常工单数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ noStore }}</h3>
              <h3>{{ count.noStore }}</h3>
              <p>无存储</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ partStore }}</h3>
              <h3>{{ count.partStore }}</h3>
              <p>部分存储</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ viewsPercentage }}%</h3>
              <h3>{{ count.viewsPercentage }}%</h3>
              <p>设备运行率</p >
            </div>
          </div>
@@ -44,7 +44,7 @@
      </el-row>
    </el-card>

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
@@ -123,8 +123,8 @@
      <el-table-column type="selection" align="center" />
      <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" v-if="columns[0].visible"/>
      <el-table-column label="区域" align="center" prop="region" width="180" v-if="columns[1].visible"/>
      <el-table-column label="标签" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible"/>
      <el-table-column label="区域" align="center" prop="address" width="180" v-if="columns[1].visible"/>
      <el-table-column label="设备状态" align="center" prop="onState" v-if="columns[2].visible">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
@@ -167,21 +167,19 @@
          <el-col :span="12">
            <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="地区：">{{ form.address }} </el-form-item>
            <el-form-item label="上报部门：">{{ form.deptName }} </el-form-item>
            <el-form-item label="设备状态：">
              <div v-if="form.onState === 1">可用</div>
              <div v-else-if="form.onState === 2">不可用</div>
            </el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="地址：">{{ form.address }}</el-form-item>
            <el-form-item label="是否生成异常工单：">
              <div v-if="form.defaultOrder === 1">是</div>
              <div v-else-if="form.defaultOrder === 2">否</div>
            </el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="异常原因：">{{ form.reason }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="安装时间：">{{ form.installedTime }}</el-form-item>
@@ -190,13 +188,13 @@
            <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-form-item label="信令时延(ms)："></el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="视频时延(ms)：">{{ form.videoDelay }}</el-form-item>
            <el-form-item label="视频时延(ms)："></el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="关键帧时延(ms)：">{{ form.iframeDelay }}</el-form-item>
            <el-form-item label="关键帧时延(ms)："></el-form-item>
          </el-col>
        </el-row>
      </el-form>
@@ -208,7 +206,7 @@
</template>

<script>
import { listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/video-monitor";
import { videoCount, listMonitor, getMonitor, delMonitor, addMonitor, updateMonitor } from "@/api/platform/monitor";
export default {
  name: "Monitor",
  dicts: ['sys_normal_disable', 'platform_yes_no','camera_state'],
@@ -226,14 +224,15 @@
        { key: 7, label: `视频时延`, visible: true },
        { key: 8, label: `关键帧时延`, visible: true }
      ],
      totalPosts: 6250,
      totalMembers: 6008,
      postsPercentage: 51,
      totalViews: 17,
      noStore: 47,
      partStore: 56,
      viewsPercentage: 96.12,
      totalErrors: 0,
      count: {
        totalPosts: 0,
        totalMembers: 0,
        postsPercentage: 0,
        totalViews: 0,
        noStore: 0,
        partStore: 0,
        viewsPercentage: 0
      },
      // 遮罩层
      loading: true,
      // 选中数组
@@ -285,9 +284,9 @@
    };
  },
  created() {
    this.getVideoCount();
    this.getList();
    this.getCountyList();

  },
  methods: {
    /** 查询设备资产列表 */
@@ -297,6 +296,12 @@
        this.monitorList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
     /** 查询设备资产统计数 */
     getVideoCount() {
      videoCount('1').then(response => {
        this.count = response.data;
      });
    },
    // 取消按钮
@@ -323,6 +328,7 @@
      this.queryParams.pageNum = 1;
      this.queryParams.cameraFunType = 1;
      this.getList();
      this.getVideoCount();
    },
    /** 重置按钮操作 */
    resetQuery() {