Merge branch 'qzc-dev'

pages/gqzq/gqxx/qk.vue

@@ -176,7 +176,7 @@ import moment from 'moment'
 				}
 				try{
 					const params = {
-						projectTypes:this.check1,
+						projectTypes:this.check1.length===0?['999']:this.check1,
 					}
 					if(this.isTime){
 						params.timeSo = {
@@ -184,7 +184,7 @@ import moment from 'moment'
 							end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'),
 						}
 					}
-					console.log('params',params)
+					console.log('params',this.check1==[])
 					const res = await uni.$http.post('/gunshiApp/xfflood/xfProjectRun/list',params)
 					console.log('res',res)
 					this.list = res.data.data

pages/gqzq/gqxx/xq.vue

@@ -189,8 +189,8 @@ import moment from 'moment'
 				}
 				try{
 					const params = {
-						severitys:this.check1,
+						severitys:this.check1.length===0?['999']:this.check1,
-						projectTypes:this.check2,
+						projectTypes:this.check2.length===0?['999']:this.check2,
 					}
 					if(this.isTime){
 						params.timeSo = {

pages/gqzq/zqxx/table.vue

@@ -148,7 +148,7 @@ import moment from 'moment'
 			},
 			getSearchVal() {
 				if(this.searchVal){
-					return this.list.filter(o => (o.projectName?.indexOf(this.searchVal)>-1 || o.address?.indexOf(this.searchVal)>-1))
+					return this.list.filter(o => (o.reporter?.indexOf(this.searchVal)>-1 || o.address?.indexOf(this.searchVal)>-1))
 				}else{
 					return this.list
 				}
@@ -178,7 +178,7 @@ import moment from 'moment'
 				}
 				try{
 					const params = {
-						severitys:this.check1,
+						severitys:this.check1.length===0?['999']:this.check1,
 					}
 					if(this.isTime){
 						params.timeSo = {

pages/orderFeedback/fk.vue

@@ -21,15 +21,42 @@
 				type="primary"
 				text="反馈"
 				customStyle="margin-top: 20px"
-				@click="submit1"
+				@click="show1 = true"
 			></u-button>
 			<u-button
 				type="primary"
 				text="反馈并结束"
 				customStyle="margin-top: 10px"
-				@click="submit2"
+				@click="show2 = true"
 			></u-button>
 		</div>
+		
+		<u-modal
+			width="250"
+			:show="show1"
+			showCancelButton
+			closeOnClickOverlay
+			@confirm="submit1"
+			@cancel="() => show1 = false"
+			@close="() => show1 = false"
+		>
+			<view class="slot-content">
+				<rich-text :nodes="'确认反馈?'" :style="{fontSize:'16px'}"></rich-text>
+			</view>
+		</u-modal>
+		<u-modal
+			width="250"
+			:show="show2"
+			showCancelButton
+			closeOnClickOverlay
+			@confirm="submit2"
+			@cancel="() => show2 = false"
+			@close="() => show2 = false"
+		>
+			<view class="slot-content">
+				<rich-text :nodes="'确认反馈并结束?'" :style="{fontSize:'16px'}"></rich-text>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -46,7 +73,9 @@
 		data() {
 			return {
 				value:'',
-				list:[]
+				list:[],
+				show1:false,
+				show2:false
 			};
 		},
 		created() {
@@ -65,6 +94,7 @@
 				}
 			},
 			async submit1() {
+				this.show1 = false
 				try{
 					if(!this.value){
 						this.$refs.uToast.show({
@@ -88,6 +118,7 @@
 				}
 			},
 			async submit2() {
+				this.show2 = false
 				try{
 					if(!this.value){
 						this.$refs.uToast.show({

pages/orderFeedback/orderFeedback.vue

@@ -66,8 +66,11 @@
 					<u-checkbox name="0" label="水库调洪" class="checkItem"></u-checkbox>
 					<u-checkbox name="1" label="人员转移" class="checkItem"></u-checkbox>
 				</u-checkbox-group>
+				<div :style="{display:'flex',alignItems:'center'}">
 					<text class="title">按时间</text>
-				<div :style="{display:'flex',marginTop:'10px'}">
+					<u-switch v-model="isTime" size="20" :style="{margin:'2px 0 0 10px'}"></u-switch>
+				</div>
+				<div :style="{display:'flex',marginTop:'10px'}" v-if="isTime">
 					<view 
 						class="tmPicker" 
 						@click="showStmPicker = true"
@@ -77,7 +80,7 @@
 					</view>
 					<text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text>
 				</div>
-				<div :style="{display:'flex',marginTop:'10px'}">
+				<div :style="{display:'flex',marginTop:'10px'}" v-if="isTime">
 					<view 
 						class="tmPicker" 
 						@click="showEtmPicker = true"
@@ -150,25 +153,8 @@
 				showEtmPicker:false,
 				stm:Number(moment(new Date()).add(-7,'days')),
 				etm:Number(new Date()),
+				isTime:false,
 				list:[],
-				// {
-				// 	serial:'10',//调度指令编号
-				// 	year:'2023',//调度令年度
-				// 	executeOrgCode:'执行单位编码',//执行单位编码
-				// 	executeOrgName:'执行单位名称',//执行单位名称
-				// 	dispatchType:'水库调洪',//调度类型
-				// 	forwardOrgName:'抄送单位',//抄送单位
-				// 	startTm:'计划执行时间',//计划执行时间
-				// 	endTm:'计划结束时间',//计划结束时间
-				// 	content:'指令内容',//指令内容
-				// 	createTm:'指令日期',//指令日期
-				// 	createUserId:'指令发起人id',//指令发起人id
-				// 	createUserName:'张三',//指令发起人
-				// 	status:'1',//调令状态，0=待下发，1=执行中，2=完成
-				// 	createTm:'2023-10-10 12:12:10',
-				// 	dispatchId: '14'
-					
-				// }
 			};
 		},
 		computed: {
@@ -191,6 +177,7 @@
 				this.show = false
 			},
 			reSet() {
+				this.isTime = false
 				this.stm = Number(moment(new Date()).add(-7,'days'))
 				this.etm = Number(new Date())
 				this.check = ['0','1']
@@ -200,7 +187,9 @@
 					const params = {
 						status:this.tabVal,
 						dispatchTypeList:this.check,
-						dateTimeRangeSo:{
+					}
+					if(this.isTime){
+						params.dateTimeRangeSo = {
 							start:moment(this.stm).format('YYYY-MM-DD HH:mm:sss'),
 							end:moment(this.etm).format('YYYY-MM-DD HH:mm:sss')
 						}