Ming пре 4 година
родитељ
комит
1c3df5560b

+ 24 - 2
common/common.scss

@@ -27,6 +27,10 @@ radio,checkbox {
 		font-size:26rpx;
 	}
 	
+	.imgPic image{
+		width:100%
+	}
+	
 	
 	
 	
@@ -313,8 +317,9 @@ radio,checkbox {
 		.top-banner {
 			width: 100%;
 			height: 273rpx;
-			background: url(/static/analyse-bg.png) no-repeat;
+			// background: url(/static/analyse-bg.png) no-repeat;
 			background-size:cover;
+			position:relative;
 			
 		}
 		
@@ -333,10 +338,21 @@ radio,checkbox {
 	}
 	
 	//消息页面
+	.image-bg {
+	    position: absolute;
+	    z-index: -1;
+	    left: 0;
+	    right: 0;
+	    bottom: 0;
+	    right: 0;
+	    width: 100%;
+	    height: 100%;
+	}
 	.info-wrapper {
 			.top-banner {
-				background: url(/static/info-bg.png) no-repeat;
+				background: none;
 				background-size:cover;
+				position:relative
 			}
 		}
 	
@@ -619,6 +635,12 @@ radio,checkbox {
 		}
 	
 	
+	}
+	
+	//报修
+	.repair-page .cu-avatar{
+		width:82rpx;
+		height:82rpx
 	}
 	
 	// 巡检详情,已执行

+ 2 - 2
data/json.js

@@ -225,8 +225,8 @@ let deviceType = [{
 		"id": "3",
 		"title": "电气火灾",
 		"num": "4",
-		// "imgUrl": "../../static/dt-dqIcon.png",  
-		"imgUrl": "https://s.yxin.tech/static/dt-dqIcon.png",
+		"imgUrl": "../../static/dt-dqIcon.png",  
+		// "imgUrl": "https://s.yxin.tech/static/dt-dqIcon.png",
 		"dwtype":7
 	},
 	{

+ 10 - 3
manifest.json

@@ -118,14 +118,14 @@
         "enable" : false
     },
     "h5" : {
-		 "publicPath" : "./",
+        "publicPath" : "./",
         "title" : "智慧消防",
         "router" : {
             "mode" : "hash",
             "base" : ""
         },
         "devServer" : {
-            "https" : true,
+            "https" : false,
             "proxy" : {
                 "/web" : {
                     "target" : "https://wx.ewoogi.com/wx",
@@ -137,6 +137,13 @@
                 }
             }
         },
-        "domain" : ""
+        "domain" : "",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
+                }
+            }
+        }
     }
 }

+ 7 - 3
pages/analyse/analyse.vue

@@ -1,11 +1,13 @@
 <template>
 	<view class="analyse-wrapper">
 		<view class="top-banner justify-center align-center text-center">
-			
+			<image class="image-bg" src="/static/analyse-bg.png"/>
 		</view>
 		<view class="cu-list menu-avatar padding-lr">
 			<view class="cu-item shadow" @tap="goMonthReport()">
-				<view class="cu-avatar " style="background-image:url(../../static/yb-icon.png)"></view>
+				<view class="cu-avatar ">
+					<image class="image-bg" src="/static/yb-icon.png"/>
+				</view>
 				<view class="content">
 					<view class="">月报</view>
 				</view>
@@ -16,7 +18,9 @@
 				</view>
 			</view>
 			<view class="cu-item  shadow"  @tap="goBuildingCheck()">
-				<view class="cu-avatar " style="background-image:url(../../static/build-icon.png)"></view>
+				<view class="cu-avatar ">
+					<image class="image-bg" src="/static/build-icon.png"/>
+				</view>
 				<view class="content">
 					<view class="">建筑体检</view>
 				</view>

+ 3 - 1
pages/analyse/monthReport/monthReport.vue

@@ -3,7 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" v-for="(item,index) in getData" :key="index" @tap="goReportDetail(item)">
-				<view class="cu-avatar round" style="background-image:url(../../../static/month-report-icon.png)"></view>
+				<view class="cu-avatar round" >
+					<image class="image-bg" src="/static/month-report-icon.png"/>
+				</view>
 				<view class="content">
 					<view class="title">{{item.company_name}} {{item.event_time}}</view>
 				</view>

+ 3 - 1
pages/device-Manage/device-Manage.vue

@@ -5,7 +5,9 @@
 			<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 				v-for="(item,index) in getData" :key="index" :data-target="'move-box-' + index"
 				@tap="goDeviceDetail(item)">
-				<view class="cu-avatar round lg" style="background-image:url(../../static/device-icon.png)"></view>
+				<view class="cu-avatar round lg">
+					<image class="image-bg" src="/static/device-icon.png"/>
+				</view>
 				<view class="content">
 					<view class="pro-title">
 						<view class="cut">{{item.owner_name}}</view>

+ 2 - 1
pages/deviceManage/deviceManage.vue

@@ -51,7 +51,8 @@
 								<checkbox :value="String(item.id)" :checked="checkedArr.includes(String(item.id))"
 									:class="{'checked':checkedArr.includes(String(item.id))}"></checkbox>
 							</view>
-							<view class="cu-avatar round lg" style="background-image:url(../../static/device-icon.png)">
+							<view class="cu-avatar round lg">
+								<image class="image-bg" src="/static/device-icon.png"/>
 							</view>
 							<view class="content" @longpress="showDetail(item)">
 								<view class="pro-title">

+ 121 - 42
pages/deviceOffLine/deviceOffLine.vue

@@ -6,22 +6,29 @@
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="with:50%;">
 				<view class="search-form round bg-white" >
-					<select name="" id="" placeholder="">
-						<option value="">请选择设备类型</option>
-						<option value="">类型1</option>
-						<option value="">类型2</option>
+					<select name="" id="" placeholder="" v-model="dwtype">
+						<option value="0">请选择设备类型</option>
+						<option value="1">用传</option>
+						<option value="2">水表</option>
+						<option value="3">烟感</option>
+						<option value="4">消防栓</option>
+						<option value="5">液位</option>
+						<option value="6">RTU</option>
+						<option value="7">电气火灾</option>
+						<option value="16">视频监测</option>
 					</select>
 				</view>
-				<view class="search-form round bg-white">
-					<input  type="text"
-					 placeholder="选输入设备点位" confirm-type="search"></input>
-				</view>
+				
 			</view>
 			
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white" style="margin-bottom:26rpx">
-					<input class="" @focus="InputFocus" v-model="siteName" @blur="InputBlur" :adjust-position="false" type="text"
-					 placeholder="选择传输方式" confirm-type="search"></input>
+					<select name="" id="" placeholder="" v-model=" transfer_type">
+						<option value="0">请选择传输方式</option>
+						<option value="NB">NB</option>
+						<option value="4G">4G</option>
+						<option value="Lora">Lora</option>
+					</select>
 				</view>
 				<view class="action">
 					<button class="cu-btn bg-blue round" @click="searchData()">查询</button>
@@ -39,14 +46,14 @@
 						<view class="cu-avatar lg" style="background-image:url(../../static/device-icon.png);"></view>
 						<view class="content">
 							<view class="pro-title">
-								<view class="cut">{{item.title}}</view>
+								<view class="cut">{{item.owner_name}}</view>
 							</view>
 							<view class="pro-des  ">
 								<view class="text-cut">
-									{{item.subTitle}}
+									{{item.unitinfo}}
 								</view>
 							</view>
-							<view class="pro-date ">{{item.time}}</view>
+							<view class="pro-date ">{{item.install_time}}</view>
 						</view>
 						
 					</view>
@@ -65,7 +72,15 @@
 
 	export default {
 		data() {
-			return {
+			return {
+				
+				dwtype: 0,
+				 transfer_type: 0,
+				
+				dwtype1: 0,
+				 transfer_type1: 0,
+				
+				status_type:0,
 				deviceOffLineData:json.deviceOffLineData,
 				siteListRes: 0,
 				siteName: '',
@@ -80,10 +95,7 @@
 
 
 		onPullDownRefresh() {
-			console.log('refresh');
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
+		
 		},
 		computed: {
 			newSiteListData() {
@@ -105,46 +117,113 @@
 				}
 			})
 		},
-		onLoad() {
-			this.getSiteList()
+		onLoad(option) {
+			this.status_type=option.status_type;
+			this.getSiteList({"status_type":option.status_type,"company_code ":uni.getStorageSync('selectedCode')});
+			
+			let url = "";
+			switch (parseInt(option.status_type)) {
+				case 1:
+					url = "离线"
+					break;
+				case 2:
+					url = "在线"
+					break;
+				
+				default:
+					break;
+			}
+			uni.setNavigationBarTitle({
+				title: url+"设备",
+			});
+		},
+		
+		// 自定义导航事件
+		onNavigationBarButtonTap(e) {
+			if (e.float == 'right') {
+				alert("你点击了导出");
+				
+				this.exportData({
+					"status_type":this.status_type,
+					"transfer_type":this. transfer_type1,
+					dwtype:this.dwtype1,
+					company_code:uni.getStorageSync('selectedCode')
+					
+				})
+				
+			return;
+			
+			
+				let exportUrl= this.$BASE_URL+`ExportModule/getStatusDetailsListExpor/status_type/${this.status_type}/company_code/${uni.getStorageSync('selectedCode')}/ transfer_type/${this. transfer_type1}/dwtype/${this.dwtype1}/`
+				
+				//#ifdef H5
+				
+				// window.open(URL,name,features,replace)
+				
+				
+				// 通过创建a标签实现
+				const link = document.createElement("a");
+				link.href = exportUrl;
+				// 对下载的文件命名
+				// link.open = "设备注册管理数据表.xls";
+				link.target="_blank"
+				console.log(link)
+				link.click();
+				
+				// window.open(exportUrl,true)
+				//#endif
+				
+			
+			} 
 		},
 
 		methods: {
 			searchData() {
 				this.getSiteList({
-					"siteName": this.siteName
+					" transfer_type": this. transfer_type,
+					"dwtype": this.dwtype,
+					'company_code': uni.getStorageSync('selectedCode'),
+					"status_type":this.status_type
 				})
+				this. transfer_type1=this. transfer_type;
+				this.dwtype1=this.dwtype;
 			},
 
 
-			async getSiteList(ming) {
+			async getSiteList(params) {
 				const res = await this.$myRequest({
-					url: 'OperationMonitoring/getSiteList',
+					url: 'StatusDetails/getStatusDetailsList',
 					showLoading: true,
-					data: ming
+					data: params
 				})
 				this.siteListRes = 1;
 				console.log(res.data.data)
-				this.siteListData = res.data.data
+				this.deviceOffLineData = res.data.data
 			},
-
-
-			// 隐藏显示
-			showDetail(e) {
-				// 存储点击那一项的状态
-				const nowStatu = e.isShow;
-				// 将每一项列表的isShow设置为false,让所有的列表都隐藏
-				this.siteListData.forEach(item => {
-					item.isShow = false
+			
+			// 导出
+			async exportData(params) {
+				const res = await this.$myRequest({
+					url: 'ExportModule/getStatusDetailsListExpor',
+					// showLoading: true,
+					  responseType: 'blob',
+					data: params
 				})
-				// 用于再次点击该项的取反
-				e.isShow = !nowStatu
-			},
-			InputFocus(e) {
-				this.InputBottom = e.detail.height
-			},
-			InputBlur(e) {
-				this.InputBottom = 0
+				console.log(res);
+				 const blob = new Blob([res.data], { type: 'application/vnd.ms-excel' });
+				
+				 let url = window.URL.createObjectURL(blob);
+				                let aLink = document.createElement('a');
+				                aLink.style.display = 'none';
+				                aLink.href = url;
+								aLink.target="_blank";
+				//                 aLink.setAttribute('download', res.headers['content-disposition'].split('=')[1]);
+				                document.body.appendChild(aLink);
+				                aLink.click();
+				                document.body.removeChild(aLink); // 下载完成移除元素
+				                window.URL.revokeObjectURL(url); // 释放掉blob对象
+				
+				
 			},
 
 

+ 3 - 1
pages/deviceType/deviceType.vue

@@ -3,7 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" v-for="(item,index) in deviceType" :key="index" @tap="goDeviceType(item)">
-				<view class="cu-avatar round" :style="`background-image:url(${item.imgUrl})`"></view>
+				<view class="cu-avatar round" >
+					<image class="image-bg" :src=item.imgUrl />
+				</view>
 				<view class="content">
 					<view class="title">{{item.title}}</view>
 				</view>

+ 3 - 1
pages/export/export.vue

@@ -10,7 +10,9 @@
 					<view class="cu-list menu-avatar">
 						
 						<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
-							<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
+							<view class="cu-avatar lg" >
+								<image class="image-bg" src="/static/process-icon.png"/>
+							</view>
 							<view class="content">
 								<view class="pro-title">
 									<view class="cut">{{item.title}}</view>

+ 4 - 4
pages/index/components/chart3/chart3.vue

@@ -61,7 +61,7 @@
 							//左侧柱状图的Y轴
 							axisTick: 'none',
 							axisLine: 'none',
-							data: [this.bindData.alarm_count,this.bindData.other_count,this.bindData.early_warning_device_count,this.bindData.fault_device_count,this.bindData.off_line_device_count],
+							data: [this.bindData.normal_device_count,this.bindData.other_device_count,this.bindData.early_warning_device_count,this.bindData.fault_device_count,this.bindData.off_line_device_count],
 							axisLabel: {
 								show: true,
 								verticalAlign: 'bottom',
@@ -82,7 +82,7 @@
 					],
 					series: [{
 							type: 'bar',
-							data: [this.bindData.alarm_count, , , , ],
+							data: [this.bindData.normal_device_count, , , , ],
 							barWidth: 6,
 							itemStyle: {
 								normal: {
@@ -92,7 +92,7 @@
 							z: 2
 						}, {
 							type: 'bar',
-							data: [ ,this.bindData.other_count, , , ],
+							data: [ ,this.bindData.other_device_count, , , ],
 							barWidth: 6,
 							itemStyle: {
 								normal: {
@@ -155,7 +155,7 @@
 		},
 		computed: {
 					// total:function(){
-					// 	 return parseInt(this.bindData.alarm_count)+3
+					// 	 return parseInt(this.bindData.normal_device_count)+3
 					//  },
 					// onePersent:function(){
 					// 	 return parseInt(1/this.total*100)

+ 20 - 13
pages/index/index.vue

@@ -40,7 +40,7 @@
 						<li @tap="goOfflineList()">
 							<image src="../../static/chart3-1.png" style="width:64rpx;height:64rpx"></image>
 						</li>
-						<li @tap="goFaultList()">
+						<li >
 							<image src="../../static/chart3-2.png" style="width:64rpx;height:64rpx"></image>
 						</li>
 						<li>
@@ -49,7 +49,7 @@
 						<li>
 							<image src="../../static/chart3-4.png" style="width:64rpx;height:64rpx"></image>
 						</li>
-						<li>
+						<li @tap="goNormalList()">
 							<image src="../../static/chart3-5.png" style="width:64rpx;height:64rpx"></image>
 						</li>
 					</ul>
@@ -105,6 +105,8 @@
 				alarmCount: json.staticData.data[0].alarmCount,
 				cuIconList: json.cuIconList,
 				Inv: 0,
+				
+				defaultSite:0,
 
 
 				flag: false,
@@ -141,18 +143,18 @@
 				});
 			}
 
-			// 数据渲染
-			this.getHomeData();
-
+			// 首页数据渲染
+			this.getSearchList();
+			this.getHomeData({'company_code':uni.getStorageSync('selectedCode')?uni.getStorageSync('selectedCode'):this.defaultSite});
+			this.getHandleData({'company_code':uni.getStorageSync('selectedCode')?uni.getStorageSync('selectedCode'):this.defaultSite});
+			
 
 			// 图表切换渲染
 			this.hackReset = false;
 			this.$nextTick(() => {
 				this.hackReset = true;
 			})
-
-			this.getHandleData();
-			this.getSearchList()
+			
 
 
 		},
@@ -261,13 +263,13 @@
 			// 页面跳转
 			goOfflineList() {
 				uni.navigateTo({
-					url: '/pages/deviceOffLine/deviceOffLine?type=离线',
+					url: '/pages/deviceOffLine/deviceOffLine?status_type=1',
 				});
 
 			},
-			goFaultList() {
+			goNormalList() {
 				uni.navigateTo({
-					url: '/pages/deviceOffLine/deviceOffLine?type=故障',
+					url: '/pages/deviceOffLine/deviceOffLine?status_type=2',
 				});
 
 			},
@@ -280,6 +282,8 @@
 					data: param
 				})
 				this.getData = res.data.data
+				
+				this.defaultSite=this.getData[0].owner_code;
 
 				if (!uni.getStorageSync('selectedCode')) {
 					uni.setStorageSync('selectedCode', this.getData[0].owner_code);
@@ -309,6 +313,8 @@
 				uni.setNavigationBarTitle({
 					title: this.searchInput
 				});
+				this.getHomeData({'company_code':uni.getStorageSync('selectedCode')});
+				this.getHandleData({'company_code':uni.getStorageSync('selectedCode')});
 				this.flag = false
 			},
 			handleInput() {
@@ -341,10 +347,11 @@
 
 			},
 			// 未处理告警请求
-			async getHandleData() {
+			async getHandleData(param = {}) {
 				const res = await this.$myRequest({
 					url: 'Index/getFunctionalModuleStatistics',
-					showLoading: true
+					showLoading: true,
+					data:param
 				})
 
 				this.cuIconList[0].badge = res.data.data[0].comprehensive_alarm_count;

+ 9 - 1
pages/info/info.vue

@@ -1,10 +1,14 @@
 <template>
 	<view class="analyse-wrapper info-wrapper" >
 		<view class="top-banner justify-center align-center text-center">
+			<image class="image-bg" src="/static/images/info-bg.png"/>
 		</view>
 		<view class="cu-list menu-avatar padding-lr">
 			<view class="cu-item shadow" @tap="goFireBase()">
-				<view class="cu-avatar " style="background-image:url(../../static/fireBase.png)"></view>
+				
+				<view class="cu-avatar " >
+					<image class="image-bg" src="/static/fireBase.png"/>
+				</view>
 				<view class="content">
 					<view class="">消防知识库</view>
 				</view>
@@ -32,9 +36,13 @@
 </template>
 
 <script>
+	import indexBackgroundImage from "@/static/fireBase.png"
+
 	export default {
 		data() {
 			return {
+				indexBackgroundImage:indexBackgroundImage
+
 			}
 		},
 		methods: {

+ 3 - 1
pages/inspectList/inspectList.vue

@@ -3,7 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" v-for="(item,index) in inspectList" :key="index" @tap="goProcessList(item)">
-				<view class="cu-avatar round" :style="`background-image:url(${item.imgUrl})`"></view>
+				<view class="cu-avatar round">
+					<image class="image-bg" :src=item.imgUrl />
+				</view>
 				<view class="content">
 					<view class="title">{{item.title}}</view>
 				</view>

+ 4 - 2
pages/inspectList/processList/processList.vue

@@ -17,7 +17,8 @@
 				<view class="cu-list menu-avatar">
 
 					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
-						<view class="cu-avatar lg" style="background-image:url(../../../static/process-icon.png);">
+						<view class="cu-avatar lg">
+							<image class="image-bg" src="/static/process-icon.png"/>
 						</view>
 						<view class="content">
 							<view class="pro-title">
@@ -43,7 +44,8 @@
 			<view class="processList">
 				<view class="cu-list menu-avatar ">
 					<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
-						<view class="cu-avatar lg" style="background-image:url(../../../static/processed-icon.png);">
+						<view class="cu-avatar lg">
+							<image class="image-bg" src="/static/processed-icon.png"/>
 						</view>
 						<view class="content">
 							<view class="pro-title">

+ 5 - 2
pages/processList/processList.vue

@@ -25,7 +25,9 @@
 				<view class="cu-list menu-avatar">
 
 					<view class="cu-item" v-for="(item,index) in unporcessList" :key="index">
-						<view class="cu-avatar lg" style="background-image:url(../../static/process-icon.png);"></view>
+						<view class="cu-avatar lg">
+							<image class="image-bg" src="/static/process-icon.png"/>
+						</view>
 						<view class="content">
 							<view class="pro-title">
 								<view class="cut">{{item.owner_name}}</view>
@@ -50,7 +52,8 @@
 			<view class="processList">
 				<view class="cu-list menu-avatar ">
 					<view class="cu-item" v-for="(item,index) in porcessedList" :key="index">
-						<view class="cu-avatar lg" style="background-image:url(../../static/processed-icon.png);">
+						<view class="cu-avatar lg">
+							<image class="image-bg" src="/static/processed-icon.png"/>
 						</view>
 						<view class="content">
 							<view class="pro-title">

+ 16 - 6
pages/repair/repair.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="processWrapper " style="   
+	<view class="processWrapper repair-page" style="   
     overflow: scroll;">
 		
 		<!-- 宫格列表 -->
@@ -20,11 +20,21 @@
 			<view>
 				<view class="cu-list menu-avatar ">
 					<view class="cu-item" v-for="(item,index) in getDataList" :key="index">
-						<view class="cu-avatar " v-if="item.cl_type==1" style="background-image:url(/static/repair1.png);width:82rpx;height:82rpx"></view>
-						<view class="cu-avatar " v-if="item.cl_type==2" style="background-image:url(/static/repair2.png);width:82rpx;height:82rpx"></view>
-						<view class="cu-avatar " v-if="item.cl_type==3" style="background-image:url(/static/repair3.png);width:82rpx;height:82rpx"></view>
-						<view class="cu-avatar " v-if="item.cl_type==4" style="background-image:url(/static/repair4.png);width:82rpx;height:82rpx"></view>
-						<view class="cu-avatar " v-if="item.cl_type==5" style="background-image:url(/static/repair5.png);width:82rpx;height:82rpx"></view>
+						<view class="cu-avatar " v-if="item.cl_type==1">
+							<image class="image-bg" src="/static/repair1.png"/>
+						</view>
+						<view class="cu-avatar " v-if="item.cl_type==2">
+							<image class="image-bg" src="/static/repair2.png"/>
+						</view>
+						<view class="cu-avatar " v-if="item.cl_type==3" >
+							<image class="image-bg" src="/static/repair3.png"/>
+						</view>
+						<view class="cu-avatar " v-if="item.cl_type==4" >
+							<image class="image-bg" src="/static/repair4.png"/>
+						</view>
+						<view class="cu-avatar " v-if="item.cl_type==5">
+							<image class="image-bg" src="/static/repair5.png"/>
+						</view>
 						<view class="content">
 							<view class="pro-title">
 								<view class="cut">{{item.wx_name}}</view>

+ 13 - 12
pages/setting/building/building.vue

@@ -92,9 +92,11 @@
 				<text class="cuIcon-titles margin-right-xs"></text>
 				消防设施平面布置图
 			</view>
-			<view class="padding-lr">
-				<img v-if="!this.getDetailData.layout_plan&&this.dataRes==1" src="/static/defaultImg.jpg" style="width:100%"></img>
-				<img v-else :src="this.getDetailData.layout_plan" style="width:100%"></img>
+			<view class="padding-lr imgPic" >
+					<image v-if="!this.getDetailData.build_plan&&this.dataRes==1"  mode='widthFix' src="/static/defaultImg.jpg"/>
+					<image v-else mode='widthFix' :src="this.getDetailData.layout_plan" />
+			
+			
 			</view>
 		</view>
 		
@@ -104,14 +106,10 @@
 				<text class="cuIcon-titles margin-right-xs"></text>
 				建筑平面图
 			</view>
-			<view class="padding-lr padding-bottom-lg">
-				<!-- <img :src="this.getDetailData.build_plan" alt="" width="100%"> -->
-				
-				<img v-if="!this.getDetailData.build_plan&&this.dataRes==1" src="/static/defaultImg.jpg" style="width:100%"></img>
-				<img v-else :src="this.getDetailData.build_plan" style="width:100%"></img>
-				
-				
-				<br><br>
+			<view class="padding-lr padding-bottom-lg imgPic"  >
+
+					<image   v-if="!this.getDetailData.build_plan&&this.dataRes==1"  mode='widthFix' src="/static/defaultImg.jpg"/>
+					<image  v-else :src="this.getDetailData.build_plan" mode='widthFix' />
 			</view>
 		</view>
 
@@ -145,7 +143,10 @@
 	}
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+	/deep/ .image-bg>div{
+		background-size:cover!important
+	}
 
 </style>
 

+ 7 - 3
pages/setting/setting.vue

@@ -2,14 +2,16 @@
 	<view class="setting-wrapper ">
 		<view class="top-banner justify-center align-center text-center">
 			<view>
-				<image width="130" src="../../static/personal-head.png"></image>
+				<image width="130" src="/static/personal-head.png"></image>
 				<view class="userName">admin</view>
 				<view>上海永天科技股份有限公司</view>
 			</view>
 		</view>
 		<view class="cu-list menu-avatar  padding-lr">
 			<view class="cu-item shadow" @tap="goMessagePush()">
-				<view class="cu-avatar " style="background-image:url(../../static/push-icon.png)"></view>
+				<view class="cu-avatar ">
+					<image class="image-bg" src="/static/push-icon.png"/>
+				</view>
 				<view class="content">
 					<view class="">推送设置</view>
 				</view>
@@ -21,7 +23,9 @@
 			</view>
 			
 			<view class="cu-item shadow" @tap="goBuilding()">
-				<view class="cu-avatar " style="background-image:url(../../static/building-icon.png)"></view>
+				<view class="cu-avatar ">
+					<image class="image-bg" src="/static/building-icon.png"/>
+				</view>
 				<view class="content">
 					<view class="">建筑管理</view>
 				</view>

+ 6 - 2
pages/videoList/videoList.vue

@@ -9,8 +9,12 @@
 			
 			<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''" v-for="(item,index) in matchedDeviceList"
 			 :key="index" :data-target="'move-box-' + index">
-				<view v-if="item.ALIVEVALUE==3" class="cu-avatar round lg" style="background-image:url(../../static/video-icon-on.png);opacity:.7"></view>
-				<view v-else class="cu-avatar round lg" style="background-image:url(../../static/video-icon-off.png);opacity:.7"></view>
+				<view v-if="item.ALIVEVALUE==3" class="cu-avatar round lg" style="opacity:.7">
+					<image class="image-bg" src="/static/video-icon-on.png"/>
+				</view>
+				<view v-else class="cu-avatar round lg" style="opacity:.7">
+					<image class="image-bg" src="/static/video-icon-off.png"/>
+				</view>
 				<view v-if="item.ALIVEVALUE==3" @tap="open_video(item)">
 					<view class="content">
 						<view class="">{{item.DEVICE}}</view>

+ 3 - 3
pages/weiBao/recordDetail/recordDetail.vue

@@ -71,9 +71,9 @@
 					<text class="cuIcon-titles margin-right-xs"></text>
 					维保图片
 				</view>
-				<view class="padding-lr padding-bottom-lg">
-					<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 class="imgPic padding-lr padding-bottom-lg">
+					<image v-if="!this.getData.report_photos&&this.dataRes==1" mode='widthFix' src="/static/defaultImg.jpg" width="100%"/>
+					<image v-else  mode='widthFix'  :src="this.getData.report_photos" width="100%"/>
 				</view>
 			</view>
 			<!-- 处理状态end -->

+ 3 - 1
pages/weiBao/weiBao.vue

@@ -3,7 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" v-for="(item,index) in inspectList" :key="index" @tap="goRecordPage(index)">
-				<view class="cu-avatar round" :style="`background-image:url(${item.imgUrl})`"></view>
+				<view class="cu-avatar round">
+					<image class="image-bg" :src=item.imgUrl />
+				</view>
 				<view class="content">
 					<view class="title">{{item.title}}</view>
 				</view>

+ 6 - 3
pages/xunJian/recordDetail/recordDetail.vue

@@ -72,9 +72,12 @@
 					<text class="cuIcon-titles margin-right-xs"></text>
 					巡检图片
 				</view>
-				<view class="padding-lr padding-bottom-lg"> 
-					<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 class="padding-lr padding-bottom-lg imgPic"> 
+						<image v-if="!this.getData.report_photos&&this.dataRes==1" mode='widthFix' src="/static/defaultImg.jpg" width="100%"/>
+						<image v-else  mode='widthFix'  :src="this.getData.report_photos" width="100%"/>
+						
+						<!-- <image class="image-bg"  v-if="!this.getData.report_photos&&this.dataRes==1"  src="/static/defaultImg.jpg"/>
+						<image  class="image-bg" v-else :src="this.getData.report_photos" /> -->
 				</view>
 			</view>
 			<!-- 处理状态end -->

+ 3 - 1
pages/xunJian/xunJian.vue

@@ -3,7 +3,9 @@
 	<view class="">
 		<view class="cu-list menu-avatar">
 			<view class="cu-item deviceTypeItem" v-for="(item,index) in inspectList" :key="index" @tap="goRecordPage(index)">
-				<view class="cu-avatar round" :style="`background-image:url(${item.imgUrl})`"></view>
+				<view class="cu-avatar round" >
+					<image class="image-bg" :src=item.imgUrl />
+				</view>
 				<view class="content">
 					<view class="title">{{item.title}}</view>
 				</view>

BIN
static/images/info-bg.png


BIN
static/info-bg.png