Merge branch 'zcwy-0306' into dev0223

This commit is contained in:
zhangsir
2024-03-29 16:49:12 +08:00
2 changed files with 25 additions and 25 deletions

View File

@@ -97,8 +97,8 @@ import {boeRequest} from "@/api/request";
}, },
{ {
title: "工号", title: "工号",
dataIndex: "wokeNum", dataIndex: "workNum",
key: "wokeNum", key: "workNum",
className: "h", className: "h",
ellipsis: true, ellipsis: true,
width: 100, width: 100,
@@ -306,14 +306,14 @@ import {boeRequest} from "@/api/request";
.tablelist{ .tablelist{
padding: 10px 35px; padding: 10px 35px;
.download{ .download{
width: 30px; width: 19px;
height: 32px; height: 20px;
background: url("../../assets/images/evaluation/download.png") no-repeat; background: url("../../assets/images/evaluation/download.png") no-repeat;
background-size: 100%; background-size: 100%;
} }
.delete{ .delete{
width: 30px; width: 19px;
height: 32px; height: 20px;
background: url("../../assets/images/evaluation/delete.png") no-repeat; background: url("../../assets/images/evaluation/delete.png") no-repeat;
background-size: 100%; background-size: 100%;
} }

View File

@@ -45,7 +45,7 @@
:columns="columns" :columns="columns"
:data-source="tableData" :data-source="tableData"
:loading="tableLoading" :loading="tableLoading"
:scroll="{ x: 'max-content' }" :scroll="{ x: '1000' }"
:pagination="false" :pagination="false"
> >
<template #operation="{ record, column }"> <template #operation="{ record, column }">
@@ -915,8 +915,8 @@ import { message } from "ant-design-vue";
}, },
{ {
title: "添加时间", title: "添加时间",
dataIndex: "updateTime", dataIndex: "createTime",
key: "updateTime", key: "createTime",
className: "h", className: "h",
ellipsis: true, ellipsis: true,
width: 200, width: 200,
@@ -1738,20 +1738,20 @@ import { message } from "ant-design-vue";
.content{ .content{
padding: 10px 35px; padding: 10px 35px;
.check{ .check{
width: 30px; width: 19px;
height: 32px; height: 20px;
background: url("../../assets/images/evaluation/check.png") no-repeat; background: url("../../assets/images/evaluation/check.png") no-repeat;
background-size: 100%; background-size: 100%;
} }
.upload{ .upload{
width: 30px; width: 19px;
height: 32px; height: 20px;
background: url("../../assets/images/evaluation/upload.png") no-repeat; background: url("../../assets/images/evaluation/upload.png") no-repeat;
background-size: 100%; background-size: 100%;
} }
.download{ .download{
width: 30px; width: 19px;
height: 32px; height: 20px;
background: url("../../assets/images/evaluation/download.png") no-repeat; background: url("../../assets/images/evaluation/download.png") no-repeat;
background-size: 100%; background-size: 100%;
} }
@@ -2125,36 +2125,36 @@ import { message } from "ant-design-vue";
align-items: center; align-items: center;
font-size: 13px; font-size: 13px;
.release{ .release{
width: 20px; width: 15px;
height: 22px; height: 16px;
background: url("../../assets/images/evaluation/release.png") no-repeat; background: url("../../assets/images/evaluation/release.png") no-repeat;
background-size: 100%; background-size: 100%;
margin-right: 2px; margin-right: 2px;
} }
.authority{ .authority{
width: 20px; width: 15px;
height: 22px; height: 16px;
background: url("../../assets/images/evaluation/authority.png") no-repeat; background: url("../../assets/images/evaluation/authority.png") no-repeat;
background-size: 100%; background-size: 100%;
margin-right: 2px; margin-right: 2px;
} }
.edit{ .edit{
width: 20px; width: 15px;
height: 22px; height: 16px;
background: url("../../assets/images/evaluation/edit.png") no-repeat; background: url("../../assets/images/evaluation/edit.png") no-repeat;
background-size: 100%; background-size: 100%;
margin-right: 2px; margin-right: 2px;
} }
.delete{ .delete{
width: 20px; width: 15px;
height: 22px; height: 16px;
background: url("../../assets/images/evaluation/delete.png") no-repeat; background: url("../../assets/images/evaluation/delete.png") no-repeat;
background-size: 100%; background-size: 100%;
margin-right: 2px; margin-right: 2px;
} }
.empty{ .empty{
width: 20px; width: 15px;
height: 22px; height: 16px;
background: url("../../assets/images/evaluation/empty.png") no-repeat; background: url("../../assets/images/evaluation/empty.png") no-repeat;
background-size: 100%; background-size: 100%;
margin-right: 2px; margin-right: 2px;