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 {
     // 生产环境

manifest.json

@@ -2,8 +2,8 @@
     "name" : "智慧安全", //中建四局
     "appid" : "__UNI__4AA4101",
     "description" : "",
-    "versionName" : "1.7.7",
+    "versionName" : "1.7.8",
-    "versionCode" : 177,
+    "versionCode" : 178,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

pages/projectEnd/safeSame/index.vue

@@ -41,12 +41,18 @@
 			</view>
 			<view class="problemData-top" v-else></view>
 			<view class="overDataList">
-				待整改
+				<view @click="goList(2)" class="">
-				<span style="margin-left: 35px;">{{countMyTodoInfo.rectificationNum}}</span>
+					待整改
-				待复查
+					<span style="margin-left: 35px;">{{countMyTodoInfo.rectificationNum}}</span>
-				<span style="margin-left: 35px;">{{countMyTodoInfo.reviewNum}}</span>
+				</view>
-				待核验
+				<view @click="goList(3)" class="">
-				<span style="margin-left: 35px;">{{countMyTodoInfo.verificationNum}}</span>
+					待复查
+					<span style="margin-left: 35px;">{{countMyTodoInfo.reviewNum}}</span>
+				</view>
+				<view @click="goList(4)" class="">
+					待核验
+					<span style="margin-left: 35px;">{{countMyTodoInfo.verificationNum}}</span>
+				</view>
 			</view>
 			<!--  <view class="overData">
         <view>待整改<span style="margin-left: 60rpx;">{{statisticsValue.rectificationNum}}</span></view>
@@ -57,7 +63,7 @@
 		<view class="commonModules">
 			<view class="overLeft">常用模块</view>
 			<view class="modulesList">
-				<view v-if="rectificationRecord" class="menu" @click="goList(1)">
+				<view v-if="rectificationRecord" class="menu" @click="goList('')">
 					<image class="icon" style="width: 60rpx; height: 60rpx;" src="@/static/newZlgl1.png"></image>
 					<view>检查台账</view>
 				</view> 
@@ -409,7 +415,7 @@
 			//列表页
 			goList(type) {
 				uni.navigateTo({
-					url: "./list?type=" + type
+					url: "./list?checkedTabType=" + type
 				})
 			},
 			//新增按钮
@@ -579,9 +585,12 @@
 	.overDataList {
 		padding-left: 14rpx;
 		margin-top: 30rpx;
+		> view {
+			display: inline-block;
+		}
 	}
 
-	.overDataList>span:not(:last-child)::after {
+	.overDataList> view:not(:last-child) > span::after {
 		content: '|';
 		margin: 0 10px;
 		color: #e9e9e9;

pages/projectEnd/safeSame/list.vue

@@ -7,7 +7,7 @@
 				</view>
 			</headers>
 			<view class="tab flex2" style="background-color: white;">
-				<view class="tabType" @click="changeTab(0)" :class="checkedTab==0?'checkedTab':'noCheckTab'">全部</view>
+				<view v-if="roleFlag || roleName.includes('项目管理员') ||roleName.includes('安全管理员')" class="tabType" @click="changeTab(0)" :class="checkedTab==0?'checkedTab':'noCheckTab'">全部</view>
 				<view class="tabType" @click="changeTab(2)" :class="checkedTab==2?'checkedTab':'noCheckTab'">待整改</view>
 				<view class="tabType" @click="changeTab(3)" :class="checkedTab==3?'checkedTab':'noCheckTab'">待复查</view>
 				<view class="tabType" @click="changeTab(4)" :class="checkedTab==4?'checkedTab':'noCheckTab'">待核验</view>
@@ -346,7 +346,7 @@
 				checkPointName: '',
 				type: 1,
 				listData: [],
-				checkedTab: 0,
+				checkedTab: -1,
 				condition: {
 					pageNo: 1,
 					pageSize: 10,
@@ -366,6 +366,9 @@
 				chekItm7: '',
 				chekItm8: '',
 				sourceIdList: [],
+				roleName: "",
+				roleFlag: false,
+				checkedTabType: 0,
 			}
 		},
 		onLoad(option) {
@@ -375,6 +378,9 @@
 			if (option.sourceIdList) {
 				this.sourceIdList = JSON.parse(option.sourceIdList);
 			}
+			this.checkedTabType = option.checkedTabType;
+			this.roleFlag = this.userInfo.accountType==5 || this.userInfo.accountType==10;
+			
 			this.getCheckPointList();
 		},
 		mounted() {
@@ -392,7 +398,8 @@
 			this.listData = [];
 			this.condition.pageNo = 1;
 			this.condition.pageSize = 10;
-			this.getListData();
+			
+			this.getSystemUserList();
 			this.getPeopleList()
 			this.getPeopleData()
 		},
@@ -405,6 +412,30 @@
 			}
 		},
 		methods: {
+			getSystemUserList() {
+				let data = {
+					projectSn: this.condition.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;
+						let countNum = 0;
+						if(this.roleFlag || this.roleName.includes('项目管理员') || this.roleName.includes('安全管理员')) {
+							countNum = this.checkedTabType ? this.checkedTabType : 0;
+						} else {
+							countNum = this.checkedTabType ? this.checkedTabType : 2;
+						}
+						this.changeTab(countNum);
+						console.log('获取检查记录数据', this.roleName.includes("项目管理员"))
+					}
+				})
+			},
 			//点击重新选择时间
 			showTimePicker(type) {
 				if (type == 1) {