fix一些列问题

api/addressbook/index.js

@@ -16,4 +16,11 @@ export function getUserDetail(query){
 		method: 'get',
 		params:query
 	})
+}
+
+export function searchName(val){
+	return request({
+		url:'/addressBook/selectListCompanyDepartmentByUserName?username='+val,
+		method:'get'
+	})
 }

pages/index/index.vue

@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<uni-search-bar class="uni-mt-10" radius="100" placeholder="请输入姓名" cancelButton="auto" @confirm="search" />
-		<uni-mall-list :dataList="dataList" :defaultHeadList="defaultHeadList" @change="handleChange"></uni-mall-list>
+		<uni-mall-list ref='nameList' :dataList="dataList" :defaultHeadList="defaultHeadList" @change="handleChange"></uni-mall-list>
 	</view>
 </template>
 
 <script>
 	import uniMallList from '@/components/uni-mall-list/uni-mall-list.vue';
 	import {
-		getAddressBookData
+		getAddressBookData,searchName
 	} from '@/api/addressbook/index.js'
 	export default {
 		components: {
@@ -41,9 +41,17 @@
 			},
 
 			search(res) {
-				uni.showToast({
-					title: '搜索：' + res.value,
-					icon: 'none'
+				// uni.showToast({
+				// 	title: '搜索：' + res.value,
+				// 	icon: 'none'
+				// })
+				let this_ = this
+				this_.defaultHeadList ={}
+				searchName(res.value).then(res =>{
+					this.$nextTick(()=>{
+						this_.dataList = res.data
+						// this_.$refs.nameList.tabChange()
+					})
 				})
 			},
 			getAddressBookData() {

pages/work/index.vue

@@ -72,7 +72,7 @@
 							</template>
 						</common-title>
 						<view class="v-index-event">
-							<view v-for="(event,index) in sonEvent" class="v-event-item" @click="toSchedulingDetail(event)">
+							<view v-for="(event,index) in sonEvent" class="v-event-item" @click="toSchedulingDetail(index+1)">
 								<view class="v-event-box">
 									<span class="big-font g-blue">{{ event.value }}</span>
 									{{event.name}}
@@ -166,6 +166,7 @@
 					},
 					{
 						"value": "0",
+						"id":"1",
 						"name": "待接警"
 					},
 					{
@@ -654,7 +655,9 @@
 				this.current = e.detail.current;
 			},
 			toSchedulingDetail(val){
-				console.log(val)
+				uni.navigateTo({
+					url:'/subPackWork/commandDispatch/commandDispatch?id='+val
+				})
 			},
 			changeGrid(e) {
 				console.log(e)

subPackWork/classifiedManagement/classifiedManagementEdit.vue

@@ -136,9 +136,7 @@
 										title: '编辑成功'
 									});
 									setTimeout(() => {
-										uni.redirectTo({
-											url: 'classifiedManagement'
-										})
+										uni.navigateBack();
 									}, 500)
 								}
 							});
@@ -150,9 +148,7 @@
 										title: '新增成功'
 									});
 									setTimeout(() => {
-										uni.redirectTo({
-											url: 'classifiedManagement'
-										})
+										uni.navigateBack();
 									}, 500)
 								}
 							});

subPackWork/commandDispatch/commandDispatch.vue

@@ -106,6 +106,14 @@
 				status: '', // 处理状态
 			};
 		},
+		onLoad(option) {
+			console.log(option)
+			if(option&&option!={}){
+				this.getEventReportData(option.id);
+			}else{
+				this.getEventReportData();
+			}
+		},
 		mounted() {
 			// 警情分类
 			this.getWaringList();
@@ -114,7 +122,7 @@
 			// 处理状态
 			this.getReportType();
 			// 列表
-			this.getEventReportData();
+			// this.getEventReportData();
 		},
 		methods: {
 			//所选择的信息
@@ -163,25 +171,47 @@
 				});
 			},
 			// 获取集合
-			getEventReportData() {
-				let data = {
-					pageNum: this.pageNum,
-					pageSize: 10,
-					status: this.status,
-					orderType: this.orderType,
-					classificationDataCode: this.classificationDataCode,
-					classificationEventCode: this.classificationEventCode,
-				};
-				getEventReportData(data).then((res) => {
-					if (res.code === 200) {
-						res.rows.forEach((item) => {
-							this.list.push(item);
-						});
-						if (this.list.length == res.total) {
-							this.pageBottoms = true;
+			getEventReportData(val) {
+				if(val){
+					let data = {
+						pageNum: this.pageNum,
+						pageSize: 10,
+						status: val,
+						orderType: this.orderType,
+						classificationDataCode: this.classificationDataCode,
+						classificationEventCode: this.classificationEventCode,
+					};
+					getEventReportData(data).then((res) => {
+						if (res.code === 200) {
+							res.rows.forEach((item) => {
+								this.list.push(item);
+							});
+							if (this.list.length == res.total) {
+								this.pageBottoms = true;
+							}
 						}
-					}
-				});
+					});
+				}else{
+					let data = {
+						pageNum: this.pageNum,
+						pageSize: 10,
+						status: this.status,
+						orderType: this.orderType,
+						classificationDataCode: this.classificationDataCode,
+						classificationEventCode: this.classificationEventCode,
+					};
+					getEventReportData(data).then((res) => {
+						if (res.code === 200) {
+							res.rows.forEach((item) => {
+								this.list.push(item);
+							});
+							if (this.list.length == res.total) {
+								this.pageBottoms = true;
+							}
+						}
+					});
+				}
+				
 			},
 			// 警情分类
 			getWaringList() {

subPackWork/electronicPatrol/electronicPatrol.vue

@@ -2,7 +2,7 @@
 	<view class="detail-container">
 		<view class="g-body">
 			<view class="body-item">
-				<calendar :signeddates="signeddates" @on-click="showData" :open="false"></calendar>
+				<calendar :signeddates="signeddates" @on-click="showData" :open="true"></calendar>
 			</view>
 			<view class="body-item">
 				<view class="job-list" v-for="item in jobList">

subPackWork/electronicPatrol/taskDetails.vue

@@ -96,6 +96,7 @@ export default {
 		},
 		// 详情
 		getPatrollingTaskDetail(){
+			debugger
 			let data = {
 				"patrolDate": this.patrolDate,
 				"taskId": this.taskId
@@ -113,7 +114,7 @@ export default {
 			  if(val.startDate >timeStr){
 				  uni.showToast({
 				  	title:"尚未到打卡时间",
-				  	icon: null
+				  	icon: 'none'
 				  })
 		
 			  }else{
@@ -140,13 +141,12 @@ export default {
 				
 			} 
 			patrollingClock(data).then(res =>{
+				let _that = this
 				if(res.code == 200){
-					
 					uni.showToast({
-						title:"打卡成功",
-						icon: null
+						title:"打卡成功"
 					})
-					this.getPatrollingTaskDetail();
+					_that.getPatrollingTaskDetail();
 				}
 			})
 		

subPackWork/myReport/reportDetail.vue

@@ -26,7 +26,7 @@
 						<uni-list-item title="联系人手机" :rightText="datas.phone || '/'" />
 						<uni-list-item title="标题" :rightText="datas.title" />
 						<uni-list-item title="事件位置" :rightText="'经度：'+datas.longitude+',纬度：'+datas.latitude " />
-						<map class="map" :markers="covers" :longitude="datas.longitude" :latitude="datas.latitude" name="" :enable-zoom="false" :enable-scroll="false"></map>
+						<map class="map" :markers="covers" :longitude="datas.longitude" :latitude="datas.latitude" name="" ></map>
 						<uni-list-item title="描述" :rightText="datas.description" />
 						<uni-list-item>
 							<template v-slot:body>
@@ -34,8 +34,8 @@
 							</template>
 							<template v-slot:footer>
 								<view class="image-box" v-if="datas.pathList">
-									<image class="iamges-list" mode="widthFix"  v-for="(item, index) in datas.pathList.split(',')" :key="index" :src="item" @click="preview(item)"></image>
-									<q-previewImage ref="previewImage"  :urls=" datas.pathList.split(',')" @open="open" @close="close"></q-previewImage>
+									<image class="iamges-list" mode="widthFix"  v-for="(item, index) in datas.pathList" :key="index" :src="requestUrl+item" @click="preview(item)"></image>
+									<q-previewImage ref="previewImage"  :urls="datas.pathList" @open="open" @close="close"></q-previewImage>
 								</view>
 							</template>
 						</uni-list-item>
@@ -53,6 +53,8 @@ import EvanStep from '@/components/evan-steps/evan-step.vue';
 import UniIcons from '@/components/uni-icons/uni-icons.vue';
 import {getEventReportDetail} from '@/api/word/myReport.js'
 import {getDicts} from '@/api/system/dict/data.js'
+import config from '@/config.js';
+const baseUrl = config.baseUrl;
 export default {
 	components: {
 		EvanSteps,
@@ -78,6 +80,7 @@ export default {
 			id: 0,
 			covers: [],
 			videoShow: true, //video组件是否显示
+			requestUrl: baseUrl,
 			imgs: ['https://web-assets.dcloud.net.cn/unidoc/zh/multiport-20210812.png', 'https://web-assets.dcloud.net.cn/unidoc/zh/uni-function-diagram.png']
 		};
 	},

subPackWork/reportMatter/reportMatter.vue

@@ -195,15 +195,14 @@
 									title: '上报成功'
 								});
 								setTimeout(() => {
-								  uni.navigateTo({
-								    url: '/subPackWork/myReport/myReport'
-								  })
+								 uni.navigateBack();
 								}, 500)
 							}
 						})
 					} else {
 						uni.showToast({
-							title: '验证失败'
+							title: '请填写必填信息',
+							icon:'error'
 						});
 					}
 				});

subPackWork/scenicAreaManagement/scenicAreaManagementEdit.vue

@@ -371,9 +371,7 @@
 									title: '编辑成功'
 								});
 								setTimeout(() => {
-									uni.redirectTo({
-										url: 'scenicAreaManagement'
-									})
+									uni.navigateBack();
 								}, 500)
 							}
 						})

subPackWork/scenicSpot/attractionsEditor.vue

@@ -262,9 +262,7 @@ export default {
               });
             }
             setTimeout(() => {
-              uni.navigateTo({
-                url: '/subPackWork/scenicSpot/scenicSpot'
-              })
+             uni.navigateBack();
             }, 500)
           })
         }

uni_modules/q-previewImage/components/q-previewImage/q-previewImage.vue

@@ -8,7 +8,7 @@
 				<movable-area class="movable-area" scale-area>
 					<movable-view class="movable-view" direction="all" :inertia="true" damping="100" scale="true" scale-min="1" scale-max="4" :scale-value="scale">
 						<scroll-view scroll-y="true" class="uni-scroll-view">
-							<view class="scroll-view"><image :key="index" class="image" :src="item" mode="widthFix" @longpress="onLongpress(item)" /></view>
+							<view class="scroll-view"><image :key="index" class="image" :src="requestUrl+item" mode="widthFix" @longpress="onLongpress(item)" /></view>
 						</scroll-view>
 					</movable-view>
 				</movable-area>
@@ -18,6 +18,8 @@
 </template>
 
 <script>
+	import config from '@/config.js';
+	const baseUrl = config.baseUrl;
 export default {
 	props: {
 		urls: {
@@ -33,13 +35,15 @@ export default {
 			show: false,
 			current: 0, //当前页
 			scale: 1,
-			isZooming: false // 是否处于缩放状态
+			isZooming: false ,// 是否处于缩放状态
+			requestUrl: baseUrl,
 		};
 	},
 	methods: {
 		//打开
 		open(current) {
-			this.current = this.urls.findIndex(item => item === current);
+			console.log(current)
+			this.current =this.urls.findIndex(item => item === current);
 			this.show = true;
 			this.$emit('open');
 		},