Forráskód Böngészése

电井间需求修改

yunxing 4 éve
szülő
commit
608bba73b1
2 módosított fájl, 49 hozzáadás és 28 törlés
  1. 20 15
      src/api/equipmentList.js
  2. 29 13
      src/views/equipmentFacilities/ElectricWell.vue

+ 20 - 15
src/api/equipmentList.js

@@ -1,61 +1,66 @@
-import httputils from '@/api/httputils'
+import httputils from "@/api/httputils";
 
 // 设备设施-根据图片类型统计图片数量
 export function querySystemCount({ getParams }) {
-    return httputils.getJson(`/data/sms_proimgup/querySystemCount`, getParams)
+    return httputils.getJson(`/data/sms_proimgup/querySystemCount`, getParams);
 }
 // 查询图片  (项目概况图片/设备设施原理图/位置分布图/分水器支路分布明细/示意图/库房管理图)
 export function querySystemImage({ getParams }) {
-    return httputils.getJson(`/data/sms_proimgup/query`, getParams)
+    return httputils.getJson(`/data/sms_proimgup/query`, getParams);
 }
 // TODO: 土建立面图 路径修改
 // 查询土建系统 建筑图
 export function querySystemTuJianImage({ data, postParams }) {
-    return httputils.fetchJson(`/data/sms_proimgup/query`, data, postParams)
+    return httputils.fetchJson(`/data/sms_proimgup/query`, data, postParams);
 }
 export function querySystemCard({ getParams }) {
-    return httputils.getJson(`/data/home/querySystemCard`, getParams)
+    return httputils.getJson(`/data/home/querySystemCard`, getParams);
 }
 
 // 设备设施-主要设备清单
 export function queryStatistics({ data, postParams }) {
-    return httputils.fetchJson(`/data/sms_asset/queryStatistics`, data, postParams)
+    return httputils.fetchJson(`/data/sms_asset/queryStatistics`, data, postParams);
 }
 // 设备设施-主要设备清单-详情
 export function queryEquipmentList({ data, postParams }) {
-    return httputils.fetchJson(`/data/sms_asset/query`, data, postParams)
+    return httputils.fetchJson(`/data/sms_asset/query`, data, postParams);
 }
 // 设备设施-主要设备清单类型
 export function queryAssetClass({ getParams }) {
     // return httputils.getJson(`/data/base/queryClassStructureBySmsxt`, getParams)
-    return httputils.getJson(`/data/sms_asset/queryAssetClass`, getParams)
+    return httputils.getJson(`/data/sms_asset/queryAssetClass`, getParams);
 }
 
 // 设备设施-楼层电井口(间)控制商铺范围清单
 export function queryShops({ getParams }) {
-    return httputils.getJson(`/data/sms_shops/query`, getParams)
+    return httputils.getJson(`/data/sms_shops/query`, getParams);
+}
+// 设备设施-楼层电井口(间)控制商铺范围清单 特色电井控制商铺
+// 添加商铺信息,增加按商铺名称搜索
+export function queryBrand({ getParams }) {
+    return httputils.getJson(`/data/sms_shops/queryBrand`, getParams);
 }
 // 查询机房平面布置图数量
 export function queryRoomCount({ getParams }) {
-    return httputils.getJson(`/data/sms_location/queryCount`, getParams)
+    return httputils.getJson(`/data/sms_location/queryCount`, getParams);
 }
 // 设备设施- 机房平面布置图列表
 export function querySmsLocation({ data, postParams }) {
-    return httputils.fetchJson(`/data/sms_location/query`, data, postParams)
+    return httputils.fetchJson(`/data/sms_location/query`, data, postParams);
 }
 // 设备设施 - 查询配电室低压柜
 export function queryDygjcx({ data, postParams }) {
-    return httputils.fetchJson(`/data/sms_location/queryDygjcx`, data, postParams)
+    return httputils.fetchJson(`/data/sms_location/queryDygjcx`, data, postParams);
 }
 // 设备设施 - 查询低压出线柜明细
 export function queryDygjcxline({ getParams }) {
-    return httputils.getJson(`/data/sms_dygjcxline/queryDygjcxline`, getParams)
+    return httputils.getJson(`/data/sms_dygjcxline/queryDygjcxline`, getParams);
 }
 // 查询更多主要设备 --废弃
 export function queryMoreAsset({ data, postParams }) {
-    return httputils.fetchJson(`/data/sms_asset/queryAsset`, data, postParams)
+    return httputils.fetchJson(`/data/sms_asset/queryAsset`, data, postParams);
 }
 // 查询更多设备卡片
 export function queryMoreSystemCard({ getParams }) {
-    return httputils.getJson(`/data/sms_asset/moreSystemCard`, getParams)
+    return httputils.getJson(`/data/sms_asset/moreSystemCard`, getParams);
 }

+ 29 - 13
src/views/equipmentFacilities/ElectricWell.vue

@@ -31,12 +31,19 @@
                     <div class='well' v-for='(detail) in item.data.slice(0,2)' :key='detail.meterbox'>
                         <div class='well-title'>{{detail.welldes}}</div>
                         <div class='meterbox'>
-                            <span class='well-left'>商铺电表:</span>
+                            <span class='well-left'>商铺电表:</span>
                             <span class='value'>{{detail.meterbox}}</span>
                         </div>
                         <div class='meterbox'>
-                            <span class='well-left'>商铺编号:</span>
-                            <span class='value'>{{detail.shopsnumList}}</span>
+                            <span class='well-left'>商铺信息:</span>
+                            <span class='value'>
+                                <i v-for='(info,infoIndex) in detail.brandList' :key='infoIndex'>
+                                    {{ info.brandname || 'xxx' }}
+                                    -
+                                    {{ info.shopsnumList ?info.shopsnumList.replaceAll(',','、'): 'xxx' }}
+                                    {{infoIndex===detail.brandList.length-1? '':',' }}
+                                </i>
+                            </span>
                         </div>
                     </div>
 
@@ -45,12 +52,19 @@
                         <div class='well' v-for='(detail) in item.data.slice(2)' :key='detail.meterbox'>
                             <div class='well-title'>{{detail.welldes}}</div>
                             <div class='meterbox'>
-                                <span class='well-left'>商铺电表:</span>
+                                <span class='well-left'>商铺电表:</span>
                                 <span class='value'>{{detail.meterbox}}</span>
                             </div>
                             <div class='meterbox'>
-                                <span class='well-left'>商铺编号:</span>
-                                <span class='value'>{{detail.shopsnumList}}</span>
+                                <span class='well-left'>商铺信息:</span>
+                                <span class='value'>
+                                    <i v-for='(info,infoIndex) in detail.brandList' :key='infoIndex'>
+                                        {{ info.brandname || 'xxx' }}
+                                        -
+                                        {{ info.shopsnumList ? info.shopsnumList.replaceAll(',','、') : 'xxx' }}
+                                        {{ infoIndex === detail.brandList.length - 1 ? '' : ',' }}
+                                    </i>
+                                </span>
                             </div>
                         </div>
                     </div>
@@ -109,7 +123,7 @@ import { NavBar, Search, List, Cell, Icon, Popup, Button, Empty } from 'vant'
 Vue.use(NavBar).use(Search).use(List).use(Cell).use(Icon).use(Popup).use(Button).use(Empty)
 import { mapGetters, mapMutations } from 'vuex'
 
-import { queryShops } from '@/api/equipmentList'
+import { queryShops, queryBrand } from '@/api/equipmentList'
 import { sleep } from '@/utils/util'
 import { cloneDeep } from 'lodash'
 export default {
@@ -146,7 +160,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr', 'oldSmsxt', 'oldCategoryId','isGlobal']),
+        ...mapGetters(['plazaId', 'smsxt', 'categoryId', 'floorsArr', 'oldSmsxt', 'oldCategoryId', 'isGlobal']),
     },
     components: {},
     created() {
@@ -170,7 +184,7 @@ export default {
         backPage() {
             // 如果是全局搜索进入时,修改smsxt,categoryId为进入全局搜索之前的,
             // 并将oldSmsxt, oldCategoryId设置为''
-            if(this.isGlobal){
+            if (this.isGlobal) {
                 this.SETSMSXT(this.oldSmsxt)
                 this.SETCATEGORYID(this.oldCategoryId)
                 this.SETOLDCATEGORYID('')
@@ -197,7 +211,7 @@ export default {
             }
             // 输入框搜索关键字
             if (this.keyword) {
-                getParams.keyword = `${this.keyword}:welldes,meterbox,shopsnumList;`
+                getParams.keyword = `${this.keyword}:welldes,meterbox,shopsnumList,brandname;`
             }
             // 右侧弹窗 筛选楼层的类型
             if (this.currentFloor && this.currentFloor !== '全部') {
@@ -208,7 +222,7 @@ export default {
                 getParams.keyword = getParams.keyword || ''
                 getParams.keyword += `${this.currentWellType}:welldes;`
             }
-            let resData = await queryShops({ getParams })
+            let resData = await queryBrand({ getParams })
             if (!resData && !resData?.data) {
                 this.list = []
                 return false
@@ -426,8 +440,10 @@ export default {
                         .value {
                             flex: 1;
                             height: auto;
-                            word-wrap: break-word;
-                            word-break: break-all;
+                            word-break: break-word;
+                            i {
+                                padding: 2px 0;
+                            }
                         }
                     }
                 }