Merge branch 'develop' into dev_kdl (64add9e0) · Commits · 融通安全管理系统 / rongtong-app · GitLab

src/views/riskProject/add/addCurrent.vue

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -270,7 +270,7 @@ import { getFun, postFun } from "@/service/table.js";
	// postRiskShowMeasures,		// postRiskShowMeasures,
	// } from "@/service/risk";		// } from "@/service/risk";
	export default {		export default {
	name: "risk-add",		name: "addCurrent",
	components: {		components: {
	LHeader,		LHeader,
	},		},
	@@ -345,9 +345,9 @@ export default {
	};		};
	},		},
	created() {		created() {
	if (this.$route.params.inherentId) {		if (this.$route.params.inherentId \|\| sessionStorage.getItem("inherentId")) {
	this.inherentId = this.$route.params.inherentId		this.inherentId = this.$route.params.inherentId \|\| sessionStorage.getItem("inherentId")
	this.buildingIds = this.$route.params.buildingId		this.buildingIds = this.$route.params.buildingId \|\| sessionStorage.getItem("buildingId")
	this.postReturnEcho();		this.postReturnEcho();
	}		}
	// this.getList();		// this.getList();

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,6 @@ export default {
	postFun(		postFun(
	`/risk/plan/submit/${this.planId}/${this.buildingId}`		`/risk/plan/submit/${this.planId}/${this.buildingId}`
	).then(res => {		).then(res => {
	console.log(res.msg,'lllll')
	Dialog.alert({		Dialog.alert({
	title: '任务执行结束',		title: '任务执行结束',
	message: res.msg,		message: res.msg,
	@@ -240,12 +239,12 @@ export default {
	},		},
	async changeFloor() {		async changeFloor() {
	let room = await this.roomList(this.value1);		let room = await this.roomList(this.value1);
	let risk = await this.riskList(this.planId, this.active, this.value1);		let risk = await this.riskList(this.planId,this.buildingId, this.value1,this.value2);
	},		},
	async changeRoom() {		async changeRoom() {
	let risk = await this.riskList(		let risk = await this.riskList(
	this.planId,		this.planId,
	this.active,		this.buildingId,
	this.value1,		this.value1,
	this.value2		this.value2
	);		);
	@@ -265,6 +264,7 @@ export default {
	sessionStorage.setItem('buildingId',this.buildingId)		sessionStorage.setItem('buildingId',this.buildingId)
	sessionStorage.setItem('planId',this.planId)		sessionStorage.setItem('planId',this.planId)
	sessionStorage.setItem('buildingName',this.buildingName)		sessionStorage.setItem('buildingName',this.buildingName)
			sessionStorage.setItem('inherentId',data.businessId \|\| data.id)
	this.$router.push({		this.$router.push({
	name: "addCurrent",		name: "addCurrent",
	params: {		params: {

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -55,12 +55,14 @@ import LHeader from "@/components/header.vue";
	})		})
	},		},
	sureClose(){		sureClose(){
	this.$router.push({		// this.$emit('',)
	name:'addInherent',		history.go(-1)
	params:{		// this.$router.push({
	level:this.level		// name:'addInherent',
	}		// params:{
	})		// level:this.level
			// }
			// })
	}		}
	}		}
	}		}

+7 −9

Original line number	Original line	Diff line number	Diff line
	@@ -169,28 +169,25 @@
	justify="space-between"		justify="space-between"
	style="margin-top:10px;"		style="margin-top:10px;"
	>		>
	<van-col span="22" @click="toRiskDetail(item)">		<van-col span="20" @click="toRiskDetail(item)">
	<van-col span="5">		<van-col span="5">
	<van-image		<van-image
	width="46"		width="46"
	height="46"		height="46"
	src="https://img01.yzcdn.cn/vant/cat.jpeg"		src="https://img01.yzcdn.cn/vant/cat.jpeg"
	/>		/>
	<van-image width="46" height="46" :src="item.avatar" />		<!-- <van-image width="46" height="46" :src="item.avatar" /> -->
	</van-col>		</van-col>
	<van-col span="17">		<van-col span="15">
	<van-row gutter="">		<van-row gutter="">
	<van-col span="9">风险名称：</van-col>		<van-col span="9">风险名称：</van-col>
	<van-col span="15">{{ item.name }}</van-col>		<van-col span="15">{{ item.name }}</van-col>
	</van-row>		</van-row>
	</van-col>		</van-col>
	</van-col>		</van-col>
	<van-col span="2">		<van-col span="4">
	<van-row		<van-row type="flex">
	:style="{		详情
	color: '#03b615'
	}"
	>
	<van-icon name="arrow" size="26px" @click="goColorDetail" />		<van-icon name="arrow" size="26px" @click="goColorDetail" />
	</van-row>		</van-row>
	</van-col>		</van-col>
	@@ -561,6 +558,7 @@ export default {
	},		},
	//执行任务		//执行任务
	performTasks() {		performTasks() {
			console.log( this.messageList,'LLLL')
	sessionStorage.setItem(		sessionStorage.setItem(
	"buildingId",		"buildingId",
	this.messageList.riskBuildingListDtos[0].buildingId		this.messageList.riskBuildingListDtos[0].buildingId