From 2f8556d0741d07761c34d05d728e8d807260779b Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Mon, 23 Jun 2025 16:45:36 +0800
Subject: [PATCH] Merge branch 'feature/gzdyh_city_bugfix' of http://120.79.193.119:9090/r/gzdyh/front into feature/gzdyh_city_bugfix
---
src/views/comprehensive/index.jsx | 17 ++++----
src/views/disputeLedger/index.jsx | 10 ++--
src/views/register/visit/index.jsx | 5 +-
src/views/workDash/index.jsx | 48 +++++++++++++-----------
4 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/src/views/comprehensive/index.jsx b/src/views/comprehensive/index.jsx
index 0c3ceda..a30c7ad 100644
--- a/src/views/comprehensive/index.jsx
+++ b/src/views/comprehensive/index.jsx
@@ -348,8 +348,6 @@
shortcuts: $$.shortcutsList(),
span: 8,
},
- { type: 'RangePicker', name: 'closeTime', label: '办结时间', shortcutsPlacementLeft: true, shortcuts: $$.shortcutsList(), span: 8 },
- { type: 'RangePicker', name: 'fileTime', label: '归档时间', shortcutsPlacementLeft: true, shortcuts: $$.shortcutsList(), span: 8 },
{
type: 'Cascader',
name: 'caseType',
@@ -360,7 +358,7 @@
treedata: $$.caseTypeSelect.caseTypeSelect,
},
{ type: 'Select', name: 'mediResult', label: '化解结果', placeholder: '请选择', span: 8, selectdata: $$.options.mediResult },
- { type: 'Input', name: 'caseRef', label: '事项编号' },
+
{
type: 'Cascader',
name: 'canal',
@@ -371,9 +369,9 @@
treedata: $$.options.caseCanal,
},
{ type: 'Select', name: 'status', label: '事项状态', placeholder: '请选择', span: 8, selectdata: $$.options.caseStatus },
- { type: 'Select', name: 'caseLevel', label: '事项等级', placeholder: '请选择', span: 8, selectdata: $$.options.caseLevelList },
- { type: 'Select', name: 'systemSource', label: '系统来源', placeholder: '请选择', span: 8, selectdata: $$.options.systemSource },
- { type: 'Input', name: 'inputUnitName', label: '登记机构' },
+
+ { type: 'Input', name: 'caseRef', label: '事项编号' },
+
{
type: 'searchButton',
name: 'mediateUnitId',
@@ -405,10 +403,13 @@
placeholder: '请选择',
label: '配合部门',
},
+ { type: 'Select', name: 'systemSource', label: '系统来源', placeholder: '请选择', span: 8, selectdata: $$.options.systemSource },
+ { type: 'Input', name: 'inputUnitName', label: '登记机构' },
{ type: 'Input', name: 'plaintiffs', label: '申请方', labelStyle: { width: '56px' } },
{ type: 'Input', name: 'defendants', label: '被申请方' },
{ type: 'Select', name: 'peopleNum', placeholder: '请选择', label: '涉及人数', selectdata: $$.options.peopleNum },
{ type: 'Select', name: 'amount', placeholder: '请选择', label: '涉及金额', selectdata: $$.options.amount },
+ { type: 'Select', name: 'caseLevel', label: '事项等级', placeholder: '请选择', span: 8, selectdata: $$.options.caseLevelList },
{ type: 'Select', name: 'evaluateGrade', placeholder: '请选择', label: '评价等级', selectdata: $$.options.evaluateGrade },
{
type: 'Select',
@@ -446,8 +447,8 @@
],
},
{ type: 'Select', name: 'agreeType', placeholder: '请选择', label: '结案协议类型', selectdata: $$.options.caseAgreeType },
- { type: 'Select', name: 'repeatCase', placeholder: '请选择', label: '合并事项', selectdata: $$.options.repeatCase },
- { type: 'Input', name: 'caseCityCode', label: '市民编号' },
+ { type: 'RangePicker', name: 'closeTime', label: '办结时间', shortcutsPlacementLeft: true, shortcuts: $$.shortcutsList(), span: 8 },
+ { type: 'RangePicker', name: 'fileTime', label: '归档时间', shortcutsPlacementLeft: true, shortcuts: $$.shortcutsList(), span: 8 },
]}
handleReset={() => {
form.resetFields();
diff --git a/src/views/disputeLedger/index.jsx b/src/views/disputeLedger/index.jsx
index 50e2e93..a6486d9 100644
--- a/src/views/disputeLedger/index.jsx
+++ b/src/views/disputeLedger/index.jsx
@@ -330,7 +330,7 @@
},
{
icon: disputeLedger_10,
- title: '12345',
+ title: '12345热线处置的矛盾',
value: allData?.ottffNum || 0,
backgroundColor: '#F9F0FF',
borderColor: '#722ED1',
@@ -339,7 +339,7 @@
},
{
icon: disputeLedger_11,
- title: '非警务纠纷',
+ title: '公安处置的非警务纠纷',
value: allData?.tzfjwjfNum || 0,
backgroundColor: 'rgba(182,221,241,0.24)',
borderColor: '#1A6FB8',
@@ -348,7 +348,7 @@
},
{
icon: disputeLedger_12,
- title: '人民调解',
+ title: '其他部门处置的调解案件',
value: allData?.rmtjNum || 0,
backgroundColor: 'rgba(253,205,197,0.24)',
borderColor: '#F53F3F',
@@ -357,7 +357,7 @@
},
{
icon: disputeLedger_13,
- title: '信访',
+ title: '信访部门处置的矛盾纠纷',
value: allData?.xfNum || 0,
backgroundColor: 'rgba(175,240,181,0.24)',
borderColor: '#00B42A',
@@ -366,7 +366,7 @@
},
{
icon: disputeLedger_14,
- title: '劳动争议',
+ title: '人社部门处置的劳动争议',
value: allData?.ldzcNum || 0,
backgroundColor: 'rgba(181,245,236,0.24)',
borderColor: '#08979c',
diff --git a/src/views/register/visit/index.jsx b/src/views/register/visit/index.jsx
index 7168d22..3b0e506 100644
--- a/src/views/register/visit/index.jsx
+++ b/src/views/register/visit/index.jsx
@@ -318,7 +318,8 @@
if (res.type) {
// setIsModalResult(res.data);
- let userInfo = $$.getLocal('customerSystemUser');
+ let userInfo = $$.getSessionStorage('customerSystemUser');
+ console.log(userInfo, 'userInfo');
setIsModalEventInfo({
...res.data,
mediateUnitName: userInfo?.unit || '',
@@ -614,7 +615,7 @@
】
</p>
<p>
- 受理编号：【<u> {isModalEventInfo?.unifiedCode || '-'} </u>】
+ 受理编号：【<u> {isModalEventInfo?.citizenEventCode || '-'} </u>】
</p>
<p>
提交日期：【<u> {isModalEventInfo?.reportTime ? $$.myTimeFormat(isModalEventInfo?.reportTime, 'YYYY年MM月DD日') : '-'} </u>
diff --git a/src/views/workDash/index.jsx b/src/views/workDash/index.jsx
index efcb209..bdbc803 100644
--- a/src/views/workDash/index.jsx
+++ b/src/views/workDash/index.jsx
@@ -243,10 +243,10 @@
firstLevel === '1'
? ['queCity', 'queArea', 'queRoad', 'queVillage']
: firstLevel === '2'
- ? ['queArea', 'queRoad', 'queVillage']
- : firstLevel === '3'
- ? ['queRoad', 'queVillage']
- : ['queVillage'];
+ ? ['queArea', 'queRoad', 'queVillage']
+ : firstLevel === '3'
+ ? ['queRoad', 'queVillage']
+ : ['queVillage'];
let key = keyList[queCodeLength - 1];
obj[key] = queCode[queCodeLength - 1];
}
@@ -755,12 +755,12 @@
list[0].level === '1'
? 'queCity'
: list[0].level === '2'
- ? 'queArea'
- : list[0].level === '3'
- ? 'queRoad'
- : list[0].level === '4'
- ? 'queVillage'
- : 'queRoad';
+ ? 'queArea'
+ : list[0].level === '3'
+ ? 'queRoad'
+ : list[0].level === '4'
+ ? 'queVillage'
+ : 'queRoad';
values.queCode = [list[0].value];
values.createTime = [
$$.myMoment().subtract(0, 'months').startOf('month').format('YYYY-MM-DD'),
@@ -819,12 +819,12 @@
option.level === '1'
? 'queCity'
: option.level === '2'
- ? 'queArea'
- : option.level === '3'
- ? 'queRoad'
- : option.level === '4'
- ? 'queVillage'
- : 'queRoad',
+ ? 'queArea'
+ : option.level === '3'
+ ? 'queRoad'
+ : option.level === '4'
+ ? 'queVillage'
+ : 'queRoad',
}))
);
};
@@ -1317,7 +1317,7 @@
</div>
</Space>
</div>
- <div className="workDash-item-value" style={{ marginTop: '4px' }}>
+ <div className="workDash-item-value" style={{ marginTop: '4px' }}>
<div style={{ width: '50px' }}></div>
<div style={{ width: '36px' }}></div>
<Space split={<Divider type="vertical" />}>
@@ -1388,7 +1388,11 @@
</div>
</Space>
</div>
- </div>
+ <div className="workDash-item-value" style={{ marginTop: '4px' }}>
+ <div style={{ width: '50px' }}>{data?.totalNum || 0}</div>
+ <div style={{ width: '36px' }}></div>
+ </div>
+ </div>
)}
</div>
<div
@@ -1707,7 +1711,7 @@
caseTypeLevel > 1
? caseTypeList?.map((i) => ({ value: i.caseRate, caseNum: i.caseNum, name: i.caseTypeName, caseType: i.caseType })) || []
: data?.typeList?.map((i) => ({ value: i.caseRate, caseNum: i.caseNum, name: i.caseTypeName, caseType: i.caseType })) ||
- []
+ []
}
onMyLTopChartPie={onMyLTopChartPie}
/>
@@ -2167,7 +2171,7 @@
dataIndex: 'createTime',
defaultSortOrder: 'descend',
order: 'ascend',
- sorter: { compare: (a, b) => {} },
+ sorter: { compare: (a, b) => { } },
render: (text) => <div>{$$.dateFormat(text)}</div>,
},
{ title: '事项来源', width: 100, dataIndex: 'canalName' },
@@ -2182,7 +2186,7 @@
width: 100,
dataIndex: 'closeTime',
order: 'ascend',
- sorter: { compare: (a, b) => {} },
+ sorter: { compare: (a, b) => { } },
render: (text) => <span>{$$.dateFormat(text)}</span>,
},
{
@@ -2840,7 +2844,7 @@
});
}, [data]);
- useEffect(() => {});
+ useEffect(() => { });
return <div id="chartLTopPie1" ref={myChartRef} style={{ height: '232px', width: '100%' }} />;
};
--
Gitblit v1.8.0