风险和隐患添加了标签页 (5cf5a65e) · Commits · 首开风险隐患双控平台 / BCDH-APP · GitLab

src/views/danger/changeDanger/index.vue

+340 −361

Original line number	Diff line number	Diff line
		@@ -16,14 +16,19 @@
		</van-search>
		</van-sticky>
		<!-- tab标签 -->

		<van-tabs
		v-model="active"
		@change="
		postList();
		showIndex = null;
		"
		color="#2980f7"
		@click="onClickTab($event, searchValue)"
		animated
		:sticky="true"
		offset-top="3rem"
		>
		<van-tab title="隐患整改">
		<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
		<!-- 内容列表 -->
		<div class="con-list" @touchmove="showIndex = null">
		<van-cell-group
		@@ -34,7 +39,11 @@
		>
		<van-row gutter="">
		<van-col span="6">隐患编号：</van-col>
		<van-col span="18">{{ item.businessId }}</van-col>
		<van-col span="18">
		{{
		item.businessId \|\| item.id
		}}
		</van-col>
		</van-row>
		<van-row gutter="">
		<van-col span="6">所属项目：</van-col>
		@@ -42,7 +51,9 @@
		</van-row>
		<van-row gutter="">
		<van-col span="6">隐患级别：</van-col>
		<van-col span="18">{{ item.hdLev \| dangerText }}</van-col>
		<van-col span="18">{{
		item.hdLev \| dangerText
		}}</van-col>
		</van-row>
		<!-- <van-row gutter="">
		<van-col span="6">发现时间：</van-col>
		@@ -58,83 +69,9 @@
		</van-row>
		<van-row gutter="">
		<van-col span="6">超期标识：</van-col>
		<van-col span="18">{{ item.dueDate \| formatTime }}</van-col>
		</van-row>
		<!-- <van-row gutter="">
		<van-col span="6">工单状态：</van-col>
		<van-col span="18">{{ item.taskName }}</van-col>
		</van-row> -->

		<!-- 长按显示遮罩层 -->
		<van-overlay :show="showIndex == index">
		<div class="wrapper" @click.stop="showIndex = null">
		<van-button round type="primary" @click="goDetail(item)"
		>详情</van-button
		>
		<van-button round type="info" @click="goConfirm(item)"
		>隐患整改</van-button
		>
		<van-button round type="info" @click="goDelay(item)"
		>申请延期</van-button
		>
		<!-- <van-button round type="warning " @click="goClose(item)"
		>关闭</van-button
		> -->
		</div>
		</van-overlay>
		</van-cell-group>
		</div>
		<!-- 暂无数据 -->
		<div
		style="
		width: 100%;
		text-align: center;
		font-size: 0.48rem;
		position: fixed;
		top: 30%;
		"
		v-if="messageList.length == 0"
		>
		暂无数据
		</div>
		</van-tab>
		<van-tab title="隐患整改（已退回）">
		<!-- 内容列表 -->
		<div class="con-list" @touchmove="showIndex = null">
		<van-cell-group
		inset
		v-for="(item, index) in messageList"
		:key="index"
		@click="touchstart(index, item)"
		>
		<van-row gutter="">
		<van-col span="6">隐患编号：</van-col>
		<van-col span="18">{{ item.businessId }}</van-col>
		</van-row>
		<van-row gutter="">
		<van-col span="6">所属项目：</van-col>
		<van-col span="18">{{ item.proId }}</van-col>
		</van-row>
		<van-row gutter="">
		<van-col span="6">隐患级别：</van-col>
		<van-col span="18">{{ item.hdLev \| dangerText }}</van-col>
		</van-row>
		<van-row gutter="">
		<van-col span="6">适用范围：</van-col>
		<van-col span="18">{{ item.hdRange }}</van-col>
		</van-row>

		<van-row gutter="">
		<van-col span="6">隐患类型：</van-col>
		<van-col span="18">{{ item.hdType }}</van-col>
		</van-row>
		<!-- <van-row gutter="">
		<van-col span="6">发现时间：</van-col>
		<van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
		</van-row> -->
		<van-row gutter="">
		<van-col span="6">超期标识：</van-col>
		<van-col span="18">{{ item.dueDate \| formatTime }}</van-col>
		<van-col span="18">{{
		item.dueDate \| formatTime
		}}</van-col>
		</van-row>
		<!-- <van-row gutter="">
		<van-col span="6">工单状态：</van-col>
		@@ -144,13 +81,24 @@
		<!-- 长按显示遮罩层 -->
		<van-overlay :show="showIndex == index">
		<div class="wrapper" @click.stop="showIndex = null">
		<van-button round type="primary" @click="goDetail(item)"
		<van-button
		round
		type="primary"
		@click="goDetail(item)"
		>详情</van-button
		>
		<van-button round type="info" @click="goConfirm(item)"
		<van-button
		round
		type="info"
		@click="goConfirm(item)"
		v-if="active!==2"
		>隐患整改</van-button
		>
		<van-button round type="info" @click="goDelay(item)"
		<van-button
		round
		type="info"
		@click="goDelay(item)"
		v-if="active!==2"
		>申请延期</van-button
		>
		<!-- <van-button round type="warning " @click="goClose(item)"
		@@ -161,7 +109,6 @@
		</van-cell-group>
		</div>
		<!-- 暂无数据 -->
		<!-- {{messageList}} -->
		<div
		style="
		width: 100%;
		@@ -176,36 +123,44 @@
		</div>
		</van-tab>
		</van-tabs>
		<tab-bar :index="1"></tab-bar>
		</div>
		</template>

		<script>
		import LHeader from "@/components/header.vue";
		import { getFun, postFun } from "@/service/table.js";
		import tabBar from "@/components/TabBar";
		import { dangerRect, list1, list2 } from "@/service/danger";
		// import { dangerRect, list1, list2 } from "@/service/danger";
		import { Dialog } from "vant";
		export default {
		components: {
		LHeader,
		tabBar,
		},
		data() {
		return {
		text: "隐患整改",
		appHeight: "",
		searchValue: "",
		isHaveNews: false,
		messageList: [],
		Loop: "", // 定时器
		showIndex: null, // 是否显示遮罩层
		active: 0,
		tabs: [
		{
		title: "隐患整改",
		api: "/rectification/list1",
		},
		{
		title: "隐患整改（已退回）",
		api: "/rectification/list2",
		},
		{
		title: "隐患整改（已整改）",
		api: "/rectification/finishList",
		},
		],
		};
		},
		created() {
		this.onClickTab(0);
		this.postList();
		},

		methods: {
		// 关闭
		goClose(val) {
		@@ -229,7 +184,7 @@ export default {
		message: "关闭成功",
		duration: 2000,
		});
		this.onClickTab(0, this.searchValue)
		this.onClickTab(0, this.searchValue);
		})
		.catch(() => {
		this.$toast.clear();
		@@ -246,34 +201,55 @@ export default {
		onSearch(val) {
		this.onClickTab(0, this.searchValue);
		},
		onClickTab(val, select = "") {
		this.showIndex = null;
		postList(select = "") {
		this.$toast.loading({
		message: "加载中...",
		forbidClick: true,
		loadingType: "spinner",
		duration: 0,
		});

		// 这里根据tab切换调用接口
		let formdata = new FormData();
		formdata.append("select", select);
		[list1, list2]
		[val](formdata)
		postFun(this.tabs[this.active]["api"], formdata)
		.then((res) => {
		console.log(res.rows)
		console.log(res);
		this.$toast.clear();
		this.messageList = res.rows;
		// 判断有无数据返回
		// if (this.messageList.length == 0) {
		// this.isHaveNews = true;
		// }
		this.messageList = res.rows \|\| res.data;
		})
		.catch(() => {
		.catch((err) => {
		console.log(err);
		this.$toast.clear();
		this.$toast.fail("加载失败,请稍后再试");
		});
		},
		// onClickTab(val, select = "") {
		// this.showIndex = null;
		// this.$toast.loading({
		// message: "加载中...",
		// forbidClick: true,
		// loadingType: "spinner",
		// duration: 0,
		// });

		// // 这里根据tab切换调用接口
		// let formdata = new FormData();
		// formdata.append("select", select);
		// [list1, list2]
		// [val](formdata)
		// .then((res) => {
		// console.log(res.rows);
		// this.$toast.clear();
		// this.messageList = res.rows;
		// // 判断有无数据返回
		// // if (this.messageList.length == 0) {
		// // this.isHaveNews = true;
		// // }
		// })
		// .catch(() => {
		// this.$toast.clear();
		// this.$toast.fail("加载失败,请稍后再试");
		// });
		// },

		// 此接口暂时废弃
		// postList() {
		@@ -392,4 +368,7 @@ export default {
		/deep/.van-tab__pane-wrapper {
		min-height: 8rem;
		}
		.van-tabs__track{
		min-height: 3rem;
		}
		</style>

src/views/danger/confirmeDanger/confirmeDanger.vue

+1 −0

Original line number	Diff line number	Diff line
		@@ -176,6 +176,7 @@ export default {
		},
		data() {
		return {

		taskId: "",
		messageList: [],
		radio: "1",

src/views/danger/confirmeDanger/index.vue

+201 −169

Original line number	Diff line number	Diff line
		@@ -13,6 +13,19 @@
		</template>
		</van-search>
		</van-sticky>

		<van-tabs
		v-model="active"
		@change="
		postList();
		showIndex = null;
		"
		color="#2980f7"
		animated
		:sticky="true"
		offset-top="3rem"
		>
		<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
		<!-- 内容列表 -->
		<div class="con-list" @touchmove="showIndex = null">
		<van-cell-group
		@@ -31,7 +44,9 @@
		</van-row>
		<van-row gutter="">
		<van-col span="6">隐患级别：</van-col>
		<van-col span="18">{{ item.hdLev \| dangerText }}</van-col>
		<van-col span="18">{{
		item.hdLev \| dangerText
		}}</van-col>
		</van-row>
		<!-- <van-row gutter="">
		<van-col span="6">发现时间：</van-col>
		@@ -52,10 +67,16 @@
		<!-- 长按显示遮罩层 -->
		<van-overlay :show="showIndex == index">
		<div class="wrapper" @click.stop="showIndex = null">
		<van-button round type="primary" @click="goDetail(item)"
		<van-button
		round
		type="primary"
		@click="goDetail(item)"
		>详情</van-button
		>
		<van-button round type="info" @click="goConfirm(item)"
		<van-button
		round
		type="info"
		@click="goConfirm(item)"
		>确认</van-button
		>
		</div>
		@@ -76,22 +97,33 @@
		>
		暂无数据
		</div>
		<tab-bar :index="1"></tab-bar>
		</van-tab>
		</van-tabs>
		</div>
		</template>

		<script>
		import LHeader from "@/components/header.vue";
		import { getFun, postFun } from "@/service/table.js";
		import tabBar from "@/components/TabBar";
		import { dangerConfirm } from "@/service/danger";
		export default {
		components: {
		LHeader,
		tabBar,
		},
		data() {
		return {
		// dangerConfirm("/confirm/list", formdata)
		active: 0,
		tabs: [
		{
		title: "待确认",
		api: "/confirm/list",
		},
		{
		title: "已确认",
		api: "/confirm/finishList",
		},
		],
		text: "隐患确认",
		isHaveNews: false,
		searchValue: "",
		@@ -116,7 +148,7 @@ export default {
		});
		let formdata = new FormData();
		formdata.append("select", select);
		dangerConfirm("/confirm/list", formdata)
		postFun(this.tabs[this.active]['api'], formdata)
		.then((res) => {
		this.$toast.clear();
		this.messageList = res.rows;

src/views/danger/reviewDanger/index.vue

+226 −190

Original line number	Diff line number	Diff line
		<template>
		<div>
		<van-sticky>
		<LHeader :text="text"></LHeader>
		</van-sticky>
		<van-sticky offset-top="1.5rem">
		<van-search
		v-model="searchValue"
		@@ -13,7 +15,19 @@
		</template>
		</van-search>
		</van-sticky>
		<!-- 内容列表 -->

		<van-tabs
		v-model="active"
		@change="
		postList();
		showIndex = null;
		"
		color="#2980f7"
		animated
		:sticky="true"
		offset-top="3rem"
		>
		<van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
		<div class="con-list" @touchmove="showIndex = null">
		<van-cell-group
		inset
		@@ -23,7 +37,7 @@
		>
		<van-row gutter="">
		<van-col span="6">隐患编号：</van-col>
		<van-col span="18">{{ item.businessId }}</van-col>
		<van-col span="18">{{ item.businessId \|\| item.id}}</van-col>
		</van-row>
		<van-row gutter="">
		<van-col span="6">所属项目：</van-col>
		@@ -31,7 +45,9 @@
		</van-row>
		<van-row gutter="">
		<van-col span="6">隐患级别：</van-col>
		<van-col span="18">{{ item.hdLev \| dangerText }}</van-col>
		<van-col span="18">{{
		item.hdLev \| dangerText
		}}</van-col>
		</van-row>
		<!-- <van-row gutter="">
		<van-col span="6">发现时间：</van-col>
		@@ -56,10 +72,18 @@
		<!-- 长按显示遮罩层 -->
		<van-overlay :show="showIndex == index">
		<div class="wrapper" @click.stop="showIndex = null">
		<van-button round type="primary" @click="goDetail(item)"
		<van-button
		round
		type="primary"
		@click="goDetail(item)"

		>详情</van-button
		>
		<van-button round type="info" @click="goConfirm(item)"
		<van-button
		round
		type="info"
		@click="goConfirm(item)"
		v-if="active==0"
		>隐患复查</van-button
		>
		</div>
		@@ -75,23 +99,23 @@
		position: fixed;
		top: 30%;
		"
		v-if="isHaveNews"
		v-if="messageList['length'] == 0"
		>
		暂无数据
		</div>
		<tab-bar :index="1"></tab-bar>
		</van-tab>
		</van-tabs>
		</div>
		</template>

		<script>
		import tabBar from "@/components/TabBar";
		import LHeader from "@/components/header.vue";
		import { getFun, postFun } from "@/service/table.js";
		import { dangerReview } from "@/service/danger";
		export default {

		components: {
		LHeader,
		tabBar,
		},
		data() {
		return {
		@@ -101,6 +125,18 @@ export default {
		messageList: [],
		Loop: "", // 定时器
		showIndex: null, // 是否显示遮罩层
		active: 0,
		tabs: [
		{
		title: "待复查",
		api: "/review/list",
		},

		{
		title: "已复查",
		api: "/review/finishList",
		},
		],
		};
		},
		created() {
		@@ -110,7 +146,6 @@ export default {
		onSearch(val) {
		this.postList(this.searchValue);
		},

		postList(select = "") {
		this.$toast.loading({
		message: "加载中...",
		@@ -120,10 +155,10 @@ export default {
		});
		let formdata = new FormData();
		formdata.append("select", select);
		dangerReview("/review/list", formdata)
		postFun(this.tabs[this.active]["api"], formdata)
		.then((res) => {
		this.$toast.clear();
		this.messageList = res.rows;
		this.messageList = res.rows\|\|res.data;
		// 判断有无数据返回
		if (this.messageList.length == 0) {
		this.isHaveNews = true;
		@@ -171,7 +206,8 @@ export default {
		return "超期";
		} else if (
		new Date(row.dueDate).getTime() >= row.rectificationTime &&
		new Date(row.dueDate).getTime() - 259200000 <= row.rectificationTime
		new Date(row.dueDate).getTime() - 259200000 <=
		row.rectificationTime
		) {
		//三天
		return "临期";

src/views/risk/my-insert/index.vue

0 → 100644

+232 −0

File added.

Preview size limit exceeded, changes collapsed.