diff --git a/public/js/pnxclient.js b/public/js/pnxclient.js index 9d82bdc..77b5bbc 100644 --- a/public/js/pnxclient.js +++ b/public/js/pnxclient.js @@ -64,15 +64,9 @@ var JIT_GW_ExtInterface = function(){ // 是否使用NPPlugin var isUseNPPlugin = function() { - checkSessionWSURL(); - if ("{\"value\":\"\"}" == currentSessionWSURL) - { - useNPPlugin = true; - } - else - { - useNPPlugin = false; - } + // 仅检测已安装插件,避免首页加载时同步请求本地证书服务。 + var plugin = navigator.mimeTypes && navigator.mimeTypes["application/x-jit-auth-plugin"]; + useNPPlugin = !!(plugin && plugin.enabledPlugin); } var addActioveX = function(){ @@ -870,4 +864,4 @@ var JIT_GW_ExtInterface = function(){ (function(){ JIT_GW_ExtInterface.Init(); -})(); \ No newline at end of file +})(); diff --git a/src/api/sensitivePerception/profilePolice.ts b/src/api/sensitivePerception/profilePolice.ts index f4d3b15..c613d4e 100644 --- a/src/api/sensitivePerception/profilePolice.ts +++ b/src/api/sensitivePerception/profilePolice.ts @@ -21,8 +21,9 @@ export function listNegativeByPoliceIdCode(idCode, query) { }); } -export function listNegativeMonthly(idCode) { +export function listNegativeMonthly(idCode, query = {}) { return request.get({ - url: `/profile/police/${idCode}/month` + url: `/profile/police/${idCode}/month`, + query }); } \ No newline at end of file diff --git a/src/components/negativeInfo/depart-dialog.vue b/src/components/negativeInfo/depart-dialog.vue index 9d9971b..02be4ac 100644 --- a/src/components/negativeInfo/depart-dialog.vue +++ b/src/components/negativeInfo/depart-dialog.vue @@ -60,14 +60,14 @@
-
投诉问题
+
信访投诉
{{ complaintCount }} - 投诉数量(件) + 信访投诉数(件)
@@ -165,7 +165,7 @@ const time = ref([ ]); const colors = [{ color: "#5B8FF9", percentage: 0 }]; -// TODO: 投诉数量暂用假数据,后续替换为接口返回值。 +// TODO: 信访投诉数暂用假数据,后续替换为接口返回值。 const complaintCount = ref(6); const loading = ref(false); diff --git a/src/components/negativeInfo/police-dialog.vue b/src/components/negativeInfo/police-dialog.vue index 80b78a9..3371029 100644 --- a/src/components/negativeInfo/police-dialog.vue +++ b/src/components/negativeInfo/police-dialog.vue @@ -130,6 +130,7 @@ const props = defineProps({ idCode: String, activeRow: { type: Object, default: () => ({}) }, initialTime: { type: Array, default: () => [] }, + profileScope: { type: Object, default: () => ({}) }, }); const emit = defineEmits(["update:modelValue"]); @@ -188,7 +189,7 @@ watch( moment().format("YYYY-MM-DD HH:mm:ss"), ]; getProfileData(); - listNegativeMonthly(idCode).then((data) => { + listNegativeMonthly(idCode, props.profileScope).then((data) => { barOption.value.xAxis.data = data.months; barOption.value.series[0].data = data.values; }); @@ -200,6 +201,7 @@ async function getProfileData() { loading.value = true; try { const data = await getPoliceProfile(props.idCode, { + ...props.profileScope, beginTime: time.value.length ? time.value[0] : "", endTime: time.value.length ? time.value[1] : "", }); diff --git a/src/views/datav/Lmgz.vue b/src/views/datav/Lmgz.vue index 4da1c48..c542ec2 100644 --- a/src/views/datav/Lmgz.vue +++ b/src/views/datav/Lmgz.vue @@ -308,6 +308,7 @@ @@ -359,11 +360,13 @@ const departDetailOpen = ref(false); const policeDetailOpen = ref(false); const detailId = ref(""); const detailTime = ref([]); +const profileScope = ref({}); function openDetail(item, type) { if (!item.detailId) return; detailId.value = item.detailId; - detailTime.value = [ + profileScope.value = item.profileScope || {}; + detailTime.value = item.initialTime || [ moment(time.value[0]).startOf("day").format("YYYY-MM-DD HH:mm:ss"), moment(time.value[1]).endOf("day").format("YYYY-MM-DD HH:mm:ss"), ]; @@ -423,33 +426,47 @@ function getData3() { }); } +function withProfileScope(data, query, category) { + return data.map(item => ({ + ...item, + profileScope: { groupId: query.groupId, category, rankName: item.label, rankEmpNo: item.empNo }, + initialTime: [ + moment(query.beginTime).startOf('day').format('YYYY-MM-DD HH:mm:ss'), + moment(query.endTime).endOf('day').format('YYYY-MM-DD HH:mm:ss'), + ], + })); +} + function getData4() { - leadNegative({ + const query = { beginTime: time.value[0], endTime: time.value[1], groupId: groupId4.value - }).then(data => { - list4.value = data + }; + leadNegative(query).then(data => { + list4.value = withProfileScope(data, query, 'lead'); }); } function getData5() { - policeNegative({ + const query = { beginTime: time.value[0], endTime: time.value[1], groupId: groupId5.value - }).then(data => { - list5.value = data + }; + policeNegative(query).then(data => { + list5.value = withProfileScope(data, query, 'police'); }); } function getData6() { - auxNegative({ + const query = { beginTime: time.value[0], endTime: time.value[1], groupId: groupId6.value - }).then(data => { - list6.value = data + }; + auxNegative(query).then(data => { + list6.value = withProfileScope(data, query, 'aux'); }); } @@ -474,7 +491,7 @@ watch(groupId2, () => { }) watch(type2, () => { - getData1() + getData2() }) watch(groupId3, () => { diff --git a/src/views/sensitivePerception/DepartNegative.vue b/src/views/sensitivePerception/DepartNegative.vue index 23b5fd7..98454b8 100644 --- a/src/views/sensitivePerception/DepartNegative.vue +++ b/src/views/sensitivePerception/DepartNegative.vue @@ -45,7 +45,8 @@ @@ -72,7 +73,7 @@
- +