Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc
This commit is contained in:
commit
e50bd3fba4
|
@ -51,7 +51,7 @@
|
|||
<span>状态:</span>
|
||||
<img :src="lampImages[data.xq.deng]" @click="escalation" />
|
||||
</div>
|
||||
<div class="lampMessage">(工作日早上8:30自动推送浙政钉)</div>
|
||||
|
||||
<div class="lampBox" v-if="clicked">
|
||||
<div class="lampTitle">确定要上报吗?</div>
|
||||
<div class="lampBtn">
|
||||
|
@ -61,55 +61,58 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-table
|
||||
:data="data.tableData"
|
||||
height="100%"
|
||||
:header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)' ,height: '60px'}"
|
||||
@row-click="handleRowClick"
|
||||
>
|
||||
<template v-for="item in data.columns" :key="item.label">
|
||||
<el-table-column
|
||||
v-if="item.type === 'slot'"
|
||||
:label="item.label"
|
||||
:property="item.property"
|
||||
:width="item.width || ''"
|
||||
:align="item.align || 'center'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!-- 状态 -->
|
||||
<div v-if="item.property == 'deng'">
|
||||
<div v-if="scope.row.deng == 1" class="progressGreen"></div>
|
||||
<div
|
||||
v-if="scope.row.deng == 2"
|
||||
class="progressYellow"
|
||||
></div>
|
||||
<!-- <div v-for="index in 3" :key="index">
|
||||
<img
|
||||
style="width: 30px; height: 30px"
|
||||
v-if="scope.row.zt == index"
|
||||
:src="lampImages[index]"
|
||||
alt="状态"
|
||||
/>
|
||||
</div> -->
|
||||
</div>
|
||||
<!-- <slot
|
||||
:name="item.property"
|
||||
:currentCol="item"
|
||||
:currentData="scope.row"
|
||||
></slot> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-else
|
||||
:property="item.property"
|
||||
:label="item.label"
|
||||
:show-overflow-tooltip="true"
|
||||
:width="item.width || ''"
|
||||
:align="item.align || 'center'"
|
||||
/>
|
||||
</template>
|
||||
</el-table>
|
||||
<div style="border: 1px solid #5284B0 ;" >
|
||||
<el-table
|
||||
:data="data.tableData"
|
||||
height="100%"
|
||||
max-height="400"
|
||||
:header-cell-style="{ background: 'rgba(0, 143, 205, 0.63)' ,}"
|
||||
@row-click="handleRowClick"
|
||||
>
|
||||
<template v-for="item in data.columns" :key="item.label">
|
||||
<el-table-column
|
||||
v-if="item.type === 'slot'"
|
||||
:label="item.label"
|
||||
:property="item.property"
|
||||
:width="item.width || ''"
|
||||
:align="item.align || 'center'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!-- 状态 -->
|
||||
<div v-if="item.property == 'deng'">
|
||||
<div v-if="scope.row.deng == 1" class="progressGreen"></div>
|
||||
<div
|
||||
v-if="scope.row.deng == 2"
|
||||
class="progressYellow"
|
||||
></div>
|
||||
<!-- <div v-for="index in 3" :key="index">
|
||||
<img
|
||||
style="width: 30px; height: 30px"
|
||||
v-if="scope.row.zt == index"
|
||||
:src="lampImages[index]"
|
||||
alt="状态"
|
||||
/>
|
||||
</div> -->
|
||||
</div>
|
||||
<!-- <slot
|
||||
:name="item.property"
|
||||
:currentCol="item"
|
||||
:currentData="scope.row"
|
||||
></slot> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
v-else
|
||||
:property="item.property"
|
||||
:label="item.label"
|
||||
:show-overflow-tooltip="false"
|
||||
:width="item.width || ''"
|
||||
:align="item.align || 'center'"
|
||||
/>
|
||||
</template>
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="lampMessage">注:工作日早上8:30自动推送浙政钉</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
@ -371,6 +374,7 @@ const closeDialog = () => {
|
|||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
margin-top: 46px;
|
||||
img {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
|
@ -389,18 +393,7 @@ const closeDialog = () => {
|
|||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.lampMessage {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
letter-spacing: 1px;
|
||||
color: #ff5959;
|
||||
width: 262px;
|
||||
position: absolute;
|
||||
top:81px;
|
||||
left: -198px;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.lampBox {
|
||||
width: 270px;
|
||||
height: 146px;
|
||||
|
@ -449,7 +442,20 @@ const closeDialog = () => {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
.lampMessage {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
letter-spacing: 1px;
|
||||
color: #ff5959;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 17px;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
:deep(.el-table) {
|
||||
--el-table-bg-color: none;
|
||||
|
@ -493,15 +499,15 @@ const closeDialog = () => {
|
|||
width: 181px;
|
||||
height: 15px;
|
||||
margin: 0 auto;
|
||||
border-radius: 8px;
|
||||
border-radius: 6px;
|
||||
background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%);
|
||||
}
|
||||
.progressYellow {
|
||||
width: 181px;
|
||||
height: 15px;
|
||||
border: 2px dashed #ffe1a5;
|
||||
border: 2px solid #ffe1a5;
|
||||
margin: 0 auto;
|
||||
border-radius: 8px;
|
||||
border-radius: 6px;
|
||||
}
|
||||
|
||||
.bo {
|
||||
|
|
|
@ -228,10 +228,10 @@ import { useRouter, useRoute } from "vue-router";
|
|||
import http from "@/utils/request.js";
|
||||
import { ElMessage } from "element-plus";
|
||||
import DialogLamp from "./dialog/dialogRW.vue";
|
||||
|
||||
import lamp1 from "../assets/sy-table/green.gif";
|
||||
import lamp2 from "../assets/sy-table/red.gif";
|
||||
import lamp3 from "../assets/sy-table/yellow.gif";
|
||||
import lamp3 from "../assets/sy-table/lampYellow1.gif";
|
||||
// import lamp3 from "../assets/sy-table/yellow.gif";
|
||||
import lamp4 from "../assets/sy-table/green1.gif";
|
||||
import lamp5 from "../assets/sy-table/red1.gif";
|
||||
import lamp6 from "../assets/sy-table/yellow1.gif";
|
||||
|
|
Loading…
Reference in New Issue