Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf' (d7a95d2f) · Commits · 融通安全管理系统 / rongtong-app · GitLab

src/assets/imgs/north.png

0 → 100644

+3.19 KiB

Loading image diff...

src/views/drawCanvas/riskView.vue

+87 −35

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,9 @@
	<span class="iconRight" v-show="isViews"></span>		<span class="iconRight" v-show="isViews"></span>
	</header>		</header>
	</van-sticky>		</van-sticky>
			<div class="north">
			<img src="../../assets/imgs/north.png" alt="">
			</div>
	<grid-layout :layout.sync="layout"		<grid-layout :layout.sync="layout"
	:col-num="colNum"		:col-num="colNum"
	:row-height="30"		:row-height="30"
	@@ -16,7 +19,7 @@
	:prevent-collision="false"		:prevent-collision="false"
	:preventCollision="true"		:preventCollision="true"
	>		>
	<grid-item v-for="item in layout"		<grid-item v-for="(item) in layout"
	:static="item.static"		:static="item.static"
	:x="item.x"		:x="item.x"
	:y="item.y"		:y="item.y"
	@@ -31,12 +34,15 @@
	:style="{'backgroundColor':item.c,'border':(item.type == 'thorough'? 'none !important':'')}"		:style="{'backgroundColor':item.c,'border':(item.type == 'thorough'? 'none !important':'')}"
	>		>
	<span class="text" :class="item.w>(item.h*5) ? '': 'rowText'">{{item.name}}</span>		<span class="text" :class="item.w>(item.h*5) ? '': 'rowText'">{{item.name}}</span>
	<span class="remove" @click="removeItem(item.i)" v-if="!item.i">x</span>		<span class="remove" @click="removeItem(item.i)" v-if="showHeader">x</span>
			<!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->
	</grid-item>		</grid-item>
	</grid-layout>		</grid-layout>
	<div class="setBtns">		<div class="setBtns">
	<van-button @click="addItem" type="info" size="mini" v-if="!isViews">添加房间</van-button>		<van-button @click="addItem" type="info" size="mini" v-if="!isViews">添加房间</van-button>
	<van-button @click="addOther" type="info" size="mini" v-if="!isViews">添加其他</van-button>		<van-button @click="addOther" type="info" size="mini" v-if="!isViews">添加其他</van-button>
			<van-button @click="addBase" type="info" size="mini" v-if="!isViews">添加基础设施</van-button>
			<!-- <van-button @click="editItem" type="info" size="mini" v-if="!isViews">修改</van-button> -->
	<van-grid direction="horizontal" :column-num="2" class="footer" v-if="isViews">		<van-grid direction="horizontal" :column-num="2" class="footer" v-if="isViews">
	风险等级图例:		风险等级图例:
	<span class="riskTab type1"></span>重大风险		<span class="riskTab type1"></span>重大风险
	@@ -110,6 +116,7 @@ export default {
	isViews:false,// true:查看页面； false: 添加页面		isViews:false,// true:查看页面； false: 添加页面
	showHeader:true,		showHeader:true,
	isRoom:true,//是否为添加房间		isRoom:true,//是否为添加房间
			layoutData:[]
	}		}
	},		},
	props:{		props:{
	@@ -123,6 +130,7 @@ export default {
	// this.$nextTick(() => {		// this.$nextTick(() => {
	// this.rotateBox();		// this.rotateBox();
	// });		// });
			console.log('floorId==>>',this.$route.params.floorId )
	if (this._props.isView) {		if (this._props.isView) {
	console.log('作为组件传值==>>',)		console.log('作为组件传值==>>',)
	this.isViews = true		this.isViews = true
	@@ -210,11 +218,15 @@ export default {
	getFun('/ledger/room/list',data).then((res) => {		getFun('/ledger/room/list',data).then((res) => {
	if (res.code == 200) {		if (res.code == 200) {
	this.layout = []		this.layout = []
	res.rows.forEach((item) => {		this.layoutData = res.data
			res.data.forEach((item) => {
	item.position = JSON.parse(item.position)		item.position = JSON.parse(item.position)
	item.position.i = item.id		item.position.i = item.id
			item.position.id = item.id
			if (!this.showHeader) {
	item.position.isDraggable = false		item.position.isDraggable = false
	item.position.isResizable = false		item.position.isResizable = false
			}
	if (!this.isViews \|\| item.position.type == 'thorough') { //添加页面不显示颜色		if (!this.isViews \|\| item.position.type == 'thorough') { //添加页面不显示颜色
	item.position.c = '#e6e5e5'		item.position.c = '#e6e5e5'
	}else{		}else{
	@@ -281,6 +293,11 @@ export default {
	this.layout.splice(index, 1);		this.layout.splice(index, 1);
	return		return
	}		}
			this.$dialog.confirm({
			title: '提示',
			message: '是否删除',
			})
			.then(() => {
	postFun('/ledger/room/delete/'+val).then((res) => {		postFun('/ledger/room/delete/'+val).then((res) => {
	if (res.code == 200) {		if (res.code == 200) {
	Toast.success('删除成功');		Toast.success('删除成功');
	@@ -289,45 +306,53 @@ export default {
	}).catch((err) => {		}).catch((err) => {
	console.log('err==>>',err)		console.log('err==>>',err)
	})		})
			})
			.catch(() => {
			// on cancel
			});
			},
			//添加基础设施
			addBase(){

	},		},
	// 移动后的事件		// 移动后的事件
	movedEvent(i, newX, newY){		movedEvent(i, newX, newY){
	this.layOutItem.x = newX		this.layOutItem.x = newX
	this.layOutItem.y = newY		this.layOutItem.y = newY
	console.log('layOutItem==>>',this.layOutItem)		// console.log('layOutItem==>>',this.layOutItem)
			// console.log('this.layout==>>',this.layout)
	},		},
	// 调整大小后的事件		// 调整大小后的事件
	resizedEvent: function(i, newH, newW){		resizedEvent: function(i, newH, newW){
	this.layOutItem.w = newW		this.layOutItem.w = newW
	this.layOutItem.h = newH		this.layOutItem.h = newH
	console.log('layOutItem==>>',this.layOutItem)		// console.log('layOutItem==>>',this.layOutItem)
			// console.log('this.layout==>>',this.layout)
	},		},
	//关闭		//关闭
	close(){		close(){
	history.go(-1)		history.go(-1)
	},		},
	// 确定保存房间信息		//edger/room/update/batch
			// 确定执行批量编辑保存
	confim(){		confim(){
	if (this.roomName == '') {		// if (this.roomName == '') {
	Toast.fail({		// Toast.fail({
	title: '提示',		// title: '提示',
	forbidClick: true,		// forbidClick: true,
	message: '请先添加房间！',		// message: '请先添加房间！',
			// })
			// return
			// }
			let data = this.layoutData
			this.layoutData.forEach((item) => {
			item.position = JSON.stringify(item.position)
	})		})
	return		console.log('data==>>',data)
	}		postFun('/ledger/room/update/batch', data).then((res) => {
	let data = {
	floorId: this.$route.params.floorId ? this.$route.params.floorId : '18',
	name:this.roomName,
	position: JSON.stringify(this.layOutItem),
	roomType: this.isRoom ? this.roomType : '9999',
	}
	postFun('/ledger/room/save', data).then((res) => {
	if (res.code == 200) {		if (res.code == 200) {
	Toast.success('提交成功');		Toast.success('保存成功');
	this.getRoomInfo()		this.getRoomInfo()
	this.roomType = ''
	this.roomName = ''
	}		}
	}).catch((err) => {		}).catch((err) => {
	console.log('err==>>',err)		console.log('err==>>',err)
	@@ -350,13 +375,29 @@ export default {
	h: 3,		h: 3,
	i: '',		i: '',
	name: this.roomName,		name: this.roomName,
	c: '#0091EA',		c: '#e6e5e5',
	type:this.isRoom ? this.roomType : 'thorough',		type:this.isRoom ? this.roomType : 'thorough',
	isDraggable:true,		isDraggable:true,
	isResizable:true		isResizable:true
	}		}
	this.layout.push(this.layOutItem)		this.layout.push(this.layOutItem)
	console.log('layOutItem==>>',this.layOutItem)		// console.log('layOutItem==>>',this.layOutItem)
			let data = {
			floorId: this.$route.params.floorId ? this.$route.params.floorId : '18',
			name:this.roomName,
			position: JSON.stringify(this.layOutItem),
			roomType: this.isRoom ? this.roomType : '9999',
			}
			postFun('/ledger/room/save', data).then((res) => {
			if (res.code == 200) {
			// Toast.success('保存成功');
			this.getRoomInfo()
			this.roomType = ''
			this.roomName = ''
			}
			}).catch((err) => {
			console.log('err==>>',err)
			})
	},		},
	cancelDialog(){		cancelDialog(){
	this.roomType = ''		this.roomType = ''
	@@ -379,6 +420,17 @@ export default {
	width: 100vw;		width: 100vw;
	position: relative;		position: relative;
	}		}
			.north{
			position: absolute;
			display: inline-block;
			top: 1.5rem;
			right: 0.5rem;
			z-index: 999;
			}
			.north img{
			width: 15px;
			height: 30px;
			}
	.footer{		.footer{
	/* position: fixed; */		/* position: fixed; */
	/* left: 0; */		/* left: 0; */