fix: 超低修改
This commit is contained in:
parent
60b277b86b
commit
a085399727
|
@ -14,7 +14,7 @@
|
|||
<div class="left-panel">
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<el-select v-model="query.time_bucket" placeholder="周期" style="margin-left:4px"
|
||||
<el-select v-model="time_bucket" placeholder="周期" style="margin-left:4px"
|
||||
@change="handleQuery">
|
||||
<el-option v-for="item in timeOptions" :key="item.value" :label="item.label"
|
||||
:value="item.value" />
|
||||
|
@ -28,7 +28,7 @@
|
|||
</div>
|
||||
</el-header>
|
||||
<el-main>
|
||||
<scTable :data="tableData" hideDo v-show="time_bucket == 'minute'">
|
||||
<scTable :data="tableData" hideDo v-show="time_bucket == 'minute'" v-loading="tableLoading">
|
||||
<el-table-column type="index" />
|
||||
<el-table-column prop="equipment_name" label="站点名称" width="140" />
|
||||
<el-table-column prop="metric_0" label="0" />
|
||||
|
@ -83,6 +83,7 @@
|
|||
export default {
|
||||
data() {
|
||||
return {
|
||||
tableLoading: false,
|
||||
tableData: [],
|
||||
metricOptions: [
|
||||
{ label: 'PM2.5', value: 'pm25' },
|
||||
|
@ -131,13 +132,15 @@ export default {
|
|||
} else if (that.time_bucket == 'hour') {
|
||||
exec_search = 'enp_edata_hour_nodrain';
|
||||
}
|
||||
that.tableLoading = true;
|
||||
that.$API.bi.dataset.exec.req(exec_search, {
|
||||
query: that.query,
|
||||
raise_exception: true
|
||||
}).then(res => {
|
||||
console.log(res.data2.ds0);
|
||||
this.tableData = res.data2.ds0;
|
||||
})
|
||||
that.tableLoading = false;
|
||||
}).catch(e=>{that.tableLoading = false;})
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ export default {
|
|||
query: {},
|
||||
params: { type: 30, tags: 'carwash' },
|
||||
cateOptions: [
|
||||
{ id: 'inner_car', name: '场内运输车辆' },
|
||||
{ id: 'inner_car', name: '厂内运输车辆' },
|
||||
{ id: 'inner_car2', name: '非路道移动机械' },
|
||||
],
|
||||
apiObj: this.$API.em.equipment.list,
|
||||
|
|
|
@ -28,56 +28,65 @@
|
|||
row-key="id" :params="params" :query="query" @row-click="rowClick"
|
||||
@dataChange="updateCount">
|
||||
<!-- <el-table-column type="index" width="50" /> -->
|
||||
<el-table-column prop="number" label="污染源编号" width="120" />
|
||||
<el-table-column prop="name" label="污染源名称" width="120" />
|
||||
<el-table-column prop="name" label="污染源类型" width="120" />
|
||||
<el-table-column prop="number" label="编号" width="80" />
|
||||
<el-table-column prop="name" label="名称" width="120" />
|
||||
<el-table-column prop="type" label="类型" width="100">
|
||||
<template #default="scope">{{ drainTypeEnum[scope.row.cate]?.text }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="mgroup_name" label="所属工段" width="100" />
|
||||
<el-table-column label="生产设备" >
|
||||
<el-table-column label="物料名称" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column label="物料分类" min-width="80" show-overflow-tooltip />
|
||||
<el-table-column label="主要参数" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column label="封闭方式" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column label="输送/堆取方式" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column label="治理措施" min-width="100" show-overflow-tooltip />
|
||||
<el-table-column label="生产设备" min-width="100" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<div v-for="item in scope.row.equip_data" v-bind:key="item.id">
|
||||
<div v-if="item.type == 10">
|
||||
<div>
|
||||
<el-tag :type="runningStateEnum[item.running_state]?.type">{{
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
{{ item.name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="治理设备" >
|
||||
<el-table-column label="治理设备" min-width="100" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<div v-for="item in scope.row.equip_data" v-bind:key="item.id">
|
||||
<div v-if="item.type == 30">
|
||||
<div>
|
||||
<el-tag :type="runningStateEnum[item.running_state]?.type">{{
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
{{ item.name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="监测设备" >
|
||||
<el-table-column label="监测设备" min-width="100" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<div v-for="item in scope.row.equip_data" v-bind:key="item.id">
|
||||
<div v-if="item.type == 40">
|
||||
<div>
|
||||
<el-tag :type="runningStateEnum[item.running_state]?.type">{{
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
{{ item.name }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="监控设备" >
|
||||
<el-table-column label="监控设备" min-width="100" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<div v-for="item in scope.row.equip_data" v-bind:key="item.id">
|
||||
<div v-if="item.type == 50">
|
||||
<div>
|
||||
<el-tag :type="runningStateEnum[item.running_state]?.type">{{
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
runningStateEnum[item.running_state]?.text }}</el-tag>|
|
||||
{{ item.name }}
|
||||
</div>
|
||||
</div>
|
||||
|
@ -148,8 +157,8 @@
|
|||
<div>
|
||||
<span class="infotitle">生产能力:</span>
|
||||
<span v-if="eqs.parameter_json && eqs.parameter_json.生产能力">{{
|
||||
eqs.parameter_json.生产能力
|
||||
}}</span>
|
||||
eqs.parameter_json.生产能力
|
||||
}}</span>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
@ -167,22 +176,22 @@
|
|||
<el-col :span="12">
|
||||
<div><span class="infotitle">风量:</span>
|
||||
<span v-if="eqz.parameter_json && eqz.parameter_json.风量">{{
|
||||
eqz.parameter_json.风量
|
||||
}}m³/h</span>
|
||||
eqz.parameter_json.风量
|
||||
}}m³/h</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div><span class="infotitle">过滤面积:</span>
|
||||
<span v-if="eqz.parameter_json && eqz.parameter_json.过滤面积">{{
|
||||
eqz.parameter_json.过滤面积
|
||||
}} m²</span>
|
||||
eqz.parameter_json.过滤面积
|
||||
}} m²</span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<div><span class="infotitle">布袋材质:</span>
|
||||
<span v-if="eqz.parameter_json && eqz.parameter_json.布袋材质">{{
|
||||
eqz.parameter_json.布袋材质
|
||||
}} </span>
|
||||
eqz.parameter_json.布袋材质
|
||||
}} </span>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<el-container>
|
||||
<el-header class="panel_title">
|
||||
<div class="left-panel">
|
||||
场外运输
|
||||
厂外运输
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<!-- <div class="backMap" @click="backtoMap">
|
||||
|
@ -39,7 +39,20 @@
|
|||
<el-main>
|
||||
<scTable ref="table" :apiObj="apiObj" :params="params" :query="query" size="large" style=""
|
||||
@row-click="rowClick" @dataChange="updateCount">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="出入口编号"></el-table-column>
|
||||
<el-table-column label="道闸编号"></el-table-column>
|
||||
<el-table-column label="抬杆方式"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column label="进厂时间"></el-table-column>
|
||||
<el-table-column prop="vehicle_number" label="车牌号码"></el-table-column>
|
||||
<el-table-column prop="access_time" label="过门禁时间"></el-table-column>
|
||||
<el-table-column prop="type" label="进出厂类型">
|
||||
|
|
|
@ -0,0 +1,115 @@
|
|||
<template>
|
||||
<el-container>
|
||||
<el-header class="panel_title">
|
||||
<div class="left-panel">
|
||||
厂外运输
|
||||
</div>
|
||||
<div class="right-panel">
|
||||
<!-- <div class="backMap" @click="backtoMap">
|
||||
切换地图
|
||||
<el-icon>
|
||||
<Switch />
|
||||
</el-icon>
|
||||
</div> -->
|
||||
<el-button type="primary" @click="backtoMap"> 返回地图 </el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main class="nopadding">
|
||||
<el-container>
|
||||
<el-header class="searchWrap">
|
||||
<div class="left-panel">
|
||||
<div style="font-size: 1.8vh;">
|
||||
车辆进出次数:<span class="totalNumber">{{ count }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="right-panel">
|
||||
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="至"
|
||||
start-placeholder="开始时间" end-placeholder="结束时间" @change="handleQuery" style="width: 100%"
|
||||
clearable />
|
||||
<el-select v-model="query.type" placeholder="出入类型" clearable @change="handleQuery">
|
||||
<el-option v-for="item in typeOptions" :key="item.id" :label="item.name" :value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-input :input-style="searchInputStyle" style="width:12vw;margin:0 5px" v-model="query.search"
|
||||
placeholder="车牌号"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
|
||||
</div>
|
||||
</el-header>
|
||||
<el-main>
|
||||
<scTable ref="table" :apiObj="apiObj" :params="params" :query="query" size="large" style=""
|
||||
@row-click="rowClick" @dataChange="updateCount">
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column prop="vehicle_number" label="车牌号码"></el-table-column>
|
||||
<el-table-column prop="access_time" label="过门禁时间"></el-table-column>
|
||||
<el-table-column prop="type" label="进出厂类型">
|
||||
<template #default="scope">
|
||||
<span>{{ type_[scope.row.type] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="door_name" label="门禁名称"></el-table-column>
|
||||
<el-table-column prop="vehicle_number" label="车辆识别代号(VIN)"></el-table-column>
|
||||
<el-table-column prop="emission_standard" label="排放标准"></el-table-column>
|
||||
<el-table-column prop="" label="新能源">
|
||||
<template #default="scope">
|
||||
<el-tag type="info" v-if="scope.row.is_new_energy">是</el-tag>
|
||||
<el-tag v-else type="danger">否</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</scTable>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</el-main>
|
||||
</el-container>
|
||||
</template>
|
||||
<script>
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
query: {},
|
||||
count: 0,
|
||||
timeRange: [],
|
||||
cateOptions: [
|
||||
{ id: 1, name: '货车' },
|
||||
{ id: 2, name: '罐车' },
|
||||
],
|
||||
typeOptions: [
|
||||
{ id: 1, name: '进厂' },
|
||||
{ id: 2, name: '出厂' }
|
||||
],
|
||||
statusOptions: [
|
||||
{ id: '', name: '全部' },
|
||||
{ id: 10, name: '已录入' },
|
||||
{ id: 20, name: '未录入' }
|
||||
],
|
||||
type_: {
|
||||
1: '进厂',
|
||||
2: '出厂'
|
||||
},
|
||||
timeOptions: ['日', '月', '年'],
|
||||
apiObj: this.$API.enp.vehicle_access,
|
||||
params: {},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
updateCount(res, tableData) {
|
||||
this.count = res.count
|
||||
},
|
||||
handleQuery() {
|
||||
if (this.timeRange) {
|
||||
this.query.access_time__gte = this.timeRange[0]
|
||||
this.query.access_time__lte = this.timeRange[1]
|
||||
} else {
|
||||
this.query.access_time__gte = null
|
||||
this.query.access_time__lte = null
|
||||
}
|
||||
this.$refs.table.queryData(this.query);
|
||||
},
|
||||
timeHandleQuery() { },
|
||||
carHandleQuery() { },
|
||||
backtoMap() {
|
||||
this.$emit('close')
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
Loading…
Reference in New Issue