fix

virgo.wzfrontend/console/src/components/work/bim/operationModel.vue

@@ -240,6 +240,7 @@
 				}
 			},
 			showDrap(type) {
+
 				this.detail = bimData[type];
 				this.drapShow = true;
 			},
@@ -472,6 +473,7 @@
 				getBimViewToken(bimData.fileId).then(this.successFunc);
 			},
 			selectItem(item) {
+				this.drapShow = false;
 				this.clearAll();
 				if (item.id === 5) return this.setWalk();
 				this.bimViewer.setStatus(bimData.cameraState);
@@ -497,7 +499,7 @@
 							html: `	<div class="tips-4">${bimData.roomList[i].name}<i class="iconfont huifont-sanjiaojiantou-xia"></i></div>`,
 							id: 'room' + bimData.roomList[i].roomId
 						}, data => {
-							this.showDrap('organizationDetail');
+							this.showDrap('roomDetail');
 						})
 					}
 				}
@@ -533,6 +535,11 @@
 			setWalk() {
 				this.isWalk = true;
 				if (!this.bimViewer) return;
+				this.bimViewer.setCamera({
+					isPan: false,
+					isRotate: false,
+					isZoom: false
+				})
 				this.bimViewer.clearAllRooms();
 				this.bimViewer.clearDrawable();
 				this.bimViewer.setStatus({
@@ -562,6 +569,11 @@
 				});
 			},
 			stopWalkFunc() {
+				this.bimViewer.setCamera({
+					isPan: true,
+					isRotate: true,
+					isZoom: true
+				})
 				this.bimViewer.clearDrawable();
 				this.isWalk = false;
 				this.stopWalk();
@@ -698,6 +710,11 @@
 							html: `	<div class="floor-name">${bimData.roomList[i].floorName}</div>`,
 							id: 'floor' + bimData.roomList[i].roomId
 						}, data => {
+							let floor = data.id.split('floor');
+							let item = bimData.roomList.find(node => node.roomId == floor[floor.length - 1]);
+							console.log(item);
+							if (item.floorName === '卫生间' || item.floorName === '公共区域' || item.floorName ===
+								'楼梯间' || item.floorName === '电梯间' || item.floorName === '设备间') return;
 							this.showDrap('roomDetail');
 						})
 					}

virgo.wzfrontend/console/src/components/work/common/coding.vue

@@ -0,0 +1,92 @@
+<template>
+	<div class="hui-flex hui-dialog">
+		<div class="hui-flex-box hui-dialog-content">
+			<el-form :model="form" label-position="top">
+				<el-form-item label="年份">
+					<el-date-picker v-model="form.year" type="year" placeholder="选择年份" :clearable="false">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="类别">
+					<el-select v-model="form.type" allow-create filterable placeholder="请选择"
+						@blur="e=>selectBlur(e,form.type)">
+						<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.name">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="位置">
+					<el-select v-model="form.position" allow-create filterable placeholder="请选择"
+						@blur="e=>selectBlur(e,form.position)">
+						<el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.name">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="序号">
+					<el-input type="text" v-model="form.number"></el-input>
+				</el-form-item>
+			</el-form>
+		</div>
+		<div class="hui-dialog-submit">
+			<el-button size="medium" @click="$emit('callback')">取 消</el-button>
+			<el-button size="medium" type="primary" @click="submit" :loading="loading">生 成</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		getCodingList,
+		insertCoding
+	} from '@/httpApi/property'
+	export default {
+		props: ['code'],
+		data() {
+			return {
+				form: {
+					year: '',
+					type: '',
+					position: '',
+					number: ''
+				},
+				loading: false,
+				typeList: [],
+				positionList: []
+			}
+		},
+		created() {
+			this.form.year = this.$dayjs(new Date()).format('YYYY');
+			this.init()
+		},
+		methods: {
+			init() {
+				getCodingList({}).then(res => {
+					if (res.state) {
+						this.typeList = res.data.filter(node => node.type === 1);
+						this.form.type = this.typeList[0].name;
+						this.positionList = res.data.filter(node => node.type === 2);
+						this.form.position = this.positionList[0].name;
+					}
+				})
+			},
+			selectBlur(e, item) {
+				item = e.target.value;
+			},
+			submit() {
+				this.loading = true;
+				let postData = JSON.parse(JSON.stringify(this.form));
+				if (!postData.number) {
+					delete postData.number;
+				}
+				insertCoding(postData).then(this.successFunc);
+			},
+			successFunc(res) {
+				this.loading = false;
+				if (res.state) {
+					this.$message.success('操作成功');
+					this.$emit('callback', 'set', res.data);
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss"></style>

virgo.wzfrontend/console/src/components/work/property/propertyFlowForm.vue

@@ -20,7 +20,9 @@
 				<el-input type="text" v-model="propertyForm.designNumber" placeholder="请输入设计编码"></el-input>
 			</el-form-item>
 			<el-form-item label="资产编码">
-				<el-input type="text" v-model="propertyForm.assetNumber" placeholder="请输入资产编码"></el-input>
+				<div class="coding-text" @click="codeVisible = true">
+					{{propertyForm.assetNumber || '点击生成资产编码'}}
+				</div>
 			</el-form-item>
 			<el-form-item label="设备编码">
 				<el-input type="text" v-model="propertyForm.deviceNumber" placeholder="请输入设备编码"></el-input>
@@ -77,6 +79,10 @@
 				</el-input>
 			</el-form-item>
 		</el-form>
+		<el-dialog :close-on-click-modal="false" title="编码生成器" :visible.sync="codeVisible" width="900px"
+			:append-to-body="true">
+			<coding v-if="codeVisible" :code="propertyForm.assetNumber" @callback="callback"></coding>
+		</el-dialog>
 	</div>
 </template>
 
@@ -87,6 +93,7 @@
 		get3DModel
 	} from '@/httpApi/property'
 	import projectItem from '@/components/common/projectItem'
+	import coding from '@/components/work/common/coding'
 	import {
 		findParentIds
 	} from '@/uitls'
@@ -125,7 +132,8 @@
 					value: 'id'
 				},
 				goDownData: [],
-				modelList: []
+				modelList: [],
+				codeVisible: false
 			}
 		},
 		created() {
@@ -164,6 +172,10 @@
 				this.propertyForm['operateDeviceLevelId'] = this.departId[this.departId.length - 1];
 				this.nowDepart = this.$refs.cascader.getCheckedNodes(true)[0].data;
 			},
+			callback(type, code) {
+				if (type === 'set') this.propertyForm.assetNumber = code;
+				this.codeVisible = false;
+			},
 			changeGoDown(val) {
 				this.propertyForm.godownName = this.goDownData.find(node => node.id == val).name;
 			},
@@ -206,10 +218,22 @@
 			}
 		},
 		components: {
-			projectItem
+			projectItem,
+			coding
 		},
 	}
 </script>
 
-<style>
+<style lang="scss">
+	.coding-text {
+		border-radius: 2px;
+		border: 1px solid #545F79;
+		background: transparent;
+		color: #BDC7DB;
+		padding: 0 12px;
+		height: 32px;
+		line-height: 32px;
+		box-sizing: border-box;
+		cursor: pointer;
+	}
 </style>

virgo.wzfrontend/console/src/httpApi/property.js

@@ -265,7 +265,7 @@ export function getGoDownDetail(id) {
 		url: `/api/godown/${id}`,
 		method: 'get'
 	})
-}
+}
 /* 
  * 3D模型库列表
  * 
@@ -323,4 +323,28 @@ export function get3DModelDetail(id) {
 		url: `/api/operateDeviceModel/${id}`,
 		method: 'get'
 	})
+}
+/* 
+ * 获取编码类型列表
+ * 
+ * 
+ */
+export function getCodingList(data) {
+	return request({
+		url: `/api/encodingGenerator/type/query`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 生成编码
+ * 
+ * 
+ */
+export function insertCoding(data) {
+	return request({
+		url: `/api/encodingGenerator`,
+		method: 'post',
+		data: data
+	})
 }

virgo.wzfrontend/console/src/views/work/energy/electrical/lighting/outdoor.vue

@@ -20,8 +20,8 @@
 								</span>
 								<div class="light-operation">
 									<i class="iconfont huifont-zhaoming"></i>
-									<span class="label">{{allChecked?'全关':'全开'}}</span>
-									<el-switch v-model="allChecked" @change="changeAllChecked"></el-switch>
+									<span class="label">{{!allChecked ? '全关' : '全开'}}</span>
+									<el-switch v-model="allChecked" @change="changeAllChecked" :disabled="list.length === 0"></el-switch>
 								</div>
 							</div>
 						</div>

virgo.wzfrontend/console/src/views/work/energy/strategy/conservation.vue

@@ -1,16 +1,14 @@
 <template>
 	<div class="hui-flex hui-content conservation-item">
 		<div class="hui-content-title">
-			<div class="hui-title-item active">输配侧</div>
-			<div class="hui-title-item">换热侧</div>
-			<div class="hui-title-item">室外侧</div>
-			<div class="hui-title-item">设备侧</div>
+			<div :class="'hui-title-item ' + (item.id === nowTitle.id ? 'active' : '')"
+				v-for="(item,index) in titleList" @click="changeTitle(item)">
+				{{item.name}}
+			</div>
 		</div>
 		<div class="hui-flex-box">
-			<div class="conservation-item">
-				<div class="hui-chart-title">
-					输配侧
-				</div>
+			<div class="conservation-item" id="view1">
+				<div class="hui-chart-title">输配侧</div>
 				<div class="conservation-chart">
 					<div class="chart-item">
 						<div class="chart-title">
@@ -46,7 +44,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="conservation-item">
+			<div class="conservation-item" id="view2">
 				<div class="hui-chart-title">
 					冷却塔换热侧
 				</div>
@@ -71,7 +69,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="conservation-item">
+			<div class="conservation-item" id="view3">
 				<div class="hui-chart-title">
 					室外侧
 				</div>
@@ -110,7 +108,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="conservation-item">
+			<div class="conservation-item" id="view4">
 				<div class="hui-chart-title">
 					设备侧
 				</div>
@@ -285,7 +283,24 @@
 				tableData1: [],
 				tableData2: [],
 				chartData: [],
-				list: []
+				list: [],
+				titleList: [{
+					id: 1,
+					name: '输配侧'
+				}, {
+					id: 2,
+					name: '换热侧'
+				}, {
+					id: 3,
+					name: '室外侧'
+				}, {
+					id: 4,
+					name: '设备侧'
+				}],
+				nowTitle: {
+					id: 1,
+					name: '输配侧'
+				}
 			}
 		},
 		created() {
@@ -369,6 +384,15 @@
 					}
 				})
 			},
+			changeTitle(title) {
+				this.nowTitle = title;
+				// 获取DOM元素
+				const element = document.getElementById('view' + title.id);
+				// 滚动到该元素
+				element.scrollIntoView({
+					behavior: 'smooth'
+				});
+			},
 			returnData(name, type) {
 				if (!type) return this.chartData.filter(node => node.data === name);
 				return this.chartData.filter(node => node.name === name && node.data === type);

virgo.wzfrontend/console/src/views/work/energy/strategy/prediction.vue

@@ -1,16 +1,14 @@
 <template>
 	<div class="hui-flex hui-content conservation-item">
 		<div class="hui-content-title">
-			<div class="hui-title-item active">输配侧</div>
-			<div class="hui-title-item">换热侧</div>
-			<div class="hui-title-item">室外侧</div>
-			<div class="hui-title-item">设备侧</div>
+			<div :class="'hui-title-item ' + (item.id === nowTitle.id ? 'active' : '')"
+				v-for="(item,index) in titleList" @click="changeTitle(item)">
+				{{item.name}}
+			</div>
 		</div>
 		<div class="hui-flex-box">
-			<div class="conservation-item">
-				<div class="hui-chart-title">
-					输配侧
-				</div>
+			<div class="conservation-item" id="view1">
+				<div class="hui-chart-title">输配侧</div>
 				<div class="conservation-chart">
 					<div class="chart-item">
 						<div class="chart-title">
@@ -46,7 +44,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="conservation-item">
+			<div class="conservation-item" id="view2">
 				<div class="hui-chart-title">
 					冷却塔换热侧
 				</div>
@@ -71,7 +69,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="conservation-item">
+			<div class="conservation-item" id="view3">
 				<div class="hui-chart-title">
 					室外侧
 				</div>
@@ -110,7 +108,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="conservation-item">
+			<div class="conservation-item" id="view4">
 				<div class="hui-chart-title">
 					设备侧
 				</div>
@@ -285,7 +283,24 @@
 				tableData1: [],
 				tableData2: [],
 				chartData: [],
-				list: []
+				list: [],
+				titleList: [{
+					id: 1,
+					name: '输配侧'
+				}, {
+					id: 2,
+					name: '换热侧'
+				}, {
+					id: 3,
+					name: '室外侧'
+				}, {
+					id: 4,
+					name: '设备侧'
+				}],
+				nowTitle: {
+					id: 1,
+					name: '输配侧'
+				}
 			}
 		},
 		created() {
@@ -369,6 +384,15 @@
 					}
 				})
 			},
+			changeTitle(title) {
+				this.nowTitle = title;
+				// 获取DOM元素
+				const element = document.getElementById('view' + title.id);
+				// 滚动到该元素
+				element.scrollIntoView({
+					behavior: 'smooth'
+				});
+			},
 			returnData(name, type) {
 				if (!type) return this.chartData.filter(node => node.data === name);
 				return this.chartData.filter(node => node.name === name && node.data === type);