@@ -77,17 +77,96 @@
-->
-
+
-
+ -->
+
+
+
+
+
推送时间：
+
+ {{ data.content.sendTime }}
+
+
+
+
+
+
+
+
+
业务单位:
+
+ {{ data.content.ywdw }}
+
+
+
+
业务负责人:
+
+ {{ data.content.ywfzr }}
+
+
+
+
受理日期:
+
+ {{ data.content.disposalTime }}
+
+
+
+
+
+
+
+
+
办结结果：
+
+ {{ data.content.nr }}
+
+
+
+
办结时间:
+
+ {{ data.content.completionTime }}
+
+
+
+
+
+
+
+
+
核实负责人：
+
+ {{ data.content.verifyName }}
+
+
+
+
核实日期：
+
+ {{ data.content.verifyTime }}
+
+
+
@@ -128,7 +207,7 @@ const props = defineProps({
},
},
tableData: {
- type: Array,
+ type: Object,
default: () => {
return [];
},
@@ -139,14 +218,7 @@ const props = defineProps({
return [];
},
},
- UU: {
- type: Array,
- default: () => {
- return [];
- },
- },
});
-// const emit = defineEmits(["close"]);
// 详情弹框
const dialogShow = ref();
const data = reactive({
@@ -177,19 +249,30 @@ const data = reactive({
stepdata: [
{
title: "预警推送",
- description: "推送时间： 2024.9.15",
+ description: "2024.9.15",
+ sendTime: "",
},
{
title: "业务受理情况",
description: "受理日期： 2024.9.16",
+
+ disposalTime: "",
+ ywdw: "",
+ ywfzr: "",
},
{
title: "办结结果",
description: "办结时间：2024.10.16",
+
+ completionTime: "",
+ nr: "",
},
{
title: "网格核实",
description: "核实日期:2024.10.17",
+
+ verifyName: "",
+ verifyTime: "",
},
],
});
@@ -203,6 +286,8 @@ const onMenu = (val, index) => {
});
data.menu[index].show = true;
// emit("openLCQX", val.bm);
+ console.log("部门", val);
+
data.content.bm = val.bm;
openLCQXs();
};
@@ -213,12 +298,6 @@ const openLCQXs = () => {
)
.then((res) => {
if (res.code == 200) {
- // data.content.sendTime = "";
- // data.content.ywdw = "";
- // data.content.ywfzr = "";
- // data.content.disposalTime = "";
- // data.content.completionTime = "";
- // data.content.nr = "";
// 初始化字段为空
Object.assign(data.content, {
sendTime: "",
@@ -230,10 +309,10 @@ const openLCQXs = () => {
verifyName: "",
verifyTime: "",
});
+ data.active = res.data.length;
if (res.data && res.data.length > 0) {
data.content.sendTime = res.data[0]?.sendTime.split(" ")[0];
- data.content.ywdw = "asdasd ";
data.content.ywdw = res.data[1]?.ywdw;
data.content.ywfzr = res.data[1]?.ywfzr;
data.content.disposalTime = res.data[1]?.disposalTime.split(" ")[0];
@@ -243,9 +322,8 @@ const openLCQXs = () => {
data.content.verifyName = res.data[3]?.verifyName;
data.content.verifyTime = res.data[3]?.verifyTime;
}
- data.stepdata[0].description = `推送时间：${
- data.content.sendTime || "未核实"
- }`;
+ // 预警推送
+ data.stepdata[0].description = ` ${data.content.sendTime || "未核实"}`;
// 业务单位、业务负责人、受理日期
if (
data.content.ywdw &&
@@ -263,9 +341,13 @@ const openLCQXs = () => {
} else {
data.stepdata[2].description = "未核实";
}
- data.stepdata[3].description = `核实负责人：${
- data.content.verifyName || "未核实"
- }\n核实日期： ${data.content.verifyTime || "未核实"}`;
+
+ // 网格核实
+ if (data.content.verifyName && data.content.verifyTime) {
+ data.stepdata[3].description = `核实负责人：${data.content.verifyName} \n 核实日期： ${data.content.verifyTime}`;
+ } else {
+ data.stepdata[3].description = "未核实";
+ }
}
});
};
@@ -295,6 +377,9 @@ watch(
data.menu = props.menu;
data.title = props.title;
data.content = props.tableData;
+ console.log("进度", props.tableData);
+
+ data.active = props.tableData.active;
if (data.menu.length > 0) {
data.menu[0].show = true;
}
@@ -330,11 +415,12 @@ watch(
} else {
data.stepdata[2].description = "未核实";
}
- data.stepdata[3].description = `核实负责人：${
- data.content.verifyName || "未核实"
- }\n核实日期： ${
- data.content.verifyTime || "未核实"
- }`;
+ // 网格核实
+ if (data.content.verifyName && data.content.verifyTime) {
+ data.stepdata[3].description = `核实负责人：${data.content.verifyName} \n 核实日期： ${data.content.verifyTime}`;
+ } else {
+ data.stepdata[3].description = "未核实";
+ }
} else {
// data.menu[0].label = data.content.bt
}
@@ -347,7 +433,6 @@ watch(
// dialogShow.value = newVal;
// if (newVal == true) {
-
// console.log(777, newVal,data.menu, data.content);
data.menu = props.menu;
data.title = props.title;
@@ -365,7 +450,7 @@ watch(
data.content.ywfzr &&
data.content.disposalTime
) {
- data.stepdata[1].description = `业务单位：${data.content.ywdw} \n业务负责人：${data.content.ywfzr}\n受理日期：${data.content.disposalTime}`;
+ data.stepdata[1].description = `业务单位：${data.content.ywdw} \n业务负责人：${data.content.ywfzr} \n受理日期：${data.content.disposalTime}`;
} else {
data.stepdata[1].description = "未核实";
}
@@ -376,11 +461,12 @@ watch(
} else {
data.stepdata[2].description = "未核实";
}
- data.stepdata[3].description = `核实负责人：${
- data.content.verifyName || "未核实"
- }\n核实日期： ${
- data.content.verifyTime || "未核实"
- }`;
+ // 网格核实
+ if (data.content.verifyName && data.content.verifyTime) {
+ data.stepdata[3].description = `核实负责人：${data.content.verifyName} \n 核实日期： ${data.content.verifyTime}`;
+ } else {
+ data.stepdata[3].description = "未核实";
+ }
}
}
// }
@@ -494,6 +580,9 @@ const closeDialog = () => {
display: flex;
align-items: center;
justify-content: space-around;
+ background: rgba(70, 114, 171, 0.36);
+ padding: 16px 12px;
+ box-sizing: border-box;
.contenta {
width: 100%;
// padding: 0 10px;
@@ -576,8 +665,9 @@ const closeDialog = () => {
.conten {
width: 100%;
display: flex;
- // justify-content: center;
justify-content: space-around;
+ margin-top: 26px;
+
.operationFlow {
.titles {
// width: 846px;
@@ -595,14 +685,14 @@ const closeDialog = () => {
}
}
.operationConten {
- width: 1360px;
- // width: 100%;
+ width: 1388px;
height: 249px;
- flex-direction: column;
- background: rgba(70, 114, 171, 0.36);
display: flex;
- align-items: center;
- justify-content: space-evenly;
+ // width: 100%;
+ // align-items: center;
+ // flex-direction: column;
+ // background: rgba(70, 114, 171, 0.36);
+ // justify-content: space-evenly;
.progress {
min-width: 176px;
height: 34px;
@@ -618,13 +708,81 @@ const closeDialog = () => {
}
}
.stepsa {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
// width: 846px;
- text-align: center;
- // display: flex;
// justify-content: center;
.stepsb {
- width: 100%;
- // margin-left: 14%;
+ width: 28%;
+ font-weight: 500;
+ font-size: 16px;
+ font-family: PingFangSC, PingFang SC;
+ color: #c3d2e1;
+ .processTitle {
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ .processimg {
+ width: 48px;
+ height: 48px;
+ margin-right: 10px;
+ background-image: url(@/assets/images/sy_details_LC/fwlc8.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ // background-size: 48px 48px;
+ text-align: center;
+ line-height: 48px;
+ flex-shrink: 0; /* 禁止缩小 */
+ }
+ .processimg1 {
+ background-image: url(@/assets/images/sy_details_LC/fwlc6.png);
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
+ }
+ .processTl {
+ // width: 160px;
+ font-size: 18px;
+ white-space: nowrap;
+ }
+ .processline {
+ // width: 100%;
+ flex-grow: 1;
+ height: 1px;
+ background-color: #2e96ff;
+ margin-left: 10px;
+ margin-right: 10px;
+ }
+ }
+
+ .processEvent {
+ display: flex;
+ flex-direction: column;
+ .processLite {
+ // display: flex;
+ display: block;
+ .processLiteTitle {
+ display: inline-block;
+ width: 100px;
+ text-align: justify; /* 尝试两端对齐 */
+ text-justify: distribute; /* 中文字符均匀分布 */
+ vertical-align: top; /* 保持对齐 */
+ }
+ .processLiteContent {
+ display: inline-block;
+ width: 150px;
+ }
+ }
+ }
+ }
+ .stepsc {
+ width: 16%;
+ .processLiteTitle {
+ width: 100px !important;
+ }
+ .processLiteContent {
+ width: 110px !important;
+ }
}
}
}
diff --git a/src/view/guide.vue b/src/view/guide.vue
index c11a227..aca4c5f 100644
--- a/src/view/guide.vue
+++ b/src/view/guide.vue
@@ -200,13 +200,18 @@ const login = () => {
if (routers.query.token) {
const encryptedText = routers.query.token;
const decodedText = decrypt(encryptedText, ENCODED_KEY);
- // console.log("Decrypted Text:", decodedText);
var tokenU = decodedText;
+ // console.log("Decrypted Text:", decodedText);
// if (getCookie("lytoken")) {
// } else {
// document.cookie = `lytoken=${tokenU}`;
// }
+
+
+
var token = tokenU;
+ // var token= 'Bearer 6b0e380b4a8f46baae4923f83faf670d';
+ // var token= '6b0e380b4a8f46baae4923f83faf670d';
tools.data.set("token", token);
tools.data.set("type", 2);
getMenu();
@@ -216,7 +221,8 @@ const login = () => {
window.location.href = backurl;
tools.data.remove("backUrl");
}
- } else {
+ }
+ else {
// var tokenPd = getCookie("lytoken");
var tokenLogin=tools.data.get("token");
if (!tokenLogin) {
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 36986e6..318ae1c 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -605,7 +605,7 @@ const push = reactive({
});
// 处置流程
const Process = reactive({
- title: "服务链流程",
+ title: "服务处置流程",
data: {
yw: "民政局-社会救助科",
fzr: "杨*",
@@ -614,6 +614,7 @@ const Process = reactive({
show: true, //表头显示
sfzhm: "",
xh: "",
+ active: 0,//流程进度
name: "",
time: "2024.10.16",
@@ -627,8 +628,6 @@ const Process = reactive({
nr: "未核实",
verifyName: "未核实",
verifyTime: "未核实",
-
-
},
menu: [],
});
@@ -955,17 +954,18 @@ const openLC = (val) => {
// });
openLCQX();
- // dialogShowProcess.value = true;
} else {
Process.data.show = true;
Process.data.yw = "医保局-龙游县医疗保障事业管理中心";
Process.data.fzr = "周*珊，伊*田，杨**";
Process.data.bt = data.name;
- Process.menu.push({
- label: data.name,
+ res.data.forEach((item, index) => {
+ Process.menu.push({
+ label: data.name,
+ bm: item.bm,
+ });
});
openLCQX();
- // dialogShowProcess.value = true;
}
}
});
@@ -986,13 +986,14 @@ const openLCQX = () => {
Process.data.nr = "";
Process.data.verifyName = "";
Process.data.verifyTime = "";
-
+ Process.data.active = res.data.length;
if (res.data && res.data.length > 0) {
Process.data.sendTime = res.data[0]?.sendTime.split(" ")[0];
Process.data.ywdw = res.data[1]?.ywdw;
Process.data.ywfzr = res.data[1]?.ywfzr;
Process.data.disposalTime = res.data[1]?.disposalTime.split(" ")[0];
- Process.data.completionTime = res.data[2]?.completionTime.split(" ")[0];
+ Process.data.completionTime =
+ res.data[2]?.completionTime.split(" ")[0];
Process.data.nr = res.data[2]?.nr;
Process.data.verifyName = res.data[3]?.verifyName;
Process.data.verifyTime = res.data[3]?.verifyTime;
diff --git a/vite.config.js b/vite.config.js
index 37e4e38..e4845bb 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,7 +15,7 @@ export default defineConfig({
// 第一个代理
"/api": {
// 匹配到啥来进行方向代理
- target: "http://10.0.0.35:8095/", //刘进
+ target: "http://192.168.2.80:8095/", //刘进
// target: "https://jzzf.longyou.gov.cn:998/", //线上
// target: "http://220.191.238.50:996/", //线上
// target: "https://zzdyyfb.dsjj.qz.gov.cn/web/mgop/gov-open/zj/2002428903/reserved/", //线上
-