feat: 新增需求

pages/index/indexWork.vue

@@ -1,4 +1,15 @@
 <template>
+	<view class="custom-nav-bar">
+		<!-- 左侧图标 + 标题 -->
+		<view class="nav-left">
+			<image class="nav-icon" src="./img/dun.png" mode="widthFix"></image>
+			<text class="nav-title">{{'综合监控系统'}}</text>
+		</view>
+		<!-- <view class="nav-right">
+			<image class="nav-avatar" :src="userInfo.avatar || '/static/image/avatar-default.png'" mode="widthFix"></image>
+			<text class="nav-dot" v-if="count > 0">●</text>
+		</view> -->
+	</view>
 	<view class="index_v">
 		<!-- <u-sticky>
 			<view class="head-tabs u-flex">
@@ -40,7 +51,7 @@
   			<view class="todo-title">
 				<view class="title-left">
 					<view >待处理事项</view>
-					<u-badge type="error" :count="count" :absolute="true" :offset="offset" />
+					<!-- <u-badge type="error" :count="count" :absolute="true" :offset="offset" /> -->
 				</view>
 				<view class="title-right" @click="openToDoPage">
 					工作信息
@@ -64,7 +75,7 @@
 				    <view class="todo-header">
 				      <view class="todo-code">
 							<text class="code-label">单号</text>
-							<text class="code-value">{{item.businessInfo.billNo}}</text>
+							<text class="code-value">{{item.businessInfo && item.businessInfo.billNo}}</text>
 					  </view>
 				    </view>
 				    <!-- 信息列表 -->
@@ -115,6 +126,9 @@
 		updatePassword,
 		updatePasswordMessage
 	} from '@/api/common.js'
+	import {
+		getProcessBusinessInfo
+	} from '@/api/apply/visualDev'
 	import chat from '@/libs/chat'
 	import CommonPane from '@/components/CommonPane'
 	import CommonPaneSys from '@/components/CommonPane/indexSystem'
@@ -387,9 +401,15 @@
 					pageSize: 3
 				}
 				getDonePage(params).then(res=>{
-					console.log(res,'res-------')
-					this.count = res.data.total
-				    this.todoList = res.data.list || []
+					const {code,data} = res
+					if(code == 0){
+						this.count = data.total
+						uni.setTabBarBadge({
+    					  index: 1, // 待办任务的tab索引
+    					  text: res.data.total.toString() // 角标数字
+    					});
+				    	this.todoList = data.list || []
+					}
 				})
 			},
 			//更多按钮
@@ -406,7 +426,8 @@
 			},
 			// 跳转待办
 			openToDoPage() {
-				uni.navigateTo({
+				uni.setStorageSync('fromNonTabBar', true);
+				uni.switchTab({
 					url: '/pages/workFlow/flowTodo/index',
 				});
 			},
@@ -419,17 +440,35 @@
 			},
 			// 待处理事项跳转详情
 			goDetail(item) {
-				console.log(item,'item----------')
+				const {processInstance} = item
+				getProcessBusinessInfo(processInstance.id).then(res=>{
+					if(res.code == 0){
+						const {dbformId,businessId} = res.data
+						// this.processBusinessInfo = res.data || {}
+						const config = {
+							modelId: dbformId,
+							id: businessId,
+							name: processInstance.name,
+							btnType: 'btn_process',
+							current: 2
+						}
+						uni.navigateTo({
+							url: '/pages/apply/dynamicModelList/form?config=' +
+								this.jnpf.base64.encode(JSON.stringify(config))
+						})
+					}
+				})
 				const config = {
 					opType: item.opType,
 					operatorId: item.id,
 					category: '1',
 					...item
 				}
-				uni.navigateTo({
-					url: '/pages/workFlow/flowBefore/index?config=' +
-						this.jnpf.base64.encode(JSON.stringify(config))
-				})
+				// /pages/apply/dynamicModelList/form
+				// uni.navigateTo({
+				// 	url: '/pages/workFlow/flowBefore/index?config=' +
+				// 		this.jnpf.base64.encode(JSON.stringify(config))
+				// })
 			}
 		}
 	}
@@ -440,8 +479,62 @@
 		background-color: #f0f2f6;
 		padding-bottom: 20rpx;
 	}
+	.custom-nav-bar {
+  		position: fixed;
+  		top: 0;
+  		left: 0;
+  		right: 0;
+  		z-index: 999;
+  		height: 44px;
+  		background: #fff;
+  		border-bottom: 1px solid #f0f2f6;
+  		display: flex;
+  		align-items: center;
+  		padding: 0 20rpx;
+  		box-sizing: border-box;
+
+  	.nav-left {
+  	  display: flex;
+  	  align-items: center; // 图标和标题垂直居中
+  	}
+
+  	.nav-icon {
+  	  width: 20px;
+  	  height: 20px;
+  	  margin-right: 8rpx;
+  	}
+
+  .nav-title {
+    font-size: 16px;
+    font-weight: 500;
+    color: #303133;
+    // 标题左对齐（flex布局默认左排列）
+  }
+
+  .nav-right {
+    margin-left: auto; // 右侧元素靠右
+    display: flex;
+    align-items: center;
+    position: relative;
+  }
+
+  .nav-avatar {
+    width: 28px;
+    height: 28px;
+    border-radius: 50%;
+  }
+
+  .nav-dot {
+    position: absolute;
+    top: -2px;
+    right: -2px;
+    color: #f56c6c;
+    font-size: 12px;
+  }
+}
 
 	.index_v {
+		 padding-top: 65rpx;
 		.head-tabs {
 			background-color: #fff;
 			width: 100%;