问题清单修复

components.d.ts

@@ -17,31 +17,24 @@ declare module 'vue' {
     ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-    ElDivider: typeof import('element-plus/es')['ElDivider']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
-    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']

env/.env.dev

@@ -10,8 +10,8 @@ VITE_API_URL = '/proxyApi'
 # VITE_proxyTarget = 'http://192.168.2.246:28080'  # 马帅 
 # VITE_proxyTarget = 'http://192.168.2.127:28080'  # 梁超 
 # VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi'  # 测试服务
-VITE_proxyTarget = 'http://192.168.0.244:28580'  # 测试服务
-# VITE_proxyTarget = 'http://192.168.2.72:28080'  # 盛旭
+# VITE_proxyTarget = 'http://192.168.0.244:28580'  # 测试服务
+VITE_proxyTarget = 'http://192.168.2.75:28080'  # 盛旭
 
 # VITE_proxyTarget = 'http://10.40.92.185:9206'  # 赵福海 ( 设备类型) 
 # VITE_proxyTarget = 'http://10.40.92.16:9502'  # 牛 (个人中心 基础信息企业申请认证) 

src/http/api/equip.ts

@@ -9,6 +9,9 @@ export const getTypeListApi = (data: any = {}) => {
 export const getDeviceListApi = (data: any) => {
     return post('/material-mall/dev/list', data)
 }
+export const getCompanyCountApi = (data: any) => {
+    return post('/material-mall/dev/getCompanyCount', data)
+}
 
 //获取装备详情
 export const getDetail = (id = '', isHome: any) => {

src/views/equip/list.vue

@@ -189,7 +189,8 @@ import {
     apiGetEquipTypeList,
     getTypeListApi,
     getDeviceListApi,
-} from '@/http/api/equip'
+    getCompanyCountApi,
+} from 'http/api/equip'
 import { getCompanyListApi, getGoodsClassListApi } from 'http/api/home'
 import $bus from '@/utils/bus'
 import NavMenu from '@/components/Navmenu/index.vue'
@@ -534,6 +535,23 @@ const getDeviceListData = async (params: any = null, keyWord: any = null) => {
 
     Object.assign(searchParams, pageData)
     const { data: res } = await getDeviceListApi(searchParams)
+
+    const searchParams_2 = JSON.parse(JSON.stringify(searchParams))
+    searchParams_2.companyId = ''
+    const result: any = await getCompanyCountApi(searchParams_2)
+    screenChooseList[4].list.forEach((e: any, index: any) => {
+        if (index != 0) {
+            e.name = e.companyName + `(${0})`
+        }
+    })
+    for (let key in result.data) {
+        screenChooseList[4].list.forEach((e: any, index: any) => {
+            if (e.companyId == key) {
+                e.name = ''
+                e.name = e.companyName + `(${result.data[key]})`
+            }
+        })
+    }
     equipList.value = res.rows
     total.value = res.total
 }