Browse Source

Merge branch 'graphEq' of http://39.106.8.246:3003/web/ibms into graphEq

haojianlong 4 years ago
parent
commit
075af1d875
1 changed files with 93 additions and 61 deletions
  1. 93 61
      src/views/ledger/facility/batchPoint.vue

+ 93 - 61
src/views/ledger/facility/batchPoint.vue

@@ -9,10 +9,17 @@
 		</el-row>
 		<el-row class="main-container">
 			<el-row class="main-container-header">
-				<el-select v-model="isPoint" placeholder="请选择" style="width: 100px;margin-left: 10px;">
+				<el-select v-model="isPoint" @change="getEquipData" placeholder="请选择" style="width: 100px;margin-left: 10px;">
 					<el-option v-for="item in isPointOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
 				</el-select>
-				<el-input style="width:250px;margin-left: 10px;" placeholder="请输入设备标识关键字" clearable suffix-icon="el-icon-search" v-model="keyword"></el-input>
+				<el-input
+					style="width:250px;margin-left: 10px;"
+					placeholder="请输入设备标识关键字"
+					clearable
+					suffix-icon="el-icon-search"
+					@change="getEquipData"
+					v-model="keyword"
+				></el-input>
 			</el-row>
 			<el-row class="main-container-box">
 				<el-col :span="3" class="container-box-left">
@@ -21,14 +28,19 @@
 					</el-select>
 					<ul class="equip-list">
 						<el-scrollbar style="height:100%;">
-							<li class="equip-item" title="全选">
+							<!-- <li class="equip-item" title="全选">
 								<el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
 							</li>
 							<el-checkbox-group v-model="checkedEquip" @change="handleCheckedEquipChange">
 								<li class="equip-item" v-for="item in equipList" :key="item.localId" :title="item[showName]">
 									<el-checkbox :label="item.localId">{{item[showName]}}</el-checkbox>
 								</li>
-							</el-checkbox-group>
+							</el-checkbox-group> -->
+							<li class="equip-item" v-for="item in equipList" :key="item.EquipID" :title="item[showName]">
+								<p class="equip-item-text">{{item[showName] || '--'}}</p>
+								<i v-if="item.BIMLocation" class="iconfont icon-hook equip-item-icon" style="color: #67C23A;"></i>
+								<i v-else class="iconfont icon-cross equip-item-icon" style="color: #F56C6C;"></i>
+							</li>
 						</el-scrollbar>
 					</ul>
 				</el-col>
@@ -50,6 +62,7 @@
 <script>
 import floorCascader from "@/components/ledger/lib/floorCascader";
 import myCascader from "@/components/ledger/lib/cascader";
+import { queryEquip } from '@/api/scan/request'
 import { mapGetters } from "vuex";
 export default {
   components: {
@@ -58,9 +71,12 @@ export default {
   },
   data() {
     return {
+		buildId: "", //建筑Id
+		floorId: "", //楼层Id
+		classCode: "", //设备类别
 		isPoint: "all", //是否有坐标(全部-all、有坐标-yes、无坐标-no)
 		keyword: "", //设备标识关键字
-		showName: "localName", //显示名称
+		showName: "EquipLocalName", //显示名称
 		isIndeterminate: false, //全选样式显示
 		checkAll: false, //是否全选
 		checkedEquip: [], //选中的设备
@@ -79,64 +95,16 @@ export default {
           label: "无坐标"
 		}],
 		showNameOptions: [{
-          value: "localName",
+          value: "EquipLocalName",
           label: "显示设备本地名称"
         }, {
-          value: "localId",
+          value: "EquipLocalID",
           label: "显示设备本地编码"
         }, {
-          value: "cadId",
+          value: "CADID",
           label: "显示图纸编码"
 		}],
-		equipList: [{
-			localName: "低压开关柜#1",
-			localId: "dykgg1",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#2",
-			localId: "dykgg2",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#3",
-			localId: "dykgg3",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#4",
-			localId: "dykgg4",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#5",
-			localId: "dykgg5",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜低压开关柜低压开关柜低压开关柜#6",
-			localId: "dykgg6",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#7",
-			localId: "dykgg7",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#8",
-			localId: "dykgg8",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#9",
-			localId: "dykgg9",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#10",
-			localId: "dykgg10",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#11",
-			localId: "dykgg11",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}, {
-			localName: "低压开关柜#12",
-			localId: "dykgg12",
-			cadId: "ajfojfhweafalf14646ahfjsh"
-		}]
+		equipList: []
 	};
   },
   computed: {
@@ -151,14 +119,64 @@ export default {
     // 返回
     goback() {
       this.$router.push({ name: "facilityLedger" });
-    },
+	},
+	//获取所以主体数据---用于维护信息
+	getEquipData() {
+		if (this.classCode) {
+			let params = {
+				Filters: `category='${this.classCode}'`,
+				PageSize: 1000,
+				Orders: 'createTime desc, EquipID desc',
+				PageNumber: 1,
+				Projection: ['Category', 'EquipLocalName', 'EquipLocalID', 'EquipID', 'BIMID', 'CADID', 'LocationJson', 'BIMLocation'],
+			}
+			if (this.buildId == 'noKnow') {
+				params.Filters += `;buildingId isNull`
+			} else if (this.buildId && this.buildId != 'all') {
+				params.Filters += `;buildingId='${this.buildId}'`
+			}
+
+			if (this.floorId == 'noKnow') {
+				params.Filters += `;floorId isNull`
+			} else if (this.floorId && this.floorId != 'all') {
+				params.Filters += `;floorId='${this.floorId}'`
+			}
+
+			if (this.isPoint == "yes") {
+				params.Filters += `;not BIMLocation isNull`
+			} else if (this.isPoint == "no") {
+				params.Filters += `;BIMLocation isNull`
+			}
+
+			if (this.keyword) {
+				params.Filters += `;EquipLocalName contain'${this.keyword}' or EquipLocalID contain '${this.keyword}' or CADID contain '${this.keyword}'`
+			}
+
+			queryEquip(params, (res) => {
+				this.equipList = res.Content;
+			})
+		}
+	},
     //修改楼层
     changeFloor(value) {
-      console.log(value);
+		if (value[0]) {
+			this.buildId = value[0];
+		}
+		if (value[1]) {
+			this.floorId = value[1];
+		} else {
+			this.floorId = "";
+		}
+		this.getEquipData();
     },
     //修改设备族
     changeDevice(value) {
-	  console.log(value);
+		if (value.code) {
+			this.classCode = value.code;
+		} else {
+			this.classCode = "";
+		}
+		this.getEquipData();
 	},
 	//设备列表全选/取消全选控制
 	handleCheckAllChange(val) {
@@ -212,9 +230,23 @@ export default {
 					overflow-x: hidden;
 				}
 				.equip-item {
-					padding: 0 15px;
+					padding-left: 15px;
+					padding-right: 10px;
 					width: 100%;
+					height: 32px;
+					line-height: 32px;
 					box-sizing: border-box;
+					cursor: pointer;
+					.equip-item-text {
+						display: inline-block;
+						width: calc(100% - 20px);
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+					.equip-item-icon {
+						float: right;
+					}
 					.el-checkbox {
 						width: 100%;
 						/deep/ .el-checkbox__label {