diff --git a/data-room-ui/packages/BasicComponents/.DS_Store b/data-room-ui/packages/BasicComponents/.DS_Store
index 24e78c85..878c776c 100644
Binary files a/data-room-ui/packages/BasicComponents/.DS_Store and b/data-room-ui/packages/BasicComponents/.DS_Store differ
diff --git a/data-room-ui/packages/BasicComponents/IndexCard/index.vue b/data-room-ui/packages/BasicComponents/IndexCard/index.vue
index 9176b37d..dbe25083 100644
--- a/data-room-ui/packages/BasicComponents/IndexCard/index.vue
+++ b/data-room-ui/packages/BasicComponents/IndexCard/index.vue
@@ -5,9 +5,9 @@
>
- {{ optionData}}
-
- {{unit}}
-
+ {{ optionData }}
+
+ {{ unit }}
+
- {{ optionData}}
-
- {{unit}}
-
+ {{ optionData }}
+
+ {{ unit }}
+
@@ -80,7 +81,7 @@ export default {
},
data () {
return {
- imgUrl:require('data-room-ui/assets/images/cardImg/cardicon.png'),
+ imgUrl: require('data-room-ui/assets/images/cardImg/cardicon.png'),
customClass: {}
}
},
@@ -88,13 +89,13 @@ export default {
mounted () {
},
computed: {
- gradientColor0 () {
+ gradientColor0 () {
return this.config.customize.gradientColor0 || this.config.customize.gradientColor1 || 'transparent'
},
gradientColor1 () {
- return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent'
+ return this.config.customize.gradientColor1 || this.config.customize.gradientColor0 || 'transparent'
},
- unit(){
+ unit () {
return this.config?.customize.unit || ''
},
option () {
@@ -105,12 +106,12 @@ export default {
},
customize () {
return this.config?.customize
- },
+ }
},
methods: {
dataFormatting (config, data) {
let dataList = ''
- if(data.success){
+ if (data.success) {
if (data.data instanceof Array) {
dataList = config.dataSource.dimensionField
? data.data[0][config.dataSource.dimensionField]
@@ -118,8 +119,8 @@ export default {
} else {
dataList = data.data[config.dataSource.dimensionField]
}
- }else{
- dataList=80
+ } else {
+ dataList = 80
}
config.option = {
...config.option,
@@ -127,7 +128,7 @@ export default {
}
return config
}
- }
+ }
}
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/30card1.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/30card1.svg
new file mode 100644
index 00000000..7b2c7b66
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/30card1.svg
@@ -0,0 +1,25 @@
+
+
+
+
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/31card2.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/31card2.svg
new file mode 100644
index 00000000..8e31bd43
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/31card2.svg
@@ -0,0 +1,25 @@
+
+
+
+
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/32card3.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/32card3.svg
new file mode 100644
index 00000000..9e4e6a23
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/32card3.svg
@@ -0,0 +1,25 @@
+
+
+
+
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/33card4.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/33card4.svg
new file mode 100644
index 00000000..ed4a809c
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/33card4.svg
@@ -0,0 +1,25 @@
+
+
+
+
diff --git a/data-room-ui/packages/assets/images/cardImg/card.png b/data-room-ui/packages/assets/images/cardImg/card.png
deleted file mode 100644
index c8ff2e34..00000000
Binary files a/data-room-ui/packages/assets/images/cardImg/card.png and /dev/null differ
diff --git a/data-room-ui/packages/assets/images/cardImg/card2.png b/data-room-ui/packages/assets/images/cardImg/card2.png
deleted file mode 100644
index a8a8fa8c..00000000
Binary files a/data-room-ui/packages/assets/images/cardImg/card2.png and /dev/null differ
diff --git a/data-room-ui/packages/assets/images/cardImg/indcard2.png b/data-room-ui/packages/assets/images/cardImg/indcard2.png
deleted file mode 100644
index 10ea0277..00000000
Binary files a/data-room-ui/packages/assets/images/cardImg/indcard2.png and /dev/null differ
diff --git a/data-room-ui/packages/assets/images/cardImg/indicard.png b/data-room-ui/packages/assets/images/cardImg/indicard.png
deleted file mode 100644
index daa99341..00000000
Binary files a/data-room-ui/packages/assets/images/cardImg/indicard.png and /dev/null differ
diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js
index aafcb6f3..b0847720 100644
--- a/data-room-ui/packages/js/utils/getComponentConfig.js
+++ b/data-room-ui/packages/js/utils/getComponentConfig.js
@@ -303,8 +303,8 @@ export default function getComponentConfig (type) {
return {
name: '指标卡一',
title: '指标卡一',
- icon: null,
- img: require('data-room-ui/assets/images/cardImg/card.png'),
+ icon: Icon.getNameList()[30],
+ // img: require('data-room-ui/assets/images/cardImg/card.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
w: 300,
h: 114,
@@ -316,8 +316,8 @@ export default function getComponentConfig (type) {
return {
name: '指标卡二',
title: '指标卡二',
- icon: null,
- img: require('data-room-ui/assets/images/cardImg/card2.png'),
+ icon: Icon.getNameList()[31],
+ // img: require('data-room-ui/assets/images/cardImg/card2.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndicatorCardChart',
w: 300,
h: 114,
@@ -329,8 +329,8 @@ export default function getComponentConfig (type) {
return {
name: '指标卡三',
title: '指标卡三',
- icon: null,
- img: require('data-room-ui/assets/images/cardImg/indicard.png'),
+ icon: Icon.getNameList()[32],
+ // img: require('data-room-ui/assets/images/cardImg/indicard.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
w: 300,
h: 114,
@@ -342,8 +342,8 @@ export default function getComponentConfig (type) {
return {
name: '指标卡四',
title: '指标卡四',
- icon: null,
- img: require('data-room-ui/assets/images/cardImg/indcard2.png'),
+ icon: Icon.getNameList()[33],
+ // img: require('data-room-ui/assets/images/cardImg/indcard2.png'),
className: 'com.gccloud.dataroom.core.module.chart.components.ScreenIndexCardChart',
w: 300,
h: 114,