From b316fe9c6aff28c0301d1f2806daf2c2ce124506 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Wed, 16 Oct 2024 17:29:44 +0800
Subject: [PATCH 1/3] gx
---
src/view/dialog/dialogRW.vue | 3 +
src/view/echarts_infabt/eP1.vue | 1 +
src/view/echarts_infabt/eP2.vue | 32 ++++----
src/view/echarts_infabt/eP3.vue | 2 +-
src/view/echarts_infabt/eP4.vue | 138 ++++++++++++++------------------
src/view/sy_details.vue | 15 ++++
src/view/table_gk/gk_infant.vue | 22 ++---
7 files changed, 108 insertions(+), 105 deletions(-)
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index 5e5433e..b39ed58 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -282,6 +282,9 @@ watch(
let obj = {
deng: 1,
bzlx: item.bzlx,
+ qtbm: item.qtbm,
+ ywfzrsj: item.ywfzrsj,
+ ywfzrzzd: item.ywfzrzzd,
};
data.tableData.push(obj);
});
diff --git a/src/view/echarts_infabt/eP1.vue b/src/view/echarts_infabt/eP1.vue
index af6dc98..8cb0e66 100644
--- a/src/view/echarts_infabt/eP1.vue
+++ b/src/view/echarts_infabt/eP1.vue
@@ -212,6 +212,7 @@ watch(
data.list = props.list;
data.list2 = props.list2;
data.year = props.year;
+ data.bg = [];
data.year.forEach(() => {
data.bg.push(0);
});
diff --git a/src/view/echarts_infabt/eP2.vue b/src/view/echarts_infabt/eP2.vue
index a8b21a4..c41f871 100644
--- a/src/view/echarts_infabt/eP2.vue
+++ b/src/view/echarts_infabt/eP2.vue
@@ -125,34 +125,34 @@ const getOption = () => {
padding: [3, -3, 3, -3],
// 标签格式化
formatter: function (params) {
- return `{b|${params.value}%}{a|${params.name}}`;
+ return `{a|${params.value}%}{a|${params.name}}`;
},
// 富文本样式
rich: {
// a样式
a: {
// 内边距
- padding: [-14, 10, 40, -70],
+ padding: [10, 0, 30, -60],
// 字体大小
- fontSize: "12px",
+ fontSize: "15px",
// 字体
fontFamily: "MicrosoftYaHei",
// 字体颜色
color: "#fff",
},
// b样式
- b: {
- // 内边距
- padding: [0, 10, 55, -70],
- // 字体大小
- fontSize: "15px",
- // 字体
- fontFamily: "MicrosoftYaHei-Bold, MicrosoftYaHei",
- // 字体粗细
- fontWeight: "bold",
- // 字体颜色
- color: "#fff",
- },
+ // b: {
+ // // 内边距
+ // padding: [0, 10, 55, -70],
+ // // 字体大小
+ // fontSize: "15px",
+ // // 字体
+ // fontFamily: "MicrosoftYaHei-Bold, MicrosoftYaHei",
+ // // 字体粗细
+ // fontWeight: "bold",
+ // // 字体颜色
+ // color: "#fff",
+ // },
},
},
// label: {
@@ -166,9 +166,11 @@ const getOption = () => {
// padding: [0, -80],
// },
labelLine: {
+ show: false,
normal: {
length: 40, // 改变标示线的长度
length2: 40,
+ align: 'right',
// lineStyle: {
// color: "white", // 改变标示线的颜色
// },
diff --git a/src/view/echarts_infabt/eP3.vue b/src/view/echarts_infabt/eP3.vue
index de288b3..8ec0554 100644
--- a/src/view/echarts_infabt/eP3.vue
+++ b/src/view/echarts_infabt/eP3.vue
@@ -301,7 +301,7 @@ const getOption = () => {
color: "#fff",
fontSize: 16,
formatter: function (value) {
- return value.length > 3 ? value.slice(0, 2) + "..." : value;
+ return value.length > 4 ? value.slice(0, 6) + "..." : value;
},
},
},
diff --git a/src/view/echarts_infabt/eP4.vue b/src/view/echarts_infabt/eP4.vue
index 629215b..0c722d2 100644
--- a/src/view/echarts_infabt/eP4.vue
+++ b/src/view/echarts_infabt/eP4.vue
@@ -2,7 +2,7 @@
-
-
\ No newline at end of file
+
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 82fc978..6e993bc 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -427,6 +427,21 @@ const tableType = reactive({
label: "服务内容",
property: "bzlx",
},
+
+ {
+ label: "牵头单位",
+ property: "qtbm",
+ }, {
+ label: "业务科室",
+ property: "ywfzrzzd",
+ }, {
+ label: "负责人",
+ property: "ywfzrzzd",
+ }, {
+ label: "联系电话",
+ property: "ywfzrsj",
+ },
+
{
label: "结果",
property: "deng",
diff --git a/src/view/table_gk/gk_infant.vue b/src/view/table_gk/gk_infant.vue
index c599271..ed556a4 100644
--- a/src/view/table_gk/gk_infant.vue
+++ b/src/view/table_gk/gk_infant.vue
@@ -45,7 +45,7 @@
src="@/assets/images/hygiene/jt.png"
class="right5_center"
/>
- {{ data.mz.mjzrc }}
+ {{ data.mz.mjzrc }} 人
@@ -56,7 +56,7 @@
src="@/assets/images/hygiene/jt.png"
class="right5_center"
/>
-
{{ data.mz.zyrs }}
+
{{ data.mz.zyrs }}人
@@ -70,7 +70,7 @@
src="@/assets/images/hygiene/jt.png"
class="right5_center"
/>
- {{ data.mz.zyrs }}
+ {{ data.mz.zyrs }}个
@@ -81,7 +81,7 @@
src="@/assets/images/hygiene/jt.png"
class="right5_center"
/>
-
{{ data.mz.zyrs }}
+
{{ data.mz.zyrs }}家
@@ -516,7 +516,7 @@ onMounted(() => {});
background-size: 100% 100%;
}
.center_top {
- width: 95%;
+ width: 98%;
// height: 150px;
display: flex;
flex-direction: column;
@@ -531,9 +531,10 @@ onMounted(() => {});
.item5 {
display: flex;
align-items: center;
- width: 233px;
+ width: 242px;
height: 140px;
background: rgba(255, 255, 255, 0.1);
+ padding-left: 8px;
// opacity: 0.37;
.left5 {
@@ -568,6 +569,9 @@ onMounted(() => {});
rgba(255, 255, 255, 0) 0%,
#3976a1 100%
);
+ span{
+ font-size: 15px;
+ }
}
}
}
@@ -1114,7 +1118,7 @@ onMounted(() => {});
margin-top: 15px;
margin-bottom: 10px;
}
-.font {
- font-size: 18px !important;
-}
+// .font {
+// font-size: 18px !important;
+// }
From cc8655d11cd0dff2fcb1833dc7c49084949dfc4c Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Thu, 17 Oct 2024 11:43:33 +0800
Subject: [PATCH 2/3] gx
---
src/view/dialog/dialogCamera.vue | 13 +++++++------
src/view/dialog/dialogCameras.vue | 7 ++++++-
src/view/dialog/dialogRW.vue | 22 +++++++++++++++++++---
src/view/sy_details.vue | 6 +++---
src/view/sy_table.vue | 13 ++++++++++---
5 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/src/view/dialog/dialogCamera.vue b/src/view/dialog/dialogCamera.vue
index 1938944..4c6bf5f 100644
--- a/src/view/dialog/dialogCamera.vue
+++ b/src/view/dialog/dialogCamera.vue
@@ -92,13 +92,10 @@ const emit = defineEmits(["close"]);
const cameraShow = ref();
const data = reactive({
title: "摄像头",
- // columns: [],
- // tableData: [],
});
-// const gridData = [];
+const dp = ref(null);
const num = ref(false);
const hlsUriSslNow = ref("");
-const dp = ref(null);
const attachmentLink = ref("");
const options = {
@@ -124,6 +121,11 @@ watch(
}
}
);
+const maskName = (name) => {
+ // 将姓名的中间部分替换为 '*'
+ return name[0] + "*".repeat(name.length - 2) + name[name.length - 1];
+};
+
const initializeVideo = () => {
if (hlsUriSslNow.value === "") {
num.value = false;
@@ -132,7 +134,7 @@ const initializeVideo = () => {
}
cameraShow.value = props.cameraShow;
hlsUriSslNow.value = props.hlsUriSsl;
- data.title = props.sxtnames;
+ data.title = maskName(props.sxtnames);
attachmentLink.value = hlsUriSslNow.value;
if (num.value) {
@@ -175,7 +177,6 @@ const insertVideo = () => {
// console.log("插入视频元素:", videoElement);
};
-
const loadVideo = () => {
if (dp.value) {
// console.log("正在销毁之前的video.js实例。");
diff --git a/src/view/dialog/dialogCameras.vue b/src/view/dialog/dialogCameras.vue
index eef9cff..0160ccc 100644
--- a/src/view/dialog/dialogCameras.vue
+++ b/src/view/dialog/dialogCameras.vue
@@ -102,6 +102,10 @@ const data = reactive({
const num = ref(false);
const hlsUriSslNow = ref("");
const gridData = [];
+const maskName = (name) => {
+ // 将姓名的中间部分替换为 '*'
+ return name[0] + "*".repeat(name.length - 2) + name[name.length - 1];
+};
// 监听
watch(
() => props.cameraShow,
@@ -115,7 +119,7 @@ watch(
// if (hlsUriSslNow.value != "" && props.hlsUriSsl != hlsUriSslNow.value)
cameraShow.value = newVal;
hlsUriSslNow.value = props.hlsUriSsl;
- data.title = props.sxtname;
+ data.title = maskName(props.sxtname);
attachmentLink.value = hlsUriSslNow.value;
dp.value = null;
@@ -132,6 +136,7 @@ watch(
}
}
);
+
const insertVideo = () => {
const videoElement = document.createElement("video");
videoElement.id = "videoPlayer";
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index b39ed58..f1f6fae 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -193,7 +193,7 @@ const handleRowClick = (row, column, event) => {
const clicked = ref(false);
const lampBox = ref(null);
const escalation = () => {
- if (data.xq.deng !== 0) {
+ if (data.xq.deng != 0) {
clicked.value = true;
}
console.log(clicked.value);
@@ -267,11 +267,25 @@ watch(
data.title = props.tableData.title;
data.columns = props.tableData.columns;
data.tableData.length = 0;
+ function maskName(name) {
+ if (name.length === 2) {
+ // 两个字的姓名,第二个字替换为 *
+ return name[0] + "*";
+ } else if (name.length > 2) {
+ // 三个字或更多的姓名,替换中间的字符
+ return name[0] + "*".repeat(name.length - 2) + name[name.length - 1];
+ }
+ return name;
+ }
if (props.tableData.data.wxs.length > 0) {
props.tableData.data.wxs.forEach((item, index) => {
let obj = {
deng: 2,
bzlx: item.bzlx,
+ qtbm: item.qtbm,
+ zrks: item.zrks,
+ ywfzr: maskName(item.ywfzr),
+ fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
};
data.tableData.push(obj);
});
@@ -283,8 +297,10 @@ watch(
deng: 1,
bzlx: item.bzlx,
qtbm: item.qtbm,
- ywfzrsj: item.ywfzrsj,
- ywfzrzzd: item.ywfzrzzd,
+ zrks: item.zrks,
+ ywfzr: maskName(item.ywfzr),
+ // fgldsj: item.fgldsj,
+ fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
};
data.tableData.push(obj);
});
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index df3e146..f960498 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -463,13 +463,13 @@ const tableType = reactive({
property: "qtbm",
}, {
label: "业务科室",
- property: "ywfzrzzd",
+ property: "zrks",
}, {
label: "负责人",
- property: "ywfzrzzd",
+ property: "ywfzr",
}, {
label: "联系电话",
- property: "ywfzrsj",
+ property: "fgldsj",
},
{
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 826dd7f..84245f6 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -339,12 +339,16 @@ const data = reactive({
img: icon6,
visible: false,
son: [
- {
+ {
id: "0",
- name: "公租房服务",
+ name: "概况",
},
{
id: "1",
+ name: "公租房服务",
+ },
+ {
+ id: "2",
name: "住房改造服务",
},
],
@@ -550,7 +554,8 @@ const tapshow = (parentId, childId) => {
parentId.name == "弱有所扶" ||
parentId.name == "学有所教" ||
parentId.name == "老有所养" ||
- parentId.name == "病有所医")
+ parentId.name == "病有所医"||
+ parentId.name == "住有所居")
) {
gaikuang(parentId.name);
} else {
@@ -613,6 +618,8 @@ const gaikuang = (name) => {
gaikuangList.yl = true;
} else if (name == "病有所医") {
gaikuangList.hygiene = true;
+ } else if (name == "住有所居") {
+ gaikuangList.infant = true;
}
};
// 服务表格样式
From 68dd704226348324d908cac2cc9d7e4c08d546ff Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Thu, 17 Oct 2024 16:09:02 +0800
Subject: [PATCH 3/3] gx
---
src/utils/request.js | 2 +-
src/view/dialog/dialogRW.vue | 14 +++++++---
src/view/dialog/dialogSf.vue | 47 ++++++++++++++++++++++-----------
src/view/table_gk/gk_infant.vue | 18 ++++++-------
4 files changed, 52 insertions(+), 29 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index bb32fc8..111c7ed 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import { ElMessage } from "element-plus";
import tools from "@/utils/tools";
import router from "../router";
-// axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/'
+axios.defaults.baseURL = 'https://jzzf.longyou.gov.cn:998/'
axios.defaults.timeout = 120000;
// HTTP request 拦截器
diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index f1f6fae..408db45 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -116,7 +116,9 @@
- 注:工作日早上8:30自动推送浙政钉
+
+ 注:每周或每月第一个工作日自动推送浙政钉通知
+
@@ -277,6 +279,12 @@ watch(
}
return name;
}
+ function maskYwfzr(ywfzr) {
+ // 使用正则匹配每个名字并进行替换
+ return ywfzr.replace(
+ /:([^,]+)/g,(match, name) => `:${maskName(name.trim())}`
+ );
+ }
if (props.tableData.data.wxs.length > 0) {
props.tableData.data.wxs.forEach((item, index) => {
let obj = {
@@ -284,7 +292,7 @@ watch(
bzlx: item.bzlx,
qtbm: item.qtbm,
zrks: item.zrks,
- ywfzr: maskName(item.ywfzr),
+ ywfzr: maskYwfzr(item.ywfzr),
fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
};
data.tableData.push(obj);
@@ -298,7 +306,7 @@ watch(
bzlx: item.bzlx,
qtbm: item.qtbm,
zrks: item.zrks,
- ywfzr: maskName(item.ywfzr),
+ ywfzr: maskYwfzr(item.ywfzr),
// fgldsj: item.fgldsj,
fgldsj: item.fgldsj.replace(/^(\d{3})\d{4}(\d{4})$/, "$1****$2"),
};
diff --git a/src/view/dialog/dialogSf.vue b/src/view/dialog/dialogSf.vue
index 9750664..7424dfb 100644
--- a/src/view/dialog/dialogSf.vue
+++ b/src/view/dialog/dialogSf.vue
@@ -54,24 +54,27 @@
详情描述
-
+
输入:
-
- {{ data.content.srsj }}
-
+
对比逻辑:
-
- {{ data.content.bdlj }}
-
+
输出:
-
- {{ data.content.scjg }}
-
+
@@ -80,7 +83,7 @@
-
-
-
\ No newline at end of file
diff --git a/src/view/table_gk/gk_infant.vue b/src/view/table_gk/gk_infant.vue
index ed556a4..084873f 100644
--- a/src/view/table_gk/gk_infant.vue
+++ b/src/view/table_gk/gk_infant.vue
@@ -139,10 +139,10 @@ const data = reactive({
jtysqyl: "49.37",
}, //健康档案
jsbgl: [], //精神病管理
- fyglrs: {}, //系统管理
- jktj: {}, //65岁健康体检
- jkhd: [], //健康活动
- lxbx: {}, //手工零星报销
+ // fyglrs: {}, //系统管理
+ // jktj: {}, //65岁健康体检
+ // jkhd: [], //健康活动
+ // lxbx: {}, //手工零星报销
});
const showEchart = ref(false);
@@ -152,12 +152,12 @@ const getData = async () => {
data.medicalInsurance = res.data.medicalInsurance;
data.lmb = res.data.lmb;
data.mz = res.data.mz;
- // data.jkda = res.data.jkda;
+ data.jkda = res.data.jkda;
data.jsbgl = res.data.jsbgl;
- data.fyglrs = res.data.fyglrs;
- data.jktj = res.data.jktj;
- data.jkhd = res.data.jkhd;
- data.lxbx = res.data.lxbx;
+ // data.fyglrs = res.data.fyglrs;
+ // data.jktj = res.data.jktj;
+ // data.jkhd = res.data.jkhd;
+ // data.lxbx = res.data.lxbx;
showEchart.value = true;
}
});