Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备监控-指标详情添加devId

Browse Source
This commit is contained in:
zhujiyan
2024-08-08 15:38:59 +08:00
parent 6a6239c488
commit a28a61c8e4
3 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/govern/device/control/detail.vue
View File

@@ -60,6 +60,7 @@ const init = () => {
echartsData.value = null echartsData.value = null
loading.value = true loading.value = true
getDeviceDataTrend({ getDeviceDataTrend({
devId:props.detail.pid,
endTime: datePickerRef.value.timeValue[1], endTime: datePickerRef.value.timeValue[1],
lineId: props.detail.lineId, lineId: props.detail.lineId,
startTime: datePickerRef.value.timeValue[0], startTime: datePickerRef.value.timeValue[0],

6
src/views/govern/device/control/index.vue
View File

@@ -238,7 +238,7 @@
<div v-if="!tableData" style="height: 42px"></div> <div v-if="!tableData" style="height: 42px"></div>
</el-tabs> </el-tabs>
</div> </div>
<el-empty v-else description="请选择设备" class="device-control-right"/> <el-empty v-else description="请选择设备" class="device-control-right" />
<Detail ref="detailRef" :detail="detail" @close="detail = null" v-if="detail"></Detail> <Detail ref="detailRef" :detail="detail" @close="detail = null" v-if="detail"></Detail>
<!-- 离线数据导入组件 --> <!-- 离线数据导入组件 -->
<offLineDataImport ref="offLineDataImportRef"></offLineDataImport> <offLineDataImport ref="offLineDataImportRef"></offLineDataImport>
@@ -417,8 +417,8 @@ const timer: any = ref()
//tab点击事件 //tab点击事件
const handleClick = async (tab?: any) => { const handleClick = async (tab?: any) => {
//点击tab时更新dataSet最新值 //点击tab时更新dataSet最新值
if(tab&&tab.props&&tab.props.name&&dataSet.value!=tab.props.name){ if (tab && tab.props && tab.props.name && dataSet.value != tab.props.name) {
dataSet.value = tab.props.name dataSet.value = tab.props.name
} }
tableLoading.value = true tableLoading.value = true

80
src/views/govern/reportCore/statistics/index.vue
View File

@@ -9,47 +9,40 @@
></PointTree> ></PointTree>
</pane> </pane>
<pane style="background: #fff" :style="height"> <pane style="background: #fff" :style="height">
<div class="default-main"> <TableHeader ref="TableHeaderRef" datePicker>
<TableHeader ref="TableHeaderRef" datePicker> <template v-slot:select>
<template v-slot:select> <el-form-item label="模板策略">
<el-form-item label="模板策略"> <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
<el-select <el-option
v-model="Template" v-for="item in templatePolicy"
@change="changetype" :key="item.id"
placeholder="请选择模版" :label="item.name"
value-key="id" :value="item"
> ></el-option>
<el-option </el-select>
v-for="item in templatePolicy" </el-form-item>
:key="item.id" <el-form-item label="报表类型:">
:label="item.name" <el-select
:value="item" :disabled="true"
></el-option> v-model="reportForm"
</el-select> :popper-append-to-body="false"
</el-form-item> placeholder="请选择报表类型"
<el-form-item label="报表类型:"> >
<el-select <el-option
:disabled="true" v-for="item in reportFormList"
v-model="reportForm" :key="item.value"
:popper-append-to-body="false" :label="item.label"
placeholder="请选择报表类型" :value="item.value"
> ></el-option>
<el-option </el-select>
v-for="item in reportFormList" </el-form-item>
:key="item.value" </template>
:label="item.label" <template #operation>
:value="item.value" <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
></el-option> </template>
</el-select> </TableHeader>
</el-form-item> <div class="box">
</template> <div id="luckysheet" :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
<template #operation>
<el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
</template>
</TableHeader>
<div class="box">
<div id="luckysheet" :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
</div>
</div> </div>
</pane> </pane>
</splitpanes> </splitpanes>
@@ -102,6 +95,7 @@ const tableStore = new TableStore({
tableStore.table.params.lineId = dotList.value.id tableStore.table.params.lineId = dotList.value.id
}, },
loadCallback: () => { loadCallback: () => {
console.log(tableStore.table.data)
tableStore.table.data.forEach((item: any) => { tableStore.table.data.forEach((item: any) => {
item.celldata.forEach((k: any) => { item.celldata.forEach((k: any) => {
item.data[k.r][k.c].v = k.v item.data[k.r][k.c].v = k.v
@@ -114,12 +108,12 @@ const tableStore = new TableStore({
showtoolbar: false, // 是否显示工具栏 showtoolbar: false, // 是否显示工具栏
showinfobar: false, // 是否显示顶部信息栏 showinfobar: false, // 是否显示顶部信息栏
showsheetbar: true, // 是否显示底部sheet按钮 showsheetbar: true, // 是否显示底部sheet按钮
// data: data
data: tableStore.table.data data: tableStore.table.data
}) })
} }
}) })
provide('tableStore', tableStore) provide('tableStore', tableStore)
onMounted(() => { onMounted(() => {
const dom = document.getElementById('navigation-splitpanes') const dom = document.getElementById('navigation-splitpanes')
if (dom) { if (dom) {
@@ -130,13 +124,13 @@ getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
templatePolicy.value = res.data templatePolicy.value = res.data
Template.value = res.data[0] Template.value = res.data[0]
reportForm.value = res.data[0]?.reportForm reportForm.value = res.data[0]?.reportForm
// tableStore.index()
}) })
const changetype = (val: any) => { const changetype = (val: any) => {
reportForm.value = val.reportForm reportForm.value = val.reportForm
} }
const handleNodeClick = (data: any, node: any) => { const handleNodeClick = (data: any, node: any) => {
console.log(data.level,"+++++++++++++");
if (data.level == 3) { if (data.level == 3) {
dotList.value = data dotList.value = data
tableStore.index() tableStore.index()