合并冲突 (ff49d463) · Commits · 融通安全管理系统 / rongtong-app · GitLab

src/components/TabBar.vue

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ export default {

	data() {		data() {
	return {		return {
	active: "0",		active: localStorage.getItem('active')?localStorage.getItem('active'):1,
	tabBarList: [		tabBarList: [
	{		{
	key: "1",		key: "1",
	@@ -53,11 +53,11 @@ export default {
	};		};
	},		},
	mounted() {		mounted() {
	this.active = this.index		// this.active = this.index
	},		},
	methods: {		methods: {
	onChange(index) {		onChange(index) {
	this.active = index;		localStorage.setItem('active',index);
	if(this.active==index){		if(this.active==index){
	this.tabBarList.forEach((item)=>{		this.tabBarList.forEach((item)=>{
	if(item.name==this.active){		if(item.name==this.active){

src/views/riskProject/add/addInherent.vue

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,7 @@
	<van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank"		<van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank"
	@select="onSelectSetRank">		@select="onSelectSetRank">
	<template #reference>		<template #reference>
	<van-field v-model="severityValue" readonly required name="level" label="发生的可能性"		<van-field v-model="severityValue" readonly required name="level" label="后果严重程度"
	placeholder="请选择" />		placeholder="请选择" />
	</template>		</template>
	</van-popover>		</van-popover>

src/views/riskProject/add/addPresent.vue

+80 −21

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@
	:rules="[{ required: true, message: '准事故类型不能为空' }]"		:rules="[{ required: true, message: '准事故类型不能为空' }]"
	/>		/>

	<van-field		<!-- <van-field
	readonly		readonly
	v-model="form.level"		v-model="form.level"
	required		required
	@@ -95,7 +95,9 @@
	placeholder="请选择"		placeholder="请选择"
	@click="seletGrade('level')"		@click="seletGrade('level')"
	:rules="[{ required: true, message: '风险等级不能为空' }]"		:rules="[{ required: true, message: '风险等级不能为空' }]"
	/>		/> -->
			<van-field readonly v-model="form.level" required name="level" label="风险等级" placeholder="请选择"
			@click="seletGrade" :rules="[{ required: true, message: '风险等级不能为空' }]" />

	<van-field		<van-field
	required		required
	@@ -295,7 +297,7 @@
	</van-uploader>		</van-uploader>
	</template>		</template>
	</van-field>		</van-field>
	<div style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" >		<div v-if="this.$route.params.isView" style="height: 1rem;font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';font-weight: 700;line-height: 1rem;" >
	<img src="@/assets/accidentIcon/bookmark.svg" alt="" style="position: relative;top: 32%;transform: translateY(-50%);" >		<img src="@/assets/accidentIcon/bookmark.svg" alt="" style="position: relative;top: 32%;transform: translateY(-50%);" >
	参考依据		参考依据
	</div>		</div>
	@@ -330,13 +332,42 @@
	/>		/>
	</van-popup>		</van-popup>

	<div style="margin: 16px 16px 0">		<div style="margin: 16px 16px 0" v-if="this.$route.params.isView" >
	<van-button round block type="info" native-type="submit"		<van-button round block type="info" native-type="submit"
	>上报</van-button		>上报</van-button
	>		>
	</div>		</div>
	</van-form>		</van-form>
	<div style="margin: 10px 16px 0px; padding-bottom: 16px">		<van-dialog v-model="showGradeDialog" title="风险评测配置" :show-cancel-button="false" :show-confirm-button="false" >
			<div class="dialogContain">
			<van-collapse v-model="activeNames">
			<van-collapse-item title="风险模型" name="1">
			<van-field readonly required name="level" label="当前风险模型" placeholder="LS风险矩阵评估模型" />
			</van-collapse-item>
			<van-collapse-item title="风险模型配置" name="2">
			<van-popover v-model="showPopover" trigger="click" :actions="columnsRiskRank"
			@select="onSelect">
			<template #reference>
			<van-field v-model="possibleValue" readonly required name="level" label="发生的可能性"
			placeholder="请选择" />
			</template>
			</van-popover>
			<van-popover v-model="showPopoveSetRank" trigger="click" :actions="columnsSetRank"
			@select="onSelectSetRank">
			<template #reference>
			<van-field v-model="severityValue" readonly required name="level" label="后果严重程度"
			placeholder="请选择" />
			</template>
			</van-popover>
			</van-collapse-item>
			</van-collapse>
			<van-row type="flex" justify="center" style="margin-top:10px">
			<van-col span="6"><van-button size="small" plain type="info" @click="showGradeDialog = false">取消</van-button></van-col>
			<van-col span="6"><van-button size="small" type="info" @click="goResultPage">开始测评</van-button></van-col>
			</van-row>
			</div>
			</van-dialog>
			<div v-if="this.$route.params.isView" style="margin: 10px 16px 0px; padding-bottom: 16px">
	<van-button round block type="warning" @click.native="cancel"		<van-button round block type="warning" @click.native="cancel"
	>取消</van-button		>取消</van-button
	>		>
	@@ -393,6 +424,10 @@ export default {
	},		},
	data() {		data() {
	return {		return {
			showPopoveSetRank: false,
			activeNames: ["1"],
			showPopover: false,
			showGradeDialog: false,
	taskId: "",		taskId: "",
	text: "添加现状风险",		text: "添加现状风险",
	id: "",		id: "",
	@@ -459,6 +494,10 @@ export default {
	urgentImg: [], //应急措施图片		urgentImg: [], //应急措施图片
	returnCause: "", // 退回原因		returnCause: "", // 退回原因
	isShowreturnCause: false,		isShowreturnCause: false,
			possibleValue: "",
			possibleScore:0,
			severityValue: "",
			severityScore:0,
	};		};
	},		},
	created() {		created() {
	@@ -546,22 +585,42 @@ export default {
	]		]
	},		},
	seletGrade(name){		seletGrade(name){
	this.showTrouble=true		this.getGradeList('possibility')
	this.riskName=name		this.getGradeList('severity')
	this.columnsTrouble=[		this.showGradeDialog = true
	{		},
	name:'重大风险',		//风险模型配置
	},		getGradeList(type) {
	{		// possibility 可能性 severity 严重性
	name:'较大风险',		getFun(`/risk/plan/matrix/${type}/list`).then(res => {
			let arr = []
			res.data.forEach(item => {
			arr.push({ text: item.title, type: item.type, sort: item.sort, score: item.score })
			})
			if (type === 'possibility') {
			this.columnsRiskRank = arr
			} else {
			this.columnsSetRank = arr
			}

			})
	},		},
	{		onSelect(data) {
	name:'一般风险',		this.possibleValue = data.text
			this.possibleScore = data.score
	},		},
	{		onSelectSetRank(data) {
	name:'较小风险',		this.severityValue = data.text
			this.severityScore = data.score
	},		},
	]		//开始测评
			goResultPage(){
			this.$router.push({
			name:'resultPage',
			params:{
			score:this.severityScore * this.possibleScore
			}
			})
	},		},
	performTasks(){		performTasks(){

src/views/riskProject/add/index.vue

+4 −14

Original line number	Original line	Diff line number	Diff line
	@@ -208,10 +208,10 @@
	>{{ item[filedName] }}</van-checkbox		>{{ item[filedName] }}</van-checkbox
	>		>
	</van-checkbox-group>		</van-checkbox-group>
	<div>
	<van-button type="primary" @click="checkAll">全选</van-button>
	<van-button type="info" @click="toggleAll">反选</van-button>
	</div>		</div>
			<div style="display: flex;justify-content: space-around;">
			<van-button native-type="button" type="primary" v-on:click="checkAll">全选</van-button>
			<van-button native-type="button" type="info" @click="toggleAll">反选</van-button>
	</div>		</div>
	</van-popup>		</van-popup>

	@@ -416,19 +416,9 @@ export default {
	});		});
	},		},
	onRiskList(value) {		onRiskList(value) {
	console.log(
	"%c [ value ]-331",
	"font-size:13px; background:pink; color:#bf2c9f;",
	value
	);
	if (this.filedName == "nickName") {		if (this.filedName == "nickName") {
	this.form.workUserIds = this.filterField("userId", value).join();		this.form.workUserIds = this.filterField("userId", value).join();
	this.form.workUserNames = this.filterField("nickName", value).join();		this.form.workUserNames = this.filterField("nickName", value).join();
	console.log(
	"%c [ this.form.workUserNames ]-334",
	"font-size:13px; background:pink; color:#bf2c9f;",
	this.form.workUserNames
	);
	} else {		} else {
	this.form.buildingIds = this.filterField("id", value).join();		this.form.buildingIds = this.filterField("id", value).join();
	this.form.buildingNames = this.filterField("name", value).join();		this.form.buildingNames = this.filterField("name", value).join();

src/views/riskProject/add/projectList.vue

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	finished-text="没有更多了"		finished-text="没有更多了"
	@load="getInsideUser()"		@load="getInsideUser()"
	>		>
	<van-radio v-for="item in projectList" :name="item.id" :key="item.id" @click="selData(item)">		<van-radio style="margin: 0px 10px;" v-for="item in projectList" :name="item.id" :key="item.id" @click="selData(item)">
	<van-cell :title="item.name" />		<van-cell :title="item.name" />
	</van-radio>		</van-radio>
	</van-list>		</van-list>