Merge remote-tracking branch 'origin/master'

xiangpei

2024-03-18 142767fca3d4bc47cb56e39e9e8f6f9bbd591cfa

Merge remote-tracking branch 'origin/master'

 src/views/screen/components/screen-examine/components/examine-table.vue

@@ -1,8 +1,8 @@
<template>
  <div class="table-container">
    <div class="table-content">
      <el-table :data="tableData" border :height="tableHeight" :max-height="tableHeight">
        <el-table-column prop="date" label="排名" align="center">
    <div class="table-content" ref="tabContent">
      <el-table :data="tableData" border :height="tableHeight" :max-height="tableHeight" class="rank-table">
        <el-table-column prop="date" label="排名" align="center" width="100">
        </el-table-column>
        <el-table-column prop="name" label="名称" align="center">
        </el-table-column>
@@ -73,21 +73,15 @@
  methods: {
    computedHeight() {
      this.$nextTick(() => {
        
        setTimeout(() => {
          const content = this.$refs.tabContent;
          this.tableHeight = content.offsetHeight;
        })
      })
      const content = this.$refs.tabContent;
      console.log(content);
      // this.tableHeight = content.clientHeight;
    }
  },
  mounted() {
    this.$nextTick(() => {
      setTimeout(() => {
        this.computedHeight();

      },1000)

    })
    this.computedHeight();
  }
}
</script>
@@ -96,7 +90,6 @@
.table-container {
  width: 100%;
  flex: 1;
  border: 1px solid red;
  position: relative;

  .table-content {
@@ -106,4 +99,58 @@
    bottom: 0;
  }
}



.rank-table {
  background-color: transparent !important;
  color: #fff !important;

  //滚动条的背景色
  ::-webkit-scrollbar-track {
    background-color: transparent;
  }
}

::v-deep .el-table tr {
  background-color: transparent !important;
}

::v-deep .el-table .el-table__header-wrapper th,
.el-table .el-table__fixed-header-wrapper th {
  background-color: transparent !important;

}

::v-deep .el-table--group,
.el-table--border {
  border: 0;
}

::v-deep .el-table th.el-table__cell.is-leaf,
.el-table td.el-table__cell {
  border-color: #56739e99 !important;
}

::v-deep .el-table--border .el-table__cell {
  border-color: #56739e99 !important;
}

::v-deep .el-table th.el-table__cell>.cell {
  color: #447ED6;
}

::v-deep .el-scrollbar__bar.is-vertical {
  display: none !important;
}

::v-deep .el-table::before,
.el-table--group::after,
.el-table--border::after {
  background-color: transparent !important;
}

::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
  background-color: #447ed648;
}
</style>

 src/views/system/check-result/index.vue

@@ -84,7 +84,19 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
    <el-card class="box-card" v-for="(item) in checkResultList">
      <div slot="header" class="clearfix">
        <span>{{ item.checkUnitName }}</span>
        <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">详情</el-button>
      </div>
      <div class="text item">考核<span class="time">{{ item.examineName }}</span></div>
      <div class="text item">考核范围<span class="time">{{ item.examineRange }}</span></div>
      <div class="text item">考核频率<span class="time">{{ item.frequency }}</span></div>
      <div class="text item">考核分数<span class="time">{{ item.checkScore }}</span></div>
      <div class="text item">考核时间<span class="time">{{ item.checkTime }}</span></div>
    </el-card>

    <!-- <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="考核对象" align="center" prop="checkUnitName" />
      <el-table-column label="考核" align="center" prop="examineName" />
@@ -100,12 +112,12 @@
            icon="el-icon-view"
            @click="handleDetail(scope.row)"
          >详情</el-button>
<!--          <el-button-->
<!--            type="text"-->
<!--            size="mini"-->
<!--            icon="el-icon-edit"-->
<!--            @click="handleSetManualScore(scope.row)"-->
<!--          >人工打分</el-button>-->
         <el-button
           type="text"
           size="mini"
           icon="el-icon-edit"
           @click="handleSetManualScore(scope.row)"
         >人工打分</el-button>
          <el-button
            size="mini"
            type="text"
@@ -122,7 +134,7 @@
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    /> -->

    <el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
      <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="请为该单位打分"/>
@@ -402,3 +414,27 @@
  }
};
</script>
<style>
  .text {
    font-size: 14px;
  }
  .time {
    font-size: 13px;
    color: #999;
    margin-left: 10px;
  }
  .item {
    margin-bottom: 18px;
  }
  .clearfix:before,
  .clearfix:after {
    display: table;
    content: "";
  }
  .clearfix:after {
    clear: both
  }
  .box-card {
    width: 480px;
  }
</style>

 src/views/system/contract/index.vue

@@ -1,29 +1,23 @@
<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="companyName">
        <el-input
          v-model="queryParams.companyName"
          placeholder="请输入公司名"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="部门名称" prop="deptName">
        <el-input
          v-model="queryParams.deptName"
          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>
      </el-form-item>
    </el-form>

    <el-row :gutter="10" class="mb8">
    <el-row>
      <el-col :span="8" v-for="(item) in tableData" :key="o" style="margin: 10px;width: 30%;">
        <el-card :body-style="{ padding: '0px' }">
          <img src="https://img2.baidu.com/it/u=68398439,1553004927&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=357" class="image">
          <div style="padding: 14px;">
            <span>{{ item.companyName }}</span>
            <span class="time" style="margin-left: 10px;">{{ item.deptName }}</span>
            <div class="bottom clearfix">
              <time class="time">{{ item.startTime }} — {{ item.endTime }}</time>
              <el-button type="text" class="button" @click="handleDetail(item)">查看详情</el-button>
            </div>
          </div>
        </el-card>
      </el-col>
    </el-row>

    <el-row :gutter="10" class="mb8" style="margin-top: 40px;">
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -33,7 +27,7 @@
          @click="handleAdd"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button
          type="success"
          plain
@@ -42,8 +36,8 @@
          :disabled="single"
          @click="handleUpdate"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
      </el-col> -->
      <!-- <el-col :span="1.5">
        <el-button
          type="danger"
          plain
@@ -52,144 +46,12 @@
          :disabled="multiple"
          @click="handleDelete"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-col> -->
    </el-row>


    <el-table
      :data="tableData"
      style="width: 100%">
      <el-table-column type="expand">
        <template slot-scope="props">
          <el-form label-position="left" inline class="table-expand">
            <el-collapse v-model="activeNames" @change="handleChange">
              <el-collapse-item title="视频平均在线率" name="1">
                <div>≥98%：不扣分</div>
                <div class="inline-input-container">
                  95%≤视频平均在线率＜98%： <el-input v-model="props.row.score95to98" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>
                </div>
                <div class="inline-input-container">
                  90%≤视频平均在线率＜95%：<el-input v-model="props.row.score90to95" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>
                </div>
                <div class="inline-input-container">
                  ＜90%： <el-input v-model="props.row.scoreBelow90" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>，
                  若有连续两次省厅考核在线率低于90%，招标人有权解除合同。
                </div>
              </el-collapse-item>
              <el-collapse-item title="前端感知源治理工作" name="2">
                <div class="inline-input-container">
                  时钟同步（超过±3秒为不合格）24小时内未修复的：扣除相关镜头数量* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分
                </div>
                <div class="inline-input-container">
                  OSD标识不满足《GAT 751-2008 视频图像文字标注规范》，24小时内未修复的：标扣除相关镜头数量* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分
                </div>
                <div class="inline-input-container">
                  用户抽检，一机一档数据项不合格（提供虚假数据或错误数据为不合格），24小时内未修复的：扣除相关镜头数量* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分
                </div>
              </el-collapse-item>
              <el-collapse-item title="后台系统的保障" name="3">
                <div class="inline-input-container">
                  个别设备故障但不影响该功能模块整体应用情况下,超出72小时不足144小时的；扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
                </div>
                <div class="inline-input-container">
                  个别设备故障但不影响该功能模块整体应用情况下,超出144小时以后，每超出12小时：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
                </div>
                <div class="inline-input-container">
                  个别设备故障但不影响该功能模块整体应用情况下,同一功能模块的相同或不同设备累计一个月内故障超过3次：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
                </div>
                <div class="inline-input-container">
                  后台功能模块不能正常运行影响正常使用的,超出24小时不足48小时的：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/次
                </div>
                <div class="inline-input-container">
                  个别设备故障但不影响该功能模块整体应用情况下,超出72小时不足144小时的；扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
                </div>
                <div class="inline-input-container">
                  后台功能模块不能正常运行影响正常使用的,超出48小时以后：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
                </div>
                <div class="inline-input-container">
                  后台功能模块不能正常运行影响正常使用的,同一功能模块的相同或不同设备累计一个月内故障超过2次：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/次
                </div>
              </el-collapse-item>
              <el-collapse-item title="存储故障" name="4">
                <div class="inline-input-container">
                  因存储设备、云存储软件等引起平台不能正常查看历史图像,单次故障时长在24小时以内的：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/小时
                </div>
                <div class="inline-input-container">
                  因存储设备、云存储软件等引起平台不能正常查看历史图像,单次故障时长在24小时以内的：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/小时
                </div>
                <div class="inline-input-container">
                  因视频或者图片丢失导致重要案事件不能回放或查看,同一点位视频图像同一案件不累计计算：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/次
                </div>
              </el-collapse-item>
              <el-collapse-item title="对于前端点位异常情况的处理" name="5">
                <div class="inline-input-container">
                  24小时后未修复的：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分*镜头数量
                </div>
                <div class="inline-input-container">
                  48小时后未修复，累计扣分：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分*镜头数量*天
                </div>
              </el-collapse-item>
              <div style="text-align: right; margin-top: 10px;">
                <el-button type="primary" @click="submitForm1(props.row)">提交</el-button>
              </div>
            </el-collapse>
          </el-form>
        </template>
      </el-table-column>
      <el-table-column
        label="公司名"
        prop="companyName">
      </el-table-column>
      <el-table-column
        label="部门名称"
        prop="deptName">
      </el-table-column>
      <el-table-column
        label="开始时间"
        prop="startTime">
      </el-table-column>
      <el-table-column
        label="截至时间"
        prop="endTime">
      </el-table-column>
      <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-edit"
            @click="handleUpdate(scope.row)"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

    <!-- 添加或修改【请填写功能名称】对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog :title="detailName" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="公司名" prop="companyName">
          <el-select v-model="form.companyName" placeholder="请选择">
@@ -231,6 +93,123 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    
    <!-- 合同详情 -->
    <el-dialog :title="detailName" :visible.sync="detail" width="500px" append-to-body>
      <el-form label-position="left" inline class="table-expand">
        <el-collapse v-model="activeNames" @change="handleChange">
          <el-collapse-item title="视频平均在线率" name="1">
            <div>≥98%：不扣分</div>
            <div class="inline-input-container">
              95%≤视频平均在线率＜98%： <el-input v-model="props.row.score95to98" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>
            </div>
            <div class="inline-input-container">
              90%≤视频平均在线率＜95%：<el-input v-model="props.row.score90to95" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>
            </div>
            <div class="inline-input-container">
              ＜90%： <el-input v-model="props.row.scoreBelow90" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>，
              若有连续两次省厅考核在线率低于90%，招标人有权解除合同。
            </div>
          </el-collapse-item>
          <el-collapse-item title="前端感知源治理工作" name="2">
            <div class="inline-input-container">
              时钟同步（超过±3秒为不合格）24小时内未修复的：扣除相关镜头数量* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分
            </div>
            <div class="inline-input-container">
              OSD标识不满足《GAT 751-2008 视频图像文字标注规范》，24小时内未修复的：标扣除相关镜头数量* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分
            </div>
            <div class="inline-input-container">
              用户抽检，一机一档数据项不合格（提供虚假数据或错误数据为不合格），24小时内未修复的：扣除相关镜头数量* <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分
            </div>
          </el-collapse-item>
          <el-collapse-item title="后台系统的保障" name="3">
            <div class="inline-input-container">
              个别设备故障但不影响该功能模块整体应用情况下,超出72小时不足144小时的；扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
            </div>
            <div class="inline-input-container">
              个别设备故障但不影响该功能模块整体应用情况下,超出144小时以后，每超出12小时：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
            </div>
            <div class="inline-input-container">
              个别设备故障但不影响该功能模块整体应用情况下,同一功能模块的相同或不同设备累计一个月内故障超过3次：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
            </div>
            <div class="inline-input-container">
              后台功能模块不能正常运行影响正常使用的,超出24小时不足48小时的：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/次
            </div>
            <div class="inline-input-container">
              个别设备故障但不影响该功能模块整体应用情况下,超出72小时不足144小时的；扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
            </div>
            <div class="inline-input-container">
              后台功能模块不能正常运行影响正常使用的,超出48小时以后：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/12小时
            </div>
            <div class="inline-input-container">
              后台功能模块不能正常运行影响正常使用的,同一功能模块的相同或不同设备累计一个月内故障超过2次：扣 <el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/次
            </div>
          </el-collapse-item>
          <el-collapse-item title="存储故障" name="4">
            <div class="inline-input-container">
              因存储设备、云存储软件等引起平台不能正常查看历史图像,单次故障时长在24小时以内的：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/小时
            </div>
            <div class="inline-input-container">
              因存储设备、云存储软件等引起平台不能正常查看历史图像,单次故障时长在24小时以内的：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/小时
            </div>
            <div class="inline-input-container">
              因视频或者图片丢失导致重要案事件不能回放或查看,同一点位视频图像同一案件不累计计算：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分/次
            </div>
          </el-collapse-item>
          <el-collapse-item title="对于前端点位异常情况的处理" name="5">
            <div class="inline-input-container">
              24小时后未修复的：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分*镜头数量
            </div>
            <div class="inline-input-container">
              48小时后未修复，累计扣分：扣<el-input v-model="props.row.time24" type="number" min="0" max="100" placeholder="请输入扣分"></el-input>分*镜头数量*天
            </div>
          </el-collapse-item>
          <el-upload
            action="#"
            list-type="picture-card"
            :auto-upload="false">
              <i slot="default" class="el-icon-plus"></i>
              <div slot="file" slot-scope="{file}">
                <img
                  class="el-upload-list__item-thumbnail"
                  :src="file.url" alt=""
                >
                <span class="el-upload-list__item-actions">
                  <span
                    class="el-upload-list__item-preview"
                    @click="handlePictureCardPreview(file)"
                  >
                    <i class="el-icon-zoom-in"></i>
                  </span>
                  <span
                    v-if="!disabled"
                    class="el-upload-list__item-delete"
                    @click="handleDownload(file)"
                  >
                    <i class="el-icon-download"></i>
                  </span>
                  <span
                    v-if="!disabled"
                    class="el-upload-list__item-delete"
                    @click="handleRemove(file)"
                  >
                    <i class="el-icon-delete"></i>
                  </span>
                </span>
              </div>
          </el-upload>
          <el-dialog :visible.sync="dialogVisible">
            <img width="100%" :src="dialogImageUrl" alt="">
          </el-dialog>
          <div style="text-align: right; margin-top: 10px;">
            <el-button type="primary" @click="submitForm1(props.row)">提交</el-button>
          </div>
        </el-collapse>
      </el-form>
    </el-dialog>



  </div>
</template>

@@ -243,6 +222,14 @@
  name: "Contract",
  data() {
    return {
      dialogImageUrl: '',
      dialogVisible: false,
      disabled: false,
      props: {
        row: {
          
        }
      },
      unitList: [],
      deptList: [],
      activeNames: ['1'],
@@ -262,8 +249,12 @@
      contractList: [],
      // 弹出层标题
      title: "",
      // 详情标题
      detailName: "",
      // 是否显示弹出层
      open: false,
      // 是否显示详情
      detail: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -316,6 +307,16 @@
    this.selectDept();
  },
  methods: {
    handleRemove(file) {
      console.log(file);
    },
    handlePictureCardPreview(file) {
      this.dialogImageUrl = file.url;
      this.dialogVisible = true;
    },
    handleDownload(file) {
      console.log(file);
    },
    // 运维公司下拉数据
    selectUnit() {
      unitSelect().then(res => {
@@ -382,6 +383,11 @@
      this.open = true;
      this.title = "添加合同";
    },
    /** 详情按钮操作 */
    handleDetail(item) {
      this.detail = true;
      this.detailName = item.companyName
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset();
@@ -440,14 +446,39 @@
  width: 100%;
  color: #99a9bf;
}
.table-expand {

}
.inline-input-container {
  white-space: nowrap; /* 防止内容内部的换行 */
  margin-right: 50px;  /* 可选的，用于在元素之间添加一些间距 */
  width: 7%;
}

.time {
  font-size: 13px;
  color: #999;
}

</style>
.bottom {
  margin-top: 13px;
  line-height: 12px;
}

.button {
  padding: 0;
  float: right;
}

.image {
  width: 100%;
  display: block;
}

.clearfix:before,
.clearfix:after {
    display: table;
    content: "";
}

.clearfix:after {
    clear: both
}
</style>