This commit is contained in:
commit
501f88793a
|
@ -50,6 +50,7 @@
|
||||||
<img :src="lampImages[data.character.zt]" @click="escalation" />
|
<img :src="lampImages[data.character.zt]" @click="escalation" />
|
||||||
<div class="lampBox" v-if="clicked">
|
<div class="lampBox" v-if="clicked">
|
||||||
<div class="lampTitle">确定要上报吗?</div>
|
<div class="lampTitle">确定要上报吗?</div>
|
||||||
|
<div class="lampMessage">注:工作日早上8:30,自动推送</div>
|
||||||
<div class="lampBtn">
|
<div class="lampBtn">
|
||||||
<div class="confirm" @click="confirmEvent()">上报</div>
|
<div class="confirm" @click="confirmEvent()">上报</div>
|
||||||
<div class="cancel" @click="cancelEvent()">取消</div>
|
<div class="cancel" @click="cancelEvent()">取消</div>
|
||||||
|
@ -144,7 +145,8 @@ import lamp7 from "../../assets/sy-table/lampGreen3.png";
|
||||||
import lamp8 from "../../assets/sy-table/lampRed3.png";
|
import lamp8 from "../../assets/sy-table/lampRed3.png";
|
||||||
import lamp9 from "../../assets/sy-table/lampYellow3.png";
|
import lamp9 from "../../assets/sy-table/lampYellow3.png";
|
||||||
import { ElMessage } from "element-plus";
|
import { ElMessage } from "element-plus";
|
||||||
|
import http from "@/utils/request.js";
|
||||||
|
import { reRendering } from "element-plus/es/components/watermark/src/utils.mjs";
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const routers = useRoute();
|
const routers = useRoute();
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
|
@ -203,13 +205,28 @@ const escalation = () => {
|
||||||
}
|
}
|
||||||
console.log(clicked.value);
|
console.log(clicked.value);
|
||||||
};
|
};
|
||||||
|
|
||||||
const confirmEvent = () => {
|
const confirmEvent = () => {
|
||||||
console.log("confirm!");
|
console.log("confirm!", data.character);
|
||||||
ElMessage.success({
|
let ReportedDto = {
|
||||||
message: `上报成功`,
|
name: data.character.xm,
|
||||||
offset: 100, // 距离窗口顶部的偏移量
|
address: data.character.dz,
|
||||||
|
phone: "",
|
||||||
|
type: data.character.id,
|
||||||
|
};
|
||||||
|
http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => {
|
||||||
|
if (res.code == 200) {
|
||||||
|
ElMessage.success({
|
||||||
|
message: `上报成功`,
|
||||||
|
});
|
||||||
|
clicked.value = false;
|
||||||
|
}else{
|
||||||
|
ElMessage.error({
|
||||||
|
message: res.message,
|
||||||
|
});
|
||||||
|
clicked.value = false;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
clicked.value = false;
|
|
||||||
};
|
};
|
||||||
const cancelEvent = () => {
|
const cancelEvent = () => {
|
||||||
clicked.value = false;
|
clicked.value = false;
|
||||||
|
@ -348,7 +365,7 @@ const handle = (current) => {
|
||||||
.lampTitle {
|
.lampTitle {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
// padding-top: 33px;
|
// padding-top: 33px;
|
||||||
margin: 33px 0 30px 0;
|
margin: 28px 0 10px 0;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
font-family: PingFangSC, PingFang SC;
|
font-family: PingFangSC, PingFang SC;
|
||||||
|
@ -356,6 +373,17 @@ const handle = (current) => {
|
||||||
line-height: 22px;
|
line-height: 22px;
|
||||||
letter-spacing: 1px;
|
letter-spacing: 1px;
|
||||||
}
|
}
|
||||||
|
.lampMessage {
|
||||||
|
text-align: center;
|
||||||
|
// padding-top: 33px;
|
||||||
|
margin: 10px 0 14px 0;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: PingFangSC, PingFang SC;
|
||||||
|
color: red;
|
||||||
|
line-height: 22px;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
}
|
||||||
.lampBtn {
|
.lampBtn {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
|
@ -2389,6 +2389,7 @@ const statusDetails = (val) => {
|
||||||
tableType.character = {
|
tableType.character = {
|
||||||
...val,
|
...val,
|
||||||
age: val.nl,
|
age: val.nl,
|
||||||
|
id: routers.query.id,
|
||||||
// dz: val.address,
|
// dz: val.address,
|
||||||
titleName: formData.name,
|
titleName: formData.name,
|
||||||
};
|
};
|
||||||
|
@ -2631,9 +2632,9 @@ const updateFormDataAndTable = (formDataName, tableData) => {
|
||||||
data.column_2 = tableData.column_2;
|
data.column_2 = tableData.column_2;
|
||||||
data.tableData = tableData.tableData1; //列表1
|
data.tableData = tableData.tableData1; //列表1
|
||||||
data.tableData1 = tableData.tableData2; //列表2
|
data.tableData1 = tableData.tableData2; //列表2
|
||||||
data.tableData3 = tableData.tableData3; //列表3 状态假数据
|
data.tableData3 = tableData.tableData3; //列表3 状态假数据(全部未筛选)
|
||||||
pagination1.total = tableData.tableData2.length; //中间数据总数
|
pagination1.total = tableData.tableData2.length;
|
||||||
handlePagination1(1); //中间分页的数据截取
|
handlePagination1(1);
|
||||||
if (formDataName == "低保") {
|
if (formDataName == "低保") {
|
||||||
selectedLamp1.red = true;
|
selectedLamp1.red = true;
|
||||||
selectedLamp.value = 1;
|
selectedLamp.value = 1;
|
||||||
|
|
|
@ -4057,7 +4057,7 @@ const reset_font2 = () => {
|
||||||
"scale(" + width / 1920 + "," + height / 1080 + ")";
|
"scale(" + width / 1920 + "," + height / 1080 + ")";
|
||||||
};
|
};
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
// tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
|
||||||
loadingss.value = true;
|
loadingss.value = true;
|
||||||
reset_font();
|
reset_font();
|
||||||
await getXzsj();
|
await getXzsj();
|
||||||
|
|
|
@ -196,10 +196,10 @@ const goto = (val) => {
|
||||||
];
|
];
|
||||||
// 检查数组val.name中是否存在availableRoutes。
|
// 检查数组val.name中是否存在availableRoutes。
|
||||||
if (availableRoutes.includes(val.name)) {
|
if (availableRoutes.includes(val.name)) {
|
||||||
// router.push({
|
router.push({
|
||||||
// path: "/home/index/table/details",
|
path: "/home/index/table/details",
|
||||||
// query: { name: val.name },
|
query: { name: val.name, id: val.id },
|
||||||
// });
|
});
|
||||||
} else {
|
} else {
|
||||||
ElMessage.warning({
|
ElMessage.warning({
|
||||||
message: `${val.name}暂无数据!`,
|
message: `${val.name}暂无数据!`,
|
||||||
|
@ -642,7 +642,7 @@ const getData = async (name, fullName) => {
|
||||||
res.data.forEach((item, index) => {
|
res.data.forEach((item, index) => {
|
||||||
const imageIndex = index % data.Bj.length;
|
const imageIndex = index % data.Bj.length;
|
||||||
data.tabPublicService.push({
|
data.tabPublicService.push({
|
||||||
id: index,
|
id: item.id,
|
||||||
Bj: data.Bj[imageIndex],
|
Bj: data.Bj[imageIndex],
|
||||||
name: item.sx,
|
name: item.sx,
|
||||||
text: item.bmfxqk,
|
text: item.bmfxqk,
|
||||||
|
@ -983,16 +983,16 @@ onMounted(() => {
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.tab{
|
.tab {
|
||||||
:deep(.el-table) {
|
:deep(.el-table) {
|
||||||
background: rgba(32, 64, 115, 1);
|
background: rgba(32, 64, 115, 1);
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
--el-table-border-color: rgba(57, 107, 161);
|
--el-table-border-color: rgba(57, 107, 161);
|
||||||
--el-table-tr-bg-color: none;
|
--el-table-tr-bg-color: none;
|
||||||
--el-table-header-bg-color: none;
|
--el-table-header-bg-color: none;
|
||||||
--el-table-header-text-color: none;
|
--el-table-header-text-color: none;
|
||||||
border: 1px solid #7aceff;
|
border: 1px solid #7aceff;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// :deep(.el-table tr) {
|
// :deep(.el-table tr) {
|
||||||
|
|
|
@ -15,8 +15,8 @@ export default defineConfig({
|
||||||
// 第一个代理
|
// 第一个代理
|
||||||
"/api": {
|
"/api": {
|
||||||
// 匹配到啥来进行方向代理
|
// 匹配到啥来进行方向代理
|
||||||
// target: "http://10.0.0.65:8095/", //刘进
|
target: "http://10.0.0.65:8095/", //刘进
|
||||||
target: "http://220.191.238.50:996/", //线上
|
// target: "http://220.191.238.50:996/", //线上
|
||||||
changeOrigin: true, //是否支持跨域
|
changeOrigin: true, //是否支持跨域
|
||||||
//rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空,这个
|
//rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空,这个
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue