heyang hace 11 meses
padre
commit
08b9575aa3
Se han modificado 24 ficheros con 2269 adiciones y 2049 borrados
  1. 3 3
      api/request/config.js
  2. 11 10
      pages/component/homeConfigurationSlot.vue
  3. 1 1
      pages/views/login/login.vue
  4. 7 7
      pages_basics/views/photoInspection.vue
  5. 1 1
      pages_manage/views/gasBottle/examination/examinationAdd.vue
  6. 1 1
      pages_manage/views/gasBottle/gasApply/gasApplyReject.vue
  7. 1 1
      pages_manage/views/gasBottle/useGasApply/useGasApplyAdd.vue
  8. 1 1
      pages_manage/views/gasBottle/useRegister/giveRegister.vue
  9. 1 1
      pages_manage/views/gasBottle/useRegister/useRegister.vue
  10. 1 1
      pages_manage/views/laboratory/monitor.vue
  11. 1 1
      pages_safetyExamine/views/dangerManage/dangerDetail.vue
  12. 1344 1207
      pages_safetyExamine/views/examineManage/examineAdd.vue
  13. 2 2
      pages_safetyExamine/views/examineManage/examineAddTow.vue
  14. 884 802
      pages_safetyExamine/views/examineManage/examineList.vue
  15. 1 1
      pages_safetyExamine/views/snapshotManage/snapshotAdd.vue
  16. 1 1
      pages_safetyExamine/views/snapshotManage/snapshotDetail.vue
  17. 1 1
      pages_student/views/gasBottle/examination/examinationAdd.vue
  18. 1 1
      pages_student/views/gasBottle/gasApply/gasApplyReject.vue
  19. 1 1
      pages_student/views/gasBottle/useGasApply/useGasApplyAdd.vue
  20. 1 1
      pages_student/views/gasBottle/useRegister/giveRegister.vue
  21. 1 1
      pages_student/views/gasBottle/useRegister/useRegister.vue
  22. 1 1
      pages_supplier/views/register/registerTow.vue
  23. 1 1
      pages_supplier/views/transportCar/transportCarAdd.vue
  24. 1 1
      pages_supplier/views/transportPerson/transportPersonAdd.vue

+ 3 - 3
api/request/config.js

@@ -1,10 +1,10 @@
 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',//刘波
-	//base_url: 'http://192.168.1.17:8080',//小飞
+	base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
 	// base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
@@ -21,4 +21,4 @@ const config = {
 }
 export {
 	config
-}
+}

+ 11 - 10
pages/component/homeConfigurationSlot.vue

@@ -1,20 +1,20 @@
-<!-- 
+<!--
  首页按钮匹配组件
 	<homeConfigurationSlot v-if="homeConfigData[0]" :homeConfig="homeConfigData[0]"></homeConfigurationSlot>
 	<homeConfigurationSlot v-if="homeConfigData[1]" :homeConfig="homeConfigData[1]"></homeConfigurationSlot>
 	<homeConfigurationSlot v-if="homeConfigData[2]" :homeConfig="homeConfigData[2]"></homeConfigurationSlot>
 	<homeConfigurationSlot v-if="homeConfigData[3]" :homeConfig="homeConfigData[3]"></homeConfigurationSlot>
-	
+
  	import { homeConfigurationSlot } from '@/pages/component/homeConfigurationSlot'
 	import { getHomeConfig } from '@/utils/homeConfig.js'
 
 	components: {
 		homeConfigurationSlot,
 	},
-	
+
 	homeConfigData: [],
-	
-	
+
+
 	async systemAppletLayoutSelect() {
 		const {data} = await systemAppletLayoutSelect({module:'home'})
 		if(data.code == 200){
@@ -68,7 +68,8 @@
 <script>
 	import {
 		outSubjectPhoto,
-		gradingControl
+		gradingControl,
+		getGentleIdentifier
 	} from '@/pages/api/index.js'
 	export default {
 		name: "homeConfigurationSlot",
@@ -106,10 +107,10 @@
 						});
 					}
 					if (item.route === 'safetyExamine') { //安全检查
-						uni.navigateTo({
+						/* uni.navigateTo({
 							url: item.routeUrl,
-						});
-						//this.getGentleIdentifier(item.routeUrl)
+						}); */
+						this.getGentleIdentifier(item.routeUrl)
 					}
 					if (item.route === 'leaveInspection') { //离开检查
 						uni.navigateTo({
@@ -438,4 +439,4 @@
 			}
 		}
 	}
-</style>
+</style>

+ 1 - 1
pages/views/login/login.vue

@@ -52,7 +52,7 @@
 			return {
 				identityStatus: 1,
 				// username:"dedsudiyu",//学生
-				username: "admin",//教职工
+				username: "sudiyu",//教职工
 				password: "zd123456",
 				checkedType: false,
 				loginBanner: uni.getStorageSync('loginBanner'),

+ 7 - 7
pages_basics/views/photoInspection.vue

@@ -45,12 +45,12 @@
 					<img v-if="item.type" :src="item.icon">
 				</view>
 			</view>
-			
+
 		</view>
 		<view class="up-data-button" @click="upButton">离开</view>
 		<helang-compress ref="helangCompress"></helang-compress>
     </view>
-	
+
 </template>
 
 <script>
@@ -191,7 +191,7 @@
 					title: '压缩中',
 					mask: true
 				});
-			
+
 				this.$refs.helangCompress.compress({
 					src: tempFilePaths[0],
 					maxSize: this.params.maxSize,
@@ -202,7 +202,7 @@
 					uni.hideLoading();
 					console.log('压缩成功')
 					self.uploadImg(res,name);
-					
+
 				}).catch((err) => {
 					uni.hideLoading();
 					uni.showToast({
@@ -218,7 +218,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',
@@ -292,7 +292,7 @@
 				    }
 				}
 			}
-			
+
 			.null-view-box{
 			    text-align center;
 			    line-height:100rpx;
@@ -371,7 +371,7 @@
 					height: 60rpx;
 					margin-top: 44rpx;
 				}
-				
+
 			}
 			.color-A{
 				border: 2rpx dotted #E0E0E0;

+ 1 - 1
pages_manage/views/gasBottle/examination/examinationAdd.vue

@@ -238,7 +238,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_manage/views/gasBottle/gasApply/gasApplyReject.vue

@@ -77,7 +77,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_manage/views/gasBottle/useGasApply/useGasApplyAdd.vue

@@ -233,7 +233,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_manage/views/gasBottle/useRegister/giveRegister.vue

@@ -105,7 +105,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_manage/views/gasBottle/useRegister/useRegister.vue

@@ -156,7 +156,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_manage/views/laboratory/monitor.vue

@@ -273,7 +273,7 @@ export default {
     async uploadImg(tempFilePaths){
       var self = this;
       uni.uploadFile({
-        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
         header:{'Authorization':uni.getStorageSync('token')},
         filePath: tempFilePaths,
         name: 'file',

+ 1 - 1
pages_safetyExamine/views/dangerManage/dangerDetail.vue

@@ -451,7 +451,7 @@ export default {
 		        mask: true
 		    });
 		    uni.uploadFile({
-		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+		        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 		        header:{'Authorization':uni.getStorageSync('token')},
 		        filePath: tempFilePaths,
 		        name: 'file',

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 1344 - 1207
pages_safetyExamine/views/examineManage/examineAdd.vue


+ 2 - 2
pages_safetyExamine/views/examineManage/examineAddTow.vue

@@ -424,7 +424,7 @@
 
 			    var self = this;
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',
@@ -642,7 +642,7 @@
                     mask: true
                 });
                 uni.uploadFile({
-                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+                    url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
                     header:{'Authorization':uni.getStorageSync('token')},
                     filePath: tempFilePaths,
                     name: 'file',

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 884 - 802
pages_safetyExamine/views/examineManage/examineList.vue


+ 1 - 1
pages_safetyExamine/views/snapshotManage/snapshotAdd.vue

@@ -175,7 +175,7 @@ export default {
 			for(let i=0;i<tempFilePaths.length;i++){
 				console.log(tempFilePaths[i])
 				uni.uploadFile({
-				    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+				    url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 				    header:{'Authorization':uni.getStorageSync('token')},
 				    filePath: tempFilePaths[i],
 				    name: 'file',

+ 1 - 1
pages_safetyExamine/views/snapshotManage/snapshotDetail.vue

@@ -218,7 +218,7 @@ export default {
 		        mask: true
 		    });
 		    uni.uploadFile({
-		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+		        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 		        header:{'Authorization':uni.getStorageSync('token')},
 		        filePath: tempFilePaths,
 		        name: 'file',

+ 1 - 1
pages_student/views/gasBottle/examination/examinationAdd.vue

@@ -238,7 +238,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_student/views/gasBottle/gasApply/gasApplyReject.vue

@@ -77,7 +77,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_student/views/gasBottle/useGasApply/useGasApplyAdd.vue

@@ -233,7 +233,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_student/views/gasBottle/useRegister/giveRegister.vue

@@ -105,7 +105,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_student/views/gasBottle/useRegister/useRegister.vue

@@ -156,7 +156,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_supplier/views/register/registerTow.vue

@@ -69,7 +69,7 @@
 			        mask: true
 			    });
 			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+			        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
 			        header:{'Authorization':uni.getStorageSync('token')},
 			        filePath: tempFilePaths,
 			        name: 'file',

+ 1 - 1
pages_supplier/views/transportCar/transportCarAdd.vue

@@ -80,7 +80,7 @@
        		        mask: true
        		    });
        		    uni.uploadFile({
-       		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+       		        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
        		        header:{'Authorization':uni.getStorageSync('token')},
        		        filePath: tempFilePaths,
        		        name: 'file',

+ 1 - 1
pages_supplier/views/transportPerson/transportPersonAdd.vue

@@ -83,7 +83,7 @@
        		        mask: true
        		    });
        		    uni.uploadFile({
-       		        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
+       		        url: config.base_url + '/system/file/upload', //仅为示例,非真实的接口地址
        		        header:{'Authorization':uni.getStorageSync('token')},
        		        filePath: tempFilePaths,
        		        name: 'file',