zhangyun 3 lat temu
rodzic
commit
1d3defe6be

+ 9 - 9
MingGaoApp/App.vue

@@ -64,7 +64,7 @@
 				that.globalData.socketTask = uni.connectSocket({
 					url: this.globalData.urlData + "&token=" + that.globalData.token,
 					success(data) {
-						console.log("websocket连接中");
+						// console.log("websocket连接中");
 					}
 				});
 
@@ -126,13 +126,13 @@
 					
 					
 					this.reset();
-					console.log('消息可正常接收');
+					// console.log('消息可正常接收');
 				});
 				
 				// 连接断开
 				// 如果希望websocket连接一直保持,在close或者error上绑定重新连接方法。
 				this.globalData.socketTask.onClose((res) => {
-					console.log(res, '连接关闭');
+					// console.log(res, '连接关闭');
 					clearInterval(this.globalData.timeoutObj);
 					setTimeout(() => {
 						that.reconnect();
@@ -141,7 +141,7 @@
 				
 				// 连接失败
 				that.globalData.socketTask.onError((res) => {
-					console.log(res, '连接错误');
+					// console.log(res, '连接错误');
 					clearInterval(this.globalData.timeoutObj);
 					setTimeout(() => {
 						that.reconnect();
@@ -164,10 +164,10 @@
 						data: JSON.stringify(obj),
 						async success(res) {
 							that.globalData.is_open_socket = true
-							console.log('消息发送成功1111')
+							// console.log('消息发送成功1111')
 						}
 					});
-					console.log('进入心跳机制了', this.globalData.timeout)
+					// console.log('进入心跳机制了', this.globalData.timeout)
 				}, this.globalData.timeout)
 			},
 			// 清除心跳机制
@@ -186,13 +186,13 @@
 				};
 				this.lockReconnect = true;
 
-				console.log('准备重连');
+				// console.log('准备重连');
 
 				//没连接上会一直重连,设置延迟避免请求过多
 				this.globalData.reconnectTimeOutObj = setInterval(() => {
 					// 重新连接
 					this.msgInit()
-					console.log('正在重新连接')
+					// console.log('正在重新连接')
 					this.lockReconnect = false;
 				}, 4000);
 			},
@@ -205,7 +205,7 @@
 			// 手动关闭
 			close() {
 				var that = this
-				console.log('已经手动关闭了')
+				// console.log('已经手动关闭了')
 				that.globalData.socketTask.close()
 				clearInterval(that.globalData.timeoutObj);
 				clearInterval(that.globalData.reconnectTimeOutObj);

+ 7 - 16
MingGaoApp/components/task-details.vue

@@ -2,15 +2,6 @@
 <!-- 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">
-				提交
-			</view>
-			<view class="taskbtn_item" v-if="istask==2" @click="skip">
-				监督
-			</view>
-		</view> -->
 		<view class="taskbox">
 			<view class="taskbox_item">
 				<view class="taskbox_item_l">
@@ -168,7 +159,7 @@
 				</view>
 			</view>
 		</view>
-		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="kpsurlL" :fixed="true" :blob="false" :maxWidth="500"
+		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="kpsurlL" :fixed="false" :blob="false" :maxWidth="500"
 			:maxHeight="500"></kps-image-cutter>
 		<u-loading-page loading-text="加载中..." :loading="loading" font-size="16"></u-loading-page>
 
@@ -315,6 +306,7 @@
 				uni.setNavigationBarTitle({
 					title: this.taskinfo.task_type //这是修改后的导航栏文字
 				})
+				this.$store.state.worndatabase = JSON.parse(JSON.stringify(this.taskinfo.trap_record_list))
 				this.loading = false
 				console.log(res)
 			},
@@ -358,8 +350,7 @@
 			async taskfillingdraft() { //任务填报接口
 				// this.gettaskinfo()
 				
-				var arr = JSON.parse(JSON.stringify(this.taskinfo.trap_record_list))
-				// this.draft = this.draft.concat(this.taskinfo.trap_record_list)
+				var arr = JSON.parse(JSON.stringify(this.$store.state.worndatabase))
 				console.log(this.draft)
 				console.log(arr)
 				for (var i = 0; i < arr.length; i++) {
@@ -378,14 +369,14 @@
 					}
 				}
 				this.draft = this.draft.concat(arr) 
+				this.$store.state.worndatabase = JSON.parse(JSON.stringify(this.draft))
 				// console.log(arr)
-				
 				for(var i = 0; i < this.draft.length; i++){
 					if(this.draft[i].id){
 						this.draft[i]["record_id"] = this.draft[i].id
 					}
 				}
-				console.log(this.draft)
+				console.log(this.draft,"0000")
 				var data = {}
 				if (this.task_type) {
 					data = {
@@ -403,12 +394,12 @@
 					}
 					console.log("无数据",data)
 				}
-				console.log(data)
+				console.log(data,555)
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=app.task.task_filling_draft',
 					data: data,
 				})
-				console.log(res)
+				// console.log(res)
 			},
 			skip() { //跳转
 				this.$emit('tosubm')

+ 46 - 33
MingGaoApp/pages/my/addcont.vue

@@ -32,7 +32,8 @@
 					内容
 				</view>
 				<view class="textarea">
-					<u--textarea v-model="value1" placeholder="请输入内容" count :maxlength="200" :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">
@@ -40,8 +41,8 @@
 			</view>
 			<u-button type="primary" text="提交" @click="submit" style="margin-top: 30rpx;"></u-button>
 		</view>
-	<kps-image-cutter @ok="onok" @cancel="oncancle" :url="kpsurlL" :fixed="false" :blob="false" :maxWidth="500"
-		:maxHeight="500"></kps-image-cutter>
+		<kps-image-cutter @ok="onok" @cancel="oncancle" :url="kpsurlL" :fixed="false" :blob="false" :maxWidth="500"
+			:maxHeight="500"></kps-image-cutter>
 	</view>
 </template>
 
@@ -64,23 +65,23 @@
 				},
 				urllist: [],
 				value1: "",
-				kpsurlL:"",
-				imgtf:false,
-				texttf:false
+				kpsurlL: "",
+				imgtf: false,
+				texttf: false
 			}
 		},
-		components:{
+		components: {
 			kpsImageCutter
 		},
 		watch: {
-		    urllist(newName, oldName) {
-		        console.log(this.urllist)
-				if(this.urllist!=0){
+		 urllist(newName, oldName) {
+				console.log(this.urllist)
+				if (this.urllist != 0) {
 					this.imgtf = false
 				}
-		    },
-			value1(){
-				if(this.value1!=''){
+			},
+			value1() {
+				if (this.value1 != '') {
 					this.texttf = false
 				}
 			},
@@ -113,38 +114,43 @@
 					}
 				});
 			},
-			oncancle(){
+			oncancle() {
 				this.kpsurlL = ""
 			},
-			onok(ev){
+			onok(ev) {
 				uni.uploadFile({
-				    url: this.baseUrl+'/api/api_gateway?method=monitor_manage.cbd_manage.add_img', //仅为示例,非真实的接口地址
+					url: this.baseUrl +
+					'/api/api_gateway?method=monitor_manage.cbd_manage.add_img', //仅为示例,非真实的接口地址
 					filePath: ev.path,
-				    name: 'img_file',
-				    success: (uploadFileRes) => {
+					name: 'img_file',
+					success: (uploadFileRes) => {
 						console.log(JSON.parse(uploadFileRes.data).data.src)
 						this.urllist.push(JSON.parse(uploadFileRes.data).data.src)
 						this.kpsurlL = ""
-				    }
+					}
 				});
 			},
-			submit(){
+			submit() {
 				this.$refs.form1.validate().then(res => {
 					// this.alterpass()
-					if(this.urllist.length==0){
+					if (this.urllist.length == 0) {
 						this.imgtf = true
-					}else if(this.value1==''){
+					} else if (this.value1 == '') {
 						this.texttf = true
-					}else{
-						var objlist = this.$store.state.addobj
+					} else {
+						var objlist = JSON.parse(JSON.stringify(this.$store.state.addobj))
 						var obj = {
-							name:this.weatherdatas.temp,
-							imglist:this.urllist,
-							text:this.value1
+							name: this.weatherdatas.temp,
+							imglist: this.urllist,
+							text: this.value1
 						}
 						// var arr = []
+						console.log(objlist)
 						objlist.push(obj)
 						this.$store.state.addobj = objlist
+						uni.navigateBack({
+							delta: 1
+						})
 						// uni.setStorage({
 						// 	key:"addobj",
 						// 	data:JSON.stringify(obj),
@@ -159,25 +165,27 @@
 					uni.$u.toast('校验失败')
 				})
 			},
-			deleimg(index){
-				this.urllist.splice(index,1)
+			deleimg(index) {
+				this.urllist.splice(index, 1)
 			}
 		},
-		onLoad(){
+		onLoad() {
 			console.log(this.baseUrl)
 		}
-		
+
 	}
 </script>
 
 <style lang="less" scoped>
-	page{
+	page {
 		background-color: #f7f7f7;
 	}
+
 	.context_box {
 		width: 90%;
 		margin: 0 auto;
 		padding-bottom: 40rpx;
+
 		/deep/.u-form-item__body {
 			border-bottom: 1px solid #F6F6F6;
 			margin-bottom: 20rpx;
@@ -216,6 +224,7 @@
 					margin-right: 30rpx;
 					margin-bottom: 30rpx;
 					position: relative;
+
 					.icon {
 						position: absolute;
 						top: -20rpx;
@@ -228,6 +237,7 @@
 						justify-content: space-around;
 						background-color: red;
 					}
+
 					.img {
 						width: 100%;
 						height: 100%;
@@ -235,16 +245,19 @@
 				}
 			}
 		}
-		.imgbox_tishi{
+
+		.imgbox_tishi {
 			padding-left: 160rpx;
 			font-size: 24rpx;
 			color: red;
 		}
+
 		.describe_box {
 			width: 100%;
 			display: flex;
 			margin-top: 30rpx;
 			margin-bottom: 30rpx;
+
 			.title {
 				font-size: 30rpx;
 				width: 160rpx;

+ 7 - 2
MingGaoApp/pages/my/monitorlog.vue

@@ -83,6 +83,9 @@
 </template>
 
 <script>
+	import {
+		Debounce
+	} from "../../util/anitthro.js"
 	export default {
 		data() {
 			return {
@@ -191,7 +194,9 @@
 					if (this.tasklist.length == 0) {
 						uni.$u.toast('请添加监测内容!')
 					} else {
-						this.setcont()
+						Debounce(() => {
+							this.setcont()
+						}, 1000)()
 					}
 				}).catch(errors => {
 					uni.$u.toast('请将信息填写完整!')
@@ -228,7 +233,7 @@
 				if (res) {
 					uni.$u.toast('提交成功!')
 					for (var key in this.weatherdatas) {
-						this.weatherdatas[key] = []
+						this.weatherdatas[key] = ""
 						this.tasklist = []
 						uni.removeStorage({
 							key: "addobj",

+ 2 - 1
MingGaoApp/store/index.js

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

Plik diff jest za duży
+ 0 - 4
MingGaoApp/unpackage/dist/build/app-plus/app-config-service.js


Plik diff jest za duży
+ 3 - 15
MingGaoApp/unpackage/dist/build/app-plus/app-service.js


Plik diff jest za duży
+ 1 - 5
MingGaoApp/unpackage/dist/build/app-plus/app-view.js


Plik diff jest za duży
+ 1 - 5
MingGaoApp/unpackage/dist/build/app-plus/manifest.json


Plik diff jest za duży
+ 1 - 5
MingGaoApp/unpackage/dist/build/app-plus/pages/response/video.js


Plik diff jest za duży
+ 1 - 9
MingGaoApp/unpackage/dist/build/app-plus/view.umd.min.js


Plik diff jest za duży
+ 607 - 609
MingGaoApp/unpackage/dist/dev/app-plus/app-service.js


Plik diff jest za duży
+ 1 - 9
MingGaoApp/unpackage/dist/dev/app-plus/view.umd.min.js