Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc
This commit is contained in:
commit
2e45ee750e
Binary file not shown.
|
After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 157 KiB |
|
|
@ -39,63 +39,72 @@
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 100%; height: calc(100% - 110px)">
|
||||
<div style="width: 100%; height: calc(100% - 110px)" class="table-els">
|
||||
<div class="tabelHead">
|
||||
<div><span>姓名：</span>{{ data.character.xm }}</div>
|
||||
<div><span>地址：</span>{{ data.character.dz }}</div>
|
||||
<div><span>年龄：</span>{{ data.character.age }}</div>
|
||||
<div><span>标签：</span>{{ data.character.titleName }}</div>
|
||||
<div class="status">
|
||||
<span>状态：</span><img :src="lampImages[data.character.zt]" />
|
||||
<span>状态：</span>
|
||||
<img :src="lampImages[data.character.zt]" @click="escalation" />
|
||||
<div class="lampBox" v-if="clicked">
|
||||
<div class="lampTitle">确定要上报吗?</div>
|
||||
<div class="lampBtn">
|
||||
<div class="confirm" @click="confirmEvent()">上报</div>
|
||||
<div class="cancel" @click="cancelEvent()">取消</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="table_zt">
|
||||
<el-table
|
||||
:data="data.tableData"
|
||||
height="100%"
|
||||
:key="tableKey"
|
||||
:header-cell-style="{ background: '#008FCD' }"
|
||||
@row-click="handleRowClick"
|
||||
>
|
||||
<template v-for="item in data.columns" :key="item.label">
|
||||
<el-table-column
|
||||
v-if="item.type === 'slot'"
|
||||
:show-overflow-tooltip="true"
|
||||
:label="item.label"
|
||||
:property="item.property"
|
||||
:width="item.width || ''"
|
||||
:align="item.align || 'center'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!-- 状态 -->
|
||||
<div v-if="item.property == 'zt'">
|
||||
<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
|
||||
|
||||
<el-table
|
||||
:data="data.tableData"
|
||||
height="100%"
|
||||
:key="tableKey"
|
||||
:header-cell-style="{ background: '#008FCD' }"
|
||||
@row-click="handleRowClick"
|
||||
>
|
||||
<template v-for="item in data.columns" :key="item.label">
|
||||
<el-table-column
|
||||
v-if="item.type === 'slot'"
|
||||
:show-overflow-tooltip="true"
|
||||
:label="item.label"
|
||||
:property="item.property"
|
||||
:width="item.width || ''"
|
||||
:align="item.align || 'center'"
|
||||
>
|
||||
<template #default="scope">
|
||||
<!-- 状态 -->
|
||||
<div v-if="item.property == 'zt'">
|
||||
<div v-if="scope.row.zt == 1" class="progressGreen"></div>
|
||||
<div v-if="scope.row.zt == 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>
|
||||
</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>
|
||||
|
||||
<div class="pagePart">
|
||||
|
|
@ -119,7 +128,7 @@ import {
|
|||
onMounted,
|
||||
reactive,
|
||||
ref,
|
||||
onBeforeMount,
|
||||
onBeforeUnmount,
|
||||
defineProps,
|
||||
watch,
|
||||
nextTick,
|
||||
|
|
@ -135,6 +144,7 @@ import lamp6 from "../../assets/sy-table/yellow1.gif";
|
|||
import lamp7 from "../../assets/sy-table/lampGreen3.png";
|
||||
import lamp8 from "../../assets/sy-table/lampRed3.png";
|
||||
import lamp9 from "../../assets/sy-table/lampYellow3.png";
|
||||
import { ElMessage } from "element-plus";
|
||||
|
||||
const router = useRouter();
|
||||
const routers = useRoute();
|
||||
|
|
@ -173,7 +183,7 @@ const props = defineProps({
|
|||
required: true,
|
||||
},
|
||||
});
|
||||
const emit = defineEmits(["close", "handle", "loadTables", "openMessage"]);
|
||||
const emit = defineEmits(["close", "handle", "openMessage"]);
|
||||
|
||||
const handleRowClick = (row, column, event) => {
|
||||
if (props.dj) {
|
||||
|
|
@ -183,9 +193,29 @@ const handleRowClick = (row, column, event) => {
|
|||
// query: { identNo: row.identNo, type: "detail" },
|
||||
// });
|
||||
// row 是当前行的数据
|
||||
emit("openMessage", { identNo: row.identNo });
|
||||
// emit("openMessage", { identNo: row.identNo });
|
||||
}
|
||||
};
|
||||
// 上报
|
||||
const clicked = ref(false);
|
||||
const lampBox = ref(null);
|
||||
const escalation = () => {
|
||||
if (data.character.zt !== 1) {
|
||||
clicked.value = true;
|
||||
}
|
||||
console.log(clicked.value);
|
||||
};
|
||||
const confirmEvent = () => {
|
||||
console.log("confirm!");
|
||||
ElMessage.success({
|
||||
message: `上报成功`,
|
||||
offset: 100, // 距离窗口顶部的偏移量
|
||||
});
|
||||
clicked.value = false;
|
||||
};
|
||||
const cancelEvent = () => {
|
||||
clicked.value = false;
|
||||
};
|
||||
|
||||
// 详情弹框
|
||||
const dialogShow = ref();
|
||||
|
|
@ -241,13 +271,13 @@ onMounted(() => {
|
|||
data.title = props.title;
|
||||
data.tableData = props.tableData;
|
||||
console.log("状态", data);
|
||||
|
||||
const paginationTotal = document.querySelector(".el-pagination__total");
|
||||
// const paginationTotal = document.querySelector(".el-pagination__total");
|
||||
// paginationTotal.innerText = `总共 ${props.pagination.total} 组数据`;
|
||||
});
|
||||
|
||||
const closeDialog = () => {
|
||||
dialogShow.value = false;
|
||||
clicked.value = false;
|
||||
emit("close");
|
||||
};
|
||||
//分页器
|
||||
|
|
@ -255,6 +285,7 @@ const handle = (current) => {
|
|||
emit("handle", current);
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
:deep(.el-dialog) {
|
||||
--el-dialog-bg-color: none;
|
||||
|
|
@ -267,7 +298,7 @@ const handle = (current) => {
|
|||
}
|
||||
|
||||
.tabelPart {
|
||||
padding: 16px;
|
||||
padding: 16px 32px;
|
||||
background: linear-gradient(
|
||||
270deg,
|
||||
rgba(0, 77, 131, 0.69) 0%,
|
||||
|
|
@ -292,6 +323,7 @@ const handle = (current) => {
|
|||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
img {
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
|
|
@ -303,8 +335,57 @@ const handle = (current) => {
|
|||
.status {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
.lampBox {
|
||||
width: 270px;
|
||||
height: 146px;
|
||||
position: absolute;
|
||||
top: 40px;
|
||||
right: -6px;
|
||||
background-image: url(@/assets/sy-table/popk.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
z-index: 999;
|
||||
.lampTitle {
|
||||
text-align: center;
|
||||
// padding-top: 33px;
|
||||
margin: 33px 0 30px 0;
|
||||
font-size: 16px;
|
||||
font-weight: 500;
|
||||
font-family: PingFangSC, PingFang SC;
|
||||
color: #ffffff;
|
||||
line-height: 22px;
|
||||
letter-spacing: 1px;
|
||||
}
|
||||
.lampBtn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
.confirm {
|
||||
width: 82.5px;
|
||||
height: 30.5px;
|
||||
line-height: 30.5px;
|
||||
text-align: center;
|
||||
background-image: url(@/assets/sy-table/btn1.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
margin-right: 9px;
|
||||
}
|
||||
.cancel {
|
||||
width: 82.5px;
|
||||
height: 30.5px;
|
||||
line-height: 30.5px;
|
||||
text-align: center;
|
||||
background-image: url(@/assets/sy-table/btn2.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.el-table) {
|
||||
--el-table-bg-color: none;
|
||||
--el-table-tr-bg-color: none;
|
||||
|
|
@ -343,6 +424,27 @@ const handle = (current) => {
|
|||
}
|
||||
}
|
||||
|
||||
.progressGreen {
|
||||
width: 106px;
|
||||
height: 8px;
|
||||
background: linear-gradient(358deg, #21eda8 0%, #8bffcd 100%);
|
||||
border-radius: 8px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.progressYellow {
|
||||
width: 106px;
|
||||
height: 8px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid;
|
||||
margin: 0 auto;
|
||||
border-image: linear-gradient(
|
||||
270deg,
|
||||
rgba(255, 197, 117, 1),
|
||||
rgba(255, 226, 151, 1)
|
||||
)
|
||||
1 1;
|
||||
}
|
||||
|
||||
.bo {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
|
|
@ -385,5 +487,4 @@ const handle = (current) => {
|
|||
height: 19px;
|
||||
}
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 97.5%; position: relative">
|
||||
<div style="width: 97.5%; position: relative" class="ta">
|
||||
<div class="backgroundVirtual"></div>
|
||||
<el-table
|
||||
border
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 97.5%; position: relative">
|
||||
<div style="width: 97.5%; position: relative" class="ta">
|
||||
<div class="backgroundVirtual"></div>
|
||||
<el-table
|
||||
border
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
<!-- <div v-else class="text_1">未享受对象</div> -->
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 97.5%; position: relative">
|
||||
<div style="width: 97.5%; position: relative" class="ta">
|
||||
<div class="backgroundVirtual"></div>
|
||||
<el-table
|
||||
border
|
||||
|
|
@ -390,12 +390,12 @@ const formData = reactive({
|
|||
{
|
||||
label: "服务内容",
|
||||
property: "fwnr",
|
||||
align: "left",
|
||||
align: "center",
|
||||
},
|
||||
{
|
||||
label: "结果",
|
||||
property: "zt",
|
||||
width: "200",
|
||||
width: "260",
|
||||
align: "center",
|
||||
type: "slot",
|
||||
},
|
||||
|
|
@ -656,6 +656,22 @@ const formData = reactive({
|
|||
PopulationLabel: "收入型低保",
|
||||
sfzhm: "281889",
|
||||
},
|
||||
{
|
||||
fullName: "伍*凤",
|
||||
zt: 2,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "46",
|
||||
PopulationLabel: "收入型低保",
|
||||
sfzhm: "281889",
|
||||
},
|
||||
{
|
||||
fullName: "伍*凤",
|
||||
zt: 3,
|
||||
address: "衢州市龙游县模******居民委员会",
|
||||
age: "46",
|
||||
PopulationLabel: "收入型低保",
|
||||
sfzhm: "281889",
|
||||
},
|
||||
{
|
||||
fullName: "吴*琴",
|
||||
zt: 1,
|
||||
|
|
@ -747,7 +763,7 @@ const formData = reactive({
|
|||
},
|
||||
{
|
||||
fwnr: "80周岁以上老年人每年，80周岁以下老年人每两年可申请免费评估一次。",
|
||||
zt: 3,
|
||||
zt: 1,
|
||||
identNo: "309601",
|
||||
},
|
||||
{
|
||||
|
|
@ -845,7 +861,7 @@ const formData = reactive({
|
|||
{
|
||||
label: "结果",
|
||||
property: "zt",
|
||||
width: "200",
|
||||
width: "260",
|
||||
align: "center",
|
||||
type: "slot",
|
||||
},
|
||||
|
|
@ -1341,7 +1357,7 @@ const formData = reactive({
|
|||
},
|
||||
{
|
||||
fwnr: "经济困难老年人发放养老护理补贴每月125",
|
||||
zt: 3,
|
||||
zt: 1,
|
||||
identNo: "309601",
|
||||
},
|
||||
],
|
||||
|
|
@ -1438,7 +1454,7 @@ const formData = reactive({
|
|||
{
|
||||
label: "结果",
|
||||
property: "zt",
|
||||
width: "200",
|
||||
width: "260",
|
||||
align: "center",
|
||||
type: "slot",
|
||||
},
|
||||
|
|
@ -1548,7 +1564,7 @@ const formData = reactive({
|
|||
},
|
||||
{
|
||||
fwnr: "经济困难老年人发放养老护理补贴每月125",
|
||||
zt: 3,
|
||||
zt: 1,
|
||||
identNo: "309601",
|
||||
},
|
||||
],
|
||||
|
|
@ -1634,7 +1650,7 @@ const formData = reactive({
|
|||
{
|
||||
label: "结果",
|
||||
property: "zt",
|
||||
width: "200",
|
||||
width: "260",
|
||||
align: "center",
|
||||
type: "slot",
|
||||
},
|
||||
|
|
@ -1777,7 +1793,7 @@ const formData = reactive({
|
|||
zt: 1,
|
||||
xx: "寺后小学",
|
||||
bzlx: "原外地建档",
|
||||
identNo:'369167',
|
||||
identNo: "369167",
|
||||
},
|
||||
{
|
||||
xm: "何*媱",
|
||||
|
|
@ -1877,7 +1893,7 @@ const formData = reactive({
|
|||
},
|
||||
{
|
||||
fwnr: "80周岁以上老年人每年，80周岁以下老年人每两年可申请免费评估一次。",
|
||||
zt: 3,
|
||||
zt: 2,
|
||||
identNo: "309601",
|
||||
},
|
||||
{
|
||||
|
|
@ -1964,7 +1980,7 @@ const formData = reactive({
|
|||
{
|
||||
label: "结果",
|
||||
property: "zt",
|
||||
width: "200",
|
||||
width: "260",
|
||||
align: "center",
|
||||
type: "slot",
|
||||
},
|
||||
|
|
@ -2102,12 +2118,12 @@ const formData = reactive({
|
|||
},
|
||||
],
|
||||
tableData2: [
|
||||
{
|
||||
{
|
||||
xm: "何*媱",
|
||||
zt: 1,
|
||||
xx: "寺后小学",
|
||||
bzlx: "原外地建档",
|
||||
identNo:'369167',
|
||||
identNo: "369167",
|
||||
},
|
||||
{
|
||||
xm: "何*媱",
|
||||
|
|
@ -2207,7 +2223,7 @@ const formData = reactive({
|
|||
},
|
||||
{
|
||||
fwnr: "80周岁以上老年人每年，80周岁以下老年人每两年可申请免费评估一次。",
|
||||
zt: 3,
|
||||
zt: 1,
|
||||
identNo: "309601",
|
||||
},
|
||||
{
|
||||
|
|
@ -2522,7 +2538,6 @@ const statusDetails = (val) => {
|
|||
titleName: formData.name,
|
||||
};
|
||||
dialogShow.value = true;
|
||||
|
||||
}
|
||||
break;
|
||||
case "义务教育学生营养改善计划":
|
||||
|
|
@ -2541,7 +2556,6 @@ const statusDetails = (val) => {
|
|||
titleName: formData.name,
|
||||
};
|
||||
dialogShow.value = true;
|
||||
|
||||
}
|
||||
break;
|
||||
default:
|
||||
|
|
@ -2661,7 +2675,6 @@ const handleRowClick = (row) => {
|
|||
path: `/home/index/person`,
|
||||
query: { identNo: data.identNo, type: "detail" },
|
||||
});
|
||||
|
||||
}
|
||||
break;
|
||||
case "义务教育学生营养改善计划":
|
||||
|
|
@ -2747,7 +2760,7 @@ const listAssignment = () => {
|
|||
}
|
||||
};
|
||||
onMounted(() => {
|
||||
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
if (routers.query.name) {
|
||||
data.name = routers.query.name;
|
||||
listAssignment();
|
||||
|
|
@ -2956,7 +2969,7 @@ onMounted(() => {
|
|||
<style lang="scss" scoped>
|
||||
// 表格
|
||||
:deep(.el-table) {
|
||||
background: rgba(32, 64, 115, 1) ;
|
||||
background: rgba(32, 64, 115, 1);
|
||||
color: #ffffff;
|
||||
--el-table-tr-bg-color: none;
|
||||
--el-table-header-bg-color: none;
|
||||
|
|
@ -3264,37 +3277,39 @@ onMounted(() => {
|
|||
</style>
|
||||
<style lang="scss" scoped>
|
||||
// 分页
|
||||
:deep(.el-pagination > .is-last) {
|
||||
color: #fff !important ;
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
margin: 0;
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li.is-active) {
|
||||
background: rgba(0, 144, 255, 0.49);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev:disabled) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next:disabled) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
.ta {
|
||||
:deep(.el-pagination > .is-last) {
|
||||
color: #fff !important ;
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
margin: 0;
|
||||
}
|
||||
:deep(.el-pagination.is-background .el-pager li.is-active) {
|
||||
background: rgba(0, 144, 255, 0.49);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev:disabled) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next:disabled) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-prev) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
:deep(.el-pagination.is-background .btn-next) {
|
||||
color: #fff;
|
||||
background: rgba(255, 255, 255, 0.14);
|
||||
border: 1px solid #6bade1;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -676,7 +676,7 @@ const sevenYX = (name) => {
|
|||
};
|
||||
|
||||
onMounted(() => {
|
||||
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||
|
||||
if (localStorage.getItem("taps1") !== undefined) {
|
||||
data.tapbody = JSON.parse(localStorage.getItem("taps1"));
|
||||
|
|
@ -696,6 +696,7 @@ onMounted(() => {
|
|||
width: 100%;
|
||||
display: flex;
|
||||
margin-top: 112px;
|
||||
|
||||
.displayFlex {
|
||||
height: 100%;
|
||||
display: flex;
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ export default defineConfig({
|
|||
// 第一个代理
|
||||
"/api": {
|
||||
// 匹配到啥来进行方向代理
|
||||
target: "http://10.0.0.65:8095/", //刘进
|
||||
// target: "http://220.191.238.50:996/", //线上
|
||||
// target: "http://10.0.0.65:8095/", //刘进
|
||||
target: "http://220.191.238.50:996/", //线上
|
||||
changeOrigin: true, //是否支持跨域
|
||||
//rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue