diff --git a/src/api/wsScreen/index.js b/src/api/wsScreen/index.js index 31a596a9..86c796e5 100644 --- a/src/api/wsScreen/index.js +++ b/src/api/wsScreen/index.js @@ -42,10 +42,11 @@ export const getProjectEquipmentApi = () => { } // 各单位装备在用率情况 -export const getDeptEquipmentApi = () => { +export const getDeptEquipmentApi = (data) => { return request({ url: '/material-mall/provinceScreen/getDeptEquipment', method: 'get', + params: data, }) } diff --git a/src/assets/images/hgnb-1.png b/src/assets/images/hgnb-1.png new file mode 100644 index 00000000..aaf6ea62 Binary files /dev/null and b/src/assets/images/hgnb-1.png differ diff --git a/src/assets/images/hgnb-2.png b/src/assets/images/hgnb-2.png new file mode 100644 index 00000000..c14f03c5 Binary files /dev/null and b/src/assets/images/hgnb-2.png differ diff --git a/src/assets/images/hgnb-3.png b/src/assets/images/hgnb-3.png new file mode 100644 index 00000000..14b56d64 Binary files /dev/null and b/src/assets/images/hgnb-3.png differ diff --git a/src/assets/images/hgnb-4.png b/src/assets/images/hgnb-4.png new file mode 100644 index 00000000..738ae0e6 Binary files /dev/null and b/src/assets/images/hgnb-4.png differ diff --git a/src/assets/images/hgnb-5.png b/src/assets/images/hgnb-5.png new file mode 100644 index 00000000..50c58255 Binary files /dev/null and b/src/assets/images/hgnb-5.png differ diff --git a/src/assets/images/more.png b/src/assets/images/more.png index 72865b6b..ec3282f3 100644 Binary files a/src/assets/images/more.png and b/src/assets/images/more.png differ diff --git a/src/assets/images/nb-img-1.png b/src/assets/images/nb-img-1.png index ee1d70e5..19502693 100644 Binary files a/src/assets/images/nb-img-1.png and b/src/assets/images/nb-img-1.png differ diff --git a/src/assets/images/nb-img-2.png b/src/assets/images/nb-img-2.png index 52728b64..6a10f5ac 100644 Binary files a/src/assets/images/nb-img-2.png and b/src/assets/images/nb-img-2.png differ diff --git a/src/assets/images/nb-img-3.png b/src/assets/images/nb-img-3.png index 6ae8dfa1..ac013a66 100644 Binary files a/src/assets/images/nb-img-3.png and b/src/assets/images/nb-img-3.png differ diff --git a/src/assets/images/nb-img-4.png b/src/assets/images/nb-img-4.png index 8fb037c2..13032576 100644 Binary files a/src/assets/images/nb-img-4.png and b/src/assets/images/nb-img-4.png differ diff --git a/src/assets/images/nb-img-5.png b/src/assets/images/nb-img-5.png new file mode 100644 index 00000000..91e1fc1f Binary files /dev/null and b/src/assets/images/nb-img-5.png differ diff --git a/src/assets/images/top2-icon.png b/src/assets/images/top2-icon.png new file mode 100644 index 00000000..e144be62 Binary files /dev/null and b/src/assets/images/top2-icon.png differ diff --git a/src/views/EquipmentLedger/components/EquAnalysis.vue b/src/views/EquipmentLedger/components/EquAnalysis.vue index 62650a44..3982beb5 100644 --- a/src/views/EquipmentLedger/components/EquAnalysis.vue +++ b/src/views/EquipmentLedger/components/EquAnalysis.vue @@ -218,7 +218,7 @@ export default { }, legend: { orient: 'vertical', - right: '3%', + left: '41%', top: 'center', itemWidth: 10, itemHeight: 10, diff --git a/src/views/home/components/ProvincialChart.vue b/src/views/home/components/ProvincialChart.vue index 7e8aa5c1..a18c890f 100644 --- a/src/views/home/components/ProvincialChart.vue +++ b/src/views/home/components/ProvincialChart.vue @@ -157,7 +157,7 @@ export default { .center-1, .center-2 { width: 928px; - height: 390px; + height: 405px; padding: 24px; background: rgba(255, 255, 255, 0.91); border-radius: 5px; diff --git a/src/views/home/components/TitleBox.vue b/src/views/home/components/TitleBox.vue index 7b41cd43..6b64d3b7 100644 --- a/src/views/home/components/TitleBox.vue +++ b/src/views/home/components/TitleBox.vue @@ -2,12 +2,16 @@
+
| 排名 | 单位名称 | -在用率 | -周转率 | +在用率 | +周转率 | {{ row.proportion }}% | -+ | {{ row.proportion }}% | +{{ row.turnoverRate }} 次/年 | @@ -60,15 +60,26 @@ export default { data() { return { tableData: [], + showTab: 1, + sort1: 'proportion_asc', + sort2: 'turnoverRate_asc', } }, mounted() { this.getList() }, methods: { + handleSort(tab) { + if (tab === 1) { + this.sort1 = this.sort1 === 'proportion_asc' ? 'proportion_desc' : 'proportion_asc' + } else { + this.sort2 = this.sort2 === 'turnoverRate_asc' ? 'turnoverRate_desc' : 'turnoverRate_asc' + } + this.getList() + }, async getList() { try { - const res = await getDeptEquipmentApi() + const res = await getDeptEquipmentApi({ sort: this.showTab === 1 ? this.sort1 : this.sort2 }) console.log('🚀 ~ 各单位装备在用率情况 ~ res:', res) this.tableData = res.data || [] if (this.tableData.length > 5) { @@ -115,6 +126,9 @@ export default { handleMore() { this.$refs.usageRateMore.openDialog() }, + handleTab(tab) { + this.showTab = tab + }, }, } diff --git a/src/views/home/components/provincial/Bottom2.vue b/src/views/home/components/provincial/Bottom2.vue index 022dbd15..6c804b87 100644 --- a/src/views/home/components/provincial/Bottom2.vue +++ b/src/views/home/components/provincial/Bottom2.vue @@ -1,9 +1,9 @@
|---|
| 排名 | -工程名称 | -在用装备数(台) | -规模(拆单公里) | -百公里线路装备使用情况 | -|
|---|---|---|---|---|---|
| 排名 | +工程名称 | +在用装备数(台) | +电压等级(kV) | +规模(拆单公里) | +百公里线路装备使用情况 | +
| NO0{{ index + 1 }} | -+ | ||||
| NO0{{ index + 1 }} | + +
+
+ {{ row.projectName }}
+
+ |
+ {{ row.inUser }} | +{{ row.voltage }} | +{{ row.scale }} | +{{ row.usage }} | +