heayng

api/request/config.js

@@ -20,8 +20,8 @@ const config = {
 	// base_url: 'https://lab.zjznai.com/api/', //暨大化材
 	// base_url: 'https://lab.zjznai.com/kdwclabSystem/', //矿大文昌地址
 	// base_url: 'https://znyj.zjznai.suda.edu.cn/labSystem/', //苏大临时地址
-	 base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
-	// base_url: 'https://lab.zjznai.com/labapp/', //43测试
+	 //base_url: 'https://labcontrol.nwafu.edu.cn/api/', //西北农林
+	base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }
 export {
 	config

pages/views/pupilPage/pupilHome.vue

@@ -14,6 +14,10 @@
 				<img class="button-img" src="@/pages/images/newImage/icon_sy_aqzr@1x.png">
 				<view class="button-name">安全准入</view>
 			</view>
+			<view class="button-min" @click="goPage('hierarchicalControlPupil')">
+				<img class="button-img" src="@/pages/images/newImage/icon_sy_fjgk@1x.png">
+				<view class="button-name">分级管控</view>
+			</view>
 			<view class="button-min" @click="goPage('securityCheck')">
 				<img class="button-img" src="@/pages/images/newImage/icon_sy_aqjc@1x.png">
 				<view class="button-name">安全检查</view>
@@ -117,6 +121,11 @@
 					uni.navigateTo({
 						url: "/pages_student/views/accessApplication/safeAccess",
 					});
+				}else if (type == 'hierarchicalControlPupil') {
+					//分级管控
+					uni.navigateTo({
+						url: "/pages_basics/views/gradingControl/gradingControl",
+					});
 				} else if (type == 'securityCheck') {
 					//安全检查
 					uni.navigateTo({

pages_basics/views/gradingControl/gradingControl.vue

@@ -17,12 +17,12 @@
 							<view class="list_li_b_t_t">
 								<view class="list_li_b_t_t_n">
 									<view class="list_li_b_t_t_l"
-										:class="[item2.ruleType== '日管控' ? 'purple': '', item2.ruleType=='周管控'? 'blue': '',item2.ruleType=='月管控'? 'orange': '',item2.ruleType=='年管控'? 'green': '',]">
+										:class="[item2.ruleType== '日管控' ? 'purple': '', item2.ruleType=='周管控'? 'blue': '',item2.ruleType=='月管控'? 'orange': '',item2.ruleType=='季度管控'? 'lightBlue ': '',item2.ruleType=='半年管控'? 'deepPurple  ': '',item2.ruleType=='年管控'? 'green': '',]">
 										{{item2.ruleType}}
 									</view>
 									<view class="list_li_b_t_t_c">{{item2.ruleName}}</view>
 									<view class="list_li_b_t_t_r" v-if="item2.isExpired==1">(过期未完成)</view>
-									<view class="list_li_b_t_t_rr">{{item2.endDate}}</view>
+									<view class="list_li_b_t_t_rr">{{item2.endDateTow}}</view>
 								</view>
 							</view>
 							<view class="list_li_b_t_b">{{item2.ruleRemark}}</view>
@@ -88,9 +88,9 @@
 					data
 				} = await gradingControl(obj)
 				if (data.code == 200) {
-					data.data.forEach(function(item){
-						item.detailList.forEach(function(item2){
-							item2.endDate=parseTime(item2.endDate, "{y}-{m}-{d} ");
+					data.data.forEach(function(item) {
+						item.detailList.forEach(function(item2) {
+							item2.endDateTow = parseTime(item2.endDate, "{y}-{m}-{d}");
 						})
 					})
 
@@ -245,6 +245,18 @@
 									background: rgba(250, 136, 1, 0.2);
 								}
 
+								/* 季管控 */
+								.lightBlue {
+									color: #81d3f8;
+									background: rgba(129, 211, 248, 0.2);
+								}
+
+								/* 半年管控 */
+								.deepPurple {
+									color: #6565f1;
+									background: rgba(101, 101, 241, 0.2);
+								}
+
 								/* 年管控 */
 								.green {
 									color: #11BA25;

pages_basics/views/gradingControl/gradingControlAdd.vue

@@ -17,12 +17,12 @@
 							<view class="list_li_b_t_t">
 								<view class="list_li_b_t_t_n">
 									<view class="list_li_b_t_t_l"
-										:class="[control.ruleType== '日管控' ? 'purple': '', control.ruleType=='周管控'? 'blue': '',control.ruleType=='月管控'? 'orange': '',control.ruleType=='年管控'? 'green': '',]">
+										:class="[control.ruleType== '日管控' ? 'purple': '', control.ruleType=='周管控'? 'blue': '',control.ruleType=='月管控'? 'orange': '',control.ruleType=='季管控'? 'lightBlue ': '',control.ruleType=='半年管控'? 'deepPurple  ': '',control.ruleType=='年管控'? 'green': '',]">
 										{{control.ruleType}}
 									</view>
 									<view class="list_li_b_t_t_c">{{control.ruleName}}</view>
 									<view class="list_li_b_t_t_r" v-if="control.isExpired==1">(过期未完成)</view>
-									<view class="list_li_b_t_t_rr">{{control.endDate}}</view>
+									<view class="list_li_b_t_t_rr">{{control.endDateTow}}</view>
 								</view>
 							</view>
 						</view>
@@ -117,30 +117,26 @@
 				if (item.type == 'png' || item.type == 'jpg' || item.type == 'jpeg' || item.type == 'gif') {
 					//查看图片
 					wx.previewImage({
-						urls: [config.base_url + item.url], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
+						urls: [item.url], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了
 						current: '', // 当前显示图片的http链接，默认是第一个
 						success: function(res) {},
 						fail: function(res) {},
 						complete: function(res) {},
 					})
-				} else if (item.type == 'pdf' || item.type == 'doc' || item.type == 'docx') {
+				} else if (item.type == 'pdf' || item.type == 'xlsx' || item.type == 'docx') {
 					uni.showLoading({
 						title: '下载中'
 					});
+					console.log(item)
 					//下载文档
 					wx.downloadFile({
-						url: config.base_url + item.url,
+						url:item.url,
 						header: {
 							Authorization: uni.getStorageSync('token')
 						},
 						success: function(res) {
-							console.log("resresresresresres", res)
 							const fileManager = wx.getFileSystemManager()
-							console.log('wx.env.USER_DATA_PATH', wx.env.USER_DATA_PATH);
-							console.log('item.name', item.name);
-							console.log('item.type', item.type);
 							const filePath = wx.env.USER_DATA_PATH + '/' + item.name
-							console.log('filePath', filePath);
 							fileManager.saveFile({
 								tempFilePath: res.tempFilePath,
 								filePath,
@@ -261,9 +257,10 @@
 
 
 						if (text != 'png' && text != 'jpg' && text != 'jpeg' && text != 'gif' && text != 'pdf' &&
-							text != 'doc' && text != 'docx') {
+							text != 'xlsx' &&
+							text != 'docx') {
 							uni.showToast({
-								title: '仅支持png/jpg/jpeg/gif/pdf/doc/docx类型的文件上传',
+								title: '仅支持png/jpg/jpeg/gif/pdf/xlsx/docx类型的文件上传',
 								icon: "none",
 								mask: true,
 								duration: 2000
@@ -527,6 +524,18 @@
 									background: rgba(250, 136, 1, 0.2);
 								}
 
+								/* 季管控 */
+								.lightBlue {
+									color: #81d3f8;
+									background: rgba(129, 211, 248, 0.2);
+								}
+
+								/* 半年管控 */
+								.deepPurple {
+									color: #6565f1;
+									background: rgba(101, 101, 241, 0.2);
+								}
+
 								/* 年管控 */
 								.green {
 									color: #11BA25;

pages_basics/views/gradingControl/gradingControlDetail.vue

@@ -16,8 +16,8 @@
 						<view class="list_li_b_t">
 							<view class="list_li_b_t_t">
 								<view class="list_li_b_t_t_n">
-									<view class="list_li_b_t_t_l"
-										:class="[infoList.ruleType== '日管控' ? 'purple': '', infoList.ruleType=='周管控'? 'blue': '',infoList.ruleType=='月管控'? 'orange': '',infoList.ruleType=='年管控'? 'green': '',]">
+									<view class="list_li_b_t_t_l" :class="[infoList.ruleType== '日管控' ? 'purple': '', infoList.ruleType=='周管控'? 'blue': '',infoList.ruleType=='月管控'? 'orange': '',infoList.ruleType=='季度管控'? 'lightBlue ': '',infoList.ruleType=='半年管控'? 'deepPurple  ': '',
+infoList.ruleType=='年管控'? 'green': '',]">
 										{{infoList.ruleType}}
 									</view>
 									<view class="list_li_b_t_t_c">{{infoList.ruleName}}</view>
@@ -54,7 +54,7 @@
 									@click="lookItem(item)">
 									<img src="@/pages_basics/images/icon_pdf.png" v-if="item.type == 'pdf'" />
 									<img src="@/pages_basics/images/icon_word.png"
-										v-if="item.type == 'doc' || item.type == 'docx'" />
+										v-if="item.type == 'docx'" />
 									<img :src="item.url"
 										v-if="item.type == 'png' || item.type == 'jpg' || item.type == 'jpeg' || item.type == 'gif'" />
 									<view class="list_li_b_b4_r_r">{{item.name}}</view>
@@ -130,20 +130,19 @@
 						fail: function(res) {},
 						complete: function(res) {},
 					})
-				} else if (item.type == 'pdf' || item.type == 'doc' || item.type == 'docx') {
+				} else if (item.type == 'pdf' || item.type == 'xlsx' || item.type == 'docx') {
 					uni.showLoading({
 						title: '下载中'
 					});
 					//下载文档
 					wx.downloadFile({
-						url: item.url,
+						url:item.url,
 						header: {
 							Authorization: uni.getStorageSync('token')
 						},
 						success: function(res) {
-							console.log("resresresresresres", res)
 							const fileManager = wx.getFileSystemManager()
-							const filePath = wx.env.USER_DATA_PATH + '/' + item.name + '.docx'
+							const filePath = wx.env.USER_DATA_PATH + '/' + item.name
 							fileManager.saveFile({
 								tempFilePath: res.tempFilePath,
 								filePath,
@@ -211,8 +210,13 @@
 					data
 				} = await gradingControlDetail(this.id)
 				if (data.code == 200) {
-					data.data.endDate = parseTime(data.data.endDate, "{y}-{m}-{d} {h}:{i}:{s}");
-					data.data.detail.createTime = parseTime(data.data.detail.createTime, "{y}-{m}-{d} {h}:{i}:{s}");
+					if(data.data.endDate){
+						data.data.endDate = parseTime(data.data.endDate, "{y}-{m}-{d} {h}:{i}:{s}");
+					}
+					
+					if(data.data.detail){
+						data.data.detail.createTime = parseTime(data.data.detail.createTime, "{y}-{m}-{d} {h}:{i}:{s}");
+					}
 					this.infoList = data.data
 					listName = data.data.detail.imgName.split(",")
 					listUrl = data.data.detail.imgUrl.split(",")
@@ -377,6 +381,18 @@
 									background: rgba(250, 136, 1, 0.2);
 								}
 
+								/* 季管控 */
+								.lightBlue {
+									color: #81d3f8;
+									background: rgba(129, 211, 248, 0.2);
+								}
+
+								/* 半年管控 */
+								.deepPurple {
+									color: #6565f1;
+									background: rgba(101, 101, 241, 0.2);
+								}
+
 								/* 年管控 */
 								.green {
 									color: #11BA25;

pages_basics/views/gradingControl/gradingControlFinish.vue

@@ -3,7 +3,7 @@
 	<view id="accessQualification">
 		<scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
 			<view class="list">
-				<view class="list_li" v-for="(item,index) in infoList" :key="index">
+				<view class="list_li" v-for="(item,index) in dataList" :key="index">
 					<view class="list_li_t">
 						<!-- <view class="list_li_t_l" :style="'color:'+item.levelColor+';border-color:'+item.levelColor">{{item.levelName}}</view> -->
 						<view class="list_li_t_c">{{item.subName}}</view>
@@ -16,7 +16,7 @@
 							<view class="list_li_b_t_t">
 								<view class="list_li_b_t_t_n">
 									<view class="list_li_b_t_t_l"
-										:class="[item2.ruleType== '日管控' ? 'purple': '', item2.ruleType=='周管控'? 'blue': '',item2.ruleType=='月管控'? 'orange': '',item2.ruleType=='年管控'? 'green': '',]">
+										:class="[item2.ruleType== '日管控' ? 'purple': '', item2.ruleType=='周管控'? 'blue': '',item2.ruleType=='月管控'? 'orange': '',item2.ruleType=='季度管控'? 'lightBlue ': '',item2.ruleType=='半年管控'? 'deepPurple  ': '',item2.ruleType=='年管控'? 'green': '',]">
 										{{item2.ruleType}}
 									</view>
 									<view class="list_li_b_t_t_c">{{item2.ruleName}}</view>
@@ -34,7 +34,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="get-null-box" v-if="infoList.length==0">暂无更多数据</view>
+			<view class="get-null-box" v-if="getDataType">暂无更多数据</view>
 		</scroll-view>
 
 	</view>
@@ -50,7 +50,13 @@
 	export default {
 		data() {
 			return {
-				infoList: [],
+				queryParams: {
+					page: 1,
+					pageSize: 20,
+				},
+				total: 0,
+				getDataType: null,
+				dataList: [],
 			}
 		},
 		onLoad() {
@@ -65,13 +71,11 @@
 
 			//清除
 			clearData() {
-				this.infoList = [];
+				this.dataList = [];
 
 			},
 			//去详情页
 			goPageInfo(item) {
-				console.log(11)
-				console.log(item)
 				uni.navigateTo({
 					url: '/pages_basics/views/gradingControl/gradingControlDetail?item=' + encodeURIComponent(JSON
 						.stringify(item))
@@ -81,26 +85,44 @@
 			scrollGet() {
 				this.getList();
 			},
+			//滚动事件
+			scrollGet() {
+				let self = this;
+				if (self.total / self.queryParams.pageSize <= self.queryParams.page) {
+					this.$set(this, 'getDataType', true);
+				} else {
+					this.queryParams.page += 1;
+					this.$nextTick(() => {
+						this.getList();
+					})
+				}
+			},
 
-
-			//获取列表数据
 			async getList() {
 				let self = this;
-				let obj = {
-
-				}
 				const {
 					data
-				} = await gradingControlFinish(obj)
+				} = await gradingControlFinish(this.queryParams);
 				if (data.code == 200) {
-					data.data.forEach(function(item){
-						item.detailList.forEach(function(item2){
-							item2.endDate=parseTime(item2.endDate, "{y}-{m}-{d} {h}:{i}:{s}");
+					data.data.records.forEach(function(item) {
+						item.detailList.forEach(function(item2) {
+							item2.endDate = parseTime(item2.endDate, "{y}-{m}-{d} {h}:{i}:{s}");
 						})
 					})
-					self.infoList = data.data;
+					if (self.queryParams.page == 1) {
+						this.dataList = data.data.records;
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					} else {
+						this.dataList = [...this.dataList, ...data.data.records]
+						this.total = data.data.total;
+						if (data.data.total / self.queryParams.pageSize <= self.queryParams.page) {
+							this.$set(this, 'getDataType', true);
+						}
+					}
 				}
-
 			},
 		}
 	}
@@ -247,6 +269,7 @@
 									background: rgba(172, 32, 224, 0.2);
 								}
 
+
 								/* 周管控 */
 								.blue {
 									color: #0183FA;
@@ -259,6 +282,20 @@
 									background: rgba(250, 136, 1, 0.2);
 								}
 
+								/* 季管控 */
+								.lightBlue {
+									color: #81d3f8;
+									background: rgba(129, 211, 248, 0.2);
+								}
+
+								/* 半年管控 */
+								.deepPurple {
+									color: #6565f1;
+									background: rgba(101, 101, 241, 0.2);
+								}
+
+
+
 								/* 年管控 */
 								.green {
 									color: #11BA25;

pages_safetyCheck/views/inspectManage/inspectAdd.vue

@@ -184,6 +184,14 @@
 					this.$set(this, 'newData', data.data);
 					//编辑的时候
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
+					if(data.data.checkFlag){
+						this.radioList[0].checked=true
+						this.radioList[1].checked=false
+					}else{
+						this.radioList[0].checked=false
+						this.radioList[1].checked=true
+					}
+					
 					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe : '');
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
@@ -203,6 +211,13 @@
 					this.$set(this, 'newData', data.data);
 					this.$set(this.newData, 'checkPlanSetVoList', this.optionData.checkPlanSetVoList);
 					this.$set(this.form, 'checkFlag', data.data.checkFlag ? data.data.checkFlag : false);
+					if(data.data.checkFlag){
+						this.radioList[0].checked=true
+						this.radioList[1].checked=false
+					}else{
+						this.radioList[0].checked=false
+						this.radioList[1].checked=true
+					}
 					this.$set(this.form, 'hazardDescribe', data.data.hazardDescribe ? data.data.hazardDescribe : '');
 					this.$set(this.form, 'photoList', data.data.photoList ? data.data.photoList : []);
 					this.$set(this.form, 'voiceList', data.data.voiceList ? data.data.voiceList : []);
@@ -245,6 +260,9 @@
 						});
 						return
 					}
+				}else{
+					this.$set(this.form, 'hazardDescribe','');
+					this.$set(this.form, 'photoList',[]);
 				}
 				let obj = {
 					checkFlag: this.form.checkFlag,

pages_safetyCheck/views/itemsManage/hiddenDangerItemsDetail.vue

@@ -114,7 +114,7 @@
 			<view @click="submitBtn(1)">编辑</view>
 			<view @click="submitBtn(2)">继续整改</view>
 		</view>
-		<view v-if="pageType==0 && newData.checkFlag && !hiddenDangerRecordStatus" @click="submitBtn(2)" class="sub-btn-tow">继续检查</view>
+		<view v-if="pageType==0 && newData.checkSetProgress ==100 && !hiddenDangerRecordStatus" @click="submitBtn(2)" class="sub-btn-tow">继续检查</view>
 	</view>
 
 </template>

pages_safetyCheck/views/snapshotManage/snapshotDetail.vue

@@ -26,12 +26,12 @@
 				</view>
 				<view v-if="newData.hazardCheckName!=''" class="hidden-content">{{newData.hazardCheckPoint}}
 				</view>
-				<view class="list-li">
+				<view class="list-li" v-if="newData.hazardDescribe">
 					<view>检查隐患</view>
 				</view>
-				<view class="hidden-content">{{newData.hazardDescribe}}
+				<view class="hidden-content" v-if="newData.hazardDescribe">{{newData.hazardDescribe}}
 				</view>
-				<view class="photo">
+				<view class="photo" v-if="newData.yhDtoList[0]">
 					<img v-for="(item,index) in newData.yhDtoList" :src="baseUrl+item.fileUrl">
 				</view>
 				<view class="list-li" @click="rectifyCollapse()">
@@ -42,7 +42,7 @@
 					</view>
 				</view>
 				<view v-if="newData.rectifyCollapse && newData.rectifyTime">
-					<view class="hidden-content" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">{{newData.rectifyDescribe}}
+					<view class="hidden-content" v-if="(newData.rectifyStatus==1 || newData.rectifyStatus==2) && newData.rectifyDescribe">{{newData.rectifyDescribe}}
 					</view>
 					<view class="photo" v-if="newData.rectifyStatus==1 || newData.rectifyStatus==2">
 						<img v-for="(item,index) in newData.zgDtoList" :src="baseUrl+item.fileUrl">

pages_safetyCheck/views/snapshotManage/snapshotItems.vue

@@ -145,6 +145,7 @@
 				this.$nextTick(()=>{
 					this.getList();
 				})
+				console.log(this.curTabTow)
 			},
 			dialogOpen() {
 				this.dialogVisible = true;
@@ -181,9 +182,16 @@
 			itemsClick(row) {
 				let infoData = row;
 				infoData.pageType = this.pageType;
-				uni.navigateTo({
-					url: '/pages_safetyCheck/views/snapshotManage/snapshotRectification?infoData=' + encodeURIComponent(JSON.stringify(infoData))
-				});
+				if(this.curTabTow==0){
+					uni.navigateTo({
+						url: '/pages_safetyCheck/views/snapshotManage/snapshotRectification?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					});
+				}else if(this.curTabTow==1 || this.curTabTow==2){
+					uni.navigateTo({
+						url: '/pages_safetyCheck/views/snapshotManage/snapshotDetail?infoData=' + encodeURIComponent(JSON.stringify(infoData))
+					});
+				}
+				
 			},
 			hiddenDangerClick(row) {
 				let infoData = row;