Signed-off-by: zhaobao <528046418@qq.com>

api/aqpt/task.js

@@ -30,3 +30,14 @@ export function waitHandleStatistics() {
     url: "/myCounter"
   })
 }
+/**
+ * 列表查询我的待办Task:
+ * @param limit待办数目
+ * @returns
+ */
+export function getMyWaitingTaskTop(limit) {
+  return request({
+    url: `/task/myWaiting/top/${limit}`,
+    method: 'GET'
+  })
+}

api/aqpt/warning.js

@@ -0,0 +1,20 @@
+import {request} from '@/libs/request.js'
+/**
+ * 我的待处理告警TOP
+ */
+export function getMyWarningWaitingTop(limit) {
+  return request({
+    url: `/warning/myWaiting/top/${limit}`,
+    method: 'GET'
+  })
+}
+/**
+ * 分页查询告警
+ */
+export function getWarningByPage(data) {
+  return request({
+    url: '/warning/page',
+    method: 'GET',
+    data
+  })
+}

libs/enum.js

@@ -184,3 +184,18 @@ export function alertStatus(i) {
     return '已撤销'
   }
 }
+export function warningLevel(val) {
+  const enums = { 1: 'Ⅰ级', 2: 'Ⅱ级', 3: 'Ⅲ级', 4: 'Ⅳ级' }
+  return enums[val]
+}
+export function warningStatus(i) {
+  if (i >= 0) {
+    const strs = [
+      '待处理',
+      '已处理'
+    ]
+    return strs[i]
+  } else {
+    return '已撤销'
+  }
+}

pages/index/detail/detail.vue

@@ -10,7 +10,7 @@
 						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in taskList" :key="item.taskId">
+						<view class="item" v-for="item in items" :key="item.taskId">
 							<view class="title">
 								<view class="name">{{item.taskTitle}}</view>
 								<view class="state">{{taskStatus(item.status)}}</view>
@@ -35,6 +35,36 @@
 						</view>
 					</view>
 				</view>
+				<view class="part" v-if="type==='warn'">
+					<view class="tab">
+						<view class="tab-item" :class="activeTab===1?'active':''" @click="tabChange(0,1)">待处理</view>
+						<view class="tab-item" :class="activeTab===2?'active':''" @click="tabChange(1,2)">已处理</view>
+						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
+					</view>
+					<view class="part-cont">
+						<view class="item" v-for="item in items" :key="item.warnId">
+							<view class="title">
+								<view class="name">{{item.warnTitle}}</view>
+								<view class="state">{{warningStatus(item.status)}}</view>
+							</view>
+							<view class="tags">
+								<text class="tag">{{alertLevel(item.warnLevel)}}</text>
+							</view>
+							<view class="time">
+								发生时间：{{item.warnTime}}
+							</view>
+							<view class="bottom" v-if="item.handleAccountName">
+								<view class="user">
+									<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
+									处理人：{{item.handleAccountName}}
+								</view>		
+								<view class="hand-time">
+									{{item.handleTime}}
+								</view>																
+							</view>
+						</view>
+					</view>
+				</view>
 				<view class="part" v-if="type==='alert'">
 					<view class="tab">
 						<view class="tab-item" :class="activeTab===1?'active':''" @click="tabChange(0,1)">待处理</view>
@@ -42,7 +72,7 @@
 						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in alertList" :key="item.alertId">
+						<view class="item" v-for="item in items" :key="item.alertId">
 							<view class="title">
 								<view class="name">{{item.alertTitle}}</view>
 								<view class="state">{{alertStatus(item.status)}}</view>
@@ -51,15 +81,15 @@
 								<text class="tag">{{alertLevel(item.alertLevel)}}</text>
 							</view>
 							<view class="time">
-								发生时间：{{item.alertTime}}
+								发生时间：{{item.warnTime}}
 							</view>
-							<view class="bottom">
+							<view class="bottom" v-if="item.handleAccountName">
 								<view class="user">
 									<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
 									处理人：{{item.handleAccountName}}
 								</view>		
 								<view class="hand-time">
-									{{item.handleTime}}
+									{{item.warnTime}}
 								</view>																
 							</view>
 						</view>
@@ -73,7 +103,7 @@
 						<view class="tab-item" :class="activeTab===4?'active':''" @click="tabChange(-1,4)">我撤销</view>
 					</view>
 					<view class="part-cont">
-						<view class="item" v-for="item in dangerList" :key="item.dangerId">
+						<view class="item" v-for="item in items" :key="item.dangerId">
 							<view class="title">
 								<view class="name">{{item.dangerTitle}}</view>
 								<view class="state">{{dangerStatus(item.status)}}</view>
@@ -111,10 +141,12 @@
 	import { getAlertByPage } from '@/api/aqpt/alertApi.js';
 	import { getDangerByPage } from '@/api/aqpt/dangerApi.js';
 	import { getTaskByPage } from '@/api/aqpt/taskApi.js';
+	import { getWarningByPage } from '@/api/aqpt/warning.js';		
 	import{
 		taskStatus,taskPriority,taskType,
 		alertLevel,alertStatus,
 		dangerStatus,dangerLevel,
+		warningLevel,warningStatus
 	} from '@/libs/enum.js';	
 	export default {
 		data() {
@@ -128,9 +160,7 @@
 					status:0
 			    },
 				total:0,
-				alertList:[],
-				dangerList:[],
-				taskList:[]			
+				items:[]		
 			}
 		},
 		onLoad({type,name}) {
@@ -146,6 +176,7 @@
 			taskStatus,taskPriority,taskType,
 			alertLevel,alertStatus,
 			dangerStatus,dangerLevel,
+			warningLevel,warningStatus,
 			getData(){
 				if(this.type==='task'){
 					this.getTaskByPage()
@@ -157,28 +188,45 @@
 				if(this.type==='alert'){
 					this.getAlertByPage()
 				}
+				if(this.type==='warn'){
+					this.getWarningByPage()
+				}
+				
+			},
+			getWarningByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
+				getWarningByPage(this.conditions).then((res)=>{
+					this.items=items.concat(res.data)
+					this.total=res.total
+				})				
 			},
 			getAlertByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
 				getAlertByPage(this.conditions).then((res)=>{
-					this.alertList=res.data
+					this.items=items.concat(res.data)
 					this.total=res.total
 				})				
 			},
 			getDangerByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
 				getDangerByPage(this.conditions).then((res)=>{
-					this.dangerList=res.data
+					this.items=items.concat(res.data)
 					this.total=res.total
 				})				
 			},
 			getTaskByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
 				getTaskByPage(this.conditions).then((res)=>{
-					this.taskList=res.data
+					this.items=items.concat(res.data)
 					this.total=res.total
 				})				
 			},
 			tabChange(value,index){
 				this.activeTab=index
-				if(this.type==='task'){
+				this.total=0,
+				this.items=[]
+				this.conditions= {page: 1,limit: 10}
+				if(this.type==='task'||this.type==='alert'||this.type==='warn'){
 					this.conditions.status=value
 				}
 				if(this.type==='danger'){
@@ -192,19 +240,14 @@
 						this.conditions.submitAccountId = this.user.userId
 						this.conditions.status = -1
 					  }
-				}				
-				if(this.type==='alert'){
-					this.conditions.status=value
-				}	
+				}					
 				this.getData()
 			},
 			onPullDownRefresh() {				
 				this.activeTab=1,
 			    this.conditions= {page: 1,limit: 10},
 				this.total=0,
-				this.alertList=[]
-				this.dangerList=[]
-				this.taskList=[]	
+				this.items=[]	
 				this.getData()
 				uni.stopPullDownRefresh()
 			},
@@ -284,7 +327,7 @@
 								}
 							}
 							.time{
-																padding-top: 20rpx;
+								padding-top: 20rpx;
 								font-size: 28rpx;									
 								color:rgba(241, 57, 57, 0.8);
 							}

pages/index/index.vue

@@ -54,15 +54,23 @@
 					<view class="tab">
 						<div class="tab-item">
 							<image class="icon" src="/static/index/tab1.png" mode="widthFix"></image>
-							<view class="tab-name">待办任务 {{taskTotal>99?'99+':taskTotal}} 个</view>
+							<view class="tab-name">待办任务</view>
+							<view class="number">{{taskTotal>99?'99+':taskTotal}}</view>
+						</div>
+						<div class="tab-item">
+							<image class="icon" src="/static/index/tab_alert.png" mode="widthFix"></image>
+							<view class="tab-name">预警提醒</view>
+							<view class="number">{{alertTotal>99?'99+':alertTotal}}</view>
 						</div>
 						<div class="tab-item">
 							<image class="icon" src="/static/index/tab2.png" mode="widthFix"></image>
-							<view class="tab-name">告警事件  {{alertTotal>99?'99+':alertTotal}}个</view>
+							<view class="tab-name">告警事件  </view>
+							<view class="number">{{warnTotal>99?'99+':warnTotal}}</view>
 						</div>
 						<div class="tab-item">
 							<image class="icon" src="/static/index/tab3.png" mode="widthFix"></image>
-							<view class="tab-name">待处理隐患   {{dangerTotal>99?'99+':dangerTotal}}个</view>
+							<view class="tab-name">待处理隐患</view>
+							<view class="number">{{dangerTotal>99?'99+':dangerTotal}}</view>
 						</div>
 					</view>
 					<view class="tab-cont">
@@ -97,10 +105,42 @@
 								</div>
 							</div>
 						</div>
-						<div class="part" v-if="alertList.length>0">
+						<div class="part" v-if="warnList.length>0">
 							<div class="head">
 								<text class="head-name">告警事件</text>
-								<view class="more" @click="linkTo('alert','告警事件')">更多</view>
+								<view class="more" @click="linkTo('warn','告警事件')">更多</view>
+							</div>
+							<div class="part-cont">
+								<div class="item" v-for="item in warnList" :key="item.alertId">
+									<div class="title">
+										<div class="name">{{item.warnTitle}}</div>
+										<view class="state">{{alertStatus(item.status)}}</view>
+									</div>
+									<div class="tags">
+										<text class="tag">{{warningLevelFilter(item.warnLevel)}}</text>
+									</div>
+<!-- 									<view class="time">
+										发生时间：{{item.warnTime}}
+									</view> -->
+									<div class="bottom">
+										<view class="user">
+											<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
+											处理人：{{item.handleAccountName}}
+										</view>		
+										<view class="hand-time">
+											{{item.warnTime}}
+										</view>																
+									</div>
+<!-- 									<view class="desc" style="padding-top: 5px;">
+										{{item.warnDesc}}
+									</view> -->
+								</div>
+							</div>
+						</div>
+						<div class="part" v-if="alertList.length>0">
+							<div class="head">
+								<text class="head-name">预警事件</text>
+								<view class="more" @click="linkTo('alert','预警事件')">更多</view>
 							</div>
 							<div class="part-cont">
 								<div class="item" v-for="item in alertList" :key="item.alertId">
@@ -114,7 +154,7 @@
 									<view class="time">
 										发生时间：{{item.alertTime}}
 									</view>
-									<div class="bottom">
+									<div class="bottom" v-if="item.handleAccountName">
 										<view class="user">
 											<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
 											处理人：{{item.handleAccountName}}
@@ -168,6 +208,7 @@
 	import { getAlertByPage } from '@/api/aqpt/alertApi.js';
 	import { getDangerByPage } from '@/api/aqpt/dangerApi.js';
 	import { getTaskByPage } from '@/api/aqpt/taskApi.js';
+	import { getMyWarningWaitingTop } from '@/api/aqpt/warning.js';	
 	import{
 		taskStatus,taskPriority,taskType,
 		alertLevel,alertStatus,
@@ -195,9 +236,11 @@
 				alertList:[],
 				dangerList:[],
 				taskList:[],
+				warnList:[],
 				alertTotal:0,
 				dangerTotal:0,
-				taskTotal:0
+				taskTotal:0,
+				warnTotal:0
 			}
 		},
 		created() {
@@ -211,6 +254,10 @@
 			taskStatus,taskPriority,taskType,
 			alertLevel,alertStatus,
 			dangerStatus,dangerLevel,
+			warningLevelFilter(val) {
+			  const enums = { 1: 'Ⅰ级', 2: 'Ⅱ级', 3: 'Ⅲ级', 4: 'Ⅳ级' }
+			  return enums[val]
+			},
 			scanQrcode(){
 				uni.scanCode({
 					onlyFromCamera: true,
@@ -237,7 +284,6 @@
 				let user=uni.getStorageSync('accountInfo');
 				if(user){this.user=user}
 				let notice=""
-				getRecentListByLimit
 				getArtByList(3).then((res)=>{
 					for(let i=0;i<res.data.length;i++){
 						notice+=`${res.data[i].artTitle} 发布时间:${res.data[i].issuedAt};`
@@ -254,6 +300,10 @@
 					status: 0,
 					handleAccountId: user.userId							
 				}
+				getMyWarningWaitingTop(5).then((res)=>{
+					this.warnList=res.data
+					this.warnTotal=res.total
+				})
 				getAlertByPage(params).then((res)=>{
 					this.alertList=res.data
 					this.alertTotal=res.total
@@ -442,8 +492,8 @@
 					align-items: center;
 					padding: 40rpx 0 20rpx 0;
 					.tab-item{
-						width: 33.33%;
-						height: 150rpx;
+						width: 25%;
+						// height: 150rpx;
 						display: flex;
 						justify-content: center;
 						align-items: center;	

pages/myCenter/updatePassword/updatePassword.vue

@@ -13,7 +13,7 @@
 				<uni-easyinput v-model="rePassword"
 				 :inputBorder="false" 
 				 class="input"
-				 type="text"  placeholder="请>确认密码">
+				 type="text"  placeholder="请确认密码">
 				</uni-easyinput>
 			</view>
 			<button type="primary" @click="submit" class="submit-BT">提交</button>

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>六院联创</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.340a447e.js></script><script src=/static/js/index.c721d98c.js></script></body></html>