代码更新

MingGaoApp/App.vue

@@ -16,9 +16,9 @@
 		},
 		onLoad() {},
 		onLaunch: function() {
+			console.log('启动了')
 			// App启动
 			var that = this
-			// uni.hideTabBar({})
 			uni.getStorage({
 				key: 'session_key',
 				success: function(res) {
@@ -36,25 +36,6 @@
 		onShow: function() {
 			// App展示在前台
 			// console.log('App Show')、
-			uni.getStorage({
-				key: 'session_key',
-				success: (res) => {
-					console.log(res)
-					if (res.data != "") {
-						this.getlistinfo()
-					} else {
-						uni.navigateTo({
-							url: "../login/login"
-						})
-					}
-				},
-				fail:()=> {
-					uni.navigateTo({
-						url: "../login/login"
-					})
-				}
-			})
-
 		},
 		onHide: function() {
 			// App不再再展示在前台
@@ -62,57 +43,6 @@
 		},
 		methods: {
 			// 实时通信 - 初始化
-			async getlistinfo() {
-				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=sysmenage.usermanager.user_info',
-				})
-				// console.log(res)
-				this.app = res.children.filter((item) => {
-					return item.purview_name == "APP"
-				})
-
-				console.log(this.app)
-				if (this.app.length != 0) {
-					if (this.app[0].children[0].purview_name == "我的任务") {
-						uni.switchTab({
-							url: "../index/index"
-						})
-					} else if (this.app[0].children[0].purview_name == "监督") {
-						uni.switchTab({
-							url: "../supervise/index"
-						})
-						uni.setTabBarItem({
-							index: 0,
-							visible: false
-						});
-					} else {
-						uni.switchTab({
-							url: "../response/index"
-						})
-						uni.setTabBarItem({
-							index: 0,
-							visible: false
-						});
-						uni.setTabBarItem({
-							index: 1,
-							visible: false
-						});
-					}
-				} else {
-					uni.setTabBarItem({
-						index: 0,
-						visible: false
-					});
-					uni.setTabBarItem({
-						index: 1,
-						visible: false
-					});
-					uni.switchTab({
-						url: "../response/index"
-					})
-				}
-				// console.log(this.app)
-			},
 			msgInit() {
 				var that = this
 				// 连接webscoket
@@ -163,14 +93,14 @@
 					} else if (val.action == 'none') {
 						// console.log('进入了')
 						that.globalData.list = val.data
-						console.log(that.globalData.list)
+						// console.log(that.globalData.list)
 						this.$store.state.list = val.data
 						// console.log(this.$store.state.list)
 					} else if (val.action == 'recv_video') {
 						// console.log(val.data)
 						that.globalData.video = val.data
 						this.$store.state.video = val.data
-						console.log(this.$store.state.video)
+						// console.log(this.$store.state.video)
 					}
 				});
 				// console.log(that.socketTask)

MingGaoApp/components/task-details.vue

@@ -2,6 +2,7 @@
 <!-- istask  0 完成任务模块 1 任务模块 2 监督模块 3监督记录模块-->
 <template name="task-details">
 	<view class="" style="padding-bottom: 40rpx;">
+		
 		<!-- <view class="taskbtn">
 			<view class="taskbtn_item" v-if="istask==1" @click="taskfillingcom">
 				提交
@@ -45,7 +46,7 @@
 			</view>
 			<view class="taskbox_item2">
 				<view class="taskbox_item_l">
-					操作描述
+					任务描述
 				</view>
 				<view class="taskbox_item_r">
 					{{taskinfo.tesk_msg}}
@@ -62,6 +63,9 @@
 						<u-icon size="20" name="plus" color="#409eff"></u-icon>
 					</view>
 					<view class="imgitem" v-for="item,index in urllist" :key="index">
+						<view class="icon" @click="deleimg(index)">
+							<u-icon name="close" color="#fff"></u-icon>
+						</view>
 						<image :src="baseUrl+item" mode="" class="img"></image>
 						<!-- <u--image :src="baseUrl+item" class="img">
 							<view slot="error" style="font-size: 24rpx;">加载失败</view>
@@ -80,7 +84,7 @@
 				</view>
 				<view class="imgbox_box">
 					<view class="imgitem" v-for="item,index in taskinfo.img_list" :key="index">
-						<image :src="baseUrl+item" mode="" class="img"></image>
+						<image :src="baseUrl+item" mode="" class="img" @click="examine(index)"></image>
 					</view>
 				</view>
 			</view>
@@ -90,7 +94,7 @@
 				任务汇报
 			</view>
 			<view class="textareainput" v-if="taskshow">
-				<u--textarea v-model="textareavalue" placeholder="请输入内容"></u--textarea>
+				<u--textarea v-model="textareavalue" placeholder="请输入内容" :maxlength="200" autoHeight count></u--textarea>
 			</view>
 			<view class="textarea" v-else>
 				{{taskinfo.report_msg || "暂无描述"}}
@@ -163,9 +167,10 @@
 				</view>
 			</view>
 		</view>
-		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="kpsurlL" :fixed="false" :blob="false" :maxWidth="500"
+		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="kpsurlL" :fixed="true" :blob="false" :maxWidth="500"
 			:maxHeight="500"></kps-image-cutter>
 		<u-loading-page loading-text="加载中..." :loading="loading" font-size="16"></u-loading-page>
+		
 	</view>
 </template>
 
@@ -212,19 +217,45 @@
 				}
 				this.taskfillingdraft()
 			},
+			kpsurlL(news, old) {
+				if (this.istask == 1) {
+					if (news != "") {
+						let pages = getCurrentPages();
+						var page = pages[pages.length - 1];
+						var currentWebview = page.$getAppWebview();
+						currentWebview.setTitleNViewButtonStyle(0, {
+							text: " ",
+						});
+						this.$store.state.kpsurlL = 1
+					} else {
+						let pages = getCurrentPages();
+						var page = pages[pages.length - 1];
+						var currentWebview = page.$getAppWebview();
+						currentWebview.setTitleNViewButtonStyle(0, {
+							text: "提交",
+						});
+						this.$store.state.kpsurlL = 0
+					}
+				}
+
+			}
 		},
 		computed: {
 			wornlist() {
-				return store.state.wornlist
+				return this.$store.state.wornlist
 			},
 		},
 
 		methods: {
+			deleimg(index) {
+				// console.log(this.urllist)
+				this.urllist.splice(index, 1)
+			},
 			gainimg() { //添加图片
 				uni.chooseImage({
 					count: 1, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册选择
+					sourceType: ['camera'], //从相册选择
 					success: (res) => {
 						console.log(res)
 						// this.urllist.push(res.tempFilePaths[0])
@@ -257,41 +288,48 @@
 						task_id: id,
 					}
 				})
+				console.log(res)
 				this.taskinfo = res
-				if(this.taskinfo.img_list == "" || this.taskinfo.img_list.length==0){
+				if (this.taskinfo.img_list == "" || this.taskinfo.img_list.length == 0) {
 					this.taskinfo.img_list = []
-				}else{
+				} else {
 					this.taskinfo.img_list = JSON.parse(this.taskinfo.img_list)
 				}
-				
+
 				if (this.taskinfo.task_type == "有害生物监测") {
 					this.task_type = true
 				} else {
 					this.task_type = false
 				}
+				uni.setNavigationBarTitle({
+					title: this.taskinfo.task_type //这是修改后的导航栏文字
+				})
 				this.loading = false
 				console.log(res)
 			},
 			taskfillingcom() {
-				console.log(this.urllist)
-				var tf = this.taskinfo.trap_record_list.every((item)=>{
+				console.log(this.taskinfo.trap_record_list)
+				var tf = this.taskinfo.trap_record_list.every((item) => {
+					console.log(item.report_status)
 					return item.report_status != ""
 				})
 				// console.log(tf)
-				if(this.urllist.length==0){
+				if (this.urllist.length == 0) {
 					uni.$u.toast('请拍摄图片进行签到')
-				}else if(this.textareavalue==""){
+				} else if (this.textareavalue == "") {
 					uni.$u.toast('请填写任务汇报')
-				}else if(!tf){
-					if(this.task_type){
-						uni.$u.toast('请完成填写设备登记')
-					}else{
+				} else if (!tf) {
+					if (this.task_type) {
+						uni.$u.toast('请将所有设备全部登记后提交！')
+					} else {
+						// this.taskfillingdraft()+
 						this.taskfilling()
 					}
-				}else{
+				} else {
+					// this.taskfillingdraft()
 					this.taskfilling()
 				}
-					
+
 			},
 			async taskfilling() { //任务填报接口
 				const res = await this.$myRequest({
@@ -300,18 +338,21 @@
 						// task_id:id,
 						task_id: this.task_id, //            是       任务id
 						report_msg: this.textareavalue, //            是       任务汇报内容
-						img_list: JSON.stringify(this.urllist), //            是       图片列表					['http://www.c.com']
+						img_list: JSON.stringify(this
+						.urllist), //            是       图片列表					['http://www.c.com']
 					}
 				})
+				console.log(res)
 				this.$emit('returnpage')
 			},
 			async taskfillingdraft() { //任务填报接口
 				console.log(this.draft)
 				var arr = []
-				for(var i=0;i<this.taskinfo.trap_record_list.length;i++){
-					if(this.taskinfo.trap_record_list[i].report_status!=""&&this.taskinfo.trap_record_list[i].id!=this.draft.record_id){
+				for (var i = 0; i < this.taskinfo.trap_record_list.length; i++) {
+					if (this.taskinfo.trap_record_list[i].report_status != "" && this.taskinfo.trap_record_list[i]
+						.id != this.draft.record_id) {
 						// arr.push()
-						var obj ={
+						var obj = {
 							record_id: this.taskinfo.trap_record_list[i].id, //      			填报记录id
 							report_status: this.taskinfo.trap_record_list[i].report_status, //			填报记录状态
 							pest_list: this.taskinfo.trap_record_list[i].pest_list
@@ -319,17 +360,31 @@
 						arr.push(obj)
 					}
 				}
+				console.log(this.draft)
 				arr.push(this.draft)
-				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=app.task.task_filling_draft',
-					data: {
-						// task_id:id,
+				var data = {}
+				if (this.task_type) {
+					data = {
+						task_id: this.task_id, //            是       任务id
+						report_msg: this.textareavalue, //            是       任务汇报内容
+						img_list: JSON.stringify(this.urllist), //            是       图片列表					['http://www.c.com']
+						trap_record_list: JSON.stringify(arr),
+					}
+				} else {
+					data = {
 						task_id: this.task_id, //            是       任务id
 						report_msg: this.textareavalue, //            是       任务汇报内容
-						img_list: this.urllist, //            是       图片列表					['http://www.c.com']
-						trap_record_list: JSON.stringify(arr),//    是       害虫填报记录列表
+						img_list: JSON.stringify(this.urllist), //            是       图片列表					['http://www.c.com']
 					}
+				}
+				console.log(data)
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=app.task.task_filling_draft',
+					data: data,
 				})
+				console.log(res)
+				// this.$store.state.wornlist = {}
+				// this.taskfilling()
 			},
 			skip() { //跳转
 				this.$emit('tosubm')
@@ -351,9 +406,20 @@
 				}
 				this.$emit('toinsect', JSON.stringify(obj))
 			},
-			tolist(){
+			tolist() {
 				this.$emit('tolist', this.task_id)
-			}
+			},
+			examine(index) {
+				var imgarr = []
+				for (var i = 0; i < this.taskinfo.img_list.length; i++) {
+					imgarr.push(this.baseUrl + this.taskinfo.img_list[i])
+				}
+				console.log(imgarr)
+				uni.previewImage({
+					urls: imgarr,
+					current: index
+				});
+			},
 		},
 	}
 </script>
@@ -441,11 +507,25 @@
 					height: 140rpx;
 					margin-right: 30rpx;
 					margin-bottom: 30rpx;
+					position: relative;
 
 					.img {
 						width: 100%;
 						height: 100%;
 					}
+
+					.icon {
+						position: absolute;
+						top: -20rpx;
+						right: -20rpx;
+						z-index: 9;
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						display: flex;
+						justify-content: space-around;
+						background-color: red;
+					}
 				}
 			}
 		}
@@ -529,6 +609,7 @@
 					border-bottom: 1px solid #F6F6F6;
 
 					.basebox_info_item_l {
+						width: 350rpx;
 						font-size: 28rpx;
 					}
 

MingGaoApp/manifest.json

@@ -56,9 +56,9 @@
                 "androidStyle" : "default",
                 "useOriginalMsgbox" : false,
                 "android" : {
-                    "hdpi" : "C:/Users/FC/Desktop/智网/智云图片/statr.png",
-                    "xhdpi" : "C:/Users/FC/Desktop/智网/智云图片/statr.png",
-                    "xxhdpi" : "C:/Users/FC/Desktop/智网/智云图片/statr.png"
+                    "hdpi" : "C:/Users/FC/Desktop/图片/智网/智云图片/statr.png",
+                    "xhdpi" : "C:/Users/FC/Desktop/图片/智网/智云图片/statr.png",
+                    "xxhdpi" : "C:/Users/FC/Desktop/图片/智网/智云图片/statr.png"
                 }
             },
             "icons" : {

MingGaoApp/pages.json

@@ -35,7 +35,7 @@
 				},
 				"titleNView": {
 					"buttons": [{
-						"text": " ",
+						"text": "",
 						"fontSize": "14px",
 						"color": "#409eff"
 					}]
@@ -132,8 +132,15 @@
 			"path": "pages/my/monitorlog",
 			"style": {
 				"navigationBarTitleText": "监测日志",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#ffffff"
+				"enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#ffffff",
+				"titleNView": {
+					"buttons": [{
+						"text": "",
+						"fontSize": "14px",
+						"color": "#409eff"
+					}]
+				}
 			}
 
 		},
@@ -174,7 +181,7 @@
 		{
 			"path": "pages/my/mtmonitdetails",
 			"style": {
-				"navigationBarTitleText": "监督记录详情",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff"
 			}
@@ -192,7 +199,7 @@
 		{
 			"path": "pages/index/harmfultask",
 			"style": {
-				"navigationBarTitleText": "生物监测任务",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"titleNView": {
@@ -208,7 +215,7 @@
 		{
 			"path": "pages/supervise/supetask",
 			"style": {
-				"navigationBarTitleText": "生物监测任务监督",
+				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#ffffff",
 				"titleNView": {

MingGaoApp/pages/index/harmfultask.vue

@@ -1,73 +1,91 @@
 <template>
-	<view>
+	<view :class="tfclass?'box':''">
 		<view class="" style="width: 100%;height: 30rpx;background-color: #f7f7f7;">
-			
+
 		</view>
-		<taskdetails :taskshow="taskshow" :istask="istask" ref="child" @toinsect="toinsect" @returnpage="returnpage" @tolist='tolist'></taskdetails>
+		<taskdetails :taskshow="taskshow" :istask="istask" ref="child" @toinsect="toinsect" @returnpage="returnpage"
+			@tolist='tolist'></taskdetails>
 	</view>
 </template>
 
 <script>
 	import taskdetails from "../../components/task-details.vue"
 	export default {
-		components:{
+		components: {
 			taskdetails
 		},
 		data() {
 			return {
-				taskshow:true,
-				istask:1,
+				taskshow: true,
+				istask: 1,
+				tfclass:false
+			}
+		},
+		computed: {
+			boxclass() {
+				console.log(this.$store.state.kpsurlL)
+				return this.$store.state.kpsurlL
+			},
+		},
+		watch:{
+			boxclass(news){
+				console.log(news)
+				if(news==1){
+					this.tfclass = true
+				}else{
+					this.tfclass = false
+				}
+				
 			}
 		},
-		
 		methods: {
-			toinsect(item){
+			toinsect(item) {
 				uni.navigateTo({
-					url:"../insectpest/insectpest?id="+item
+					url: "../insectpest/insectpest?id=" + item
 				})
 			},
-			returnpage(){
+			returnpage() {
 				uni.navigateBack({
-					delta:1
+					delta: 1
 				})
 			},
-			tolist(id){
+			tolist(id) {
 				uni.navigateTo({
-					url:"../insectpest/baselist?id="+id+"&taskshow="+this.taskshow
+					url: "../insectpest/baselist?id=" + id + "&taskshow=" + this.taskshow
 				})
 			}
 		},
-		onNavigationBarButtonTap(e){
-			if(this.istask==1){
+		onNavigationBarButtonTap(e) {
+			if (this.istask == 1) {
 				this.$refs.child.taskfillingcom()
 			}
 		},
 		onLoad(option) {
 			// this.taskid = Number(option.id)
-			if(option.current==2){
+			if (option.current == 2) {
 				this.taskshow = false
 				this.istask = 0
-			}else{
+			} else {
 				this.taskshow = true
 				this.istask = 1
 			}
 			let pages = getCurrentPages();
 			var page = pages[pages.length - 1];
 			var currentWebview = page.$getAppWebview();
-			if(this.istask==1){
+			if (this.istask == 1) {
 				currentWebview.setTitleNViewButtonStyle(0, {
 					text: "提交",
 				});
-			}else if(this.istask == 2){
+			} else if (this.istask == 2) {
 				currentWebview.setTitleNViewButtonStyle(0, {
 					text: "监督",
 				});
-			}else{
+			} else {
 				currentWebview.setTitleNViewButtonStyle(0, {
 					text: " ",
 				});
 			}
-			this.$nextTick(()=>{
+			this.$nextTick(() => {
 				this.$refs.child.gettaskinfo(option.id)
 			})
 			// this.$refs.child.no()
@@ -75,6 +93,9 @@
 	}
 </script>
 
-<style>
-
+<style lang="less" scoped>
+.box{
+	height: 100vh;
+	overflow: hidden;
+}
 </style>

MingGaoApp/pages/index/index.vue

@@ -33,13 +33,13 @@
 						<view class="taskbox_item_l_l_l">
 							处理人：{{item.operator_user}}
 						</view>
-						<view class="taskbox_item_l_l_r" v-if="status=='待处理'">
-							距结束{{item.diff_day}}天
+						<view class="taskbox_item_l_l_r" v-if="item.task_status=='未开始'">
+							{{item.diff_day}}天后开始
 						</view>
-						<view class="taskbox_item_l_l_r" v-if="status=='未完成'">
+						<view class="taskbox_item_l_l_r" v-if="item.task_status=='处理中'">
 							剩余{{item.diff_day}}天
 						</view>
-						<view class="taskbox_item_l_l_ri" v-if="status=='已完成'">
+						<view class="taskbox_item_l_l_ri" v-if="item.task_status=='未处理'">
 							逾期{{item.diff_day}}天
 						</view>
 					</view>
@@ -74,10 +74,11 @@
 			}
 		},
 		onShow() {
+			this.page = 1
+			this.tasklist = []
 			this.gettaskdata()
 		},
 		onLoad() {
-			
 		},
 		onReachBottom() {
 			this.page++

MingGaoApp/pages/insectpest/baselist.vue

@@ -1,8 +1,11 @@
 <template>
 	<view>
+		<view class="division">
+			<u-search placeholder="请输入设备ID" v-model="name" :showAction="false"></u-search>
+		</view>
 		<view class="basebox_info">
 			<view class="basebox_info_item" v-for="item,index in taskinfo.trap_record_list" :key="index">
-				<view class="box">
+				<view class="box" v-if="item.trap_number.indexOf(name) != -1">
 					<view class="basebox_info_item_l">
 						{{item.trap_number}}
 					</view>
@@ -26,25 +29,26 @@
 	export default {
 		data() {
 			return {
-				task_type:false,
-				taskinfo:{},
-				task_id:"",
-				loading:false,
-				taskshow:false
+				task_type: false,
+				taskinfo: {},
+				task_id: "",
+				loading: false,
+				taskshow: false,
+				name: ""
 			}
 		},
 		onLoad(option) {
 			console.log(option)
 			this.task_id = option.id
-			if(option.taskshow == "true"){
+			if (option.taskshow == "true") {
 				this.taskshow = true
-			}else{
+			} else {
 				this.taskshow = false
 			}
 			// this.taskshow = option.taskshow
 			// this.gettaskinfo()
 		},
-		onShow(){
+		onShow() {
 			this.gettaskinfo()
 		},
 		methods: {
@@ -53,7 +57,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=control_center.task.task_info',
 					data: {
-						task_id: this.task_id ,
+						task_id: this.task_id,
 					}
 				})
 				this.taskinfo = res
@@ -68,7 +72,7 @@
 					comtype: false
 				}
 				uni.navigateTo({
-					url:"../insectpest/insectpest?id="+JSON.stringify(obj)
+					url: "../insectpest/insectpest?id=" + JSON.stringify(obj) + "&index=2"
 				})
 				// this.$emit('toinsect', JSON.stringify(obj))
 			},
@@ -79,31 +83,46 @@
 					comtype: true
 				}
 				uni.navigateTo({
-					url:"../insectpest/insectpest?id="+JSON.stringify(obj)
+					url: "../insectpest/insectpest?id=" + JSON.stringify(obj) + "&index=2"
 				})
 				// this.$emit('toinsect', JSON.stringify(obj))
+			},
+			search() {
+
 			}
 		}
 	}
 </script>
 
 <style lang="less" scoped>
+	.division {
+		position: fixed;
+		width: 90%;
+		left: 5%;
+		background-color: #FFFFFF;
+		padding: 20rpx 0;
+		z-index: 9;
+	}
+
 	.basebox_info {
 		width: 90%;
-		margin:  0 auto;
+		margin: 0 auto;
+		padding-top: 100rpx;
+
 		.basebox_info_item {
 			width: 100%;
-	
+
 			.box {
 				display: flex;
 				justify-content: space-between;
 				padding: 20rpx 0;
 				border-bottom: 1px solid #F6F6F6;
-	
+
 				.basebox_info_item_l {
 					font-size: 28rpx;
+					width: 150rpx;
 				}
-	
+
 				.basebox_info_item_c {
 					color: #999999;
 					font-size: 28rpx;

MingGaoApp/pages/insectpest/insectpest.vue

@@ -20,7 +20,7 @@
 				<view class="examine_itemno_input">
 					<u--input border="surround" v-model="item.pest_number" disabled></u--input>
 				</view>
-				<view class="" style="color:red">
+				<view class="" style="color:red" @click="selectdelold(item,index)">
 					删除
 				</view>
 			</view>
@@ -38,10 +38,10 @@
 					<view class="" v-if="item != notwornlistnum" @click="selectdel(item)">
 						删除
 					</view>
-					<u-icon name="plus-circle" size="22" color="#1890ff" top="4" v-else @click="addnotwornlistnum(item)">
+					<u-icon name="plus-circle" size="22" color="#1890ff" top="4" v-else
+						@click="addnotwornlistnum(item)">
 					</u-icon>
 				</view>
-				<u-picker :show="show" :columns="columns" @confirm="confirm" @cancel="show = false"></u-picker>
 			</view>
 		</view>
 		<view class="write" v-else>
@@ -58,11 +58,12 @@
 			</view>
 		</view>
 		<view class="operation" v-if="baseinfo.comtype">
-			<u-button type="primary" text="无虫" @click="opebtn('无虫')"></u-button>
-			<u-button type="primary" text="带回" @click="opebtn('已带回')"></u-button>
+			<u-button type="primary" text="无虫" @click="opebtn2('无虫')"></u-button>
+			<u-button type="primary" text="带回" @click="opebtn3('已带回')"></u-button>
 			<u-button type="primary" text="提交" @click="opebtn('已登记')"></u-button>
 		</view>
 		<u-loading-page loading-text="加载中..." :loading="loading" font-size="16"></u-loading-page>
+		<u-picker :show="show" :columns="columns" @confirm="confirm" @cancel="show = false"></u-picker>
 	</view>
 </template>
 
@@ -83,13 +84,22 @@
 					num: []
 				},
 				elsectindex: 0,
-				dellist: []
+				dellist: [],
+				roteindex: false
 			}
 		},
 		onLoad(option) {
 			this.baseinfo = JSON.parse(option.id)
-			this.getwornlist(this.baseinfo.id)
+
+			if (option.index) {
+				console.log("列表")
+				this.roteindex = true
+			} else {
+				console.log("不是列表")
+				this.roteindex = false
+			}
 			this.getselectworn()
+			this.getwornlist(this.baseinfo.id)
 		},
 		methods: {
 			async getwornlist(id) {
@@ -103,6 +113,14 @@
 				console.log(res)
 				this.wornlist = res
 				this.loading = false
+				var arr = []
+				for (var i = 0; i < res.length; i++) {
+					arr.unshift(this.columns[0].indexOf(res[i].pest_name))
+				}
+				// console.log(arr)
+				for (var i = 0; i < arr.length; i++) {
+					this.columns[0].splice(arr[i], 1)
+				}
 			},
 			async getselectworn() {
 				const res = await this.$myRequest({
@@ -123,17 +141,18 @@
 			},
 			addnotwornlistnum(item) {
 				console.log(this.notwornlistdata.name[item])
-				if(this.notwornlistdata.name[item]&& this.notwornlistdata.num[item]){
+				if (this.notwornlistdata.name[item] && this.notwornlistdata.num[item]) {
 					this.notwornlistnum++
-				}else{
+				} else {
 					uni.$u.toast('请将信息填写完成')
 				}
-				
+
 			},
 			confirm(e) {
 				this.show = false
 				console.log(e.value[0], this.elsectindex)
 				this.notwornlistdata.name[this.elsectindex] = e.value[0]
+				// console.log(this.notwornlistdata)
 				this.datacount()
 			},
 			datacount() {
@@ -151,13 +170,13 @@
 					}
 				}
 				for (var k = 0; k < this.columns2.length; k++) {
-					if (this.notwornlistdata.name.indexOf(this.columns2[k]) ==-1) {
-						if(this.columns[0].indexOf(this.columns2[k])==-1){
+					if (this.notwornlistdata.name.indexOf(this.columns2[k]) == -1) {
+						if (this.columns[0].indexOf(this.columns2[k]) == -1) {
 							this.columns[0].unshift(this.columns2[k])
 						}
 					}
 				}
-				
+
 			},
 			selectdel(item) {
 				this.notwornlistnum--
@@ -165,35 +184,116 @@
 				this.notwornlistdata.num.splice(item, 1)
 				this.columns[0].unshift(arr[0])
 			},
-			opebtn(str) {
+			selectdelold(item, index) {
+				console.log(item, index)
+				// var arr = this.notwornlistdata.name.splice(item.pest_name, 1)
+				// this.notwornlistdata.num.splice(item, 1)
+				var arr = item.pest_name
+				this.columns[0].unshift(arr)
+				this.wornlist.splice(index, 1)
+			},
+			opebtn2(str) {
 				var arr = []
-				for (var j = 1; j < this.wornlist.length; j++) {
+				this.$store.state.wornlist = {
+					record_id: this.baseinfo.id, //      			填报记录id
+					report_status: str, //			填报记录状态
+					pest_list: arr
+				}
+				if (this.roteindex) {
+					// console.log("返回二页")
+					uni.navigateBack({
+						delta: 2
+					});
+				} else {
+					// console.log("返回一页")
+					uni.navigateBack({
+						delta: 1
+					});
+				}
+			},
+			opebtn3(str) {
+				var arr = []
+				console.log(this.wornlist)
+				for (var j = 0; j < this.wornlist.length; j++) {
 					var obj = {
 						pest_name: this.wornlist[j].pest_name, //		害虫名称
 						pest_number: this.wornlist[j].pest_number //			害虫数量
 					}
 					arr.push(obj)
 				}
+				// console.log(arr)
+				// var arr1 = []
 				for (var i = 1; i < this.notwornlistdata.name.length; i++) {
+					if (this.notwornlistdata.name[i]) {
+						var obj = {
+							pest_name: this.notwornlistdata.name[i], //		害虫名称
+							pest_number: this.notwornlistdata.num[i] || 0 //			害虫数量
+						}
+						arr.push(obj)
+					}
+				}
+				console.log(arr)
+				this.$store.state.wornlist = {
+					record_id: this.baseinfo.id, //      			填报记录id
+					report_status: str, //			填报记录状态
+					pest_list: arr
+				}
+				if (this.roteindex) {
+					uni.navigateBack({
+						delta: 2
+					});
+				} else {
+					uni.navigateBack({
+						delta: 1
+					});
+				}
+			},
+			opebtn(str) {
+				var arr = []
+				console.log(this.wornlist)
+				for (var j = 0; j < this.wornlist.length; j++) {
 					var obj = {
-						pest_name: this.notwornlistdata.name[i], //		害虫名称
-						pest_number: this.notwornlistdata.num[i] //			害虫数量
+						pest_name: this.wornlist[j].pest_name, //		害虫名称
+						pest_number: this.wornlist[j].pest_number //			害虫数量
 					}
 					arr.push(obj)
 				}
-				if(arr.length!=0){
+				// console.log(arr)
+				// var arr1 = []
+				for (var i = 1; i < this.notwornlistdata.name.length; i++) {
+					if (this.notwornlistdata.name[i]) {
+						var obj = {
+							pest_name: this.notwornlistdata.name[i], //		害虫名称
+							pest_number: this.notwornlistdata.num[i] //			害虫数量
+						}
+						arr.push(obj)
+					}
+				}
+				// console.log(arr)
+				var tf = arr.every((item) => {
+					return item.pest_number
+				})
+				// console.log(tf,arr)
+				if (arr.length != 0 && tf) {
 					this.$store.state.wornlist = {
 						record_id: this.baseinfo.id, //      			填报记录id
 						report_status: str, //			填报记录状态
 						pest_list: arr
 					}
-					uni.navigateBack({
-						delta: 2
-					});
-				}else{
+					if (this.roteindex) {
+						uni.navigateBack({
+							delta: 2
+						});
+					} else {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+
+				} else {
 					uni.$u.toast('请将信息填写完成')
 				}
-				
+
 			}
 		}
 	}

MingGaoApp/pages/login/login.vue

@@ -44,7 +44,7 @@
 					},
 				},
 				checkboxValue1: [],
-				isloading:false
+				isloading: false
 			}
 		},
 		methods: {
@@ -56,6 +56,71 @@
 					// uni.$u.toast('校验失败')
 				})
 			},
+			async getlistinfo() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=sysmenage.usermanager.user_info',
+				})
+				// console.log(res)
+				this.app = res.children.filter((item) => {
+					return item.purview_name == "APP"
+				})
+				// console.log(this.app)
+				if (this.app.length == 0) {
+					uni.setTabBarItem({
+						index: 0,
+						visible: false
+					});
+					uni.setTabBarItem({
+						index: 1,
+						visible: false
+					});
+					uni.switchTab({
+						url: "../response/index"
+					})
+				} else {
+					var renwu = this.app[0].children.some((item) => {
+						// console.log(item)
+						return item.purview_name == "我的任务"
+					})
+					var jiandu = this.app[0].children.some((item) => {
+						// console.log(item)
+						return item.purview_name == "监督"
+					})
+					if (renwu) {
+						uni.setTabBarItem({
+							index: 0,
+							visible: true
+						});
+					} else {
+						uni.setTabBarItem({
+							index: 0,
+							visible: false
+						});
+					}
+					if (jiandu) {
+						uni.setTabBarItem({
+							index: 1,
+							visible: true
+						});
+					} else {
+						uni.setTabBarItem({
+							index: 1,
+							visible: false
+						});
+					}
+					if(renwu){
+						uni.switchTab({
+							url: "../index/index"
+						})
+					}else{
+						uni.switchTab({
+							url: "../supervise/index"
+						})
+					}
+				}
+				
+
+			},
 			async login() {
 				this.isloading = true
 				const res = await this.$myRequest({
@@ -66,7 +131,6 @@
 					}
 				})
 				console.log(res)
-				this.isloading = false
 				if (res) {
 					if (this.checkboxValue1.length) {
 						uni.setStorage({
@@ -91,14 +155,16 @@
 						key: 'session_key',
 						data: res.session_key,
 						success: () => {
-							uni.switchTab({
-								url: "../index/index"
-							})
+							this.getlistinfo()
 						}
 					})
 				}
+
 			},
 		},
+		onShow() {
+			this.isloading = false
+		},
 		onLoad() {
 			this.isloading = false
 			uni.getStorage({

MingGaoApp/pages/my/addcont.vue

@@ -17,6 +17,9 @@
 						<u-icon size="20" name="plus" color="#409eff"></u-icon>
 					</view>
 					<view class="imgitem" v-for="item,index in urllist" :key="index">
+						<view class="icon" @click="deleimg(index)">
+							<u-icon name="close" color="#fff"></u-icon>
+						</view>
 						<image :src="baseUrl+item" mode="" class="img"></image>
 					</view>
 				</view>
@@ -29,7 +32,7 @@
 					内容
 				</view>
 				<view class="textarea">
-					<u--textarea v-model="value1" placeholder="请输入内容" :autoHeight="true"></u--textarea>
+					<u--textarea v-model="value1" placeholder="请输入内容" count :maxlength="200" :autoHeight="true"></u--textarea>
 				</view>
 			</view>
 			<view class="imgbox_tishi" v-if="value1==''&&texttf">
@@ -53,9 +56,10 @@
 				rules: {
 					'temp': {
 						type: 'string',
+						max: 20,
 						required: true,
-						message: '请填写事项',
-						trigger: ['blur', 'change']
+						message: '请填写事项(字数最多20字)',
+						trigger: ['blur', 'change'],
 					},
 				},
 				urllist: [],
@@ -86,7 +90,7 @@
 				uni.chooseImage({
 					count: 1, //默认9
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册选择
+					sourceType: ['camera'], //从相册选择
 					success: (res) => {
 						console.log(res)
 						// this.urllist.push(res.tempFilePaths[0])
@@ -117,24 +121,31 @@
 					}else if(this.value1==''){
 						this.texttf = true
 					}else{
+						var objlist = this.$store.state.addobj
 						var obj = {
 							name:this.weatherdatas.temp,
 							imglist:this.urllist,
 							text:this.value1
 						}
-						uni.setStorage({
-							key:"addobj",
-							data:JSON.stringify(obj),
-							success(res) {
-								uni.navigateBack({
-									delta:1
-								})
-							}
-						})
+						// var arr = []
+						objlist.push(obj)
+						this.$store.state.addobj = objlist
+						// uni.setStorage({
+						// 	key:"addobj",
+						// 	data:JSON.stringify(obj),
+						// 	success(res) {
+						// 		uni.navigateBack({
+						// 			delta:1
+						// 		})
+						// 	}
+						// })
 					}
 				}).catch(errors => {
 					uni.$u.toast('校验失败')
 				})
+			},
+			deleimg(index){
+				this.urllist.splice(index,1)
 			}
 		},
 		onLoad(){
@@ -189,7 +200,19 @@
 					height: 140rpx;
 					margin-right: 30rpx;
 					margin-bottom: 30rpx;
-
+					position: relative;
+					.icon {
+						position: absolute;
+						top: -20rpx;
+						right: -20rpx;
+						z-index: 9;
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+						display: flex;
+						justify-content: space-around;
+						background-color: red;
+					}
 					.img {
 						width: 100%;
 						height: 100%;

MingGaoApp/pages/my/index.vue

@@ -1,8 +1,10 @@
 <template>
 	<view class="my_box">
 		<view class="my_info">
-			<view class="my_info_logo">
-				<image :src="userinfo.theme_info.logo_url.indexOf('http') == -1 ?(baseUrl+userinfo.theme_info.logo_url):userinfo.theme_info.logo_url" mode=""></image>
+			<view class="my_info_logo_wai">
+				<view class="my_info_logo">
+					{{userinfo.username.slice(0,1)}}
+				</view>
 			</view>
 			<view class="my_info_name">{{userinfo.username}}</view>
 		</view>
@@ -32,9 +34,10 @@
 				userinfo: {
 					theme_info: {
 						logo_url: ""
-					}
+					},
+					username:""
 				},
-				tablist: ["个人中心", "检测日志", "监督记录","版本信息"],
+				tablist: ["个人中心", "监测日志", "监督记录","版本信息"],
 				newversion:false
 			}
 		},
@@ -94,12 +97,12 @@
 </script>
 
 <style lang="less">
-	page{
-		background-color: #f7f7f7;
-	}
+	// page{
+	// 	background-color: #f7f7f7;
+	// }
 	.my_box {
 		width: 100%;
-		height: calc(100vh - 100rpx);
+		height: 100vh;
 		background-image: url(../../static/image/geren.jpg);
 		background-size: 100%;
 		background-repeat: no-repeat;
@@ -109,18 +112,32 @@
 			padding-top: 150rpx;
 			text-align: center;
 			margin: 0 auto;
-
-			.my_info_logo {
-				width: 200rpx;
-				height: 200rpx;
+			.my_info_logo_wai{
+				width: 232rpx;
+				height: 232rpx;
+				border-radius: 50%;
 				margin: 0 auto 30rpx;
-
-				image {
-					width: 100%;
-					height: 100%;
+				background-color: rgba(255,255,255,0.15);
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+				// box-shadow: 5px 10px 5px #888888;
+				.my_info_logo {
+					width: 200rpx;
+					height: 200rpx;
+					// margin: 0 auto 30rpx;
 					border-radius: 50%;
+					background-image: linear-gradient(#addbff, #5cacff);
+					// background-color: #409eff;
+					color: #fff;
+					line-height: 200rpx;
+					font-size: 80rpx;
+					.my_info_logo_bg{
+						
+					}
 				}
 			}
+			
 
 			.my_info_name {
 				color: #fff;

MingGaoApp/pages/my/monitorlog.vue

@@ -1,8 +1,8 @@
 <template>
 	<view style="background-color: #fff;">
-		<view class="screen" v-if="current==1" @click="opencale">
+		<!-- <view class="screen" v-if="current==1" @click="opencale">
 			<u-icon name="calendar" color="#2979ff" size="24"></u-icon>
-		</view>
+		</view> -->
 		<view class="subsection">
 			<u-subsection :list="list" :current="current" @change="sectionChange"></u-subsection>
 		</view>
@@ -54,7 +54,8 @@
 					</u-swipe-action-item>
 				</u-swipe-action>
 			</view>
-			<u-button type="primary" text="提交" @click="submit" style="margin-top: 30rpx;" :loading="passload" shape="circle"></u-button>
+			<u-button type="primary" text="提交" @click="submit" style="margin-top: 30rpx;" :loading="passload"
+				shape="circle"></u-button>
 		</view>
 		<view class="hisbox" v-else>
 			<view class="hisbox_hint" v-if="hislist.length==0">
@@ -124,12 +125,31 @@
 				},
 				kpsurlL: "",
 				tasklist: [],
-				hislist:[],
-				start_time:"",//开始时间
-				end_time:"",//结束时间
-				page:1,
-				passload:false,
-				loading:false,
+				hislist: [],
+				start_time: "", //开始时间
+				end_time: "", //结束时间
+				page: 1,
+				passload: false,
+				loading: false,
+			}
+		},
+		watch: {
+			current(news) {
+				if (news == 1) {
+					let pages = getCurrentPages();
+					var page = pages[pages.length - 1];
+					var currentWebview = page.$getAppWebview();
+					currentWebview.setTitleNViewButtonStyle(0, {
+						text: "搜索",
+					});
+				} else {
+					let pages = getCurrentPages();
+					var page = pages[pages.length - 1];
+					var currentWebview = page.$getAppWebview();
+					currentWebview.setTitleNViewButtonStyle(0, {
+						text: " ",
+					});
+				}
 			}
 		},
 		methods: {
@@ -186,7 +206,7 @@
 						address: this.weatherdatas.city, //              必填                    检测地点
 						record_list: JSON.stringify(list), //          必填 
 						monitor_time: this.weatherdatas
-						.date, //         必填                     监督日期   2021-01-03
+							.date, //         必填                     监督日期   2021-01-03
 					}
 				})
 				this.passload = false
@@ -217,12 +237,12 @@
 					url: '/api/api_gateway?method=control_center.task.monitor_log_list',
 					data: {
 						page: this.page,
-						start_time:this.start_time,
+						start_time: this.start_time,
 						end_time: this.end_time
 					}
 				})
 				console.log(res.page_list)
-				for(var i =0;i<res.page_list.length;i++){
+				for (var i = 0; i < res.page_list.length; i++) {
 					this.hislist.push(res.page_list[i])
 				}
 				this.loading = false
@@ -233,31 +253,39 @@
 			opencale() {
 				this.$refs.calendars.open();
 			},
-			confirms(e){
+			confirms(e) {
 				console.log(e.range)
 				this.start_time = e.range.before
 				this.end_time = e.range.after
 				this.hislist = []
 				this.gethis()
 			},
-			todata(id){
+			todata(id) {
 				uni.navigateTo({
-					url: './monitorlogdata?id='+id,
+					url: './monitorlogdata?id=' + id,
 				});
+			},
+			onPullDownRefresh() {
+				this.hislist = []
+				this.page = 1
+				this.gethis()
+				setTimeout(() => {
+					uni.stopPullDownRefresh()
+				}, 1000)
+			},
+		},
+		onNavigationBarButtonTap(e){
+			if(this.current==1){
+				this.opencale()
 			}
 		},
 		onLoad() {
-
+			// this.tasklist = []
+			// console.log(11)
 		},
 		onShow() {
 			var that = this
-			uni.getStorage({
-				key: "addobj",
-				success(res) {
-					console.log(that.tasklist)
-					that.tasklist.push(JSON.parse(res.data))
-				}
-			})
+			this.tasklist = this.$store.state.addobj
 		},
 		onHide() {
 			uni.removeStorage({
@@ -268,11 +296,11 @@
 			this.page++
 			this.gethis()
 		},
-		onPullDownRefresh(){
+		onPullDownRefresh() {
 			this.hislist = []
 			this.page = 1
-			this.start_time="",
-			this.end_time=""
+			this.start_time = "",
+				this.end_time = ""
 			this.gethis()
 			setTimeout(() => {
 				uni.stopPullDownRefresh()
@@ -282,24 +310,28 @@
 </script>
 
 <style lang="less" scoped>
-	page{
+	page {
 		background-color: #f7f7f7;
 	}
+
 	.screen {
 		position: fixed;
 		top: 20rpx;
 		right: 20rpx;
 		z-index: 9999;
 	}
-	.subsection{
+
+	.subsection {
 		width: 100%;
 		position: fixed;
-		top: 88rpx;
+		top: 0rpx;
 		height: 70rpx;
 		z-index: 9999;
 	}
+
 	/deep/.u-subsection {
 		background-color: #f7f7f7 !important;
+
 		// margin: 20rpx 0;
 		.u-subsection__bar {
 			background-color: #fff;
@@ -311,6 +343,7 @@
 		margin: 0 auto 0;
 		padding-top: 80rpx;
 		padding-bottom: 40rpx;
+
 		/deep/.u-form-item__body {
 			border-bottom: 1px solid #F6F6F6;
 			margin-bottom: 20rpx;
@@ -347,21 +380,24 @@
 					font-size: 24rpx;
 				}
 			}
-			.task_box_con{
+
+			.task_box_con {
 				text-overflow: -o-ellipsis-lastline;
-				 overflow: hidden;
-				 text-overflow: ellipsis;
-				 display: -webkit-box;
-				 -webkit-line-clamp: 2;
-				 line-clamp: 2;
-				 -webkit-box-orient: vertical;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				line-clamp: 2;
+				-webkit-box-orient: vertical;
 			}
 		}
 	}
-	.hisbox{
+
+	.hisbox {
 		width: 90%;
 		margin: 70rpx auto 0;
-		.hisbox_hint{
+
+		.hisbox_hint {
 			width: 100%;
 			text-align: center;
 			font-size: 28rpx;
@@ -369,20 +405,23 @@
 			line-height: 100rpx;
 			color: #999999;
 		}
-		.hisbox_item{
+
+		.hisbox_item {
 			box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
 			padding: 20rpx;
 			margin-bottom: 30rpx;
 			font-size: 28rpx;
-			.task_box_left{
+
+			.task_box_left {
 				display: flex;
 				margin-bottom: 20rpx;
 				justify-content: space-between;
 			}
-			.task_box_con{
+
+			.task_box_con {
 				color: #999999;
 			}
 		}
-		
+
 	}
 </style>

MingGaoApp/pages/my/myinfo.vue

@@ -93,16 +93,6 @@
 				})
 				console.log(res)
 				if(res){
-					// uni.removeStorage({
-					// 	key: 'username',
-					// })
-					// uni.removeStorage({
-					// 	key: 'password',
-					// })
-					// uni.setStorage({
-					// 	key: 'logincheckbox',
-					// 	data: 0,
-					// })
 					uni.removeStorage({
 						key: 'session_key',
 					})

MingGaoApp/pages/my/password.vue

@@ -79,9 +79,21 @@
 						confirm_password: this.setpass.newpasswordtwo,
 					}
 				})
-				this.passload = false
 				console.log(res)
-				this.userinfo = res
+				if(res){
+					uni.$u.toast('修改成功')
+					this.passload = false
+				}else{
+					this.passload = false
+				}
+				setTimeout(()=>{
+					uni.removeStorage({
+						key: 'session_key',
+					})
+					uni.reLaunch({
+						url: '../login/login',
+					});
+				},500)
 			},
 		}
 	}

MingGaoApp/pages/response/index.vue

@@ -302,12 +302,12 @@
 			// videClose() {
 			// 	console.log('close');
 			// },
-			
+
 			// 推流 - 展示视图
 			onPublish() {
 				// 设置视频配置
 				ZegoExpressEngine.instance().setVideoConfig(this.videoObj.room_id);
-				
+
 				if (this.isPublishingStream) {
 					this.engine.stopPreview();
 					this.engine.stopPublishingStream();
@@ -347,6 +347,9 @@
 		// 下拉刷新
 		onPullDownRefresh() {
 			console.log('刷新了')
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1000)
 		},
 		// 上拉加载
 		onReachBottom() {
@@ -462,17 +465,20 @@
 			right: 0;
 			top: 0;
 		}
-		
+
 		.video_btn {
 			// border: 1px solid;
 			position: absolute;
 			bottom: 0;
 			left: 0;
 			width: 100%;
+
 			.video_imgList {
 				display: flex;
 				justify-content: space-evenly;
+
 				.video_imgList1 {
+
 					// border: 1px solid;
 					// background: rgba(0, 0, 0, .5);
 					.video_view {
@@ -482,18 +488,22 @@
 						width: 50px;
 						height: 50px;
 						margin: 0 auto;
+
 						image {
 							width: 50rpx;
 							height: 50rpx;
 							margin: 24rpx 0 0 25rpx;
 						}
 					}
+
 					view {
 						color: #fff;
 						font-size: 20rpx;
 					}
 				}
+
 				.video_imgList2 {
+
 					// border: 1px solid;
 					// background: rgba(0, 0, 0, .5);
 					.video_view {
@@ -503,12 +513,14 @@
 						border-radius: 50px;
 						width: 50px;
 						height: 50px;
+
 						image {
 							width: 50rpx;
 							height: 50rpx;
 							margin: 24rpx 0 0 25rpx;
 						}
 					}
+
 					view {
 						color: #fff;
 						font-size: 20rpx;

MingGaoApp/pages/start/start.vue

@@ -12,7 +12,92 @@
 			}
 		},
 		methods: {
-			
+			async getlistinfo() {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=sysmenage.usermanager.user_info',
+				})
+				console.log(res)
+				this.app = res.children.filter((item) => {
+					return item.purview_name == "APP"
+				})
+				// console.log(this.app)
+				if (this.app.length == 0) {
+					uni.setTabBarItem({
+						index: 0,
+						visible: false
+					});
+					uni.setTabBarItem({
+						index: 1,
+						visible: false
+					});
+					uni.switchTab({
+						url: "../response/index"
+					})
+				} else {
+					var renwu = this.app[0].children.some((item) => {
+						// console.log(item)
+						return item.purview_name == "我的任务"
+					})
+					var jiandu = this.app[0].children.some((item) => {
+						// console.log(item)
+						return item.purview_name == "监督"
+					})
+					if (renwu) {
+						uni.setTabBarItem({
+							index: 0,
+							visible: true
+						});
+					} else {
+						uni.setTabBarItem({
+							index: 0,
+							visible: false
+						});
+					}
+					if (jiandu) {
+						uni.setTabBarItem({
+							index: 1,
+							visible: true
+						});
+					} else {
+						uni.setTabBarItem({
+							index: 1,
+							visible: false
+						});
+					}
+					if(renwu){
+						uni.switchTab({
+							url: "../index/index"
+						})
+					}else{
+						uni.switchTab({
+							url: "../supervise/index"
+						})
+					}
+				}
+				// console.log(this.app)
+			},
+		},
+		onLoad() {
+			uni.getStorage({
+				key: 'session_key',
+				success: (res) => {
+					console.log(res)
+					console.log(555555555)
+					if (res.data == "") {
+						uni.navigateTo({
+							url: "../login/login"
+						})
+					} else {
+						this.getlistinfo()
+					}
+				},
+				fail:()=> {
+					console.log(111999)
+					uni.navigateTo({
+						url: "../login/login",
+					})
+				}
+			})
 		}
 	}
 </script>

MingGaoApp/pages/supervise/index.vue

@@ -1,13 +1,13 @@
 <template>
 	<view>
 		<view class="division">
-			<u-search placeholder="请输入任务处理人名称" v-model="name" :showAction="false" @input="search"></u-search>
-		</view>
-		<view class="hisbox_hint" v-if="tasklist.length==0">
-			暂无数据
+			<u-search placeholder="请输入任务监督人" v-model="name" :showAction="false" @input="search"></u-search>
 		</view>
 		<u-loading-page loading-text="加载中..." :loading="loading" font-size="16"></u-loading-page>
 		<view class="taskbox">
+			<view class="hisbox_hint" v-if="tasklist.length==0">
+				暂无数据
+			</view>
 			<view class="taskbox_item" v-for="item,index in tasklist" :key="index" @click="totask(item.task_id)">
 				<view class="taskbox_item_t">
 					<view class="taskbox_item_t_l">
@@ -46,6 +46,11 @@
 			}
 		},
 		onLoad() {
+			
+		},
+		onShow(){
+			this.tasklist = []
+			this.page = 1
 			this.gettaskdata()
 		},
 		onReachBottom() {

MingGaoApp/pages/supervise/submitsupe.vue

@@ -16,7 +16,7 @@
 					<u--input v-model="supervise.supervisor_depa" border="none" placeholder="请输入监督部门"></u--input>
 				</u-form-item>
 				<u-form-item label="监督情况" prop="supervisor_msg" borderBottom ref="item1">
-					<u--textarea v-model="supervise.supervisor_msg" placeholder="请输入监督情况" count maxlength="100"
+					<u--textarea v-model="supervise.supervisor_msg" placeholder="请输入监督情况" count :maxlength="200"
 						:autoHeight="true" height="100"></u--textarea>
 				</u-form-item>
 			</u--form>
@@ -98,8 +98,8 @@
 				})
 				if(res){
 					uni.$u.toast('发布成功')
-					uni.navigateBack({
-						delta:1
+					uni.switchTab({
+						url:"./index"
 					})
 				}
 				this.loading = false

MingGaoApp/store/index.js

@@ -9,7 +9,9 @@ const store = new Vuex.Store({
 		video: null ,// 视频通话数据
 		wornlist:{
 			
-		}
+		},
+		addobj:[],
+		kpsurlL:0
 	},
 	mutations: {},
 	actions: {}

MingGaoApp/unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/39557780-9adb-11ec-a8a2-4923bd78b3ae
+https://ide.dcloud.net.cn/build/download/db819da0-9ec9-11ec-b633-f97232d80d9d

MingGaoApp/unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=C:/Users/FC/Desktop/智网/zhiwang.keystore
+andrCertfile=C:/Users/FC/Desktop/图片/智网/zhiwang.keystore
 andrCertAlias=zhiwang
 andrCertPass=URGvFntdIuDRhikTw3n2rw==

MingGaoApp/util/api.js

@@ -21,6 +21,9 @@ export const myRequest=(options)=>{
 			data:data,
 			success:(res)=>{
 				if(res.data.message!=""){
+					// uni.navigateTo({
+					// 	url:"/pages/login/login.vue"
+					// })
 					return	uni.showToast({
 						title:res.data.message || '请求接口失败',
 						icon:"none"

MingGaoApp/util/url.js

@@ -1,4 +1,5 @@
 export default{
- baseUrl:"http://114.115.147.140:12345"
- // baseUrl:"http://192.168.1.17:12345"
-}
+	baseUrl:"http://114.115.147.140:12345"
+	// baseUrl:"http://192.168.1.17:12345"
+	// baseUrl:"http://192.168.1.77:12345"
+}