xielei
/
xytSk-App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'qzc-dev'

master
秦子超 2024-06-13 17:17:21 +08:00
parent a16f01b987 71f656c7c9
commit 25c2616e7e
4 changed files with 85 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
pages/gqzq/gqxx/qk.vue
View File

@ -57,8 +57,11 @@
<u-checkbox name="1" label="水库" class="checkItem"></u-checkbox> <u-checkbox name="1" label="水库" class="checkItem"></u-checkbox>
<u-checkbox name="2" label="水电站" class="checkItem"></u-checkbox> <u-checkbox name="2" label="水电站" class="checkItem"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<div :style="{display:'flex',alignItems:'center'}">
<text class="title">按上报时间</text> <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 <view
class="tmPicker" class="tmPicker"
@click="showStmPicker = true" @click="showStmPicker = true"
@ -68,7 +71,7 @@
</view> </view>
<text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text> <text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text>
</div> </div>
<div :style="{display:'flex',marginTop:'10px'}"> <div :style="{display:'flex',marginTop:'10px'}" v-if="isTime">
<view <view
class="tmPicker" class="tmPicker"
@click="showEtmPicker = true" @click="showEtmPicker = true"
@ -129,6 +132,7 @@ import moment from 'moment'
searchVal:'', searchVal:'',
stm:Number(moment(new Date()).add(-7,'days')), stm:Number(moment(new Date()).add(-7,'days')),
etm:Number(new Date()), etm:Number(new Date()),
isTime:false,
check1:['1','2'], check1:['1','2'],
list:[] list:[]
} }
@ -156,6 +160,7 @@ import moment from 'moment'
this.show = false this.show = false
}, },
reSet() { reSet() {
this.isTime = false
this.stm = Number(moment(new Date()).add(-7,'days')) this.stm = Number(moment(new Date()).add(-7,'days'))
this.etm = Number(new Date()) this.etm = Number(new Date())
this.check1 = ['1','2'] this.check1 = ['1','2']
@ -171,69 +176,18 @@ import moment from 'moment'
} }
try{ try{
const params = { const params = {
timeSo:{ projectTypes:this.check1,
}
if(this.isTime){
params.timeSo = {
start:moment(this.stm).format('YYYY-MM-DD HH:mm:ss'), start:moment(this.stm).format('YYYY-MM-DD HH:mm:ss'),
end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'), end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'),
}, }
projectTypes:this.check1,
} }
console.log('params',params) console.log('params',params)
const res = await uni.$http.post('/gunshiApp/xfflood/xfProjectRun/list',params) const res = await uni.$http.post('/gunshiApp/xfflood/xfProjectRun/list',params)
console.log('res',res) console.log('res',res)
this.list = [...res.data.data this.list = res.data.data
// ,
// {
// id:'1',
// projectName:'工程名称',
// projectType:'1',//工程类型(1水库 2水电站)
// reportType:'上报类型',
// isPowerGeneration:'1',//是否发电（0 否 1 是）
// isFloodRelease:'0',//是否泄洪（0 否 1 是）
// waterLevel:'10',//上报水位(m)
// inflowVolume:'21',//上报入库流量(m³/s)
// outflowVolume:'11',//上报出库流量(m³/s)
// reporter:'上报人',
// reportTime:'2011-12-12 11:11:22',//上报时间
// reportUnit:'上报单位',
// moditime:'时间戳',
// remark:'情况说明',
// isRead:0,//（0 否 1 是）
// },
// {
// id:'2',
// projectName:'工程3名称3',
// projectType:'2',//工程类型(1水库 2水电站)
// reportType:'上报类型',
// isPowerGeneration:'0',//是否发电（0 否 1 是）
// isFloodRelease:'0',//是否泄洪（0 否 1 是）
// waterLevel:'3',//上报水位(m)
// inflowVolume:'1',//上报入库流量(m³/s)
// outflowVolume:'6',//上报出库流量(m³/s)
// reporter:'上报人2',
// reportTime:'2011-12-12 11:11:22',//上报时间
// reportUnit:'上报单位2',
// moditime:'时间戳',
// remark:'情况说明2',
// isRead:0,//（0 否 1 是）
// },
// {
// id:'3',
// projectName:'工程3名称',
// projectType:'2',//工程类型(1水库 2水电站)
// reportType:'上报类型',
// isPowerGeneration:'0',//是否发电（0 否 1 是）
// isFloodRelease:'0',//是否泄洪（0 否 1 是）
// waterLevel:'3',//上报水位(m)
// inflowVolume:'1',//上报入库流量(m³/s)
// outflowVolume:'6',//上报出库流量(m³/s)
// reporter:'上报人2',
// reportTime:'2011-12-12 11:11:22',//上报时间
// reportUnit:'上报单位2',
// moditime:'时间戳',
// remark:'情况说明2',
// isRead:0,//（0 否 1 是）
// },
]
this.close() this.close()
}catch(e){ }catch(e){
//TODO handle the exception //TODO handle the exception

41
pages/gqzq/gqxx/xq.vue
View File

@ -68,8 +68,11 @@
<u-checkbox name="1" label="水库" class="checkItem"></u-checkbox> <u-checkbox name="1" label="水库" class="checkItem"></u-checkbox>
<u-checkbox name="2" label="水电站" class="checkItem"></u-checkbox> <u-checkbox name="2" label="水电站" class="checkItem"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<div :style="{display:'flex',alignItems:'center'}">
<text class="title">按上报时间</text> <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 <view
class="tmPicker" class="tmPicker"
@click="showStmPicker = true" @click="showStmPicker = true"
@ -79,7 +82,7 @@
</view> </view>
<text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text> <text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text>
</div> </div>
<div :style="{display:'flex',marginTop:'10px'}"> <div :style="{display:'flex',marginTop:'10px'}" v-if="isTime">
<view <view
class="tmPicker" class="tmPicker"
@click="showEtmPicker = true" @click="showEtmPicker = true"
@ -140,6 +143,7 @@ import moment from 'moment'
searchVal:'', searchVal:'',
stm:Number(moment(new Date()).add(-7,'days')), stm:Number(moment(new Date()).add(-7,'days')),
etm:Number(new Date()), etm:Number(new Date()),
isTime:false,
check1:['1','2','3','4'], check1:['1','2','3','4'],
check2:['1','2'], check2:['1','2'],
list:[] list:[]
@ -168,6 +172,7 @@ import moment from 'moment'
this.show = false this.show = false
}, },
reSet() { reSet() {
this.isTime = false
this.stm = Number(moment(new Date()).add(-7,'days')) this.stm = Number(moment(new Date()).add(-7,'days'))
this.etm = Number(new Date()) this.etm = Number(new Date())
this.check1 = ['1','2','3','4'] this.check1 = ['1','2','3','4']
@ -184,36 +189,20 @@ import moment from 'moment'
} }
try{ try{
const params = { const params = {
timeSo:{
start:moment(this.stm).format('YYYY-MM-DD HH:mm:ss'),
end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'),
},
severitys:this.check1, severitys:this.check1,
projectTypes:this.check2, projectTypes:this.check2,
} }
if(this.isTime){
params.timeSo = {
start:moment(this.stm).format('YYYY-MM-DD HH:mm:ss'),
end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'),
}
}
console.log('params',params) console.log('params',params)
const res = await uni.$http.post('/gunshiApp/xfflood/xfProjectIncident/list',params) const res = await uni.$http.post('/gunshiApp/xfflood/xfProjectIncident/list',params)
console.log('res',res) console.log('res',res)
this.list = [ this.list = res.data.data
...res.data.data
// ,
// {
// id:'1',
// projectName:'工程名称',
// projectType:'1',//工程类型(1水库 2水电站)
// severity:'1',//严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情）
// incidentDescription:'险情描述',
// isControlled:'1',//是否已管控（0 否 1 是）
// controlResponsiblePerson:'管控责任人',
// responsiblePersonPhone:'12328281728',//责任人电话
// reporter:'张三',//上报人
// reportTime:'2022-11-21 10:21:11',//上报时间
// reportUnit:'上报单位',
// moditime:'时间戳',
// remark:'情况说明',
// isRead:0,//是否已读（0 否 1 是）
// },
]
this.close() this.close()
}catch(e){ }catch(e){
//TODO handle the exception //TODO handle the exception

43
pages/gqzq/index.vue
View File

@ -16,11 +16,17 @@
<view class="info"> <view class="info">
<div class="ul_list" @click="todetail(1)"> <div class="ul_list" @click="todetail(1)">
<div class="left">工情信息</div> <div class="left">工情信息</div>
<div class="left">></div> <div class="left" :style="{display:'flex',alignItems:'center'}">
<div class="redDot" v-show="gq"></div>
<text>></text>
</div>
</div> </div>
<div class="ul_list" @click="todetail(2)"> <div class="ul_list" @click="todetail(2)">
<div class="left">灾情信息</div> <div class="left">灾情信息</div>
<div class="left">></div> <div class="left" :style="{display:'flex',alignItems:'center'}">
<div class="redDot" v-show="zq"></div>
<text>></text>
</div>
</div> </div>
</view> </view>
</view> </view>
@ -28,7 +34,13 @@
<script> <script>
export default { export default {
data () { data () {
return {} return {
gq:false,
zq:false
}
},
onShow() {
this.getData()
}, },
methods: { methods: {
todetail (val) { todetail (val) {
@ -43,6 +55,24 @@ export default {
url: '/pages/gqzq/zqxx/zqxx' url: '/pages/gqzq/zqxx/zqxx'
}) })
} }
},
async getData() {
try{
const res = await uni.$http.get("/gunshiApp/xfflood/xfProjectRun/has/read")
const data = res.data.data
if(data){
console.log(data['1'],data['2'],data['3'])
this.gq = (data['1']||data['2'])?true:false
this.zq = data['3']?true:false
}
console.log('res',res)
}catch(e){
this.$refs.uToast.show({
type: 'error',
title: '失败主题',
message: "请求失败",
})
}
} }
} }
} }
@ -82,4 +112,11 @@ export default {
height: 48px; height: 48px;
border-bottom: 1px solid #dfdfdf; border-bottom: 1px solid #dfdfdf;
} }
.redDot{
margin-right: 10px;
width: 8px;
height: 8px;
border-radius: 4px;
background-color: red;
}
</style> </style>

71
pages/gqzq/zqxx/table.vue
View File

@ -59,8 +59,11 @@
<u-checkbox name="3" label="重大险情" class="checkItem"></u-checkbox> <u-checkbox name="3" label="重大险情" class="checkItem"></u-checkbox>
<u-checkbox name="4" label="特别重大险情" class="checkItem"></u-checkbox> <u-checkbox name="4" label="特别重大险情" class="checkItem"></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<div :style="{display:'flex',alignItems:'center'}">
<text class="title">按上报时间</text> <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 <view
class="tmPicker" class="tmPicker"
@click="showStmPicker = true" @click="showStmPicker = true"
@ -70,7 +73,7 @@
</view> </view>
<text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text> <text :style="{width:'20%',lineHeight:'32px',textAlign:'center'}">至</text>
</div> </div>
<div :style="{display:'flex',marginTop:'10px'}"> <div :style="{display:'flex',marginTop:'10px'}" v-if="isTime">
<view <view
class="tmPicker" class="tmPicker"
@click="showEtmPicker = true" @click="showEtmPicker = true"
@ -131,6 +134,7 @@ import moment from 'moment'
searchVal:'', searchVal:'',
stm:Number(moment(new Date()).add(-7,'days')), stm:Number(moment(new Date()).add(-7,'days')),
etm:Number(new Date()), etm:Number(new Date()),
isTime:false,
check1:['1','2','3','4'], check1:['1','2','3','4'],
list:[] list:[]
} }
@ -158,6 +162,7 @@ import moment from 'moment'
this.show = false this.show = false
}, },
reSet() { reSet() {
this.isTime = false
this.stm = Number(moment(new Date()).add(-7,'days')) this.stm = Number(moment(new Date()).add(-7,'days'))
this.etm = Number(new Date()) this.etm = Number(new Date())
this.check1 = ['1','2','3','4'] this.check1 = ['1','2','3','4']
@ -173,68 +178,18 @@ import moment from 'moment'
} }
try{ try{
const params = { const params = {
timeSo:{ severitys:this.check1,
}
if(this.isTime){
params.timeSo = {
start:moment(this.stm).format('YYYY-MM-DD HH:mm:ss'), start:moment(this.stm).format('YYYY-MM-DD HH:mm:ss'),
end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'), end:moment(this.etm).format('YYYY-MM-DD HH:mm:ss'),
}, }
severitys:this.check1,
} }
console.log('params',params) console.log('params',params)
const res = await uni.$http.post('/gunshiApp/xfflood/iaCHsfwater/queryList',params) const res = await uni.$http.post('/gunshiApp/xfflood/iaCHsfwater/queryList',params)
console.log('res',res) console.log('res',res)
this.list = [ this.list = res.data.data
...res.data.data
// ,{
// // id:'1',
// mtcd:'12121',//山洪灾害编码
// wscd:'22222',//小流域代码
// otime:'2022-12-12 10:22:22',//灾害发生时间
// severity:'22222',//小流域代码
// wscd:'3',//严重程度（1一般灾情 2较大灾情 3重大灾情 4特别重大灾情）
// address:'灾害发生地点',//灾害发生地点
// lgtd:'111.21',//经度
// lttd:'32.12',//纬度
// ddscrib:'灾害描述',//灾害描述
// dpcount:'2',//死亡人数（人）
// mpcount:'12',//失踪人数（人）
// spcount:'2211',//转移人数（人）
// chcount:'41',//损毁房屋（人）
// elose:'6623',//直接经济损失（万元）
// pfrain:'41',//过程降雨量（mm）
// reporter:'张三',//上报人
// reportTime:'2022-11-21 10:21:11',//上报时间
// reportUnit:'上报单位',
// moditime:'时间戳',
// remark:'情况说明',
// isRead:0,//是否已读（0 否 1 是）
// severity:'1',//严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情）
// },
// {
// // id:'1',
// mtcd:'12121',//山洪灾害编码
// wscd:'22222',//小流域代码
// otime:'2022-12-12 10:22:22',//灾害发生时间
// severity:'22222',//小流域代码
// wscd:'3',//严重程度（1一般灾情 2较大灾情 3重大灾情 4特别重大灾情）
// address:'灾害发生地点2',//灾害发生地点
// lgtd:'111.21',//经度
// lttd:'32.12',//纬度
// ddscrib:'灾害描述',//灾害描述
// dpcount:'2',//死亡人数（人）
// mpcount:'12',//失踪人数（人）
// spcount:'2211',//转移人数（人）
// chcount:'41',//损毁房屋（人）
// elose:'6623',//直接经济损失（万元）
// pfrain:'41',//过程降雨量（mm）
// reporter:'张三',//上报人
// reportTime:'2022-11-21 10:21:11',//上报时间
// reportUnit:'上报单位',
// moditime:'时间戳',
// remark:'情况说明',
// isRead:1,//是否已读（0 否 1 是）
// severity:'1',//严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情）
// },
]
this.close() this.close()
}catch(e){ }catch(e){
//TODO handle the exception //TODO handle the exception