Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-20 e1a0d9a35c8d91db02d1123ea1f6d4538b7c27fe

Merge remote-tracking branch 'origin/master'

 src/views/system/car/index.vue

@@ -34,14 +34,27 @@
      </el-row>
    </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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          placeholder="请输入关键字"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="地区" prop="onState">
        <el-select
          v-model="queryParams.address"
          placeholder="地区"
          clearable
        >
        <el-option label="自贡市" value="自贡市"/>
        <el-option label="沿滩区" value="沿滩区"/>
        <el-option label="大安区" value="大安区"/>
        <el-option label="贡井区" value="贡井区"/>
        <el-option label="自流井区" value="自流井区"/>
        </el-select>
      </el-form-item>
      <el-form-item label="设备状态" prop="onState">
        <el-select
@@ -94,34 +107,34 @@
    </el-row>

    <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180px"/>
      <el-table-column label="设备名称" align="center" prop="name" />
      <el-table-column label="上报部门" align="center" prop="deptName" />
      <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="address" width="180"/>
      <el-table-column label="标签" align="center" prop="publicSecurity" 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"/>
      </template>
      </el-table-column>
      <el-table-column label="地址" align="center" prop="address" />
      <el-table-column label="是否生成异常工单" align="center" prop="defaultOrder">
        <template slot-scope="scope">
            <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
        </template>
      <el-table-column label="是否生成异常工单" align="center" prop="defaultOrder" width="180">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
      </template>
      </el-table-column>
      <el-table-column label="异常原因" align="center" prop="reason" />
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180">
      </el-table-column>
      <el-table-column label="管理单位" align="center" prop="managementUnit" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="handleView(scope.row,scope.index)"
          >详细</el-button>
        </template>
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180"/>
      <el-table-column label="管理单位" align="center" prop="managementUnit" width="180"/>
      <el-table-column label="过车数据量" align="center" prop="model" width="180"/>
      <el-table-column label="持续无数据天数" align="center" prop="recovery" width="180"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right">
          <template slot-scope="scope">
            <el-button
              size="mini"
              type="text"
              icon="el-icon-view"
              @click="handleView(scope.row,scope.index)"
            >详细</el-button>
          </template>
      </el-table-column>
    </el-table>

@@ -140,6 +153,7 @@
          <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.address }} </el-form-item>
            <el-form-item label="上报部门：">{{ form.deptName }} </el-form-item>
            <el-form-item label="设备状态：">
              <div v-if="form.onState === 1">可用</div>
@@ -155,14 +169,17 @@
            </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>
          </el-col>
          <el-col :span="24">
            <el-form-item label="管理单位：">{{ form.managementUnit }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="过车数据量：">{{ form.model }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="持续无数据天数：">{{ form.recovery }}</el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">

 src/views/system/face/index.vue

@@ -34,14 +34,27 @@
      </el-row>
    </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 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入设备名称"
          placeholder="请输入关键字"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="地区" prop="onState">
        <el-select
          v-model="queryParams.address"
          placeholder="地区"
          clearable
        >
        <el-option label="自贡市" value="自贡市"/>
        <el-option label="沿滩区" value="沿滩区"/>
        <el-option label="大安区" value="大安区"/>
        <el-option label="贡井区" value="贡井区"/>
        <el-option label="自流井区" value="自流井区"/>
        </el-select>
      </el-form-item>
      <el-form-item label="设备状态" prop="onState">
        <el-select
@@ -93,34 +106,34 @@
    </el-row>

    <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180px"/>
      <el-table-column label="设备名称" align="center" prop="name" />
      <el-table-column label="上报部门" align="center" prop="deptName" />
      <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="address" width="180"/>
      <el-table-column label="标签" align="center" prop="publicSecurity" 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"/>
      </template>
      </el-table-column>
      <el-table-column label="地址" align="center" prop="address" />
      <el-table-column label="是否生成异常工单" align="center" prop="defaultOrder">
      <el-table-column label="是否生成异常工单" align="center" prop="defaultOrder" width="180">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
      </template>
      </el-table-column>
      <el-table-column label="异常原因" align="center" prop="reason" />
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180">
      </el-table-column>
      <el-table-column label="管理单位" align="center" prop="managementUnit" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="handleView(scope.row,scope.index)"
          >详细</el-button>
        </template>
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180"/>
      <el-table-column label="管理单位" align="center" prop="managementUnit" width="180"/>
      <el-table-column label="抓拍量" align="center" prop="model" width="180"/>
      <el-table-column label="持续无数据天数" align="center" prop="recovery" width="180"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right">
          <template slot-scope="scope">
            <el-button
              size="mini"
              type="text"
              icon="el-icon-view"
              @click="handleView(scope.row,scope.index)"
            >详细</el-button>
          </template>
      </el-table-column>
    </el-table>

@@ -181,6 +194,7 @@
          <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.address }} </el-form-item>
            <el-form-item label="上报部门：">{{ form.deptName }} </el-form-item>
            <el-form-item label="设备状态：">
              <div v-if="form.onState === 1">可用</div>
@@ -195,14 +209,17 @@
            </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>
          </el-col>
          <el-col :span="24">
            <el-form-item label="管理单位：">{{ form.managementUnit }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="抓拍量：">{{ form.model }}</el-form-item>
          </el-col>
          <el-col :span="24">
            <el-form-item label="持续无数据天数：">{{ form.recovery }}</el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">

 src/views/system/score/index.vue

@@ -1,14 +1,14 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="单位名" prop="unitId">
        <el-input
          v-model="queryParams.unitId"
          placeholder="请输入单位名"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
<!--      <el-form-item label="单位名" prop="unitId">-->
<!--        <el-input-->
<!--          v-model="queryParams.unitId"-->
<!--          placeholder="请输入单位名"-->
<!--          clearable-->
<!--          @keyup.enter.native="handleQuery"-->
<!--        />-->
<!--      </el-form-item>-->
      <el-form-item label="考核名" prop="examineId">
        <el-input
          v-model="queryParams.examineId"
@@ -17,14 +17,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="积分类型" prop="scoreCategory">
        <el-input
          v-model="queryParams.scoreCategory"
          placeholder="请输入积分类型"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
<!--      <el-form-item label="积分类型" prop="scoreCategory">-->
<!--        <el-input-->
<!--          v-model="queryParams.scoreCategory"-->
<!--          placeholder="请输入积分类型"-->
<!--          clearable-->
<!--          @keyup.enter.native="handleQuery"-->
<!--        />-->
<!--      </el-form-item>-->
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -76,13 +76,16 @@
    <el-table v-loading="loading" :data="scoreList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="考核名" align="center" prop="examineName" />
      <el-table-column label=考核对象" align="center" prop="unitName" />
      <el-table-column label="考核对象" align="center" >
        {{"成都x运维"}}
      </el-table-column>
      <el-table-column label="分值" align="center" prop="score" />
      <el-table-column label="考核规则" align="center" prop="scoreCategory">
      <template slot-scope="scope">
        <div v-if="scope.row.scoreCategory === 1">视频在线率</div>
        <div v-else-if="scope.row.scoreCategory === 2">存储故障</div>
        <div v-else-if="scope.row.scoreCategory === 3">保障工作</div>
        <div v-else-if="scope.row.scoreCategory === 4">一机一档24小时未修复</div>
        <div v-else-if="scope.row.scoreCategory === 5">时钟不同步24小时未修复</div>
      </template>
      </el-table-column>
      <el-table-column label="创建人" align="center" prop="createBy" />
@@ -119,16 +122,6 @@
        <el-form-item label="分值" prop="score">
          <el-input v-model="form.score" placeholder="请输入分值" />
        </el-form-item>
        <el-form-item label="单位名" prop="unitId">
          <el-select v-model="form.unitId" placeholder="请选择">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="考核名" prop="examineId">
          <el-select v-model="form.examineId" placeholder="请选择">
            <el-option
@@ -139,7 +132,17 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="积分类型" prop="scoreCategory">
        <el-form-item label="考核对象" prop="unitId">
          <el-select v-model="form.unitId" placeholder="请选择">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="考核规则" prop="scoreCategory">
          <el-select v-model="form.scoreCategory" placeholder="请选择">
            <el-option
              v-for="item in scoreCategoryList"
@@ -168,14 +171,12 @@
  dicts: ['platform_operate_category'],
  data() {
    return {
      operateCategoryList: [
        { id: 2, value: '人工打分' },
        { id: 1, value: '系统打分' },
      ],
      scoreCategoryList: [
        { id: 2, value: '存储故障' },
        { id: 1, value: '视频在线率' },
        { id: 3, value: '保障工作' },
        { id: 4, value: '一机一档24小时未修复' },
        { id: 5, value: '时钟不同步24小时未修复' },
      ],

      unitList: [],

 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: {
    /** 查询设备资产列表 */