bug修改

SafeCampus.WEB/components.d.ts

@@ -27,7 +27,6 @@ declare module 'vue' {
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -40,7 +39,6 @@ declare module 'vue' {
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElLink: typeof import('element-plus/es')['ElLink']
     ElMain: typeof import('element-plus/es')['ElMain']
@@ -49,12 +47,9 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSpace: typeof import('element-plus/es')['ElSpace']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
@@ -63,11 +58,8 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     ESign: typeof import('./src/components/ESign/index.vue')['default']
     FormContainer: typeof import('./src/components/Form/FormContainer/index.vue')['default']
     Grid: typeof import('./src/components/Grid/index.vue')['default']

monitorMobile/pages/earlyWarning/components/warningInfo.vue

@@ -98,7 +98,7 @@
 
 		</view>
 		<view class="tableBox">
-			<u-empty marginTop="100rpx" :show="false" mode="warnList" text="暂无数据"></u-empty>
+			<u-empty marginTop="100rpx" :show="false" mode="list" text="暂无数据"></u-empty>
 			<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 0rpx);">
 				<u-list-item v-for="(item, index) in warnList" :key="index">
 					<view class="liBox">
@@ -184,6 +184,11 @@
 <script>
 	import selectRadio from "@/components/selectRadio.vue"
 	import selectSearch from "@/components/selectSearch.vue"
+	import {
+		page, //获取列表
+		detail, //详情
+		warnType, //获取预警类型
+	} from '@/api/warn/index.js'
 	export default {
 		components: {
 			selectRadio,
@@ -361,17 +366,21 @@
 			loadmore() {
 				if (this.status != 'loadmore') return
 				this.status = 'loading'
-				setTimeout(() => {
-					for (let i = 0; i < 1; i++) {
-						this.warnList.push({}, {})
-					}
+				page(this.searchForm).then(res=>{
+					console.log(res)
 					// 获取到的总条数>=接口总条数
 					if (this.warnList.length >= 14) {
 						this.status = 'nomore'
 					} else {
 						this.status = 'loadmore'
 					}
-				}, 2000)
+				})
+				// setTimeout(() => {
+				// 	for (let i = 0; i < 1; i++) {
+				// 		this.warnList.push({}, {})
+				// 	}
+					
+				// }, 2000)
 			}
 		}
 	}

monitorMobile/pages/monitor/index.vue

@@ -9,9 +9,8 @@
 			</view>
 		</view>
 		<view class="searchBox">
-			<view class="searchLine" @click="showTree">
-
-				<view class="searchLabels">
+			<view class="searchLine">
+				<view class="searchLabels" @click="showTree">
 					<image v-show="isShowSearch==false" src="@/static/image/earlyWarning/group.png" mode="">
 					</image>
 					<image v-show="isShowSearch" src="@/static/image/earlyWarning/group2.png" mode="">
@@ -26,9 +25,46 @@
 					<image v-show="isShowSearch" src="@/static/image/earlyWarning/arrow2.png" mode=""></image>
 				</view>
 			</view>
+			<view @click="isShowSearch=false" class="searchDialog" v-if="isShowSearch">
+				<view class="content" @click.stop="isSelect">
+					<u-row justify="space-between" gutter="10">
+						<u-col span="7">
+							<view class="demo-layout">
+								<view class="left-layout">
+									<text>{{'警告类型'}}</text>
+								</view>
+								<view class="right-layout">
+									<image style="width: 30rpx;height:30rpx;"
+										src="@/static/image/earlyWarning/arrowRight.png" mode=""></image>
+								</view>
+							</view>
+						</u-col>
+						<u-col span="5">
+							<view class="demo-layout" @click="toOpenSelect">
+								<view class="left-layout">
+									<text>{{'处理状态'}}</text>
+								</view>
+								<view class="right-layout">
+									<image style="width: 30rpx;height:30rpx;"
+										src="@/static/image/earlyWarning/arrowRight.png" mode=""></image>
+								</view>
+							</view>
+						</u-col>
+					</u-row>
+					
+					<view class="btnBox">
+						<view class="leftBtn" @click="clearform">
+							重置
+						</view>
+						<view class="rightBtn" @click="onsubmit">
+							确认
+						</view>
+					</view>
+				</view>
+			</view>
 		</view>
 		<view class="tableBox">
-			<u-empty marginTop="100rpx" :show="false" mode="warnList" text="暂无数据"></u-empty>
+			<u-empty marginTop="100rpx" :show="false" mode="list" text="暂无数据"></u-empty>
 			<u-list @scrolltolower="scrolltolower" style="height: calc(100% - 0rpx);">
 				<u-list-item v-for="(item, index) in warnList" :key="index">
 					<view class="liBox">