Ming %!s(int64=4) %!d(string=hai) anos
pai
achega
ec07b6b1c4

+ 10 - 10
data/json.js

@@ -210,63 +210,63 @@ let deviceType = [{
 		"id": "1",
 		"title": "火警",
 		"num": "3",
-		"imgUrl": "/static/dt-alarmIcon.png",
+		"imgUrl": "../../static/dt-alarmIcon.png",
 		"dwtype":1
 	},
 	{
 		"id": "2",
 		"title": "水警",
 		"num": "4",
-		"imgUrl": "/static/dt-waterIcon.png",
+		"imgUrl": "../../static/dt-waterIcon.png",
 		"dwtype":2
 	},
 	{
 		"id": "3",
 		"title": "电气火灾",
 		"num": "4",
-		"imgUrl": "/static/dt-dqIcon.png",
+		"imgUrl": "../../static/dt-dqIcon.png",
 		"dwtype":7
 	},
 	{
 		"id": "4",
 		"title": "RTU",
 		"num": "4",
-		"imgUrl": "/static/dt-rtuIcon.png",
+		"imgUrl": "../../static/dt-rtuIcon.png",
 		"dwtype":6
 	},
 	{
 		"id": "5",
 		"title": "烟感",
 		"num": "4",
-		"imgUrl": "/static/dt-ygIcon.png",
+		"imgUrl": "../../static/dt-ygIcon.png",
 		"dwtype":3
 	},
 	{
 		"id": "6",
 		"title": "视频",
 		"num": "4",
-		"imgUrl": "/static/dt-videoIcon.png",
+		"imgUrl": "../../static/dt-videoIcon.png",
 		"dwtype":16
 	},
 {
 		"id": "7",
 		"title": "电梯",
 		"num": "4",
-		"imgUrl": "/static/dt.png",
+		"imgUrl": "../../static/dt.png",
 		"dwtype":17
 	},
 	{
 		"id": "8",
 		"title": "井盖",
 		"num": "4",
-		"imgUrl": "/static/dt-jgIcon.png",
+		"imgUrl": "../../static/dt-jgIcon.png",
 		"dwtype":128
 	},
 	{
 		"id": "9",
 		"title": "消防栓",
 		"num": "4",
-		"imgUrl": "/static/dt-xfsIcon.png",
+		"imgUrl": "../../static/dt-xfsIcon.png",
 		"dwtype":4
 	},
 	
@@ -274,7 +274,7 @@ let deviceType = [{
 		"id": "10",
 		"title": "液位设备",
 		"num": "4",
-		"imgUrl": "/static/dt-ywIcon.png",
+		"imgUrl": "../../static/dt-ywIcon.png",
 		"dwtype":5
 	},
 	// {

+ 3 - 2
manifest.json

@@ -120,10 +120,11 @@
     "h5" : {
         "title" : "智慧消防",
         "router" : {
-            "mode" : "hash"
+            "mode" : "hash",
+            "base" : ""
         },
         "devServer" : {
-            "https" : false,
+            "https" : true,
             "proxy" : {
                 "/web" : {
                     "target" : "https://wx.ewoogi.com/wx",

+ 3 - 3
pages/accountManage/perAdd/perAdd.vue

@@ -110,9 +110,9 @@
 						icon: "none"
 					});
 				} else {
-					uni.showToast({
-						title: "添加成功",
-					});
+					// uni.showToast({
+					// 	title: "添加成功",
+					// });
 					setTimeout(() => {
 						uni.navigateTo({
 							url: '/pages/accountManage/success/success',

+ 1 - 1
pages/accountManage/success/success.vue

@@ -33,7 +33,7 @@
 		methods: {
 			
 			back() {
-				alert(1)
+				// alert(1)
 							/*uni.navigateBack({
 								delta: 1
 							})*/

+ 9 - 4
pages/deviceManage/deviceAdd/deviceAdd.vue

@@ -500,12 +500,17 @@
 					data: params
 				})
 				if (res.data.flag) {
-					uni.showToast({
-						title: "提交成功",
-					});
+					// uni.showToast({
+					// 	title: "提交成功",
+					// });
+					// setTimeout(() => {
+					// 	uni.navigateTo({
+					// 		url: '/pages/deviceManage/deviceManage',
+					// 	});
+					// }, 1000);
 					setTimeout(() => {
 						uni.navigateTo({
-							url: '/pages/deviceManage/deviceManage',
+							url: '/pages/accountManage/success/success',
 						});
 					}, 1000);
 				}

+ 4 - 2
pages/xunJian/recordDetail/recordDetail.vue

@@ -73,7 +73,7 @@
 					巡检图片
 				</view>
 				<view class="padding-lr padding-bottom-lg"> 
-					<img v-if="!this.getData.report_photos" src="/static/defaultImg.jpg" style="width:100%"></img>
+					<img v-if="!this.getData.report_photos&&this.dataRes==1" src="/static/defaultImg.jpg" style="width:100%"></img>
 					<img v-else :src="this.getData.report_photos" style="width:100%"></img>
 				</view>
 			</view>
@@ -99,7 +99,8 @@
 				msg2: '',
 				flag: false,
 				companyCode: 0,
-				getData: {}
+				getData: {},
+				dataRes: 0,
 
 			}
 		},
@@ -120,6 +121,7 @@
 					showLoading: true
 				})
 				this.getData = res.data.data[0];
+				this.dataRes=1;
 				console.log(this.getData);
 			},