flx：修复危大

examples/sosExample.vue

@@ -72,7 +72,7 @@ export default {
   },
   
   onLoad() {
-    this.initSOSPolyfill()
+    // this.initSOSPolyfill()
   },
   
   onUnload() {

pages/projectEnd/dangerBigProject/control.vue

@@ -45,16 +45,16 @@
 		},
 		created() {
 			this.initData()
-			this.getDEById()
+			// this.getDEById()
-			this.getApply()
+			// this.getApply()
 		},
 		onShow() {
-			this.getApply()
+			// this.getApply()
 		},
 		methods: {
 			initData() {
 				this.sendRequest({
-					url: 'xmgl/bigDangerControlItem/selectControlItemList',
+					url: 'xmgl/bigDangerChooseControlItem/selectControlItemList',
 					method: 'post',
 					data: {
 						engineeringId: this.detailId,
@@ -127,7 +127,7 @@
 				}
 				console.log(data)
 				this.sendRequest({
-					url: 'xmgl/bigDangerControlItem/edit',
+					url: 'xmgl/bigDangerChooseControlItem/edit',
 					method: 'post',
 					data: data,
 					success: res => {

pages/projectEnd/dangerBigProject/details.vue

@@ -18,9 +18,9 @@
 								:class="{'wkg-box':detailData.recordStatus == 1 || detailData.recordStatus == 4,'zs-box':detailData.recordStatus == 2,'wg-box':detailData.recordStatus == 3}">
 								{{ recordStatusUp(detailData.recordStatus) }}
 							</view>
-							<view class="state-box"
+							<view class="state-box" v-if="detailData.securityStatus"
-								:class="{'wg-box':detailData.recordStatus == 2,'xgz-box':detailData.recordStatus == 3}">
+								:class="{'wg-box':detailData.securityStatus == 2,'xgz-box':detailData.securityStatus == 1}">
-								{{ recordStatusUp(detailData.recordStatus) }}
+								{{ detailData.securityStatus == 1 ? '需关注' : '安全可控' }}
 							</view>
 						</view>
 					</view>
@@ -139,7 +139,7 @@
 			return {
 				statusBarHeight: 0,
 				isShow: true,
-				componentName: "control",
+				componentName: "",
 				navList: [{
 						id: 2,
 						name: "工程资料"
@@ -168,7 +168,7 @@
 						name: "管控要点"
 					},
 				],
-				activeIndex: 7,
+				activeIndex: "",
 				detailId: "",
 				detailData: {},
 				isShowBtn: null,
@@ -237,7 +237,10 @@
 						// 	this.listData = res.result.records
 						// }
 						this.detailData = res.result
-						this.getApply()
+						this.getApply();
+						this.checkNav({
+							id: 2
+						});
 					}
 				})
 			},
@@ -308,7 +311,7 @@
 					}
 					uni.navigateTo({
 						// url:'../safeManage/addExamine?type=1&engineeringId='+this.detailId + '&moduleType=safeCheck'
-						url: '../safeSame/addIssue?type=1&engineeringId=' + this.detailId + '&moduleType=safeCheck'
+						url: '../safeSame/addIssue?type=11&engineeringId=' + this.detailId + '&moduleType=safeCheck'
 					})
 				} else if (this.activeIndex == 6) {
 					uni.navigateTo({

pages/projectEnd/dangerBigProject/index.vue

@@ -3,14 +3,14 @@
 		<view class="fixedheader">
 			<headers :showBack="true" :themeType="true">
 				<view class="headerName">
-					隐患工单派发
+					危大工程
 				</view>
 			</headers>
 		</view>
 		<view class="search-box" :style="{paddingTop: mobileTopHeight + 44 + 'px'}">
 			<view class="uni-form-item">
 				<u-search class="uni-input" placeholder="请输入名称" :show-action="false"
-					v-model="projectTypeName"></u-search>
+					v-model="projectTypeName" @change="loadData"></u-search>
 				<view @click="dropdownBtnChange('')" class="search-btn">
 					<image src="/static/riskPoint/screenIcon.png" mode=""></image>
 				</view>
@@ -30,9 +30,9 @@
 									:class="{'wkg-box':item.recordStatus == 1 || item.recordStatus == 4,'zs-box':item.recordStatus == 2,'wg-box':item.recordStatus == 3}">
 									{{ recordStatusUp(item.recordStatus) }}
 								</view>
-								<view class="state-box"
+								<view class="state-box" v-if="item.securityStatus"
-									:class="{'wg-box':item.recordStatus == 2,'xgz-box':item.recordStatus == 3}">
+									:class="{'wg-box':item.securityStatus == 2,'xgz-box':item.securityStatus == 1}">
-									{{ recordStatusUp(item.recordStatus) }}
+									{{ item.securityStatus == 1 ? '需关注' : '安全可控' }}
 								</view>
 							</view>
 						</view>
@@ -87,7 +87,7 @@
 							<view>安全情况</view>
 							<view>
 								<view @click="onRiskLevelClick(item.id, 3)"
-									:class="{'active': policeCameraInfo.riskLevel === item.id}"
+									:class="{'active': policeCameraInfo.securityStatus === item.id}"
 									v-for="item in riskLevelList" :key="item.id">{{item.name}}</view>
 							</view>
 						</view>
@@ -183,7 +183,7 @@
 				policeCameraInfo: {
 					effectiveTimeEnd_begin: "",
 					effectiveTimeBegin_end: "",
-					riskLevel: "",
+					securityStatus: "",
 					projectClassify: "",
 					recordStatus: "",
 				},
@@ -295,6 +295,7 @@
 					safeControlDutyIdList: this.searchInfo.systemUserIds,
 					projectClassify: this.policeCameraInfo.projectClassify,
 					recordStatus: this.policeCameraInfo.recordStatus,
+					securityStatus: this.policeCameraInfo.securityStatus,
 				}
 				this.sendRequest({
 					url: 'xmgl/bigDangerRecord/page',
@@ -352,7 +353,7 @@
 				const obj = {
 					1: 'projectClassify',
 					2: 'recordStatus',
-					3: 'riskLevel',
+					3: 'securityStatus',
 				}
 				if (this.policeCameraInfo[obj[type]] == rowId) {
 					this.policeCameraInfo[obj[type]] = "";
@@ -442,7 +443,7 @@
 				this.policeCameraInfo = {
 					effectiveTimeEnd_begin: "",
 					effectiveTimeBegin_end: "",
-					riskLevel: "",
+					securityStatus: "",
 					projectClassify: "",
 					recordStatus: "",
 				};

pages/projectEnd/dangerBigProject/list/list.vue

@@ -355,7 +355,7 @@
 					pageNo: 1,
 					pageSize: 10,
 					projectSn: "",
-					status: 2,
+					// status: 2,
 					search: '', //搜索字段
 				},
 				teach: true,
@@ -987,7 +987,7 @@
 					data: {
 						...that.condition,
 						recordType: this.recordType,
-						type: 1,
+						type: 11,
 						// type: 10,
 						engineeringId: this.engineeringId,
 					},

pages/projectEnd/dangerBigProject/safeList.vue

@@ -21,10 +21,8 @@
 				listData: [],
 			}
 		},
-		onLoad() {
+		created() {
-			console.log("==============safeLis,detailIdt===============");
+			this.initData();
-			console.log(this.detailId);
-			console.log("==============safeList,detailId===============");
 		},
 		methods:{
 			initData() {
@@ -37,7 +35,7 @@
 						pageNo: 1,
 						pageSize: -1,
 						recordType: 2,
-						type: -1,
+						type: 11,
 					},
 					success: res => {
 						uni.hideLoading()

pages/projectEnd/safeSame/addIssue.vue

@@ -128,7 +128,7 @@
 					<view class="name"><text class="star" v-if="item.isRequired == 1">*</text>{{item.displayFieldName
 									  ? item.displayFieldName
 									  : item.originalFieldName}}：</view>
-					<dateTimePiccker :placeholder="'请选择'" :disabled="item.defaultDataType ? true : false"
+					<dateTimePiccker :placeholder="'请选择'" :disabled="(item.defaultDataType && type != 11) ? true : false"
 						:start="startTime" fields="second" :default-value="form.inspectTime"
 						@change="bindPickerChange($event,'startTime')" class="dateTimePiccker">
 					</dateTimePiccker>
@@ -635,7 +635,26 @@
 			this.form.itemId = option.itemId
 			console.log(dateformat(new Date()), 777888)
 			if (option.engineeringId) this.engineeringId = option.engineeringId
-			if (option.type) this.type = Number(option.type)
+			if (option.type){
+				this.type = Number(option.type);
+				if(this.type == 11) {
+					this.startTime = "2022-01-01";
+					this.startTime2 = "2022-01-01";
+				}
+			}
+			if (option.url) {
+				let data = JSON.parse(option.url);
+				console.log(1155555, data);
+				if(option.moduleType == 'type2'){
+					this.typeCheck = 'type2';
+					this.checkedTab = 'type2';
+					this.form.recordType = 2;
+				}
+				this.imgFileList.push({
+					name: data.fileInfo.originalFilename,
+					url: data.imageUrl
+				})
+			}
 			this.getSecurityDangerFieldPage();
 			this.getDicProjectTypeList();
 			this.getXzSecurityDangerReviewVerifyList();
@@ -684,7 +703,7 @@
 			onSubmitType(type) {
 				if (type == 1) {
 					const dataId = this.constructionAreasList.join(',');
-					if(dataId != this.form.regionDrawId) {
+					if (dataId != this.form.regionDrawId) {
 						this.form.drawingPointData = [];
 					}
 					this.form.regionDrawId = dataId;