heyang

pages/views/login/login.vue

@@ -52,7 +52,7 @@
 			return {
 				identityStatus: 1,
 				// username:"dedsudiyu",//学生
-				username: "1001",//教职工
+				username: "sudiyu",//教职工
 				password: "zd123456",
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),

pages_safetyExamine/api/index.js

@@ -140,6 +140,30 @@ export const getHazardInfoBySubId  = (data) => {
         data: data,
     })
 };
+//巡查计划--检查计划各检查状态数据数量
+export const getCheckStatusCount  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkPlan/getCheckStatusCount`,
+        method: 'GET',
+        data: data,
+    })
+};
+//各检查状态数据数量
+export const getManageStatusCount  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/getManageStatusCount`,
+        method: 'GET',
+        data: data,
+    })
+};
+//数据统计
+export const dataStatistics  = (data) => {
+    return apiResquest({
+        url: `/security/DataStatistics/countApp`,
+        method: 'GET',
+        data: data,
+    })
+};
 /* 巡查计划------------------------------ */
 //巡查计划--列表
 export const checkPlanList  = (data) => {
@@ -255,6 +279,14 @@ export const getHazardById = (data) => {
         data: data
     })
 };
+//开展检查-获取巡查计划管理列表
+export const checkHazardAdd  = (data) => {
+    return apiResquest({
+        url: `/security/checkRectify/addOrApprove`,
+        method: 'POST',
+        data: {...data}
+    })
+};
 //随手拍-----------------------------------------------------
 //随手拍--添加
 export const checkClapAdd  = (data) => {

pages_safetyExamine/views/dangerManage/dangerDetail.vue

@@ -248,7 +248,7 @@
 	import {
 		getHazardById,
 		checkHazardAdd
-	} from '@/api/apiDemo/index.js'
+	} from '@/pages_safetyExamine/api/index.js'
 	export default {
 		name: "rectifyList",
 		components: {

pages_safetyExamine/views/inforSign.vue

@@ -1,333 +1,369 @@
 <!-- 安全信息牌 -->
 <template>
-  <view class="examine">
-	<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-		<view class="header">
-			<view class="header_l">
-				<text>{{itemData.typeName}}</text>
-				<text></text>
-				<text>{{itemData.levelName}}</text>
+	<view class="examine">
+		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
+			<view class="header">
+				<view class="header_l">
+					<text>{{itemData.typeName}}</text>
+					<text></text>
+					<text>{{itemData.levelName}}</text>
+				</view>
+				<view class="header_r">{{itemData.deptName}}-{{itemData.room}}</view>
 			</view>
-			<view class="header_r">{{itemData.deptName}}-{{itemData.room}}</view>
-		</view>
-		<view  class="basics">
-			<view class="grade">
-				<text>责任单位：</text>
-				<text>{{itemData.deptName}}</text>
+			<view class="basics">
+				<view class="grade">
+					<text>责任单位：</text>
+					<text>{{itemData.deptName}}</text>
+				</view>
+				<view class="grade">
+					<text>实验室负责人：</text>
+					<text>{{itemData.adminName}}-{{itemData.adminPhone?itemData.adminPhone:'未填写'}}</text>
+				</view>
+				<view class="duty">
+					<view class="duty_l">安全责任人：</view>
+					<view class="duty_r">
+						<text>{{itemData.safeUserNameAdminPhone}}</text>
+					</view>
+				</view>
 			</view>
-			<view class="grade">
-				<text>实验室负责人：</text>
-				<text >{{itemData.adminName}}-{{itemData.adminPhone?itemData.adminPhone:'未填写'}}</text>
+			<view class="category" v-if="item.privateList.length>0 && item.classifyType==1"
+				v-for="(item,index) in  itemData.classifyList" :key="index">
+				<view class="title" :style="'background:'+item.showColour">{{item.classifyName}}</view>
+				<view class="category_li" v-for="(item2,index2) in item.privateList" :key="index2">
+					<text></text><text>{{item2.infoName}}</text></view>
 			</view>
-			<view class="duty">
-				<view class="duty_l">安全责任人：</view>
-				<view class="duty_r">
-					<text>{{itemData.safeUserNameAdminPhone}}</text>
+			<view class="category" v-if="item.privateList.length>0 && item.classifyType==2"
+				v-for="(item,index) in  itemData.classifyList" :key="index">
+				<view class="title">{{item.classifyName}}</view>
+				<view class="identify_img" @click="lockImg(item.privateList)">
+					<img :src="baseUrl+item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2" />
 				</view>
 			</view>
-		</view>
-		<view class="category" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  itemData.classifyList" :key="index">
-			<view class="title" :style="'background:'+item.showColour">{{item.classifyName}}</view>
-			<view class="category_li" v-for="(item2,index2) in item.privateList" :key="index2"><text></text><text>{{item2.infoName}}</text></view>
-		</view>
-		<view class="category" v-if="item.privateList.length>0 && item.classifyType==2" v-for="(item,index) in  itemData.classifyList" :key="index">
-			<view class="title">{{item.classifyName}}</view>
-			<view class="identify_img" @click="lockImg(item.privateList)">
-				<img :src="baseUrl+item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2"/>
+			<view class="category" v-if="item.privateList.length>0 && item.isSpecial==2"
+				v-for="(item,index) in  itemData.classifyList" :key="index">
+				<view class="title">{{item.classifyName}}</view>
+				<view class="telephone_li" v-for="(item3,index3) in item.privateList" :key="index3">
+					{{item3.infoContent}}</view>
 			</view>
-		</view>
-		<view class="category" v-if="item.privateList.length>0 && item.isSpecial==2" v-for="(item,index) in  itemData.classifyList" :key="index">
-			<view class="title">{{item.classifyName}}</view>
-			<view class="telephone_li" v-for="(item3,index3) in item.privateList" :key="index3">{{item3.infoContent}}</view>
-		</view>
 
-	</scroll-view>
-	<view  class="bottom_btn" @click="handleClick('start')">开展检查</view>
-  </view>
+		</scroll-view>
+		<view class="bottom_btn" @click="handleClick('start')">开展检查</view>
+	</view>
 
 </template>
 
 <script>
-import { config } from '@/api/request/config.js'
-import { getSelectInfoByRoom,getInforSign} from '@/api/apiDemo/index.js'
-export default {
-  name: "rectifyList",
-  components: {
-
-  },
-  data() {
-    return {
-		baseUrl:config.base_url,
-		pageType:2,
-		id:'',
-		itemData:{},
-	}
-  },
-  onLoad(option) {
-	 if(option.subId){
-	 	this.id=option.subId;
-	 }
-  },
-  onShow() {
-
-  },
-  mounted(){
-	  this.getInforSign()
-	  console.log(uni.getStorageSync('saoCodeId'))
-  },
-  methods: {
-		//滚动事件
-		scrollGet(){},
-		//查询详情
-		async getInforSign(){
-		  let self = this;
-		  let id = uni.getStorageSync('saoCodeId');
-		  const {data} = await getInforSign(id);
-		  if(data.code == 200){
-		    this.itemData = data.data;
-			console.log(this.itemData)
-		  }
+	import {
+		config
+	} from '@/api/request/config.js'
+	import {
+		getSelectInfoByRoom,
+		getInforSign
+	} from '@/api/apiDemo/index.js'
+	export default {
+		name: "rectifyList",
+		components: {
+
 		},
-		//查看图片
-		lockImg(list){
-			console.log(list)
-			if(!list[0]){
-				return
+		data() {
+			return {
+				baseUrl: config.base_url,
+				pageType: 2,
+				id: '',
+				itemData: {},
 			}
-			let urlList=[];
-			for(let i=0;i<list.length;i++){
-				urlList.push(this.baseUrl+list[i].infoContent)
+		},
+		onLoad(option) {
+			if (option.subId) {
+				this.id = option.subId;
 			}
-			wx.previewImage({
-				urls: urlList, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
-				current: '', // 当前显示图片的http链接，默认是第一个
-				success: function(res) {},
-				fail: function(res) {},
-				complete: function(res) {},
-			})
 		},
-	    handleClick(doType){
-		  let self=this;
-		  if(doType=='start'){//提交
-			  uni.navigateTo({
-			      url: '/pages_safetyExamine/views/examineManage/examineAdd?id='+ uni.getStorageSync('saoCodeId')
-			  });
-		  }
-	    },
-  }
-}
+		onShow() {
+
+		},
+		mounted() {
+			this.getInforSign()
+			console.log(uni.getStorageSync('saoCodeId'))
+		},
+		methods: {
+			//滚动事件
+			scrollGet() {},
+			//查询详情
+			async getInforSign() {
+				let self = this;
+				let id = uni.getStorageSync('saoCodeId');
+				const {
+					data
+				} = await getInforSign(id);
+				if (data.code == 200) {
+					this.itemData = data.data;
+					console.log(this.itemData)
+				}
+			},
+			//查看图片
+			lockImg(list) {
+				console.log(list)
+				if (!list[0]) {
+					return
+				}
+				let urlList = [];
+				for (let i = 0; i < list.length; i++) {
+					urlList.push(this.baseUrl + list[i].infoContent)
+				}
+				wx.previewImage({
+					urls: urlList, //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+					current: '', // 当前显示图片的http链接，默认是第一个
+					success: function(res) {},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
+			},
+			handleClick(doType) {
+				let self = this;
+				if (doType == 'start') { //提交
+					uni.navigateTo({
+						url: '/pages_safetyExamine/views/examineManage/examineAdd?id=' + uni.getStorageSync(
+							'saoCodeId')
+					});
+				}
+			},
+		}
+	}
 </script>
 
 <style lang="stylus" scoped>
-.examine{
-	height:100%;
-	display flex;
-	box-sizing: border-box;
-	.info-max-box{
-		flex: 1;
-		overflow: scroll;
-		padding-bottom: 128rpx;
-		box-sizing: border-box;
-	}
-	.header{
-		width: 690rpx;
-		height: 100rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		margin: 20rpx 30rpx;
-		padding: 0 30rpx;
+	.examine {
+		height: 100%;
+		display flex;
 		box-sizing: border-box;
-		display: flex;
-		justify-content: flex-start;
-		align-items: center;
-		.header_l{
-			width: auto;
-			height: 60rpx;
+
+		.info-max-box {
+			flex: 1;
+			overflow: scroll;
+			padding-bottom: 128rpx;
+			box-sizing: border-box;
+		}
+
+		.header {
+			width: 690rpx;
+			height: 100rpx;
 			background: #FFFFFF;
-			border-radius: 50rpx 50rpx 50rpx 50rpx;
-			opacity: 1;
-			border: 1rpx solid #DF4848;
-			padding: 0 20rpx;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			margin: 20rpx 30rpx;
+			padding: 0 30rpx;
 			box-sizing: border-box;
 			display: flex;
 			justify-content: flex-start;
 			align-items: center;
-			margin-right: 26rpx;
 
-			>text:nth-of-type(1){
-				font-size: 24rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 400;
-				color: #DF4848;
-				line-height: 60rpx;
-			}
-			>text:nth-of-type(2){
-				display: inline-block;
-				width: 0rpx;
-				height: 19rpx;
+			.header_l {
+				width: auto;
+				height: 60rpx;
+				background: #FFFFFF;
+				border-radius: 50rpx 50rpx 50rpx 50rpx;
 				opacity: 1;
-				border: 1rpx solid #A2A2A2;
-				margin: 0 10rpx;
+				border: 1rpx solid #DF4848;
+				padding: 0 20rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-right: 26rpx;
+
+				>text:nth-of-type(1) {
+					font-size: 24rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #DF4848;
+					line-height: 60rpx;
+				}
+
+				>text:nth-of-type(2) {
+					display: inline-block;
+					width: 0rpx;
+					height: 19rpx;
+					opacity: 1;
+					border: 1rpx solid #A2A2A2;
+					margin: 0 10rpx;
+				}
+
+				>text:nth-of-type(3) {
+					font-size: 24rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #DF4848;
+					line-height: 60rpx;
+				}
 			}
-			>text:nth-of-type(3){
-				font-size: 24rpx;
+
+			.header_r {
+				font-size: 30rpx;
 				font-family: PingFang SC-Medium, PingFang SC;
 				font-weight: 400;
-				color: #DF4848;
+				color: #333333;
 				line-height: 60rpx;
+				flex: 1;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
 			}
 		}
-		.header_r{
-			font-size: 30rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 400;
-			color: #333333;
-			line-height: 60rpx;
-			flex: 1;
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
-		}
-	}
-	.basics{
-		width: 690rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-		padding: 0rpx 30rpx;
-		box-sizing: border-box;
-		margin: 20rpx 30rpx ;
-		.grade{
-			height: 100rpx;
-			display: flex;
-			justify-content: space-between;
-			border-bottom: 1rpx solid #D8D8D8;
-			>text:nth-of-type(1){
-				font-size: 28rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 400;
-				color: #333333;
-				line-height: 100rpx;
+
+		.basics {
+			width: 690rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 0rpx 30rpx;
+			box-sizing: border-box;
+			margin: 20rpx 30rpx;
+
+			.grade {
+				height: 100rpx;
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 1rpx solid #D8D8D8;
+
+				>text:nth-of-type(1) {
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 100rpx;
+				}
+
+				>text:nth-of-type(2) {
+					flex: 1;
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #666666;
+					line-height: 100rpx;
+					text-align: right;
+				}
 			}
-			>text:nth-of-type(2){
-				flex: 1;
-				font-size: 28rpx;
-				font-family: PingFang SC-Medium, PingFang SC;
-				font-weight: 400;
-				color: #666666;
-				line-height: 100rpx;
-				text-align: right;
+
+			.duty {
+				display: flex;
+				justify-content: space-between;
+				padding: 20rpx 0rpx;
+				box-sizing: border-box;
+
+				.duty_l {
+					font-size: 28rpx;
+					font-family: PingFang SC-Medium, PingFang SC;
+					font-weight: 400;
+					color: #333333;
+					line-height: 60rpx;
+				}
+
+				.duty_r {
+					flex: 1;
+
+					>text {
+						display: block;
+						font-size: 28rpx;
+						font-family: PingFang SC-Medium, PingFang SC;
+						font-weight: 400;
+						color: #666666;
+						line-height: 60rpx;
+						text-align: right;
+					}
+				}
 			}
+
 		}
-		.duty{
-			display: flex;
-			justify-content: space-between;
-			padding: 20rpx 0rpx;
+
+		.category {
+			width: 690rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx;
+			margin: 20rpx 30rpx;
+			padding-bottom: 20rpx;
 			box-sizing: border-box;
-			.duty_l{
-				font-size: 28rpx;
+
+			.title {
+				width: 690rpx;
+				height: 80rpx;
+				background: #133E93;
+				border-radius: 10rpx 10rpx 0rpx 0rpx;
+				font-size: 30rpx;
 				font-family: PingFang SC-Medium, PingFang SC;
 				font-weight: 400;
-				color: #333333;
-				line-height: 60rpx;
+				color: #FFFFFF;
+				line-height: 80rpx;
+				text-align: center;
+				margin-bottom: 20rpx;
 			}
-			.duty_r{
-				flex: 1;
-				>text{
-					display: block;
+
+			.category_li {
+				margin-left: 34rpx;
+				display: flex;
+				justify-content: flex-start;
+
+				>text:nth-of-type(1) {
+					display: inline-block;
+					width: 20rpx;
+					height: 20rpx;
+					border-radius: 50%;
+					background: #D8D8D8;
+					margin-right: 14rpx;
+					margin-top: 20rpx;
+				}
+
+				>text:nth-of-type(2) {
+					flex: 1;
 					font-size: 28rpx;
 					font-family: PingFang SC-Medium, PingFang SC;
 					font-weight: 400;
 					color: #666666;
 					line-height: 60rpx;
-					text-align: right;
 				}
 			}
-		}
 
-	}
-	.category{
-		width: 690rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx;
-		margin: 20rpx 30rpx ;
-		padding-bottom: 20rpx;
-		box-sizing: border-box;
-		.title{
-			width: 690rpx;
-			height: 80rpx;
-			background: #133E93;
-			border-radius: 10rpx 10rpx 0rpx 0rpx;
-			font-size: 30rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 400;
-			color: #FFFFFF;
-			line-height: 80rpx;
-			text-align: center;
-			margin-bottom:20rpx;
-		}
-		.category_li{
-			margin-left: 34rpx;
-			display: flex;
-			justify-content: flex-start;
-			>text:nth-of-type(1){
-				display: inline-block;
-				width: 20rpx;
-				height: 20rpx;
-				border-radius: 50%;
-				background: #D8D8D8;
-				margin-right: 14rpx;
-				margin-top: 20rpx;
+			/* 安全警示标识 */
+			.identify_img {
+				display: flex;
+				justify-content: flex-start;
+				flex-wrap: wrap;
+				margin-left: 34rpx;
+
+				>img {
+					width: 67rpx;
+					height: 90rpx;
+					margin-right: 24rpx;
+					margin-bottom: 20rpx;
+				}
 			}
-			>text:nth-of-type(2){
+
+			/* 紧急报警电话 */
+			.telephone_li {
 				flex: 1;
 				font-size: 28rpx;
 				font-family: PingFang SC-Medium, PingFang SC;
 				font-weight: 400;
-				color: #666666;
+				color: #333333;
 				line-height: 60rpx;
+				margin-left: 34rpx;
 			}
 		}
-		/* 安全警示标识 */
-		.identify_img{
-			display: flex;
-			justify-content: flex-start;
-			flex-wrap:wrap;
-			margin-left: 34rpx;
-			>img{
-				width: 67rpx;
-				height: 90rpx;
-				margin-right: 24rpx;
-				margin-bottom: 20rpx;
-			}
-		}
-		/* 紧急报警电话 */
-		.telephone_li{
-			flex: 1;
-			font-size: 28rpx;
+
+		/* 待整改 */
+
+		.bottom_btn {
+			position: fixed;
+			bottom: 26rpx;
+			left: 30rpx;
+			font-size: 30rpx;
 			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 400;
-			color: #333333;
-			line-height: 60rpx;
-			margin-left: 34rpx;
-		}
-	}
-	/* 待整改 */
-
-    .bottom_btn{
-		position: fixed;
-		bottom: 26rpx;
-		left: 30rpx;
-		font-size: 30rpx;
-		font-family: PingFang SC-Medium, PingFang SC;
-		font-weight: 400;
-		color: #FFFFFF;
-		line-height: 90rpx;
-		width: 690rpx;
-		height: 90rpx;
-		background: #0183FA;
-		border-radius: 20rpx;
-		text-align: center;
+			color: #FFFFFF;
+			line-height: 90rpx;
+			width: 690rpx;
+			height: 90rpx;
+			background: #0183FA;
+			border-radius: 20rpx;
+			text-align: center;
 
+		}
 	}
-}
 </style>

pages_safetyExamine/views/patrolPlan/patrolPlanAdd.vue

@@ -4,7 +4,7 @@
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="basics">
 				<view class="title">
-					<view class="title_t">计划标题11</view>
+					<view class="title_t">计划标题</view>
 					<textarea class="title_b" type="text" v-model="form.title" maxlength="200" placeholder="请输入检查计划标题"
 						placeholder-style="color:#999999;font-size:30rpx;"></textarea>
 				</view>

pages_safetyExamine/views/patrolPlan/patrolPlanAddMember.vue

@@ -48,8 +48,6 @@
 					checkLevel: '0',
 					searchValue: '',
 					checkLevel: '',
-
-
 				},
 				total: 0,
 				dataList: [],
@@ -106,11 +104,6 @@
 					})
 				}
 				this.seleteListMember.push(this.dataList[index])
-				// if(this.dataList[index].type){//判断是选中还是取消
-				// 	this.seleteListMember.push(this.dataList[index])
-				// }else{
-				// 	this.seleteListMember=[];
-				// }
 			},
 			//实验室搜索
 			searchBtn() {
@@ -164,17 +157,6 @@
 					prevPage.onShow(encodeURIComponent(JSON.stringify(this.form)))
 					uni.navigateBack()
 
-
-					// if(this.pageType==1){
-					// 	uni.redirectTo({
-					// 	    url: '/pages_safetyExamine/patrolPlan/patrolPlanAdd?form='+encodeURIComponent(JSON.stringify(this.form))
-					// 	});
-					// }else if(this.pageType==2){
-					// 	uni.redirectTo({
-					// 	    url: '/pages_safetyExamine/patrolPlan/patrolPlanEdit?form='+encodeURIComponent(JSON.stringify(this.form))
-					// 	});
-					// }
-
 				}
 
 			},