diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ \ No newline at end of file + diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git "a/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..34ce236 --- /dev/null +++ "b/src/assets/kitchen/\345\234\260\345\233\276\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git "a/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" new file mode 100644 index 0000000..dd0c295 --- /dev/null +++ "b/src/assets/kitchen/\347\273\237\350\256\241\351\241\265\347\273\237\350\256\241\345\233\276\350\203\214\346\231\257.png" Binary files differ diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue index 460d923..04a0090 100644 --- a/src/components/echart/barChart/verticalBarChart.vue +++ b/src/components/echart/barChart/verticalBarChart.vue @@ -2,21 +2,7 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@ \ No newline at end of file + diff --git a/src/views/dashboard/components/deviceList.vue b/src/views/dashboard/components/deviceList.vue index a7c11e1..23c5f15 100644 --- a/src/views/dashboard/components/deviceList.vue +++ b/src/views/dashboard/components/deviceList.vue @@ -1,21 +1,16 @@ - - - - \ No newline at end of file + diff --git a/src/views/dashboard/components/layoutChartDoughnu.vue b/src/views/dashboard/components/layoutChartDoughnu.vue index 7906430..9d3214e 100644 --- a/src/views/dashboard/components/layoutChartDoughnu.vue +++ b/src/views/dashboard/components/layoutChartDoughnu.vue @@ -3,9 +3,9 @@
- + 设备分类统计
-
+
@@ -25,10 +25,6 @@ type: String, default: "", }, - width:{ - type: String, - default: "500px" - }, height:{ type: String, default: "250px" @@ -63,11 +59,14 @@ \ No newline at end of file diff --git a/src/views/dashboard/components/managementList.vue b/src/views/dashboard/components/managementList.vue index 88c7827..d27a0de 100644 --- a/src/views/dashboard/components/managementList.vue +++ b/src/views/dashboard/components/managementList.vue @@ -28,7 +28,7 @@ fetchData() { getUserCount().then((res) => { this.management = res.data.map(item => { - return{...item,icon:'icon-user-man'} + return{...item,icon:'cockpit-' + item.roleName} }) }); }, diff --git a/src/views/dashboard/components/supplierList.vue b/src/views/dashboard/components/supplierList.vue index 978600e..3e41367 100644 --- a/src/views/dashboard/components/supplierList.vue +++ b/src/views/dashboard/components/supplierList.vue @@ -39,20 +39,20 @@ { title: "供应商注册设备总数量", count: "", - icon: "device-count", + icon: "cockpit-device-register", type: "deviceCount", }, { title: "供应商审核通过总数量", count: "", - icon: "supplier-panel", + icon: "cockpit-approved", type: "approvedCount", }, { title: "供应商注册总数量", count: "", - icon: "supplier-panel", - type: "supplierCount", + icon: "cockpit-supplier-register", + type: "approvedCount", }, ], }; diff --git a/src/views/dashboard/components/switch.vue b/src/views/dashboard/components/switch.vue index 43ef875..db4efa7 100644 --- a/src/views/dashboard/components/switch.vue +++ b/src/views/dashboard/components/switch.vue @@ -1,9 +1,10 @@