fix: BUG修改

This commit is contained in:
kun 2023-06-30 21:36:08 +08:00
parent a5aee810f6
commit 5bacfbfa3c
18 changed files with 97 additions and 25 deletions

View File

@ -150,7 +150,7 @@
</el-form>
<template #footer>
<el-button class="hzCancelStyle" @click="visible1 = false">取消</el-button>
<el-button class="hzStyle" type="primary" @click="confirm(ruleFormRef)"> 保存 </el-button>
<el-button class="btnStyle" type="primary" @click="confirm(ruleFormRef)"> 保存 </el-button>
</template>
</el-dialog>
</div>

View File

@ -28,7 +28,6 @@
overflow: auto;
background-color: transparent;
color: #c4c4c4;
font-size: 16px;
.el-tree-node__content {
height: 33px;
}
@ -37,6 +36,9 @@
color: #0bc4f0;
font-size: 16px;
}
.el-tree-node__label {
font-size: 16px !important;
}
}
:deep(.el-tree--highlight-current) {
.el-tree-node.is-current > .el-tree-node__content {

View File

@ -162,7 +162,7 @@
background-color: transparent !important;
border-bottom: 0 !important;
color: var(--el-menu-text-color);
font-size: 16px;
font-size: 16px !important;
}
th.el-table__cell {
background-color: transparent;
@ -403,7 +403,7 @@
.btnStyle {
background-color: #087ba4;
border-color: #087ba4;
font-size: 16px;
font-size: 16px !important;
color: white;
}
.darkStyle {

View File

@ -156,7 +156,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
class="btnStyle"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>

View File

@ -13,6 +13,17 @@
<div class="jiantb"></div>
<div></div>
<div class="jiantbcent">动态跟踪</div>
<div class="scrollTitle">
<div class="item">
<div class="time">时间</div>
<div class="qs">名称</div>
<div class="denjji">
<div>等级</div>
</div>
<div class="cent">预警类型</div>
<div class="vaks">预警值</div>
</div>
</div>
<vue3-seamless-scroll :list="list" class="scroll" :hover="true" :step="0.4" :singleWaitTime="3000" :wheel="true">
<div class="item" v-for="(item, index) in list" :key="index">
<div class="time">{{ item.date }}</div>
@ -357,6 +368,41 @@ const settxa = () => {
color: #e8e9ef;
}
.scroll {
width: 97.5%;
margin-left: 1px;
overflow: hidden;
.item {
position: relative;
display: flex;
align-items: center;
user-select: none;
justify-content: space-around;
padding: 3px 0;
color: #cfcfcf;
div {
width: 100%;
display: flex;
justify-content: center;
}
div:nth-child(1) {
width: 110%;
}
.time {
display: flex;
justify-content: center;
}
.qs {
}
.denjji {
width: 50%;
}
.vaks {
width: 50%;
}
}
}
.scrollTitle {
margin-top: 30px;
width: 97.5%;
margin-left: 1px;

View File

@ -47,7 +47,7 @@
}
.bottom_item {
.bottomSize {
font-size: 12px;
font-size: 14px !important;
color: #666666;
}
}

View File

@ -47,7 +47,7 @@
}
.bottom_item {
.bottomSize {
font-size: 12px;
font-size: 14px !important;
color: #666666;
}
}

View File

@ -48,7 +48,7 @@
}
.bottom_item {
.bottomSize {
font-size: 12px;
font-size: 14px !important;
color: #666666;
}
}

View File

@ -47,7 +47,7 @@
}
.bottom_item {
.bottomSize {
font-size: 12px;
font-size: 14px !important;
color: #666666;
}
}

View File

@ -119,7 +119,7 @@
</div>
<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
<el-button type="info" class="hzCancelStyle" style="margin-right: 98px" @click="backAll">驳回,请尽快整改</el-button>
<el-button class="hzStyle" type="primary" @click="allSubmit">整改完成,全部合格</el-button>
<el-button class="btnStyle" type="primary" @click="allSubmit">整改完成,全部合格</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">

View File

@ -119,7 +119,7 @@
</div>
<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
<el-button type="info" class="hzCancelStyle" style="margin-right: 98px" @click="backAll">驳回,请尽快整改</el-button>
<el-button type="primary" class="hzStyle" @click="allSubmit">整改完成,全部合格</el-button>
<el-button type="primary" class="btnStyle" @click="allSubmit">整改完成,全部合格</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">

View File

@ -30,7 +30,7 @@
end-placeholder="结束日期"
>
</el-date-picker>
<el-button class="hzStyle" type="primary" style="margin-left: 20px" @click="getAttendanceData">发送</el-button>
<el-button class="btnStyle" type="primary" style="margin-left: 20px" @click="getAttendanceData">发送</el-button>
</el-card>
</div>
<div class="statistics-echart">
@ -113,7 +113,8 @@ const drawEcharts = () => {
right: 0,
top: 0,
textStyle: {
color: "#c4c4c4"
color: "#c4c4c4",
fontSize: 16
},
data: ["出勤总数(人)", "在职总数(人)", "出勤率(%)"]
},
@ -123,6 +124,9 @@ const drawEcharts = () => {
data: ["1月", "2月", "3月", "4月", "5月", "6月", "7月"],
axisPointer: {
type: "shadow"
},
axisLabel: {
fontSize: 14
}
}
],
@ -132,7 +136,11 @@ const drawEcharts = () => {
name: "单位(人)",
nameTextStyle: {
align: "right",
color: "#c4c4c4"
color: "#c4c4c4",
fontSize: 14
},
axisLabel: {
fontSize: 16
},
min: 0,
max: 250,
@ -142,7 +150,11 @@ const drawEcharts = () => {
type: "value",
name: "出勤率(%)",
nameTextStyle: {
color: "#c4c4c4"
color: "#c4c4c4",
fontSize: 14
},
axisLabel: {
fontSize: 16
},
min: 0,
max: 25,

View File

@ -231,7 +231,7 @@
}
.bottom_item {
.bottomSize {
font-size: 10px;
font-size: 14px !important;
color: rgba(196, 196, 196, 0.65);
}
}

View File

@ -166,7 +166,7 @@
}
.bottom_item {
.bottomSize {
font-size: 10px;
font-size: 14px !important;
color: #666666;
}
}

View File

@ -116,7 +116,7 @@
}
.bottom_item {
.bottomSize {
font-size: 10px;
font-size: 14px !important;
color: #666666;
}
}

View File

@ -120,7 +120,7 @@
<div class="operation-btn" v-if="basicData?.state != 4">
<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
<el-button type="primary">整改完成,全部合格</el-button> -->
<el-button class="hzStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
<el-button class="btnStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">
@ -156,7 +156,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
class="btnStyle"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -228,7 +232,7 @@
<el-button type="primary" @click="auditVisible = true">审核</el-button>
</div> -->
<div class="status-operate" v-if="item.type">
<el-button class="hzStyle" type="primary" @click="submitForm">提交</el-button>
<el-button class="btnStyle" type="primary" @click="submitForm">提交</el-button>
</div>
</el-timeline-item>
</el-timeline>

View File

@ -120,7 +120,7 @@
<div class="operation-btn" v-if="basicData?.state != 4">
<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
<el-button type="primary">整改完成,全部合格</el-button> -->
<el-button class="hzStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
<el-button class="btnStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
</div>
</div>
<div class="transform-record" v-if="transformDialog">
@ -156,7 +156,11 @@
</div>
<div class="situation">
<span>整改情况</span>
<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
<el-button
class="btnStyle"
type="success"
@click="addSituation"
v-if="recordRowData.state === 1 || recordRowData.state === 4"
>新增整改记录</el-button
>
</div>
@ -226,7 +230,7 @@
<el-button type="primary" @click="auditVisible = true">审核</el-button>
</div> -->
<div class="status-operate" v-if="item.type">
<el-button class="hzStyle" type="primary" @click="submitForm">提交</el-button>
<el-button class="btnStyle" type="primary" @click="submitForm">提交</el-button>
</div>
</el-timeline-item>
</el-timeline>

View File

@ -105,7 +105,7 @@
<template #footer>
<div class="form-footer">
<el-button class="hzCancelStyle" @click="visible = false">取消</el-button>
<el-button class="hzStyle" type="primary" @click="confirm(ruleFormRef, formData)"> 保存 </el-button>
<el-button class="btnStyle" type="primary" @click="confirm(ruleFormRef, formData)"> 保存 </el-button>
</div>
</template>
</el-dialog>