pref: app、mp端 优化代码

@@ -6,7 +6,7 @@
 			<image src="/static/shaixuan.png" />
 			<image src="/static/shaixuan.png" />
 		</view>
 		</view>
 		<!-- 告警分页 -->
 		<!-- 告警分页 -->
-		<mescroll-uni height="700px" ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption"
+		<mescroll-uni height="700rpx;" ref="mescrollRef" @init="mescrollInit" :up="upOption" :down="downOption"
 			@down="downCallback" @up="upCallback">
 			@down="downCallback" @up="upCallback">
 			<alarm-item :list="list" @openAlertDetail="openAlertDetail"></alarm-item>
 			<alarm-item :list="list" @openAlertDetail="openAlertDetail"></alarm-item>
 			<mescroll-empty v-if="!list.length" />
 			<mescroll-empty v-if="!list.length" />
@@ -17,7 +17,6 @@
 	</view>
 	</view>
 </template>
 </template>
 <script>
 <script>
-	import FilterItem from '@/pages/device/components/query-item.vue';
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 	import MescrollMixin from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js';
 	import api from '@/api/index.js'
 	import api from '@/api/index.js'
 	import alarmItem from '@/pages/alarm/components/alarm-item.vue'
 	import alarmItem from '@/pages/alarm/components/alarm-item.vue'
@@ -29,7 +28,6 @@
 	export default {
 	export default {
 		mixins: [MescrollMixin],
 		mixins: [MescrollMixin],
 		components: {
 		components: {
-			FilterItem,
 			alarmItem,
 			alarmItem,
 			alarmPopup
 			alarmPopup
 		},
 		},
@@ -69,7 +67,9 @@
 			},
 			},
 			resetQuery() {
 			resetQuery() {
 				this.page.num = 1;
 				this.page.num = 1;
-				this.$refs.alarmPopupRef.resetQuery()
+				this.$nextTick(() => {
+					this.$refs.alarmPopupRef.resetQuery()
+				})
 				this.conditions = {}
 				this.conditions = {}
 			},
 			},
 			downCallback() {
 			downCallback() {

 <template>
 <template>
+
 </template>
 </template>
 
 
 <script>
 <script>
 	export default {
 	export default {
 
 
 	}
 	}
-</script>
-<style>
-</style>
+</script>

@@ -60,7 +60,7 @@
 		</view>
 		</view>
 		<!-- 命令下发 -->
 		<!-- 命令下发 -->
 		<!-- #ifdef APP-PLUS -->
 		<!-- #ifdef APP-PLUS -->
-		<app-command-issuance :showModal="appShowModal"></app-command-issuance>
+		<app-command-issuance></app-command-issuance>
 		<!-- #endif -->
 		<!-- #endif -->
 		<!-- #ifdef MP -->
 		<!-- #ifdef MP -->
 		<!-- u-modal在app端弹窗层级无法覆盖 -->
 		<!-- u-modal在app端弹窗层级无法覆盖 -->
@@ -80,13 +80,11 @@
 	import api from '@/api/index.js'
 	import api from '@/api/index.js'
 	import mpCommandIssuance from './mp-command-issuance.vue'
 	import mpCommandIssuance from './mp-command-issuance.vue'
 	import appCommandIssuance from './app-command-issuance.vue'
 	import appCommandIssuance from './app-command-issuance.vue'
-	import nextModal from '@/components/module/next-modal_1.0.2/components/next-modal/next-modal.vue'
 
 
 	export default {
 	export default {
 		components: {
 		components: {
 			mpCommandIssuance,
 			mpCommandIssuance,
 			appCommandIssuance,
 			appCommandIssuance,
-			nextModal
 		},
 		},
 		props: {
 		props: {
 			deviceDetail: {
 			deviceDetail: {
@@ -137,7 +135,7 @@
 					latitude: this.deviceDetail.deviceInfo.latitude || 0
 					latitude: this.deviceDetail.deviceInfo.latitude || 0
 				};
 				};
 				uni.navigateTo({
 				uni.navigateTo({
-					url: '/deviceSubPage/deviceDetailPage/devicePosition?data=' + JSON.stringify(data)
+					url: '/device-subpackage/device-detail/device-position?data=' + JSON.stringify(data)
 				});
 				});
 			},
 			},
 			disabledScroll() {
 			disabledScroll() {
@@ -145,6 +143,7 @@
 			},
 			},
 			handleAppShowModal() {
 			handleAppShowModal() {
 				this.appShowModal = true
 				this.appShowModal = true
+				this.$refs.appCommandIssuanceRef.open()
 			},
 			},
 			handleMpShowModal() {
 			handleMpShowModal() {
 				const {
 				const {

@@ -103,7 +103,7 @@
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 	.command-detail {
 	.command-detail {
-		padding: 0 30rpx;
+		padding: 5rpx 30rpx;
 		height: 100vh;
 		height: 100vh;
 		background-color: #f8f9fa;
 		background-color: #f8f9fa;
 
 

@@ -39,15 +39,17 @@
 			</view>
 			</view>
 		</mescroll-uni>
 		</mescroll-uni>
 		<!-- 命令记录弹窗筛选 -->
 		<!-- 命令记录弹窗筛选 -->
-		<u-popup @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20"
-			@touchmove.stop.prevent="disabledScroll">
+		<u-popup  @close="close" closeable bgColor="#fff" :show="show" mode="bottom" :round="20">
 			<view class="filter" @touchmove.stop.prevent="disabledScroll">
 			<view class="filter" @touchmove.stop.prevent="disabledScroll">
 				<view class="filter-title"><text>筛选条件</text></view>
 				<view class="filter-title"><text>筛选条件</text></view>
 				<query-item :filterList="issueStatus" title="下发状态"
 				<query-item :filterList="issueStatus" title="下发状态"
 					@clickTag="currentIndex => handleClickTag(currentIndex, issueStatus)"></query-item>
 					@clickTag="currentIndex => handleClickTag(currentIndex, issueStatus)"></query-item>
-				<view class="mt-3">
-					<uni-datetime-picker return-type="timestamp" v-model="range" type="datetimerange"
-						rangeSeparator="至" />
+				<view class="flex-column">
+					<view class="mt-3 command-time-text">命令下发时间</view>
+					<view class="mt-3">
+						<uni-datetime-picker return-type="timestamp" v-model="range" type="datetimerange"
+							rangeSeparator="至" />
+					</view>
 				</view>
 				</view>
 				<view class="h-30"></view>
 				<view class="h-30"></view>
 				<view class="button-group">
 				<view class="button-group">
@@ -147,7 +149,9 @@
 				const condition = Object.values(this.formTime)
 				const condition = Object.values(this.formTime)
 				if (condition.length === 0) {
 				if (condition.length === 0) {
 					this.page.num += 1;
 					this.page.num += 1;
-					this.loadData(this.page.num);
+					this.loadData(this.page.num, {
+						...tbDeviceId
+					});
 				} else if (condition.filter(Boolean).length > 0) {
 				} else if (condition.filter(Boolean).length > 0) {
 					this.page.num += 1;
 					this.page.num += 1;
 					this.loadData(this.page.num, {
 					this.loadData(this.page.num, {
@@ -156,7 +160,9 @@
 					});
 					});
 				} else {
 				} else {
 					this.page.num += 1;
 					this.page.num += 1;
-					this.loadData(this.page.num);
+					this.loadData(this.page.num, {
+						...tbDeviceId
+					});
 				}
 				}
 			},
 			},
 			async loadData(pageNo, params = {}) {
 			async loadData(pageNo, params = {}) {
@@ -321,5 +327,11 @@
 				width: 330rpx;
 				width: 330rpx;
 			}
 			}
 		}
 		}
+
+		.command-time-text {
+			color: #333;
+			font-size: 14px;
+			font-weight: 700;
+		}
 	}
 	}
 </style>
 </style>

@@ -96,7 +96,6 @@
 				alarmStatus,
 				alarmStatus,
 				lastOnlineTime,
 				lastOnlineTime,
 			};
 			};
-
 			// 设备类型不是网关子设备的添加一个命令记录的选项卡
 			// 设备类型不是网关子设备的添加一个命令记录的选项卡
 			if (this.deviceDetail.deviceType !== "SENSOR") {
 			if (this.deviceDetail.deviceType !== "SENSOR") {
 				this.list.push({
 				this.list.push({
@@ -180,7 +179,6 @@
 					};
 					};
 				});
 				});
 			});
 			});
-
 			const keys = await getDeviceKeys(tbDeviceId);
 			const keys = await getDeviceKeys(tbDeviceId);
 			this.keys = [keys];
 			this.keys = [keys];
 			// 昨天
 			// 昨天
@@ -204,7 +202,6 @@
 			});
 			});
 			this.timeDiff = "30分钟";
 			this.timeDiff = "30分钟";
 			if (!Object.keys(data).length) return;
 			if (!Object.keys(data).length) return;
-
 			this.historyData = data[keys[0]].map((item) => {
 			this.historyData = data[keys[0]].map((item) => {
 				return {
 				return {
 					value: item.value,
 					value: item.value,

@@ -16,17 +16,23 @@
 						<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count>
 						<u--textarea placeholder="请输入反馈信息" v-model="feedbackData.feedbackInfo.message" count>
 						</u--textarea>
 						</u--textarea>
 					</u-form-item>
 					</u-form-item>
-					<view class="feed-back-text" style="margin: 15px 0px 0px -16rpx;">上传图片(最多6张)</view>
-					<view class="info" style="margin-top: 15rpx;background: rgba(1, 1, 1, 0);">
+					<view class="feed-back-text upload-text">上传图片(最多6张)</view>
+					<view class="info">
 						<view class="info-contain">
 						<view class="info-contain">
 							<u-form-item label="图片" prop="feedbackInfo.images" borderBottom>
 							<u-form-item label="图片" prop="feedbackInfo.images" borderBottom>
 								<u-upload :capture="capture" :fileList="fileList1" @afterRead="afterRead"
 								<u-upload :capture="capture" :fileList="fileList1" @afterRead="afterRead"
 									@delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
 									@delete="deletePic" name="1" multiple :maxCount="6"></u-upload>
 							</u-form-item>
 							</u-form-item>
 						</view>
 						</view>
-						<view style="width:427rpx;margin:0 auto;">
+						<view class="info-button">
+							<!-- #ifdef MP -->
 							<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交"
 							<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交"
-								customStyle="margin-top: 200rpx" @click="submit"></u-button>
+								customStyle="margin-top: 280rpx" @click="submit"></u-button>
+							<!-- #endif -->
+							<!-- #ifdef APP-PLUS -->
+							<u-button class="buttonSty button-sty" shape="circle" type="primary" text="提交"
+								customStyle="margin-top: 880rpx" @click="submit"></u-button>
+							<!-- #endif -->
 						</view>
 						</view>
 					</view>
 					</view>
 				</u--form>
 				</u--form>

@@ -15,6 +15,9 @@
 		padding-left: 15rpx;
 		padding-left: 15rpx;
 		padding: 0 20rpx;
 		padding: 0 20rpx;
 		height: 860rpx;
 		height: 860rpx;
+		.upload-text{
+			margin: 15px 0px 0px -16rpx;
+		}
 
 
 		.info {
 		.info {
 			width: 700rpx;
 			width: 700rpx;
@@ -23,6 +26,8 @@
 			margin-top: 100rpx;
 			margin-top: 100rpx;
 			height: 256rpx;
 			height: 256rpx;
 			margin-left: -20rpx;
 			margin-left: -20rpx;
+			margin-top: 15rpx;
+			background: rgba(1, 1, 1, 0);
 
 
 			.info-contain {
 			.info-contain {
 				margin: 0rpx 27rpx;
 				margin: 0rpx 27rpx;
@@ -43,6 +48,10 @@
 					border: none !important;
 					border: none !important;
 				}
 				}
 			}
 			}
+			.info-button{
+				width:427rpx;
+				margin:0 auto;
+			}
 		}
 		}
 
 
 		/deep/.u-button--primary {
 		/deep/.u-button--primary {

@@ -38,8 +38,7 @@
 				<u-form-item labelWidth="80px" label="邮箱地址" prop="email" borderBottom>
 				<u-form-item labelWidth="80px" label="邮箱地址" prop="email" borderBottom>
 					<u--input placeholder="请输入邮箱地址" v-model="myInfoModel.email" border="none"></u--input>
 					<u--input placeholder="请输入邮箱地址" v-model="myInfoModel.email" border="none"></u--input>
 				</u-form-item>
 				</u-form-item>
-				<u-form-item @click="showDate = true;hideKeyboard();" labelWidth="80px" label="有效期"
-					prop="accountExpireTime">
+				<u-form-item @click="hideKeyboard" labelWidth="80px" label="有效期" prop="accountExpireTime">
 					<u--input v-model="myInfoModel.accountExpireTime" placeholder="请选择有效期" border="none"></u--input>
 					<u--input v-model="myInfoModel.accountExpireTime" placeholder="请选择有效期" border="none"></u--input>
 					<u-datetime-picker :formatter="formatter" :show="showDate" :value="datetime" mode="dateTime"
 					<u-datetime-picker :formatter="formatter" :show="showDate" :value="datetime" mode="dateTime"
 						closeOnClickOverlay @confirm="dateConfirm" @cancel="dateClose" @close="dateClose">
 						closeOnClickOverlay @confirm="dateConfirm" @cancel="dateClose" @close="dateClose">
@@ -383,6 +382,7 @@
 			},
 			},
 			//隐藏输入框
 			//隐藏输入框
 			hideKeyboard() {
 			hideKeyboard() {
+				this.showDate = true;
 				uni.hideKeyboard();
 				uni.hideKeyboard();
 			}
 			}
 		}
 		}

@@ -139,7 +139,7 @@
 				useShowToast(toastText).then(async (res) => {
 				useShowToast(toastText).then(async (res) => {
 					this.saveUserInfo();
 					this.saveUserInfo();
 					await this.getAlarmTotalData();
 					await this.getAlarmTotalData();
-					useReLaunch("/pages/index/index")
+					useReLaunch("../../pages/index/index")
 				});
 				});
 			},
 			},
 			//微信授权登录
 			//微信授权登录

@@ -130,7 +130,9 @@
 			resetQuery() {
 			resetQuery() {
 				this.queryCondition.searchAlarmText = '';
 				this.queryCondition.searchAlarmText = '';
 				this.page.num = 1;
 				this.page.num = 1;
-				this.$refs.alarmPopupRef.resetQuery()
+				this.$nextTick(() => {
+					this.$refs.alarmPopupRef.resetQuery()
+				})
 				this.conditions = {}
 				this.conditions = {}
 			},
 			},
 			topBack() {
 			topBack() {
@@ -185,7 +187,9 @@
 			},
 			},
 			openSearchDialog() {
 			openSearchDialog() {
 				this.show = true;
 				this.show = true;
-				this.resetQuery();
+				this.$nextTick(() => {
+					this.resetQuery();
+				})
 			},
 			},
 			openOrg() {
 			openOrg() {
 				useNavigateTo('/pages/organization/organization')
 				useNavigateTo('/pages/organization/organization')

@@ -19,6 +19,7 @@
 								rangeSeparator="至" />
 								rangeSeparator="至" />
 						</view>
 						</view>
 					</view>
 					</view>
+					<view class="h-30"></view>
 					<view class="u-flex bottom-button">
 					<view class="u-flex bottom-button">
 						<view class="button-item">
 						<view class="button-item">
 							<u-button @click="resetQuery" type="info" shape="circle" text="重置">
 							<u-button @click="resetQuery" type="info" shape="circle" text="重置">
@@ -110,10 +111,12 @@
 			resetQuery() {
 			resetQuery() {
 				for (let i in this.queryCondition) Reflect.set(this.queryCondition, i, '')
 				for (let i in this.queryCondition) Reflect.set(this.queryCondition, i, '')
 				this.range = []
 				this.range = []
-				this.$refs.queryItemAlarmStatusRef.reset()
-				this.$refs.queryDeviceTypeStatusRef.reset()
-				this.$refs.queryItemAlarmLevelRef.reset()
-				this.$refs.queryItemSelectTimeRef.reset()
+				this.$nextTick(() => {
+					this.$refs.queryItemAlarmStatusRef.reset()
+					this.$refs.queryDeviceTypeStatusRef.reset()
+					this.$refs.queryItemAlarmLevelRef.reset()
+					this.$refs.queryItemSelectTimeRef.reset()
+				})
 			},
 			},
 		}
 		}
 	};
 	};

@@ -170,7 +170,9 @@
 			},
 			},
 			openSearchDialog() {
 			openSearchDialog() {
 				this.show = true;
 				this.show = true;
-				this.resetQuery()
+				this.$nextTick(() => {
+					this.resetQuery();
+				})
 			},
 			},
 			openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
 			openDeviceDetail(id, alarmStatus, lastOnlineTime, tbDeviceId) {
 				uni.navigateTo({
 				uni.navigateTo({

 <template>
 <template>
 	<view class="container">
 	<view class="container">
 		<view class="container-box">
 		<view class="container-box">
-			<image :src="mpOwnConfig.logo"></image>
+			<image v-if="mpOwnConfig.logo" :src="mpOwnConfig.logo"></image>
+			<image v-else :src="staticLogo"></image>
 			<text class="splash-text-muted">连接世界 创造价值</text>
 			<text class="splash-text-muted">连接世界 创造价值</text>
 		</view>
 		</view>
 	</view>
 	</view>
@@ -12,7 +13,9 @@
 		mapState
 		mapState
 	} from 'vuex';
 	} from 'vuex';
 	import api from '@/api/index.js'
 	import api from '@/api/index.js'
-	import { useReLaunch } from '@/plugins/utils.js'
+	import {
+		useReLaunch
+	} from '@/plugins/utils.js'
 
 
 	export default {
 	export default {
 		data() {
 		data() {
@@ -72,4 +75,4 @@
 			}
 			}
 		}
 		}
 	}
 	}
-</style>
+</style>

@@ -47,6 +47,10 @@ button {
 	white-space: nowrap;
 	white-space: nowrap;
 }
 }
 ///////////////////////////////////////////////////////////////小程序、app抽取公共样式/////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////小程序、app抽取公共样式/////////////////////////////////////////////////////////////////////
+.flex-column{
+	display: flex;
+	flex-direction: column;
+}
 .mt-3{
 .mt-3{
 	margin-top: 30rpx;
 	margin-top: 30rpx;
 }
 }