bug修复

pages/accountManage/perAdd/perAdd.vue

@@ -8,7 +8,7 @@
 					<text class="necessary">*</text>
 					联系方式:
 				</view>
-				<select name="" id="" v-model="phone">
+				<select name="" id="" v-model="phone" clearable>
 					<option value="0">请选择</option>
 					<option :value="item.phone" v-for="(item,index) in phoneListData" :key="index">{{item.phone}}
 					</option>
@@ -26,7 +26,7 @@
 					<text class="necessary">*</text>
 					所在单位:
 				</view>
-				<select name="" id="" v-model="company_code">
+				<select name="" id="" v-model="company_code" clearable>
 					<option value="0">请选择</option>
 					<option :value="item.owner_code" v-for="(item,index) in companyListData" :key="index"
 						style="width:80%">{{item.owner_name}}</option>

pages/analyse/monthDetail/monthDetail.vue

@@ -80,7 +80,7 @@
 
 					<tr>
 						<td colspan="3">合计</td>
-						<td>{{getData.point_count}}</td>
+						<td>{{getData.point_count!='null'?getData.point_count:0}}</td>
 					</tr>
 				</table>
 			</view>
@@ -214,16 +214,19 @@
 				<text class="cuIcon-titles margin-right-xs"></text>
 				项目情况
 			</view>
+			
 			<view class="padding text-center">
 				<view class="chart-tit">
 					各类告警总数饼状图
 				</view>
 				<chart :bindData="alarm_total" v-if="Object.keys(alarm_total).length!==0" ></chart>
+			</view>
+
+			
+			<view class="padding text-center">
 				<view class="chart-tit">火灾告警处理情况饼图</view>
 				<chart2 :bindData="fire_data" v-if="Object.keys(fire_data).length!==0" ></chart2>
-				<br>
 			</view>
-
 			<view class="padding text-df">
 				<view v-html="fire_data.data"></view>
 			</view>

pages/deviceManage/component/searchArea.vue

@@ -5,7 +5,7 @@
 		<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="">
+					<select name="" id="" placeholder="" clearable>
 						<option value="">请选择设备类型</option>
 						<option value="">类型1</option>
 						<option value="">类型2</option>
@@ -15,7 +15,7 @@
 
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white" style="margin-bottom:26rpx">
-					<select name="" id="" placeholder="">
+					<select name="" id="" placeholder="" clearable>
 						<option value="">请选择传输方式</option>
 						<option value="">类型1</option>
 						<option value="">类型2</option>

pages/deviceManage/deviceAdd/deviceAdd.vue

@@ -19,7 +19,7 @@
 			</view>
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>所属楼层:</view>
-				<select name="" id="" v-model="louyu">
+				<select name="" id="" filterable clearable v-model="louyu">
 					<option value="">请选择</option>
 					<option value="B10">楼层B10</option>
 					<option value="B9">楼层B9</option>
@@ -42,7 +42,7 @@
 			</view>
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>所属单位:</view>
-				<select name="" id="" v-model="company_code">
+				<select name="" id="" clearable v-model="company_code">
 					<option value="0">请选择</option>
 					<option :value="item.owner_code" v-for="(item,index) in companyListData" 
 						style="width:80%">{{item.owner_name}}</option>
@@ -51,7 +51,7 @@
 			</view>
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>设备类型:</view>
-				<select name="" id="" placeholder="" v-model="type">
+				<select name="" id="" placeholder=""clearable  v-model="type">
 					<option value="0">请选择设备类型</option>
 					<option value="1">用传</option>
 					<option value="2">水表</option>
@@ -67,7 +67,7 @@
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>传输方式:</view>
 
-				<select name="" id="" placeholder="" v-model="transfer_type">
+				<select name="" id="" placeholder="" clearable v-model="transfer_type">
 					<option value="0">请选择传输方式</option>
 					<option  v-if="this.type==2||this.type==5" value="NB">NB</option>
 					<option value="4G">4G</option>
@@ -95,7 +95,7 @@
 			<block v-if="this.transfer_type=='NB'&&(this.type==2||this.type==5)">
 				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB类型:</view>
-					<select name="" id=""  v-model="deviceType">
+					<select name="" id=""  v-model="deviceType" clearable>
 <!-- 						<option value="">烟感</option>
  -->						<option value="MultiSensor">水表</option>
 						<option value="WaterMeter">宇洁戎情水表</option>
@@ -105,7 +105,7 @@
 				</view>
 				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB厂商名称:</view>
-					<select name="" id="" v-model="manufacturerName">
+					<select name="" id="" v-model="manufacturerName" clearable>
 						<option value="ST">ST</option>
 						<option value="ZHYQ">ZHYQ</option>
 						<option value="shanghaijunyanTest">shanghaijunyanTest</option>
@@ -115,7 +115,7 @@
 				</view>
 				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB设备型号:</view>
-					<select name="" id="" v-model="model">
+					<select name="" id="" v-model="model" clearable>
 						<!-- <option value="">烟感型号</option> -->
 						<option value="PT124B-2892-010">水表型号</option>
 						<option value="WPTA">宇洁戎情水表型号</option>
@@ -125,7 +125,7 @@
 				</view>
 				<view class="form-item selectBox" >
 					<view class="title"><text class="necessary">*</text>NB厂商id:</view>
-					<select name="" id="" v-model="manufacturerId">
+					<select name="" id="" v-model="manufacturerId" clearable>
 						<option value="ST">ST</option>
 						<option value="ZHYQ">ZHYQ</option>
 						<option value="JunyanTest">JunyanTest</option>
@@ -149,7 +149,7 @@
 			<block v-if="this.type==1&&this.transfer_type=='4G'">
 				<view class="form-item selectBox"  >
 					<view class="title"><text class="necessary">*</text>解析方法:</view>
-					<select name="" id="" v-model="owner_xh_a">
+					<select name="" id="" v-model="owner_xh_a" clearable>
 						<option value="z">请选择</option>
 						<option :value=index v-for="(item,index) in 8">方法{{index}}</option> 
 					</select>
@@ -165,7 +165,7 @@
 				</view>
 				<view class="form-item selectBox">
 					<view class="title"></view>
-					<select name="" id="" v-model="owner_xh_c">
+					<select name="" id="" v-model="owner_xh_c" clearable>
 						<option value="z">请选择</option>
 						<option :value=index v-for="(item,index) in 8">方法{{index}}</option> 
 					</select>
@@ -177,7 +177,7 @@
 			<block v-if="this.type==7&&this.transfer_type=='4G'">
 				<view class="form-item selectBox">
 					<view class="title"><text class="necessary">*</text>最高层:</view>
-					<select name="" id="" v-model="max_level">
+					<select name="" id="" v-model="max_level" clearable>
 						<option value="">请选择</option>
 						<option value="-10">楼层B10</option>
 						<option value="-9">楼层B9</option>
@@ -195,7 +195,7 @@
 				</view>
 				<view class="form-item selectBox">
 					<view class="title"><text class="necessary">*</text>最底层:</view>
-					<select name="" id="" v-model="min_level">
+					<select name="" id="" v-model="min_level" clearable>
 						<option value="">请选择</option>
 						<option value="-10">楼层B10</option>
 						<option value="-9">楼层B9</option>

pages/deviceManage/deviceEdit/deviceEdit.vue

@@ -19,7 +19,7 @@
 			</view>
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>所属楼层:</view>
-				<select name="" id="" v-model="deviceDetailData.louyu">
+				<select name="" id="" v-model="deviceDetailData.louyu" clearable>
 					<option value="">请选择</option>
 					<option value="B10">楼层B10</option>
 					<option value="B9">楼层B9</option>
@@ -42,7 +42,7 @@
 			</view>
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>所属单位:</view>
-				<select name="" id="" v-model="deviceDetailData.company" disabled="disabled">
+				<select name="" id="" v-model="deviceDetailData.company" disabled="disabled" clearable>
 					<option value="0">请选择</option>
 					<option :value="item.owner_code" v-for="(item,index) in companyListData" 
 						style="width:80%">{{item.owner_name}}</option>
@@ -51,7 +51,7 @@
 			</view>
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>设备类型:</view>
-				<select name="" id="" placeholder="" v-model="deviceDetailData.dwtype" disabled="disabled">
+				<select name="" id="" placeholder="" v-model="deviceDetailData.dwtype" disabled="disabled" clearable>
 					<option value="0">请选择设备类型</option>
 					<option value="1">用传</option>
 					<option value="2">水表</option>
@@ -67,7 +67,7 @@
 			<view class="form-item selectBox">
 				<view class="title"><text class="necessary">*</text>传输方式:</view>
 
-				<select name="" id="" placeholder="" v-model="deviceDetailData.transfer_type" disabled="disabled">
+				<select name="" id="" placeholder="" v-model="deviceDetailData.transfer_type" disabled="disabled" clearable>
 					<option value="0">请选择传输方式</option>
 					<option v-if="deviceDetailData.dwtype==2||deviceDetailData.dwtype==5" value="NB">NB</option>
 					<option value="4G">4G</option>
@@ -147,7 +147,7 @@
 			<block v-if="deviceDetailData.dwtype==1&&deviceDetailData.transfer_type=='4G'">
 				<view class="form-item selectBox"  >
 					<view class="title"><text class="necessary">*</text>解析方法:</view>
-					<select name="" id="" v-model="deviceDetailData.owner_xh_a">
+					<select name="" id="" v-model="deviceDetailData.owner_xh_a" clearable>
 						<option value="z">请选择</option>
 						<option :value=index v-for="(item,index) in 8">方法{{index}}</option> 
 					</select>
@@ -155,7 +155,7 @@
 				</view>
 				<view class="form-item selectBox">
 					<view class="title"></view>
-					<select name="" id="" v-model="deviceDetailData.owner_xh_b">
+					<select name="" id="" v-model="deviceDetailData.owner_xh_b" clearable>
 						<option value="z">请选择</option>
 						<!-- <option :value=item v-for="item in 7" >方法{{item}}</option>  -->
 						<option :value=index v-for="(item,index) in 8">方法{{index}}</option> 
@@ -164,7 +164,7 @@
 				</view>
 				<view class="form-item selectBox">
 					<view class="title"></view>
-					<select name="" id="" v-model="deviceDetailData.owner_xh_c">
+					<select name="" id="" v-model="deviceDetailData.owner_xh_c" clearable>
 						<option value="z">请选择</option>
 						<option :value=index v-for="(item,index) in 8">方法{{index}}</option> 
 					</select>
@@ -176,7 +176,7 @@
 			<block v-if="deviceDetailData.dwtype==7&&deviceDetailData.transfer_type=='4G'">
 				<view class="form-item selectBox">
 					<view class="title"><text class="necessary">*</text>最高层:</view>
-					<select name="" id="" v-model="deviceDetailData.max_level">
+					<select name="" id="" v-model="deviceDetailData.max_level" clearable>
 						<option value="">请选择</option>
 						<option value="-10">楼层B10</option>
 						<option value="-9">楼层B9</option>
@@ -194,7 +194,7 @@
 				</view>
 				<view class="form-item selectBox">
 					<view class="title"><text class="necessary">*</text>最底层:</view>
-					<select name="" id="" v-model="deviceDetailData.min_level">
+					<select name="" id="" v-model="deviceDetailData.min_level" clearable>
 						<option value="">请选择</option>
 						<option value="-10">楼层B10</option>
 						<option value="-9">楼层B9</option>

pages/deviceManage/deviceManage.vue

@@ -7,7 +7,7 @@
 			<view class="ding">
 				<view class="cu-bar search bg-gray filter-section" style="with:50%;">
 					<view class="search-form round bg-white selectBox">
-						<select name="" id="" placeholder="" v-model="dwtype">
+						<select name="" id="" placeholder="" v-model="dwtype" clearable>
 							<option value="0">请选择设备类型</option>
 							<option value="1">用传</option>
 							<option value="2">水表</option>
@@ -24,7 +24,7 @@
 
 				<view class="cu-bar search bg-gray filter-section">
 					<view class="search-form round bg-white selectBox" style="margin-bottom:26rpx">
-						<select name="" id="" placeholder="" v-model="transmission_mode">
+						<select name="" id="" placeholder="" v-model="transmission_mode" clearable>
 							<option value="0">请选择传输方式</option>
 							<option value="NB">NB</option>
 							<option value="4G">4G</option>
@@ -48,9 +48,6 @@
 					<view class="cu-list menu-avatar ">
 						<view class=" site-item text-center margin-top"
 							v-if="!this.deviceManage.length&&this.deviceManageRes==1">暂无数据</view>
-
-
-
 						<view class="cu-item" :class="modalName=='move-box-'+ index?'move-cur':''"
 							v-for="(item,index) in newDeviceManage" :key="index" :data-target="'move-box-' + index">
 							<view class="cu-form-group margin-top">
@@ -61,7 +58,7 @@
 							<view class="cu-avatar round lg">
 								<image class="image-bg" src="/static/device-icon.png" />
 							</view>
-							<view class="content" @longpress="showDetail(item)">
+							<view class="content" @longpress="showDetail(item)" style="width:570rpx">
 								<view class="pro-title">
 									<view class="cut">{{item.owner_name}}</view>
 								</view>
@@ -246,6 +243,7 @@
 			}
 		},
 		mounted() {
+		
 			//点击弹框外隐藏弹框
 			document.addEventListener('click', (event) => {
 				if (event.target.className != 'showDetailEdit') {
@@ -256,6 +254,7 @@
 			})
 		},
 		onShow: function(option) {
+			this.deviceManage=[]
 			this.getDataList({
 				'company_code': uni.getStorageSync('selectedCode'),
 				"page": this.page,
@@ -356,10 +355,13 @@
 					showLoading: true
 				})
 				this.deviceManageRes = 1;
+				// this.deviceManage=[]
 
 				if (res.data.data.length) {
 
-					this.deviceManage = this.deviceManage.concat(res.data.data)
+					this.deviceManage = this.deviceManage.concat(res.data.data);
+					console.log('this.deviceManage')
+					console.log(this.deviceManage)
 
 					if (res.data.data.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页
 						this.isLoadMore = true

pages/deviceOffLine/deviceOffLine.vue

@@ -6,7 +6,7 @@
 		<view class="ding">
 			<view class="cu-bar search bg-gray filter-section" style="with:50%;">
 				<view class="search-form round bg-white selectBox" >
-					<select name="" id="" placeholder="" v-model="dwtype">
+					<select name="" id="" placeholder="" v-model="dwtype" clearable>
 						<option value="0">请选择设备类型</option>
 						<option value="1">用传</option>
 						<option value="2">水表</option>
@@ -24,7 +24,7 @@
 			
 			<view class="cu-bar search bg-gray filter-section">
 				<view class="search-form round bg-white selectBox" style="margin-bottom:26rpx">
-					<select name="" id="" placeholder="" v-model=" transfer_type">
+					<select name="" id="" placeholder="" v-model=" transfer_type" clearable>
 						<option value="0">请选择传输方式</option>
 						<option value="NB">NB</option>
 						<option value="4G">4G</option>

pages/processList/export/export.vue

@@ -4,7 +4,13 @@
 		<view class="ding">
 			<!-- <calendar></calendar> -->
 			<view class="example-body">
-				<uni-datetime-picker v-model="datetimerange" type="datetimerange" start-placeholder="请选择开始时间"
+				
+				<!-- <view class="example-body">
+					<uni-datetime-picker v-model="range" type="daterange" rangeSeparator="至" />
+				</view> -->
+				
+				
+				<uni-datetime-picker v-model="datetimerange" type="daterange" start-placeholder="请选择开始时间"
 					end-placeholder="请选择结束时间" start="2000-3-20 12:00:00" end="2025-10-20 20:00:00" rangeSeparator="至" />
 			</view>
 		</view>
@@ -121,14 +127,16 @@
 		
 		methods: {
 			async getData(params = {}) {
+				this.dataRes = 0;
 				const res = await this.$myRequest({
 					url: 'ComprehensiveAlarm/getIntegratedAlarmList', //综合告警列表渲染
 					data: params,
 					showLoading: true
 				})
+		
 				this.dataRes = 1;
-				if (res.data.data.length) {
-				
+
+				if (res.data.data.length>0) {
 					this.getExportData = this.getExportData.concat(res.data.data)
 				
 					if (res.data.data.length < this.pageSize) { //判断接口返回数据量小于请求数据量，则表示此为最后一页

pages/weiBao/planDetailDone/planDetailDone.vue

@@ -3,13 +3,13 @@
 
 		<form action=""  class="planDetailDone" >
 			
-			<view class="form-item">
+			<!-- <view class="form-item">
 				<view class="title">
 					<text class="necessary">*</text>
 					上报名称：
 				</view>
 				<view>{{this.getData.wx_name}}</view>
-			</view>
+			</view> -->
 			
 			<view class="form-item">
 				<view class="title">

pages/weiBao/recordDetail/recordDetail.vue

@@ -61,7 +61,7 @@
 					</view>
 					<view class="info-one-info ">
 						<text>维保描述：</text>
-						<text>{{this.getData.rec_count}}</text>
+						<text>{{this.getData.dwsb_remarks}}</text>
 					</view>
 				</view>
 			</view>
@@ -73,7 +73,7 @@
 				</view>
 				<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%"/>
+					<image v-else  mode='widthFix'  :src="`${this.$websiteUrl}${this.getData.report_photos}`"  width="100%"/>
 				</view>
 			</view>
 			<!-- 处理状态end -->
@@ -119,7 +119,8 @@
 					showLoading: true
 				})
 				this.getData = res.data.data[0];
-				console.log(this.getData);
+				console.log('this.getData.report_photos');
+				console.log(this.getData.report_photos);
 				this.dataRes=1
 			},
 			

pages/xunJian/recordDetail/recordDetail.vue

@@ -61,7 +61,7 @@
 					</view>
 					<view class="info-one-info ">
 						<text>巡检描述：</text>
-						<text>{{this.getData.rec_count}}</text>
+						<text>{{this.getData.dwsb_remarks}}</text>
 					</view>
 
 				</view>
@@ -74,7 +74,7 @@
 				</view>
 				<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 v-else  mode='widthFix' :src="`${this.$websiteUrl}${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" /> -->