flx:修改首页和权限

main.js

@@ -103,7 +103,7 @@ if (process.env.NODE_ENV === 'development') {
         // Vue.prototype.url_config = 'http://8.136.222.164:8808/'//中科安信
         // Vue.prototype.url_config = 'http://101.43.164.214:11111/'// 百色三标段
         // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:9500/'//  测试环境h5
-    Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' //  潮州项目h5
+    // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:21000/' //  潮州项目h5
 
 } else {
     // 生产环境

pages/projectEnd/projectIndex/projectIndex.vue

@@ -2,15 +2,16 @@
 	<view class="fullHeight projectIndexPage" style="background-color: white">
 		<scroll-view class="" :class="accountType == 5 || accountType == 6 || accountType == 10 ? 'smallHeight' : ''"
 			scroll-y>
-			<headers :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true"
+			<!-- :themeType="'white'" -->
-				:themeType="'white'">
+			<headers :themeType="true" :showBack="accountType == 5 || accountType == 6 || accountType == 10 ? false : true">
 				<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">
+			<view class="topBoxContent-box"></view>
+			<!-- <view class="topBoxContent">
 				<view class="" style="height: 20px"></view>
 				<view class="progressBox">
 					<image src="/static/progressLine.png" class="progressLine"></image>
@@ -35,7 +36,6 @@
 						</image>
 					</view>
 					<view class="bottom">
-						<!-- {{weatherInfo.reporttime.split(' ')[0]}} -->
 						{{ weatherInfo.winddirection }}风 {{ weatherInfo.windpower }}级
 					</view>
 				</view>
@@ -60,16 +60,8 @@
 						</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">
@@ -990,7 +982,15 @@
 			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: 55px 15px 15px;
+		margin: 15px 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">
+			<view class="problemData" v-if="roleFlag || roleName.includes('项目管理员') ||roleName.includes('安全管理员')">
 				<view class="dataBox1 dataStyle">
 					<view class="day" v-if="statisticsValue.totalNumDifferYesterday<0">
 						较昨日{{statisticsValue.totalNumDifferYesterday||0}}</view>
@@ -39,13 +39,14 @@
 					<view class="text">未闭合</view>
 				</view>
 			</view>
+			<view class="problemData-top" v-else></view>
 			<view class="overDataList">
 				待整改
-				<span style="margin-left: 35px;">{{statisticsValue.rectificationNum}}</span>
+				<span style="margin-left: 35px;">{{countMyTodoInfo.rectificationNum}}</span>
 				待复查
-				<span style="margin-left: 35px;">{{statisticsValue.reviewNum}}</span>
+				<span style="margin-left: 35px;">{{countMyTodoInfo.reviewNum}}</span>
 				待核验
-				<span style="margin-left: 35px;">{{statisticsValue.verificationNum}}</span>
+				<span style="margin-left: 35px;">{{countMyTodoInfo.verificationNum}}</span>
 			</view>
 			<!--  <view class="overData">
         <view>待整改<span style="margin-left: 60rpx;">{{statisticsValue.rectificationNum}}</span></view>
@@ -200,6 +201,10 @@
 				rectificationRecord: true,
 				projectSelfinspection: true,
 				mobileTopHeight: 0,
+				countMyTodoInfo: {},
+				userInfo: {},
+				roleName: "",
+				roleFlag: false,
 			}
 		},
 		onLoad() {
@@ -209,7 +214,7 @@
 			this.parameter = this.checkMenuPermission({menuPath: '/project/dangerousBigProject/parameter'})
 			this.safetyAnalysis = this.checkMenuPermission({menuPath: '/project/safetyEducation/safetyAnalysis'})
 			
-			this.rectificationRecord = this.checkBtnPermission({key: 'inspectionLedger_rectificationRecord', menuPath: '/project/safeSame/inspectionLedger'});
+			this.rectificationRecord = this.checkBtnPermission({key: 'inspectionLedger_rectificationRecordApp', menuPath: '/project/safeSame/inspectionLedger'});
 			this.pendingReview = this.checkBtnPermission({key: 'inspectionLedger_pendingReview', menuPath: '/project/safeSame/inspectionLedger'});
 			this.myHiddenTrouble = this.checkBtnPermission({key: 'inspectionLedger_myHiddenTrouble', menuPath: '/project/safeSame/inspectionLedger'});
 			this.hazardousWorkDistribution = this.checkBtnPermission({key: 'inspectionLedger_hazardousWorkDistribution', menuPath: '/project/safeSame/inspectionLedger'});
@@ -229,10 +234,14 @@
 		},
 		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) {
@@ -306,6 +315,38 @@
 					}
 				})
 			},
+			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 = [];
@@ -408,7 +449,7 @@
 
 
 	.problemOverview {
-		height: 33%;
+		// height: 33%;
 		// box-sizing: border-box;
 		border-radius: 10px;
 		border: 3px solid #fafbfc;
@@ -422,6 +463,9 @@
 			font-size: 12px;
 			color: gray;
 		}
+		.problemData-top {
+			margin-top: 13%;
+		}
 
 		.problemData {
 			margin-top: 13%;
@@ -533,8 +577,8 @@
 	}
 
 	.overDataList {
-		padding-left: 7px;
+		padding-left: 14rpx;
-		margin-top: 15px;
+		margin-top: 30rpx;
 	}
 
 	.overDataList>span:not(:last-child)::after {