风险巡查问题修改 (a1d4c276) · Commits · 融通安全管理系统 / rongtong-app · GitLab

.eslintrc.js

+2 −2

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ module.exports = {
		'plugin:vue/essential'
		],
		rules: {
		'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
		'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
		'no-console': 'off',
		'no-debugger': 'off'
		},
		parserOptions: {
		parser: 'babel-eslint'

src/App.vue

+2 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,6 @@ export default {
		this.cachePage.push(roterFromName);
		}
		}
		console.log(this.cachePage, 'cach')
		},
		},
		watch: {
		@@ -150,6 +149,8 @@ export default {
		this.handleCache("risk-confirme", to.name, "risk-affirm");
		} else if (to.name == 'taskLedger' \|\| from.name == 'taskLedger') {
		this.handleCache("riskTaskList", to.name, "taskLedger");
		} else if (to.name == 'riskView' \|\| from.name == 'riskInherent') {
		this.handleCache("addInherent", to.name, "riskInherent");
		}

		// 列表页面动态添加缓存

src/utils/common.js

+0 −1

Original line number	Diff line number	Diff line
		@@ -96,6 +96,5 @@ export const rotateBase64Img = (src, edg, callback) => {
		}
		};
		} catch (e) {
		console.log(e);
		}
		};

src/views/drawCanvas/riskView.vue

+28 −23

Original line number	Diff line number	Diff line
		@@ -347,6 +347,7 @@ export default {
		this.layoutData = res.data;
		this.layoutDataStr = JSON.stringify(this.layoutData);
		res.data.forEach((item) => {
		if (item.position) {
		item.position = JSON.parse(item.position);
		item.position.i = item.id;
		item.position.id = item.id;
		@@ -362,6 +363,7 @@ export default {
		}
		this.layout.push(item.position);
		this.updateLayoutHeight();
		}
		});
		// console.log(res.data);
		}
		@@ -469,8 +471,8 @@ export default {
		const max = Math.max(
		...this.layoutData.map((x) => {
		let data = x.position;
		if (!data) return 0;
		if (typeof x.position == "string") {
		// x.position.y + x.position.h
		data = JSON.parse(x.position);
		}
		return data.y + data.h;
		@@ -490,8 +492,8 @@ export default {
		// 拖动时判断layoutHeight是否需要更新
		item.x = (x / this.W) * 12;
		item.y = y / 30;
		item.x = (newX / this.W) * 12;
		item.y = newY / 30;
		item.x = (x / this.W) * 12;
		item.y = y / 30;
		debounce(this.updateLayoutHeight)();
		// if (top > this.layoutHeight) {
		// this.layoutHeight = top;
		@@ -555,12 +557,14 @@ export default {
		});

		//修改房间后返回清掉房间的值
		if (sessionStorage.getItem("inherenForm")) {
		var inherenForm = JSON.parse(sessionStorage.getItem("inherenForm"));
		if (inherenForm) {
		inherenForm.roomName = "";
		inherenForm.roomId = "";
		sessionStorage.setItem("inherenForm", JSON.stringify(inherenForm));
		}
		}
		//保存
		let data = this.layoutData;
		data.forEach((item) => {
		@@ -757,7 +761,8 @@ export default {
		}

		.north {
		position: fixed;
		/* position: fixed; */
		position: absolute;
		display: inline-block;
		top: 1.5rem;
		right: 0.5rem;

src/views/riskPatrol/patrolExecute/implement.vue

+4 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		</van-sticky>
		<!-- tab标签 -->
		<template v-if="tabs.length">
		<van-tabs v-model="active" color="#2980f7" animated @click="tabClick" :sticky="true" offset-top="1.5rem">
		<van-tabs v-model="active" color="#2980f7" animated @change="tabClick" :sticky="true" offset-top="1.5rem">
		<van-tab v-for="(i, key) in tabs" :key="key" :title="i.title">
		<!-- 内容列表 -->
		<div class="con-list">
		@@ -143,6 +143,9 @@ export default {
		this.loadingTabs()
		},
		methods: {
		tabClick() {
		this.showIndex = null;
		},
		loadingTabs() {
		getFun("/risk/currentRiskPatrolDetail/detailList", { projectId: this.id, patrolId: this.$route.query.patrolId }).then(res => {
		const tabs = new Set(res.rows.map(x => x.type));