Merge branch 'master' of http://git.xt.wenhq.top:8083/hs/zhny_ui

# Conflicts:
#	ems-ui-cloud/src/views/basecfg/device/index.vue

ems-ui-cloud/src/api/basecfg/area.js

@@ -60,16 +60,9 @@ export function getAreaByCode(areaCode) {
 }
 
 // 查询区域树结构
-export function areaTreeSelect(areaCode, recursion) {
+export function areaTreeSelect(areaCode, layer) {
   return request({
-    url: '/ems/basecfg/area/getAreaTree?rootCode=' + areaCode + '&recursion=' + recursion,
-    method: 'get'
-  })
-}
-
-export function getAreaTreeSelect(rootCode, layer) {
-  return request({
-    url: '/ems/basecfg/area/getAreaTree?rootCode=' + rootCode + '&layer=' + layer,
+    url: '/ems/basecfg/area/getAreaTree?rootCode=' + areaCode + '&layer=' + layer,
     method: 'get'
   })
 }

ems-ui-cloud/src/api/basecfg/boundaryRel.js

@@ -1,43 +0,0 @@
-import request from '@/utils/request'
-
-// 查询计量设备绑定边界对象关系列表
-export function listByObj(objType,meterCls, boundaryObj) {
-  return request({
-    url: '/ems/meterBoundaryRel/listByObj',
-    method: 'get',
-    params: {
-      objType: objType,
-      meterCls:meterCls,
-      boundaryObj: boundaryObj
-    }
-  })
-}
-
-// 新增计量设备绑定边界对象关系
-export function addByObj(data) {
-  return request({
-    url: '/ems/meterBoundaryRel/addBatch',
-    method: 'post',
-    data: data
-  })
-}
-
-export function addAllByObj(objType, meterCls, boundaryObj,data) {
-  return request({
-    url: `/ems/meterBoundaryRel/merge?objType=${objType}&boundaryObj=${boundaryObj}&meterCls=${meterCls}`,
-    method: 'put',
-    data: data // 将数据数组作为请求体发送
-  });
-}
-
-// 删除计量设备绑定边界对象关系
-export function delByObj(objType, boundaryObj) {
-  return request({
-    url: '/ems/meterBoundaryRel/delByObj',
-    method: 'delete',
-    params: {
-      objType: objType,
-      boundaryObj: boundaryObj
-    }
-  })
-}

ems-ui-cloud/src/views/adapter/pv/index.vue

@@ -583,7 +583,7 @@ export default {
   created() {
     this.queryParams.deviceCategory = 'E'; // 确保初始加载时就设置为 'E'
     this.getList()
-    this.getAreaTree('0', false)
+    this.getAreaTree('0', 1)
     this.getFacsOptions()
     this.getSubsystem()
     this.getSubCategorygetByCode()
@@ -673,8 +673,8 @@ export default {
       })
     },
     /** 查询区域树结构 */
-    getAreaTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.treeAreaOptions =  [{
           id: '-1',
           label: '全部',
@@ -828,9 +828,9 @@ export default {
         this.open = true
         this.title = '修改能源设备'
       })
-      const recursion = false
+      const layer = 1
       const areaCode = '0'
-      areaTreeSelect(areaCode, recursion).then(response => {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.totalAreaOptions = response.data
       })
     },

ems-ui-cloud/src/views/alarm/alarm-info/index.vue

@@ -272,7 +272,7 @@ export default {
     }
   },
   created () {
-    this.getAreaTree( '0', false);
+    this.getAreaTree( '0', 1);
     this.getList();
     this.getSubList();
   },
@@ -386,8 +386,8 @@ export default {
         ...this.queryParams,
       }, `alarm-info_${new Date().getTime()}.xlsx`);
     },
-    getAreaTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions =[{
           id: '-1',
           label: '全部',

ems-ui-cloud/src/views/alarm/index.vue

@@ -212,7 +212,7 @@ export default {
     }
   },
  async created () {
-    await this.getAreaTreeByTag('0', false)
+    await this.getAreaTreeByTag('0', 1)
     this.getList();
   },
   methods: {
@@ -226,8 +226,8 @@ export default {
       });
     },
      /** 查询区域树结构 */
-     async getAreaTreeByTag(areaCode, recursion) {
-       await areaTreeSelect(areaCode, recursion).then(response => {
+     async getAreaTreeByTag(areaCode, layer) {
+       await areaTreeSelect(areaCode, layer).then(response => {
          this.areaOptions = [{
            id: '-1',
            label: '全部',

ems-ui-cloud/src/views/analysis/device/warn.vue

@@ -136,7 +136,7 @@ export default {
     }
   },
   async mounted () {
-    await this.getAreaTreeByTag('0', false)
+    await this.getAreaTreeByTag('0', 1)
     this.queryCharts()
     this.getRecentSevenDays();
   },
@@ -149,8 +149,8 @@ export default {
       this.endRecTime = endRecTime.format('YYYY-MM-DD HH:mm:ss');
     },
     /** 查询区域树结构 */
-    async getAreaTreeByTag(areaCode, recursion) {
-      await areaTreeSelect(areaCode, recursion).then(response => {
+    async getAreaTreeByTag(areaCode, layer) {
+      await areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = [{
           id: '-1',
           label: '全部',

ems-ui-cloud/src/views/basecfg/boundaryRel/index.vue

@@ -513,8 +513,8 @@ export default {
     this.getDeviceList();
   },
   created() {
-    this.getAreaFacsTree('0', false)
-    this.getAreaDeviceTree('0', false)
+    this.getAreaFacsTree('0', 1)
+    this.getAreaDeviceTree('0', 1)
     this.getAllDevProcess(this.subcategoryCode)
     this.getEmsTag('Area');
     this.getFacsOptions()
@@ -524,8 +524,8 @@ export default {
 
   },
   methods: {
-    getAreaFacsTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaFacsTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.facsOptions = [{
           id: '-1',
           label: '全部',
@@ -533,8 +533,8 @@ export default {
         }]
       })
     },
-    getAreaDeviceTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaDeviceTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.deviceOptions =  [{
           id: null,
           label: '全部',

ems-ui-cloud/src/views/basecfg/device/index.vue

@@ -374,12 +374,11 @@
                 <div>
                   <p><span class="bold">设备名称：</span>{{ curRow.deviceName }}</p>
                   <p><span class="bold">设备代码：</span>{{ curRow.deviceCode }}</p>
+                  <p><span class="bold">设备分类：</span>{{ curRow.deviceCategoryName + getPsName(curRow.psName)}}</p>
                   <p><span class="bold">归属设施：</span>{{ curRow.refFacsName }}</p>
-                  <p><span class="bold">设备分类：</span>{{ curRow.deviceCategoryName + '-' + curRow.psName}}</p>
-                  <p><span class="bold">归属区域：</span>{{ getAreaNameByCode(curRow.areaCode) }}</p>
-                  <p><span class="bold">归属子区：</span>{{ curRow.locationRefName }}</p>
-                  <p><span class="bold">安装位置：</span>{{ curRow.location}}</p>
-                  <p><span class="bold">子系统：</span>{{ curRow.subsystemName }}</p>
+                  <p><span class="bold">归属区域：</span>{{ buildRefAreaName(curRow) }}</p>
+                  <p><span class="bold">安装位置：</span>{{ curRow.location === null ? '无' : curRow.location }}</p>
+                  <p><span class="bold">归属系统：</span>{{ curRow.subsystemName === null ? '无' : curRow.subsystemName}}</p>
                 </div>
                 <div class="footer">
                   <div class="footer">
@@ -820,15 +819,19 @@ export default {
   },
   methods: {
     // 根据区域代码获取区域名称
-    getAreaNameByCode(areaCode) {
-      const area = this.areaOptions.find(a => a.id === areaCode);
-      return area ? area.label : '未知区域';
+    buildRefAreaName(curRow) {
+      const area = this.treeAreaOptions.find(a => a.id === curRow.areaCode);
+      const areaName = area ? area.label : '未知区域';
+
+      if (curRow.locationRef !== curRow.areaCode) {
+        return areaName + ' - ' + curRow.locationRefName;
+      }
+      return areaName;
     },
     /**下拉归属区域*/
     loadAreaOptions() {
       getAreaTreeSelect('0', 1).then(response => {
         this.areaOptions = response.data || []
-        console.log("归属区域",this.areaOptions)
       })
     },
     /**下拉归属子区*/
@@ -1382,7 +1385,9 @@ export default {
     updateAttrValue(attrKey, newValue) {
       this.attrValuesMap[attrKey] = newValue
     },
-
+    getPsName(psName) {
+      return psName === null ? '' : ' - '+psName;
+    },
     getFacsModel() {
       listAllModel(2).then(response => {
         this.modelList = response.data

ems-ui-cloud/src/views/basecfg/emsfacs/index.vue

@@ -293,7 +293,7 @@ import {
   getFacsCategorygetByCode
 } from '@/api/basecfg/emsfacs'
 import { listAllFacsCategory } from '@/api/basecfg/facscategory'
-import { areaTreeSelect, getAreaTreeSelect } from '@/api/basecfg/area'
+import { areaTreeSelect } from '@/api/basecfg/area'
 import { getModelByCode, listAllModel } from '@/api/basecfg/objModel'
 import { getObjAttr } from '@/api/basecfg/objAttribute'
 import { addAttrValueBatch } from '@/api/basecfg/objAttributeValue'
@@ -630,7 +630,7 @@ export default {
     },
     /** 查询区域树结构 */
     getAreaTree(areaCode, layer) {
-      getAreaTreeSelect(areaCode, layer).then(response => {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = [{
           id: null,
           label: '全部',

ems-ui-cloud/src/views/basecfg/meterdevc/index.vue

@@ -157,7 +157,7 @@
 
 <script>
 import { listDevice, getDevice, delDevice, addDevice, updateDevice, listAreaDevice } from '@/api/device/meterDevice'
-import { areaTreeSelect, getAreaTreeSelect } from '@/api/basecfg/area'
+import { areaTreeSelect } from '@/api/basecfg/area'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
@@ -258,7 +258,7 @@ export default {
   methods: {
     /**归属子区*/
     loadSubAreaOptions(areaCode) {
-      getAreaTreeSelect(areaCode, 2).then((response) => {
+      areaTreeSelect(areaCode, 2).then((response) => {
         this.subAreaOptions = response.data || [];
       })
     },
@@ -423,7 +423,7 @@ export default {
     },
     /** 查询区域树结构 */
     getAreaTree(areaCode, layer) {
-      getAreaTreeSelect(areaCode, layer).then(response => {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = response.data || [];
         this.$nextTick(() => {
           //触发第一个节点

ems-ui-cloud/src/views/basecfg/price/index.vue

@@ -610,8 +610,8 @@ export default {
     }
   },
   created() {
-    this.getAreaList('0', false)
-    this.getAreaTree('0', true)
+    this.getAreaList('0', 1)
+    this.getAreaTree('0', 2)
     this.getAttrList()
     this.getGwPriceList()
     this.getPvPriceList()
@@ -622,8 +622,8 @@ export default {
   },
   methods: {
     /** 查询区域树结构 */
-    getAreaTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.treeAreaOptions =  response.data
         // 自动选中并触发点击第一个节点
         if (response.data && response.data.length > 0) {
@@ -938,8 +938,8 @@ export default {
       })
     },
     // 查询区域列表
-    getAreaList(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaList(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = response.data
       })
     },

ems-ui-cloud/src/views/devmgr/attr/index.vue

@@ -258,9 +258,11 @@
                 <div>
                   <p><span class="bold">设备名称：</span>{{ curRow.deviceName }}</p>
                   <p><span class="bold">设备代码：</span>{{ curRow.deviceCode }}</p>
-                  <p><span class="bold">归属设施：</span>{{ curRow.refFacs }}</p>
-                  <p><span class="bold">归属区域：</span>{{ curRow.areaPath }}</p>
-                  <p><span class="bold">子系统：</span>{{ curRow.subsystemName }}</p>
+                  <p><span class="bold">设备分类：</span>{{ curRow.deviceCategoryName + getPsName(curRow.psName)}}</p>
+                  <p><span class="bold">归属设施：</span>{{ curRow.refFacsName }}</p>
+                  <p><span class="bold">归属区域：</span>{{ buildRefAreaName(curRow) }}</p>
+                  <p><span class="bold">安装位置：</span>{{ curRow.location === null ? '无' : curRow.location }}</p>
+                  <p><span class="bold">归属系统：</span>{{ curRow.subsystemName === null ? '无' : curRow.subsystemName}}</p>
                   <p>
                     <span class="bold">设备状态：</span>
                     <span :class="getDeviceStatusClass(curRow.deviceStatus)">
@@ -442,7 +444,7 @@ export default {
   },
   created() {
     this.getList()
-    this.getAreaTree('0', false)
+    this.getAreaTree('0', 2)
     this.getFacsOptions()
     this.getSubsystem()
     this.getSubCategorygetByCode()
@@ -597,9 +599,18 @@ export default {
         abilityParam: row.abilityParam
       }).then(response => {
         this.$message({ message: '设备能力执行成功', type: 'success' })
-
       })
     },
+    // 根据区域代码获取区域名称
+    buildRefAreaName(curRow) {
+      const area = this.treeAreaOptions.find(a => a.id === curRow.areaCode);
+      const areaName = area ? area.label : '未知区域';
+
+      if (curRow.locationRef !== curRow.areaCode) {
+        return areaName + ' - ' + curRow.locationRefName;
+      }
+      return areaName;
+    },
     handleOperate(row) {
       listcallAbility({
         abilityKey: row.abilityKey,
@@ -609,9 +620,11 @@ export default {
         abilityParam: row.abilityParam
       }).then(response => {
         this.$message({ message: '设备能力执行成功', type: 'success' })
-
       })
     },
+    getPsName(psName) {
+      return psName === null ? '' : ' - '+psName;
+    },
     getDeviceStatus(status) {
       return status === 1 ? '在线' : '离线'
     },
@@ -659,8 +672,8 @@ export default {
       })
     },
     /** 查询区域树结构 */
-    getAreaTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.treeAreaOptions = [{
           id: null,
           label: '全部',
@@ -736,12 +749,7 @@ export default {
     },
     deviceCategoryChange() {
       this.reset()
-      if (this.queryParams.deviceCategory === 'E' || this.queryParams.deviceCategory === 'W'
-        || this.queryParams.deviceCategory === 'T' || this.queryParams.deviceCategory === 'C') {
-        this.getAreaTree('0', false)
-      } else if (this.queryParams.deviceCategory === 'Z') {
-        this.getAreaTree('0', true)
-      }
+      this.getAreaTree('0', 2)
       this.getSubCategorygetByCode()
       this.getFacsOptions()
       this.handleQuery()

ems-ui-cloud/src/views/devmgr/el/index.vue

@@ -320,7 +320,7 @@ export default {
 
   },
   async created () {
-    await this.getAreaTreeByTag('0', false)
+    await this.getAreaTreeByTag('0', 1)
     // 确保默认选中第一个Tab，并设置 queryParams.objType
     this.queryParams.objType = this.dict.type.device_type[0].value;
     this.getList(true); // 调用 getList 并传递一个参数来强制刷新
@@ -367,8 +367,8 @@ export default {
     },
 
     /** 查询区域树结构 */
-    async getAreaTreeByTag(areaCode, recursion) {
-      await areaTreeSelect(areaCode, recursion).then(response => {
+    async getAreaTreeByTag(areaCode, layer) {
+      await areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = [{
           id: '-1',
           label: '全部',
@@ -396,7 +396,7 @@ export default {
     updateObjCodeOptions() {
       if (this.form.objType === '2') {
         // 设备逻辑
-        areaTreeSelect(this.form.areaCode, true).then(response => {
+        areaTreeSelect(this.form.areaCode, 3).then(response => {
           this.objCodeOptions = [{
             id: this.form.areaCode,
             label: this.getAreaLabelById(this.form.areaCode),
@@ -476,7 +476,7 @@ export default {
       console.log("objType",objType)
       if (objType === '1') {
         // 区域逻辑
-        areaTreeSelect('0', false).then(response => {
+        areaTreeSelect('0', 1).then(response => {
           console.log("areaTreeSelect response:", response); // 检查返回的数据
           // 只保留“default”下的前三个子项
           if (response.data && response.data.length > 0) {
@@ -498,7 +498,7 @@ export default {
       } else if (objType === 2) {
         // 设备逻辑
         console.log("this.form.areaCode",this.form.areaCode)
-        areaTreeSelect(this.form.areaCode, true).then(response => {
+        areaTreeSelect(this.form.areaCode, 3).then(response => {
           this.objCodeOptions = [{
             id: this.form.areaCode,
             label: this.getAreaLabelById(this.form.areaCode),

ems-ui-cloud/src/views/devmgr/meterRead/index.vue

@@ -249,7 +249,7 @@ export default {
     }
   },
   created() {
-    this.getAreaTreeSelect('0', false)
+    this.getAreaTreeSelect('0', 1)
     this.getList()
   },
 
@@ -322,8 +322,8 @@ export default {
       }
       return tagMap[objTag] || '未知'
     },
-    async getAreaTreeSelect(areaCode, recursion) {
-      await areaTreeSelect(areaCode, recursion).then(response => {
+    async getAreaTreeSelect(areaCode, layer) {
+      await areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = response.data
       })
     },

ems-ui-cloud/src/views/mgr/strategy.vue

@@ -425,7 +425,7 @@ export default {
   },
   created() {
     this.queryParams.strategyType = 1;
-    this.getAreaTree('0', false)
+    this.getAreaTree('0', 1)
     this.getList();
   },
   methods: {
@@ -718,8 +718,8 @@ export default {
       this.handleQuery()
     },
     /** 查询区域树结构 */
-    getAreaTree(areaCode, recursion) {
-      areaTreeSelect(areaCode, recursion).then(response => {
+    getAreaTree(areaCode, layer) {
+      areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = [{
           id: '-1',
           label: '全部',

ems-ui-cloud/src/views/task/index.vue

@@ -50,12 +50,12 @@ export default {
     }
   },
   async created () {
-    await this.getAreaTreeByTag('0', false)
+    await this.getAreaTreeByTag('0', 1)
   },
   methods: {
     /** 查询区域树结构 */
-    async getAreaTreeByTag(areaCode, recursion) {
-      await areaTreeSelect(areaCode, recursion).then(response => {
+    async getAreaTreeByTag(areaCode, layer) {
+      await areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = [{
           id: '-1',
           label: '全部',

ems-ui-cloud/src/views/task/report/index.vue

@@ -202,7 +202,7 @@ export default {
     }
   },
  async created () {
-    await this.getAreaTreeSelect('0', false)
+    await this.getAreaTreeSelect('0', 1)
     this.getList();
   },
   methods: {
@@ -216,8 +216,8 @@ export default {
       });
     },
     /** 查询区域树结构 */
-    async getAreaTreeSelect(areaCode, recursion) {
-      await areaTreeSelect(areaCode, recursion).then(response => {
+    async getAreaTreeSelect(areaCode, layer) {
+      await areaTreeSelect(areaCode, layer).then(response => {
         this.areaOptions = [{
           id: '-1',
           label: '全部',