heyang

pages.json

@@ -1,17 +1,6 @@
 {
 	"pages": [
-		{
-			"path": "pages/views/sceneInspect/memorandum", 
-			"style": {
-				"navigationBarTitleText": "现场检查"
-			}
-		},
-		{
-			"path": "pages/views/sceneInspect/sceneInspect", 
-			"style": {
-				"navigationBarTitleText": "现场检查"
-			}
-		},
+		
 		{
 			"path": "pages/views/login/login", //登录
 			"style": {

pages_safetyCheck/views/inspectManage/inspectList.vue

@@ -86,7 +86,7 @@
 				baseUrl: config.base_url,
 				pageType: 0,
 				userType: 1,
-				tabListTow: ['自查任务', '复查验证', '隐患整改'],
+				tabListTow: ['检查任务', '复查验证', '隐患整改'],
 				tabIndexTow: 0,
 				//学院选择
 				deptIndex:null,

pages_safetyCheck/views/itemsManage/hiddenDangerItems.vue

@@ -10,14 +10,10 @@
 			</view>
 			<view class="line"></view>
 			<view class="search">
-				<uni-data-picker :ellipsis="false" :localdata="checkOptionList[0]" :map="{text:'name',value:'id'}"
-					popup-title="请选择所属目录" @change="(e)=>onchange(e)" @nodeclick="onnodeclick()"
-					ref="uniDataPicker" :addType="false" :addIndex="index">
-					<view class="search-l">
-						{{newData.hazardCheckName?newData.hazardCheckName:'检查指标'}}
-						<img src="@/pages_safetyCheck/images/icon_06.png">
-					</view>
-				</uni-data-picker>
+				<view class="search-l">
+					<view>符合</view>
+					<view>不符合</view>
+				</view>
 				<view class="search-r" @click="inspectionItemsClick()">
 					<img src="@/pages_safetyCheck/images/icon_aqjc_ss.png">
 					{{newData.hazardCheckCode?newData.hazardCheckCode:''}}{{newData.hazardCheckName?newData.hazardCheckName:'模糊搜索检查项'}}
@@ -52,7 +48,6 @@
 	} from '@/api/request/config.js'
 	import {
 		securityAppCheckPhotoList,
-		securityCheckOptionList,
 	} from '@/pages_safetyCheck/api/index.js'
 	export default {
 		name: "hiddenDangerItems",
@@ -82,10 +77,8 @@
 					searchValue: '',
 				},
 				total: 0,
-				dataList: [{}],
+				dataList: [],
 				getDataType: false,
-				//检查项
-				checkOptionList: [],
 
 			}
 		},
@@ -106,14 +99,14 @@
 			} else if (this.pageType == 2) {
 				//整改
 				this.tabTextTow = ['待整改', '已整改', '暂无法整改']
+				this.getList()
 			}
 		},
 		onShow() {
 
 		},
 		mounted() {
-			this.getCheckOptionList()
-			this.getList()
+			
 		},
 		methods: {
 			//滚动事件
@@ -186,58 +179,7 @@
 					}
 				}
 			},
-			/**************************检查项***************************/
-			//获取检查项
-			async getCheckOptionList() {
-				const {
-					data
-				} = await securityCheckOptionList();
-				if (data.code == 200) {
-					let list = this.getTreeData(data.data);
-					console.log(list)
-					this.checkOptionList.push(JSON.parse(JSON.stringify(list)));
-
-				}
-			},
-			getTreeData(data) {
-				for (var i = 0; i < data.length > 0; i++) {
-					if (data[i].children == null || data[i].children.length <= 0) {
-						// children若为空数组，则将children设为undefined
-						data[i].children = undefined;
-					} else {
-						if (this.form.checkCategory == 1 && data[i].level == 3) {
-							if (data[i].children[0]) {
-								let mainPoint = []
-								for (let b = 0; b < data[i].children.length; b++) {
-									mainPoint.push(data[i].children[b].name)
-									data[i].mainPoint = mainPoint.join(',')
-								}
-							} else {
-								data[i].mainPoint = '';
-							}
-							data[i].children = [];
-						}
-						// children若不为空数组，则继续 递归调用 本方法
-						this.getTreeData(data[i].children);
-					}
-				}
-				return data;
-			},
-			//选中固有检查项(新)
-			onchange(e) {
-				let self = this;
-				//hazardCheckCode:'', //检查项目code序号
-				//hazardCheckName:'', //检查项目名称
-				//hazardCheckPro:'', //最后一级的id
-				console.log(e.detail.value)
-				this.$set(this.queryParams,'hazardCheckId',e.detail.value[e.detail.value.length - 1].value)
-				this.$set(this.newData,'hazardCheckName',e.detail.value[e.detail.value.length - 1].text)
-				this.getList()
-				
-			},
-			onnodeclick(node) {
-
-			},
+			
 
 		}
 	}
@@ -330,20 +272,37 @@
 				align-items: center;
 
 				.search-l {
-					width: 200rpx;
-					height: 60rpx;
-					border-radius: 50rpx 50rpx 50rpx 50rpx;
-					border: 1rpx solid #E0E0E0;
 					display: flex;
-					justify-content: space-between;
+					justify-content: flex-start;
 					align-items: center;
-					padding: 0 20rpx;
-					box-sizing: border-box;
-					margin: 0 32rpx 0 30rpx;
-
-					>img {
-						width: 24rpx;
-						height: 12rpx;
+					margin: 0 30rpx;
+					.search-A{
+						border-radius: 50rpx 50rpx 50rpx 50rpx;
+						border: 1rpx solid #E0E0E0;
+						width: 100rpx;
+						height: 60rpx;
+						background: #E0E0E0;
+						border-radius: 50rpx 50rpx 50rpx 50rpx;
+						font-weight: normal;
+						font-size: 24rpx;
+						color: #333333;
+						line-height: 60rpx;
+						text-align: center;
+						margin-right: 10rpx;
+					}
+					.search-B{
+						border-radius: 50rpx 50rpx 50rpx 50rpx;
+						border: 1rpx solid #E0E0E0;
+						width: 100rpx;
+						height: 60rpx;
+						background: #0183FA;
+						border-radius: 50rpx 50rpx 50rpx 50rpx;
+						font-weight: normal;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						line-height: 60rpx;
+						text-align: center;
+						margin-right: 10rpx;
 					}
 				}