Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-20 a6842851a844e63a8766d63c5410a8e2f27a7d45

 src/views/system/monitor/face/index.vue

@@ -2,12 +2,12 @@
  <div class="app-container">
    <el-card class="box-card" >
      <el-row type="flex" align="middle" justify="space-between">
        <el-col :xl="8" :lg="8" :md="10" :sm="8" :xs="6">
          <div class="icon-container" style="background-color: #5599F7">
        <el-col :span="4">
          <div class="icon-container" style="background-color: #1890FF">
            <i class="el-icon-user"></i>
          </div>
        </el-col>
        <el-col :xl="14" :lg="14" :md="12" :sm="14" :xs="16">
        <el-col :span="20">
          <div class="dashboard">
            <div class="dashboard-item">
              <h3 style="color: #5C9BF8">{{ count.totalPosts }}</h3>
@@ -20,14 +20,6 @@
            <div class="dashboard-item">
              <h3 style="color: #fe640d">{{ count.postsPercentage }}</h3>
              <p>异常数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalViews }}</h3>
              <p>生成异常工单数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalFace }}</h3>
              <p>抓拍数据总量</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.viewsPercentage }}%</h3>
@@ -78,24 +70,9 @@
        />
        </el-select>
      </el-form-item>
       <el-form-item label="是否生成异常工单" prop="defaultOrder" label-width="130px">
         <el-select
           v-model="queryParams.defaultOrder"
           placeholder="是否生成异常工单"
           clearable
           style="width: 170px"
         >
         <el-option
           v-for="dict in dict.type.platform_yes_no"
           :key="dict.value"
           :label="dict.label"
           :value="dict.value"
         />
         </el-select>
        </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>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

@@ -115,7 +92,7 @@

    <el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
      <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="name" width="280" fixed show-overflow-tooltip/>
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180"/>
      <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"/>
@@ -131,8 +108,10 @@
      </el-table-column>
      <el-table-column label="数据时间" align="center" prop="installedTime" width="180" v-if="columns[4].visible"/>
      <el-table-column label="管理单位" align="center" prop="managementUnit" width="180" v-if="columns[5].visible"/>
      <el-table-column label="抓拍量" align="center" prop="a" width="180" v-if="columns[6].visible"/>
      <el-table-column label="持续无数据天数" align="center" prop="a" width="180" v-if="columns[7].visible"/>
      <el-table-column label="抓拍量" align="center" prop="clockPercent" width="180" v-if="columns[6].visible"/>
      <el-table-column label="时钟准确率" align="center" prop="dataCount" width="180" v-if="columns[7].visible"/>
      <el-table-column label="大图可用率" align="center" prop="bigUsefulPercent" width="180" v-if="columns[8].visible"/>
      <el-table-column label="人脸合格率" align="center" prop="faceEligPercent" width="180" v-if="columns[9].visible"/>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"  fixed="right">
          <template slot-scope="scope">
            <el-button
@@ -190,8 +169,8 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
      </div>
    </el-dialog>

@@ -254,7 +233,9 @@
        { key: 4, label: `数据时间`, visible: true },
        { key: 5, label: `管理单位`, visible: true },
        { key: 6, label: `抓拍量`, visible: true },
        { key: 7, label: `持续无数据天数`, visible: true }
        { key: 7, label: `时钟准确率`, visible: true },
        { key: 8, label: `大图可用率`, visible: true },
        { key: 9, label: `人脸合格率`, visible: true }
      ],
      count: {
        totalPosts: 0,
@@ -434,7 +415,7 @@
<style lang="scss" scoped>

.box-card {
  background-color: #F5F9FE;
  background-color: #ffffff;
  width: 100%;
  margin-bottom: 20px;
  height: 120px
@@ -443,8 +424,8 @@
  display: flex;
  justify-content: center;
  align-items: center;
  border-radius: 20px;
  width: 20%;
  border-radius: 10px;
  width: 130px;
  height: 80px;
  margin-left: 5%;
}
@@ -455,9 +436,10 @@

.dashboard {
  display: flex;
  gap: 10%;
  gap: 5%;
  align-items: center;
  margin-left: -50%;
  justify-content: space-between;
  margin-right: 20px;
}

.dashboard-item {