zc

api/request/config.js

@@ -1,6 +1,7 @@
 const config = {
 	/************************************ 后台服务地址 ************************************/
 	
+	base_url: 'http://192.168.1.20:8089',//1.8外网
 	// 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.9:8080',//柴
@@ -13,7 +14,7 @@ const config = {
 	// base_url: 'http://192.168.1.29:8080',//何成
 	// base_url: 'https://demo.zjznai.com/xzgd/',
 	// base_url: 'https://lab.zjznai.com/labNhSystem/',//43服务器高升测试
-	base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
+	// base_url: 'https://lab.zjznai.com/labTest/',//1.8外网
 	// base_url: 'https://lab.zjznai.com/labapp/',//43服务器线上
 	// base_url: 'https://lab.zjznai.com/appTest/',//88服务器线上
 	// base_url: 'https://lab.zjznai.com/labSystem/', //矿大地址

pages/views/saoCode/saoCode.vue

@@ -86,6 +86,11 @@
 						uni.reLaunch({
 							url: '/pages/views/saoCode/chemicalsInstructionsVideo'
 						});
+					} else if (codeData.type == 15) {
+						//安科院设备信息
+						uni.reLaunch({
+							url: '/pages_equipmentUtilization/views/equipmentInformation/index?code=' + codeData.id,
+						});
 					} else if (codeData.type == 7) {
 						//培训课程
 						uni.reLaunch({

pages_equipmentUtilization/api/index.js

@@ -8,9 +8,9 @@ export const demo1 = (data) => {
 	})
 };
 
-export const demo2 = (data) => {
+export const mpDeviceDetail = (data) => {
 	return apiResquest({
-		url: `/laboratory/applet/getSubDetailInfo`,
+		url: `/mp/device/detail`,
 		method: 'GET',
 		data: data,
 	})

pages_equipmentUtilization/views/equipmentInformation/index.vue

@@ -5,8 +5,8 @@
 			<view :class="checkType == 2?'checkButton':''" @click="checkButton(2)">使用记录</view>
 		</view>
 		<view class="bottom-flex">
-			<infoPage v-if="checkType == 1"></infoPage>
-			<listPage v-if="checkType == 2"></listPage>
+			<infoPage :equipmentId="equipmentId" v-if="checkType == 1"></infoPage>
+			<listPage :equipmentId="equipmentId" v-if="checkType == 2"></listPage>
 		</view>
 	</view>
 </template>
@@ -28,15 +28,18 @@
 		},
 		data() {
 			return {
-				checkType:2,
+				checkType:1,
+				equipmentId:'',
 			}
 		},
 		onLoad(option) {
+			this.$set(this,'equipmentId',option.id);
 		},
 		onShow() {
 			
 		},
 		mounted() {
+			
 		},
 		methods: {
 			checkButton(type){

pages_equipmentUtilization/views/equipmentInformation/infoPage.vue

@@ -144,9 +144,12 @@
 
 <script>
 	import {
-		demo1,
+		mpDeviceDetail,
 	} from '@/pages_equipmentUtilization/api/index.js'
 	export default {
+		props: {
+			equipmentId: {},
+		},
 		data() {
 			return {
 				shadeType:0,
@@ -175,15 +178,20 @@
 				},
 			}
 		},
-		onLoad(option) {
-			
-		},
-		onShow() {
-			
-		},
 		mounted() {
+			this.mpDeviceDetail(this.equipmentId);
 		},
 		methods: {
+			//获取设备信息
+			async mpDeviceDetail(id) {
+				let self = this;
+				const {
+					data
+				} = await mpDeviceDetail({id:id});
+				if (data.code == 200) {
+					
+				}
+			},
 			lookText(type){
 				if(type == 1){
 					this.$set(this,'shadeDataD',{