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 @@
- {{ titleText }} + {{ titleText }} +
+ 在用率 + 周转率 +
- +
更多 - +
@@ -20,14 +24,24 @@ export default { type: String, default: '', }, + showTab: { + type: Boolean, + default: false, + }, }, data() { - return {} + return { + active: 1, + } }, methods: { handleMore() { this.$emit('handleMore') }, + handleActive(index) { + this.active = index + this.$emit('handleTab', index) + }, }, } @@ -43,9 +57,10 @@ export default { font-weight: bold; font-size: 16px; color: #333; - text-align: left; + display: flex; + // align-items: flex-start; } - + .title-more { display: flex; align-items: center; @@ -67,4 +82,22 @@ export default { } } } +.tabs { + margin-left: 20px; + display: flex; + align-items: flex-start; +} +.tab { + cursor: pointer; + margin-right: 15px; + height: 18px; + font-weight: 400; + font-size: 12px; + color: #3f3f3f; + + &.active { + color: #2cbab2; + border-bottom: 2px solid #2cbab2; + } +} diff --git a/src/views/home/components/provincial/Bottom1-2.vue b/src/views/home/components/provincial/Bottom1-2.vue index da8c5bdf..43557da6 100644 --- a/src/views/home/components/provincial/Bottom1-2.vue +++ b/src/views/home/components/provincial/Bottom1-2.vue @@ -1,6 +1,6 @@