flx: 潮州页面还原标准版

pages/projectEnd/projectIndex/projectIndex.vue

@@ -2,16 +2,15 @@
 	<view class="fullHeight projectIndexPage" style="background-color: white">
 		<scroll-view class="" :class="accountType == 5 || accountType == 6 || accountType == 10 ? 'smallHeight' : ''"
 			scroll-y>
-			<!-- :themeType="'white'" -->
+			<headers :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true"
-			<headers :themeType="true" :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true">
+				:themeType="'white'">
 				<view class="headerName" @click="toDept">
 					{{ projectDetail.projectName }}
 				</view>
 			</headers>
-			<!-- <image src="/static/projectIndexBG.png" class="projectIndexBG"
+			<image src="/static/projectIndexBG.png" class="projectIndexBG"
-				:style="{ height: systemInfo.statusBarHeight + 357 + 'px' }"></image> -->
+				:style="{ height: systemInfo.statusBarHeight + 357 + 'px' }"></image>
-			<view class="topBoxContent-box"></view>
+			<view class="topBoxContent">
-			<!-- <view class="topBoxContent">
 				<view class="" style="height: 20px"></view>
 				<view class="progressBox">
 					<image src="/static/progressLine.png" class="progressLine"></image>
@@ -36,6 +35,7 @@
 						</image>
 					</view>
 					<view class="bottom">
+						<!-- {{weatherInfo.reporttime.split(' ')[0]}} -->
 						{{ weatherInfo.winddirection }}风 {{ weatherInfo.windpower }}级
 					</view>
 				</view>
@@ -60,8 +60,16 @@
 						</view>
 						<view class=""> 要求完成日期</view>
 					</view>
+					<!-- <view class="item">
+            <view class="">
+              —.—.—
+            </view>
+            <view class="">
+              预计完成日期
+            </view>
+          </view> -->
 				</view>
-			</view> -->
+			</view>
 			<view class="moudleContent">
 				<view class="moudleTitle"> ·已有产品·</view>
 				<view class="moudleBox">
@@ -982,15 +990,7 @@
 			margin-bottom: 12rpx;
 		}
 	}
-	.topBoxContent-box {
+
-		margin: 26rpx;
-		width: calc(100% - 52rpx);
-		height: 400rpx;
-		background-image: url('@/static/chaozhou-index.png');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		position: relative;
-	}
 	.topBoxContent {
 		color: white;
 		font-size: 14px;
@@ -1083,7 +1083,7 @@
 
 	.projectIndexPage {
 		/deep/ .headerBox {
-			// background-color: transparent;
+			background-color: transparent;
 			border-bottom: none;
 		}
 	}
@@ -1200,10 +1200,10 @@
 	}
 
 	.moudleContent {
-		// box-shadow: 0px 4px 16px 0px rgba(212, 220, 236, 0.59);
+		box-shadow: 0px 4px 16px 0px rgba(212, 220, 236, 0.59);
 		border-radius: 8px;
 		padding: 15px 15px;
-		margin: 15px 15px 15px;
+		margin: 55px 15px 15px;
 		position: relative;
 		z-index: 2;
 	}

pages/projectEnd/safeSame/index.vue

@@ -8,7 +8,7 @@
 		<view class="problemOverview" :style="{paddingTop: mobileTopHeight + 60 + 'px'}">
 			<view class="overLeft">问题概览</view>
 			<view class="overRight">{{nowTime}}</view>
-			<view class="problemData" v-if="roleFlag || roleName.includes('项目管理员') ||roleName.includes('安全管理员')">
+			<view class="problemData">
 				<view class="dataBox1 dataStyle">
 					<view class="day" v-if="statisticsValue.totalNumDifferYesterday<0">
 						较昨日{{statisticsValue.totalNumDifferYesterday||0}}</view>
@@ -39,14 +39,13 @@
 					<view class="text">未闭合</view>
 				</view>
 			</view>
-			<view class="problemData-top" v-else></view>
 			<view class="overDataList">
 				待整改
-				<span style="margin-left: 35px;">{{countMyTodoInfo.rectificationNum}}</span>
+				<span style="margin-left: 35px;">{{statisticsValue.rectificationNum}}</span>
 				待复查
-				<span style="margin-left: 35px;">{{countMyTodoInfo.reviewNum}}</span>
+				<span style="margin-left: 35px;">{{statisticsValue.reviewNum}}</span>
 				待核验
-				<span style="margin-left: 35px;">{{countMyTodoInfo.verificationNum}}</span>
+				<span style="margin-left: 35px;">{{statisticsValue.verificationNum}}</span>
 			</view>
 			<!--  <view class="overData">
         <view>待整改<span style="margin-left: 60rpx;">{{statisticsValue.rectificationNum}}</span></view>
@@ -201,10 +200,6 @@
 				rectificationRecord: true,
 				projectSelfinspection: true,
 				mobileTopHeight: 0,
-				countMyTodoInfo: {},
-				userInfo: {},
-				roleName: "",
-				roleFlag: false,
 			}
 		},
 		onLoad() {
@@ -234,14 +229,10 @@
 		},
 		onShow() {
 			this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
-			this.userInfo = JSON.parse(uni.getStorageSync('userInfo'));
-			this.roleFlag = this.userInfo.accountType==5 || this.userInfo.accountType==10;
 			this.statusBarHeight = uni.getStorageSync('systemInfo').statusBarHeight;
 			// this.getListData();
 			// this.loadData();
 			this.getRecordList()
-			this.getCountMyTodo();
-			this.getProjectChilderSystemUserList();
 		},
 		methods: {
 			onNavigateToDetail(type) {
@@ -315,38 +306,6 @@
 					}
 				})
 			},
-			getCountMyTodo() {
-				let data = {
-					projectSn: this.projectSn
-				}
-				this.sendRequest({
-					url: 'xmgl/xzSecurityQualityInspectionRecord/countMyTodo',
-					method: 'post',
-					data,
-					success: res => {
-						this.countMyTodoInfo = res.result;
-						console.log('获取检查记录数据', res)
-					}
-				})
-			},
-			getProjectChilderSystemUserList() {
-				let data = {
-					projectSn: this.projectSn,
-					userId: this.userInfo.userId
-				}
-				this.sendRequest({
-					url: 'xmgl/systemUser/getProjectChilderSystemUserList',
-					method: 'post',
-					data,
-					success: res => {
-						// this.countMyTodoInfo = res.result;
-						if(res.result.length == 0) return;
-						this.roleName = res.result[0].roleName;
-						
-						console.log('获取检查记录数据', this.roleName.includes("项目管理员"))
-					}
-				})
-			},
 			loadData() {
 				if (this.manageTypeList.length > 0) {
 					let arr = [];
@@ -449,7 +408,7 @@
 
 
 	.problemOverview {
-		// height: 33%;
+		height: 33%;
 		// box-sizing: border-box;
 		border-radius: 10px;
 		border: 3px solid #fafbfc;
@@ -463,9 +422,6 @@
 			font-size: 12px;
 			color: gray;
 		}
-		.problemData-top {
-			margin-top: 13%;
-		}
 
 		.problemData {
 			margin-top: 13%;
@@ -577,8 +533,8 @@
 	}
 
 	.overDataList {
-		padding-left: 14rpx;
+		padding-left: 7px;
-		margin-top: 30rpx;
+		margin-top: 15px;
 	}
 
 	.overDataList>span:not(:last-child)::after {

pages/projectEnd/safeSame/reply.vue

@@ -54,7 +54,7 @@
 				</view>
 				<view class="type flex" v-if="title == '整改'">
 					<view class="name">
-						违章人员:
+						<text class="star">*</text>违章人员:
 					</view>
 					<!-- <picker mode="selector" :range="personList" range-key="workerName" @change="handleChangeRegion"
 				filterable>
@@ -79,7 +79,7 @@
 						input-align="left" @confirm="handleChangeCharger"></g-picker> -->
 				</view>
 				<view class="type flex3">
-					<view class="name"><text v-if="type != 3" class="star">*</text>补充说明：</view>
+					<view class="name"><text class="star">*</text>补充说明：</view>
 					<textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent"
 						@input='changeTextarea' :value="content" placeholder="请输入"></textarea>
 				</view>
@@ -435,7 +435,7 @@
 			},
 			//提交表单
 			formSubmit() {
-				if (this.content == '' && this.type != 3) {
+				if (this.content == '') {
 					uni.showToast({
 						title: "请输入回复内容",
 						icon: "none"
@@ -458,10 +458,10 @@
 					return
 				}
 
-				// if (this.violatorId.length == 0 && this.type == 1) {
+				if (this.violatorId.length == 0 && this.type == 1) {
-				// 	this.$message.error("请选择违章人员");
+					this.$message.error("请选择违章人员");
-				// 	return;
+					return;
-				// }
+				}
 				let time = this.getNewDate()
 
 				let data = {