|
|
@@ -112,7 +112,6 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
-
|
|
|
<!-- 组织机构 -->
|
|
|
<div v-if="activeTab === 'organ'">
|
|
|
<el-form :model="DeptQueryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
|
|
@@ -173,7 +172,6 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
-
|
|
|
<!-- 设施 -->
|
|
|
<div v-if="activeTab === 'facs'">
|
|
|
<el-tabs v-model="FacsQueryParams.facsCategory" @tab-click="facsCategoryChange">
|
|
|
@@ -276,8 +274,6 @@
|
|
|
<el-option v-for="item in devOptions" :label="item.psName" :value="item.psCode" :key="item.psCode"/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
-
|
|
|
<el-form-item>
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleDeviceQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetDeviceQuery">重置</el-button>
|
|
|
@@ -368,7 +364,6 @@
|
|
|
</el-table>
|
|
|
<pagination v-show="total>0" :total="total" :page.sync="MeterQueryParams.pageNum" :limit.sync="MeterQueryParams.pageSize"
|
|
|
@pagination="getMeterData" />
|
|
|
-
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click="saveByObj">保 存</el-button>
|
|
|
<el-button @click="MeterCancel">取 消</el-button>
|
|
|
@@ -384,7 +379,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
|
|
import { areaTreeSelect, listDetailArea } from '@/api/basecfg/area'
|
|
|
import SubTitle from '@/components/SubTitle/index.vue'
|
|
|
import { getDevProcess, getEmsTag } from '@/api/commonApi'
|
|
|
-import { delDevice, listDevice } from '@/api/device/meterDevice'
|
|
|
+import { listDevice } from '@/api/device/meterDevice'
|
|
|
import { addAllByObj, listByObj } from '@/api/basecfg/boundaryRel'
|
|
|
import { listDept } from '@/api/system/dept'
|
|
|
import { getFacsCategorygetByCode, listAllFacs, listFacs } from '@/api/basecfg/emsfacs'
|
|
|
@@ -585,6 +580,7 @@ export default {
|
|
|
this.form.areaAttr = {};
|
|
|
this.getList();
|
|
|
this.getDeptList();
|
|
|
+
|
|
|
},
|
|
|
methods: {
|
|
|
getAreaFacsTree(areaCode, recursion) {
|
|
|
@@ -631,7 +627,6 @@ export default {
|
|
|
});
|
|
|
return name;
|
|
|
},
|
|
|
-
|
|
|
getColCycleName(colCycle) {
|
|
|
const cycleMap = {
|
|
|
0: '实时',
|
|
|
@@ -672,7 +667,7 @@ export default {
|
|
|
this.getMeterData();
|
|
|
},
|
|
|
|
|
|
- //地理位置
|
|
|
+ /**地理位置*/
|
|
|
handleNodeClick(data) {
|
|
|
if (data.id === 'all') {
|
|
|
this.areaOptions = this.areaList.slice(1).map(item => {
|
|
|
@@ -693,8 +688,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
-
|
|
|
- //组织机构
|
|
|
+ /**组织机构*/
|
|
|
handleDeptNodeClick(data) {
|
|
|
if (data.deptId === 'all') {
|
|
|
this.organOptions = this.deptList.slice(1).map(item => {
|
|
|
@@ -713,17 +707,16 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- //设施
|
|
|
+ /**设施*/
|
|
|
handleFacsNodeClick(data) {
|
|
|
this.FacsQueryParams.refArea = data.id
|
|
|
this.handleFacsQuery()
|
|
|
},
|
|
|
- //设备
|
|
|
+ /**设备*/
|
|
|
handleDeviceNodeClick(data) {
|
|
|
this.DeviceQueryParams.locationRef = data.id
|
|
|
this.handleDeviceQuery()
|
|
|
},
|
|
|
-
|
|
|
/** 查询区域对象列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
@@ -1150,6 +1143,7 @@ export default {
|
|
|
},
|
|
|
getTagStyle(tagName) {
|
|
|
// 从tagName找到对应的tagCode
|
|
|
+
|
|
|
const tagCode = this.emsTagOptions.find(tag => tag.label === tagName)?.value;
|
|
|
const color = this.tagCodeToColorMap[tagCode] || '#FFFFFF'; // 默认白色
|
|
|
return {
|
