diff --git a/src/api/wsScreen/index.js b/src/api/wsScreen/index.js
index 78283776..a83e2c22 100644
--- a/src/api/wsScreen/index.js
+++ b/src/api/wsScreen/index.js
@@ -127,3 +127,57 @@ export const getProListApi = (data = {}) => {
data,
})
}
+
+// 变电装备统计分析-装备年限
+export const getStatByTypeAndAgeDetailsApi = (data = {}) => {
+ return request({
+ url: '/material-mall/largeScreen/statByTypeAndAgeDetails',
+ method: 'get',
+ params: data,
+ })
+}
+
+// 变电装备统计分析-装备价值
+export const getStatByTypeAndAgeByEquipmentApi = (data = {}) => {
+ return request({
+ url: '/material-mall/largeScreen/statByTypeAndAgeByEquipment',
+ method: 'get',
+ params: data,
+ })
+}
+
+// 变电装备统计分析-地市装备
+export const getStatByTypeAndAgeByCityApi = (data = {}) => {
+ return request({
+ url: '/material-mall/largeScreen/statByTypeAndAgeByCity',
+ method: 'get',
+ params: data,
+ })
+}
+
+// 单位装备配置-列表
+export const getStatByTypeAndAgeByConfigurationApi = (data = {}) => {
+ return request({
+ url: '/material-mall/largeScreen/statByTypeAndAgeByConfiguration',
+ method: 'get',
+ params: data,
+ })
+}
+
+// 装备在用率
+export const getStatByTypeAndAgeByUsageRateApi = (data = {}) => {
+ return request({
+ url: '/material-mall/largeScreen/statByTypeAndAgeByUsageRate',
+ method: 'get',
+ params: data,
+ })
+}
+
+// 装备周转率
+export const getStatByTypeAndAgeByTurnoverRateApi = (data = {}) => {
+ return request({
+ url: '/material-mall/largeScreen/statByTypeAndAgeByTurnoverRate',
+ method: 'get',
+ params: data,
+ })
+}
diff --git a/src/views/screen/wsScreen/components/left/AllEquip.vue b/src/views/screen/wsScreen/components/left/AllEquip.vue
index 932a0e7d..a49016cd 100644
--- a/src/views/screen/wsScreen/components/left/AllEquip.vue
+++ b/src/views/screen/wsScreen/components/left/AllEquip.vue
@@ -34,8 +34,8 @@
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -86,7 +86,7 @@
@@ -108,17 +108,17 @@
style="width: 240px"
/>
-
-
+
+
-
-
+
+
-
+
-
+
item.propertyName).join(',')
},
// 拼接特征值
getFeatureValue(item) {
+ if (!item || item.length == 0) return ''
return item.map((item) => item.propertyValue).join(',')
},
// 装备范围
@@ -380,7 +382,7 @@ export default {
this.getCompanyNameList(val)
} else {
this.companyNameList = []
- this.queryParams.companyName = ''
+ this.queryParams.propertyUnit = ''
}
},
// 地市公司
diff --git a/src/views/screen/wsScreen/components/left/BottomItem.vue b/src/views/screen/wsScreen/components/left/BottomItem.vue
index 51bc27fb..95f2881d 100644
--- a/src/views/screen/wsScreen/components/left/BottomItem.vue
+++ b/src/views/screen/wsScreen/components/left/BottomItem.vue
@@ -4,18 +4,44 @@
diff --git a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
index 25518d07..47c55568 100644
--- a/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
+++ b/src/views/screen/wsScreen/components/left/EquipStatusMore.vue
@@ -11,15 +11,10 @@
-
全量装备
+
装备状态
-
-
-
-
-
@@ -61,6 +56,18 @@
:prop="column.prop"
align="center"
>
+
+ 在库
+ 自用
+ 共享
+ 退役
+ 维修
+
+
+
+ {{ getFeatureValue(row, column.prop) }}
+
+
@@ -78,6 +85,7 @@
@@ -100,8 +111,6 @@ export default {
::v-deep .el-dialog .el-dialog__body {
background-image: url('../../img/unit-config-dialog.png');
background-size: 100% 100%;
- // 以宽度为准
- background-size: 100% auto;
color: #fff;
}
::v-deep .el-dialog__header {
diff --git a/src/views/screen/wsScreen/components/left/index.vue b/src/views/screen/wsScreen/components/left/index.vue
index 85bbbed5..51bcfa2f 100644
--- a/src/views/screen/wsScreen/components/left/index.vue
+++ b/src/views/screen/wsScreen/components/left/index.vue
@@ -16,13 +16,13 @@
-
+
-
+
-
+
@@ -201,8 +201,8 @@ export default {
openSystemEquip() {
this.$refs.systemEquip.openDialog()
},
- openEquipItemMore() {
- this.$refs.equipItemMore.openDialog()
+ openEquipItemMore(type) {
+ this.$refs.equipItemMore.openDialog(type)
},
openRemarkMore() {
this.$refs.remarkMore.openDialog()
diff --git a/src/views/screen/wsScreen/components/right/EquipItemMore.vue b/src/views/screen/wsScreen/components/right/EquipItemMore.vue
index 1182e192..94574f4d 100644
--- a/src/views/screen/wsScreen/components/right/EquipItemMore.vue
+++ b/src/views/screen/wsScreen/components/right/EquipItemMore.vue
@@ -21,6 +21,7 @@