heyang

api/request/config.js

@@ -1,6 +1,6 @@
 const config = {
 	// base_url: 'http://192.168.1.43/api', //43服务器
-	 base_url: 'http://192.168.1.8/api',//1.8服务器
+	// base_url: 'http://192.168.1.8/api',//1.8服务器
 	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.24:8080',//林总
 	// base_url: 'http://192.168.1.7:8080',//刘波
@@ -20,7 +20,7 @@ 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://labcontrol.nwafu.edu.cn/api/', //西北农林
 	// base_url: 'https://lab.zjznai.com/labapp/', //43测试
 }
 export {

pages/views/pupilPage/pupilMine.vue

@@ -116,7 +116,7 @@
 		methods: {
 			initialize(){
 				this.systemUserProfile();
-				this.examPointsRecordGetMyPointsLogInfo();
+				//this.examPointsRecordGetMyPointsLogInfo();
 			},
 			scanCode() {
 				uni.scanCode({

pages/views/teacherPage/teacherMine.vue

@@ -126,7 +126,7 @@
 		methods: {
 			initialize(){
 				this.systemUserProfile();
-				this.examPointsRecordGetMyPointsLogInfo();
+				//this.examPointsRecordGetMyPointsLogInfo();
 			},
 			scanCode() {
 				uni.scanCode({

pages_basics/views/deviceCageSitePage.vue

@@ -6,7 +6,7 @@
 		<!-- 笼位管理 -->
 		<web-view v-if="pageType==2" :src="'https://labcontrol.nwafu.edu.cn/cage/app/#/?ticket='+ticket"></web-view>
 		<!-- 安全教育与考试 -->
-		<web-view v-if="pageType==3" :src="'https://labcontrol.nwafu.edu.cn/studay/wx/#/zjznaiLogin?access_token=4e36fbc7-f765-4864-857c-a6a94f5b0f9e'"></web-view>
+		<web-view v-if="pageType==3" :src="'https://labcontrol.nwafu.edu.cn/studay/wx/#/zjznaiLogin?access_token='+access_token"></web-view>
 	</view>
 </template>
 
@@ -43,8 +43,8 @@
 				this.systemMineLinkGetCagePositionDetail()
 			}else if(this.pageType==3){
 				//安全教育与考试
-				this.access_token='4e36fbc7-f765-4864-857c-a6a94f5b0f9e'
-				//this.systemMineLinkGetEducationExamDetail()
+				//this.access_token='4e36fbc7-f765-4864-857c-a6a94f5b0f9e'
+				this.systemMineLinkGetEducationExamDetail()
 			}
 			
 
@@ -111,10 +111,16 @@
 
 			},
 			async menuLinkPost(item,obj){
-				menuLinkPost('http://'+item.reqApi,obj).then(response => {
-					if(response.data.code==200){
-						this.ticket=response.data.data.ticket
+				let self=this;
+				menuLinkPost('https://'+item.reqApi,obj).then(response => {
+					if(self.pageType==2){
+						if(response.data.code==200){
+							self.ticket=response.data.data.ticket
+						}
+					}if(self.pageType==3){
+						self.access_token=response.data.data.access_token
 					}
+					
 
 				})
 			},

pages_safetyCheck/views/snapshotManage/snapshotItems.vue

@@ -34,7 +34,8 @@
 							<img v-if="curTabTow==1" src="@/pages_safetyCheck/images/icon_xz_zg@1x.png">
 							<img v-if="curTabTow==4" src="@/pages_safetyCheck/images/icon_xz_fc@1x.png">
 						</view>
-						<view>{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
+						<view v-if="item.hazardCheckCode">{{item.hazardCheckCode}}{{item.hazardCheckName}}</view>
+						<view v-if="!item.hazardCheckCode">{{item.hazardDescribe}}</view>
 					</view>
 				</view>
 			</view>

pages_safetyCheck/views/snapshotManage/snapshotRectification.vue

@@ -183,9 +183,11 @@
 					sizeType: ["original", "compressed"],
 					sourceType: ["album", "camera"],
 					success: function(res) {
-						let tempFilePaths = res.tempFilePaths[0];
-						console.log(tempFilePaths)
-						self.uploadImg(tempFilePaths);
+						if (res.tempFilePaths[0]) {
+							res.tempFilePaths.forEach(function(item, index) {
+								self.uploadImg(item);
+							})
+						}
 					}
 				});
 			},
@@ -236,7 +238,7 @@
 			//整改/暂无法整改
 			async submitForm(status) {
 				let self = this;
-				if (status ==2 && this.form.rectifyProjectUrl=='') {
+				/* if (status ==2 && this.form.rectifyProjectUrl=='') {
 					uni.showToast({
 						title: '请上传整改方案!',
 						icon: "none",
@@ -244,7 +246,7 @@
 						duration: 2000
 					});
 					return
-				}
+				} */
 				let obj={
 					photoId:this.newData.photoId,
 					rectifyStatus:status,//1已整改2暂无法整改