diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index b3a5e5b7..b5bbcaf1 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -403,7 +403,7 @@
value: '0'
}],
images: [],
- summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary5', 'summary7', 'summary9', 'summary10'],
+ summaryList: ['summary0', 'summary1', 'summary2', 'summary3', 'summary4', 'summary6', 'summary5', 'summary7', 'summary8', 'summary9', 'summary10', 'summary11'],
borderList: ['border0', 'border1', 'border2', 'border3', 'border4', 'border5']
}
},
diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue
index f67025b9..622c6a70 100644
--- a/packages/bigscreen/designer/components/RenderElement.vue
+++ b/packages/bigscreen/designer/components/RenderElement.vue
@@ -138,6 +138,7 @@
+
@@ -155,7 +156,7 @@
export default {
name: 'RenderElement',
- props: ['data', 'index', 'theme'],
+ props: ['data', 'index', 'theme', 'instance'],
components: {
AiSwiper
@@ -222,15 +223,6 @@
.render-element {
::v-deep .dvScrollBoard1 {
- .index {
- color: #fff;
- text-shadow: none;
- background: transparent;
- background-color: #BD4921!important;
- -webkit-background-clip: inherit;
- -webkit-text-fill-color: #fff;
- }
-
.header {
background: rgba(0, 0, 0, 0.1)!important;
@@ -251,9 +243,19 @@
background: linear-gradient(180deg, #FFF6C7 0%, #FF9A02 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
+
& > div:nth-of-type(2n) {
background: rgba(0, 0, 0, 0.1)!important;
}
+
+ .index {
+ color: #fff;
+ text-shadow: none;
+ background: transparent;
+ background-color: #BD4921!important;
+ -webkit-background-clip: inherit;
+ -webkit-text-fill-color: #fff;
+ }
}
}
}
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index c2740e37..8ecf7b16 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -543,6 +543,39 @@ const components = [
}
]
},
+ {
+ label: '党组织',
+ type: 'partyOrg',
+ list: [
+ {
+ type: 'partyOrg',
+ label: '党组织',
+ width: 840,
+ height: 800,
+ zIndex: 1,
+ top: 0,
+ left: 0,
+ dataX: '',
+ dataY: [],
+ title: '党组织',
+ border: 'border3',
+ sourceDataId: '',
+ dataType: 'staticData',
+ staticData: [
+ {
+ key: '个人服务办理',
+ value: 247
+ },
+ {
+ key: '同比上月',
+ value: 247
+ }
+ ],
+ dynamicData: [],
+ thumb: 'https://cdn.cunwuyun.cn/dvcp/dv/tpl/total.png'
+ }
+ ]
+ },
{
label: '边框',
type: 'panel',
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index cc6cd85f..69f7a041 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -14,7 +14,7 @@
}"
v-for="(item, index) in componentList"
:key="index">
-
+
diff --git a/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue b/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue
new file mode 100644
index 00000000..eeddf4cf
--- /dev/null
+++ b/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue
@@ -0,0 +1,224 @@
+
+
+
+
+
+
+
diff --git a/project/dvui/layout/AiDvSummary/AiDvSummary.vue b/project/dvui/layout/AiDvSummary/AiDvSummary.vue
index 14942010..75aa0868 100644
--- a/project/dvui/layout/AiDvSummary/AiDvSummary.vue
+++ b/project/dvui/layout/AiDvSummary/AiDvSummary.vue
@@ -13,8 +13,10 @@
import Summary5 from './components/Summary5'
import Summary6 from './components/Summary6'
import Summary7 from './components/Summary7'
+ import Summary8 from './components/Summary8'
import Summary9 from './components/Summary9'
import Summary10 from './components/Summary10'
+ import Summary11 from './components/Summary11'
export default {
name: 'AiDvSummary',
@@ -28,8 +30,10 @@
Summary5,
Summary6,
Summary7,
+ Summary8,
Summary9,
- Summary10
+ Summary10,
+ Summary11
},
props: {
diff --git a/project/dvui/layout/AiDvSummary/components/DonutChart.vue b/project/dvui/layout/AiDvSummary/components/DonutChart.vue
new file mode 100644
index 00000000..85f1d5e9
--- /dev/null
+++ b/project/dvui/layout/AiDvSummary/components/DonutChart.vue
@@ -0,0 +1,137 @@
+
+
+
+
+ {{ ratio }}
+ %
+
+
+
+
+
+
+
diff --git a/project/dvui/layout/AiDvSummary/components/Summary11.vue b/project/dvui/layout/AiDvSummary/components/Summary11.vue
new file mode 100644
index 00000000..79670553
--- /dev/null
+++ b/project/dvui/layout/AiDvSummary/components/Summary11.vue
@@ -0,0 +1,107 @@
+
+
+
+

+
+
{{ item[keys] }}
+
{{ item[value] }}
+

+
+

+
+
+
+
+
+
+
diff --git a/project/dvui/layout/AiDvSummary/components/Summary8.vue b/project/dvui/layout/AiDvSummary/components/Summary8.vue
new file mode 100644
index 00000000..b6994ede
--- /dev/null
+++ b/project/dvui/layout/AiDvSummary/components/Summary8.vue
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
{{ item[keys] }}
+
{{ item[value] }}
+
+
+
+
+
+
+
+
diff --git a/project/xiushan/apps/creditScore/scorePersonal/detail.vue b/project/xiushan/apps/creditScore/scorePersonal/detail.vue
index 79277430..02c64cbe 100644
--- a/project/xiushan/apps/creditScore/scorePersonal/detail.vue
+++ b/project/xiushan/apps/creditScore/scorePersonal/detail.vue
@@ -11,7 +11,7 @@
获取积分
- {{ info.personalIntegral || 0 }}
+ {{ (info.personalIntegral + info.personalUsedIntegral) || 0 }}
已用积分
diff --git a/project/xiushan/apps/creditScore/scorePersonal/spList.vue b/project/xiushan/apps/creditScore/scorePersonal/spList.vue
index 1ea77a53..fb8a1362 100644
--- a/project/xiushan/apps/creditScore/scorePersonal/spList.vue
+++ b/project/xiushan/apps/creditScore/scorePersonal/spList.vue
@@ -87,9 +87,10 @@ export default {
label: '用户账号',
},
{
- prop: 'personalIntegral',
+ // prop: 'personalIntegral',
align: 'center',
label: '获取积分',
+ render: (h, {row}) => h('span',null, row.personalIntegral + row.personalUsedIntegral)
},
{
prop: 'personalUsedIntegral',
@@ -97,9 +98,10 @@ export default {
label: '已用积分',
},
{
+ prop: 'personalIntegral',
align: 'center',
label: '剩余积分',
- render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
+ // render: (h, {row}) => h('span', null, row.personalIntegral - row.personalUsedIntegral)
}
]
},
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
index b962be29..7f511323 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -11,7 +11,7 @@
-
{
if (res?.data) {
this.tableData = res.data?.records
@@ -103,6 +105,7 @@ export default {
},
},
created() {
+ this.dict.load('financialLoanApplySearchStatus')
this.getTableData()
}
}
diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
index f775f188..ab2f27e5 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
@@ -24,13 +24,18 @@
总数
-
+
@@ -172,6 +177,7 @@ export default {
overviews: [],
productTop10: [],
tradeTrend: [],
+ applyInfo: {}
}
},
methods: {
@@ -179,6 +185,16 @@ export default {
this.getOverviews()
this.getProductTop10()
this.getTradeTrend()
+ this.getApply()
+ },
+ getApply() {
+ this.instance.post("/appfinancialloanapply/staticFinancialLoanApplyByMainbody", null, {
+ params: {...this.search}
+ }).then(res => {
+ if (res?.data) {
+ this.applyInfo = res.data
+ }
+ })
},
getOverviews() {
this.instance.post("/appfinancialloanapply/staticFinancialLoanApplyByOrganization", null, {
diff --git a/project/xiushan/apps/loanStatement/AppLoanSta.vue b/project/xiushan/apps/loanStatement/AppLoanSta.vue
index b72f5fed..3a578500 100644
--- a/project/xiushan/apps/loanStatement/AppLoanSta.vue
+++ b/project/xiushan/apps/loanStatement/AppLoanSta.vue
@@ -48,7 +48,7 @@ export default {
},
data() {
return {
- search: {status: 1},
+ search: {status: ''},
page: {current: 1, size: 10, total: 0},
tableData: [],
colConfigs: [
@@ -67,8 +67,9 @@ export default {
},
methods: {
getTableData() {
+ let status = this.search.status || 999
this.instance.post("/appfinancialloanapply/list", null, {
- params: {...this.page, ...this.search}
+ params: {...this.page, ...this.search, status}
}).then(res => {
if (res?.data) {
this.tableData = res.data?.records
diff --git a/project/xiushan/apps/loanStatement/AppNeedSta.vue b/project/xiushan/apps/loanStatement/AppNeedSta.vue
index 8565fa14..ac65709c 100644
--- a/project/xiushan/apps/loanStatement/AppNeedSta.vue
+++ b/project/xiushan/apps/loanStatement/AppNeedSta.vue
@@ -6,7 +6,7 @@
-
- {{ dict.getLabel('financingDemandStatus', row.status) }}
+ {{ dict.getLabel('financingDemandSearchStatus', row.status) }}
@@ -54,7 +54,7 @@ export default {
},
data() {
return {
- search: {status: "1"},
+ search: {status: ""},
page: {current: 1, size: 10, total: 0},
tableData: [],
colConfigs: [
@@ -74,7 +74,7 @@ export default {
},
methods: {
getTableData() {
- let status = this.search.status || 999
+ let status = this.search.status || 888
this.instance.post("/appfinancingdemand/list", null, {
params: {...this.page, ...this.search, status}
}).then(res => {
@@ -92,7 +92,7 @@ export default {
}
},
created() {
- this.dict.load('financingDemandStatus')
+ this.dict.load('financingDemandSearchStatus')
this.search.areaId = this.user.info.areaId
this.getTableData()
}