mengff
/
jihe-hs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

交调增加周查询

develop
lau572 3 days ago
parent
777b53981b
commit
d76ea47344
4 changed files with 35 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/data.js
  2. 27
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/index.vue
  3. 6
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/data.js
  4. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/index.vue

4
ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/data.js
View File

@ -66,6 +66,10 @@ export const searchFormList = [
key: "3",
label: "年",
},
{
key: "5",
label: "周",
},
{
key: "4",
label: "日期范围",

27
ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/comprehensiveQuery/index.vue
View File

@ -55,6 +55,10 @@
<!-- <ElTableColumn prop="motorcycleTrafficVolume" align="center" label="摩托车" />-->
<!-- <ElTableColumn prop="tractorTrafficVolume" align="center" label="拖拉机" />-->
<ElTableColumn prop="trafficVolume" align="center" label="合计" />
<ElTableColumn align="center" label="周日均" prop="avgDailyTrafficVolume" v-if="queryForm.type == '5'"></ElTableColumn>
<ElTableColumn align="center" label="同比增长率" prop="yoyGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
<ElTableColumn align="center" label="环比增长率" prop="momGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
</Table>
<!--车流量 不分方向 大类-->
<Table v-if="queryForm.dataType == '1' && queryForm.direction == '2' && queryForm.carType == '2'" style="width:85vw" :data="tableData" :key="tableKey" height="50%" >
@ -64,6 +68,9 @@
<ElTableColumn prop="goodsCar" align="center" label="货车" />
<ElTableColumn prop="goodsCarRatio" align="center" label="占比" />
<ElTableColumn prop="trafficVolume" align="center" label="合计" />
<ElTableColumn align="center" label="周日均" prop="avgDailyTrafficVolume" v-if="queryForm.type == '5'"></ElTableColumn>
<ElTableColumn align="center" label="同比增长率" prop="yoyGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
<ElTableColumn align="center" label="环比增长率" prop="momGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
</Table>
<!--车流量 分方向 小类-->
@ -124,6 +131,9 @@
<ElTableColumn prop="trafficVolumeRatioJN" align="center" label="占比" ></ElTableColumn>
</ElTableColumn>
<ElTableColumn align="center" label="总计车流量" prop="allTrafficVolume" ></ElTableColumn>
<ElTableColumn align="center" label="周日均" prop="avgDailyTrafficVolume" v-if="queryForm.type == '5'"></ElTableColumn>
<ElTableColumn align="center" label="同比增长率" prop="yoyGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
<ElTableColumn align="center" label="环比增长率" prop="momGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
</Table>
<!--车流量 分方向 大类-->
<Table v-if="queryForm.dataType == '1' && queryForm.direction == '1' && queryForm.carType == '2'" style="width:85vw" :data="tableData" :key="tableKey" height="50%" >
@ -147,6 +157,9 @@
<ElTableColumn prop="trafficVolumeRatioJN" align="center" label="占比" ></ElTableColumn>
</ElTableColumn>
<ElTableColumn align="center" label="总计车流量" prop="allTrafficVolume" ></ElTableColumn>
<ElTableColumn align="center" label="周日均" prop="avgDailyTrafficVolume" v-if="queryForm.type == '5'"></ElTableColumn>
<ElTableColumn align="center" label="同比增长率" prop="yoyGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
<ElTableColumn align="center" label="环比增长率" prop="momGrowthRate" v-if="queryForm.type == '5'" ></ElTableColumn>
</Table>
<!--车速 不分方向 小类-->
@ -415,7 +428,12 @@
if (this.queryForm.dataType == '1'){
tableChartsOptions.yAxis[0].name = '流量'
dataList = this.tableData.slice(0,this.tableData.length - 4);
tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
if (this.queryForm.type == '5'){
tableChartsOptions.xAxis.data = dataList.map(item => item.time)
} else {
tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
}
if (this.queryForm.direction == '1'){
tableChartsOptions.series = [
{
@ -462,8 +480,11 @@
} else {
tableChartsOptions.yAxis[0].name = '车速'
dataList = this.tableData.slice(0,this.tableData.length - 1);
tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
if (this.queryForm.type == '5'){
tableChartsOptions.xAxis.data = dataList.map(item => item.time)
} else {
tableChartsOptions.xAxis.data = dataList.map(item => item.time.slice(item.time.length - 2,item.time.length))
}
if (this.queryForm.direction == '1'){
tableChartsOptions.series = [
{

6
ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/data.js
View File

@ -21,6 +21,10 @@ export const searchFormList = [
key: "year",
label: "年",
},
{
key: "week",
label: "周",
},
{
key: "range",
label: "日期范围",
@ -102,7 +106,7 @@ export const searchFormList = [
},
default: moment().format("YYYY-MM-DD"),
visible: (data) => {
if (data.type == "year") {
if (data.type == "year" || data.type == "week") {
return true;
}
},

2
ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSurvey/survey/index.vue
View File

@ -36,6 +36,8 @@
<ElTableColumn label="方向" prop="direction" align="center" header-align="center" width="120" />
<ElTableColumn v-for="item in columnList" :label="item.label" :prop="item.key" min-width="80" align="center" header-align="center" />
<ElTableColumn label="合计" prop="total" width="150" align="center" header-align="center" />
<ElTableColumn label="周平均" prop="avgWeek" width="150" align="center" header-align="center" v-if="searchData.type=='week'" />
<ElTableColumn label="日均" prop="avgDay" width="150" align="center" header-align="center" v-if="searchData.type=='week'" />
</Table>
</div>

Write Preview
Loading…
Cancel
Save