zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:mpoint新增测点原始记录

This commit is contained in:
shijing 2024-05-09 13:46:23 +08:00
parent 330a87bf7e
commit 77aa24c19e
1 changed files with 392 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

325
src/views/em/mpoint.vue
View File

@ -1,33 +1,88 @@
<template> <template>
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<el-button type="primary" icon="el-icon-plus" @click="table_add" v-auth="'mpoint.create'">新增</el-button> <el-button
<el-button type="warning" @click="king_sync" v-auth="'mpoint.create'">同步亚控测点</el-button> type="primary"
<el-button type="primary" @click="batchUpdate" v-auth="'mpoint.update'">批量修改</el-button> icon="el-icon-plus"
@click="table_add"
v-auth="'mpoint.create'"
>新增</el-button
>
<el-button
type="warning"
@click="king_sync"
v-auth="'mpoint.create'"
>同步亚控测点</el-button
>
<el-button
type="primary"
@click="batchUpdate"
v-auth="'mpoint.update'"
>批量修改</el-button
>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select v-model="query.enabled" placeholder="是否启用" @change="handleQuery" clearable style="width:100px"> <el-select
<el-option v-for="e in boolEnum.values" :key="e.key" :value="e.key" v-model="query.enabled"
:label="e.text"></el-option> placeholder="是否启用"
@change="handleQuery"
clearable
style="width: 100px"
>
<el-option
v-for="e in boolEnum.values"
:key="e.key"
:value="e.key"
:label="e.text"
></el-option>
</el-select> </el-select>
<el-select v-model="query.type" placeholder="测点类型" @change="handleQuery" clearable style="width:100px"> <el-select
<el-option v-for="e in mpointTypeEnum.values" :key="e.key" :value="e.key" v-model="query.type"
:label="e.text"></el-option> placeholder="测点类型"
@change="handleQuery"
clearable
style="width: 100px"
>
<el-option
v-for="e in mpointTypeEnum.values"
:key="e.key"
:value="e.key"
:label="e.text"
></el-option>
</el-select> </el-select>
<el-select v-model="query.val_type" placeholder="值类型" @change="handleQuery" clearable style="width:100px"> <el-select
<el-option v-for="e in valTypeEnum.values" :key="e.key" :value="e.key" v-model="query.val_type"
:label="e.text"></el-option> placeholder="值类型"
@change="handleQuery"
clearable
style="width: 100px"
>
<el-option
v-for="e in valTypeEnum.values"
:key="e.key"
:value="e.key"
:label="e.text"
></el-option>
</el-select> </el-select>
<el-select v-model="query.need_display" placeholder="是否展示" @change="handleQuery" clearable style="width:100px"> <el-select
<el-option v-for="e in boolEnum.values" :key="e.key" :value="e.key" v-model="query.need_display"
:label="e.text"></el-option> placeholder="是否展示"
@change="handleQuery"
clearable
style="width: 100px"
>
<el-option
v-for="e in boolEnum.values"
:key="e.key"
:value="e.key"
:label="e.text"
></el-option>
</el-select> </el-select>
<el-input <el-input
v-model="query.search" v-model="query.search"
placeholder="名称/代号" placeholder="名称/代号"
style="width:200px" style="width: 200px"
clearable clearable
></el-input> ></el-input>
<el-button <el-button
@ -38,56 +93,150 @@
</div> </div>
</el-header> </el-header>
<el-main class="nopadding"> <el-main class="nopadding">
<scTable ref="table" :apiObj="apiObj" row-key="id" remoteSort @selection-change="selectionChange"> <scTable
ref="table"
:apiObj="apiObj"
row-key="id"
remoteSort
@selection-change="selectionChange"
>
<el-table-column type="selection" width="50" /> <el-table-column type="selection" width="50" />
<el-table-column label="名称" prop="name" width="200" show-overflow-tooltip sortable></el-table-column> <el-table-column
<el-table-column label="别名" prop="nickname" width="120" show-overflow-tooltip sortable></el-table-column> label="名称"
<el-table-column label="代号" prop="code" width="130" show-overflow-tooltip sortable></el-table-column> prop="name"
width="200"
show-overflow-tooltip
sortable
></el-table-column>
<el-table-column
label="别名"
prop="nickname"
width="120"
show-overflow-tooltip
sortable
></el-table-column>
<el-table-column
label="代号"
prop="code"
width="130"
show-overflow-tooltip
sortable
></el-table-column>
<el-table-column label="是否启用" width="80"> <el-table-column label="是否启用" width="80">
<template #default="scope"> <template #default="scope">
<el-icon v-if="scope.row.enabled" color="green" <el-icon v-if="scope.row.enabled" color="green"
><CircleCheckFilled ><CircleCheckFilled
/></el-icon> /></el-icon>
<el-icon v-else color="red"><CircleCloseFilled /></el-icon> <el-icon v-else color="red"
><CircleCloseFilled
/></el-icon>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采集状态" show-overflow-tooltip> <el-table-column label="采集状态" show-overflow-tooltip>
<template #default="scope"> <template #default="scope">
<el-tag :type="mpointGatherStateEnum[scope.row.gather_state]?.type">{{ <el-tag
mpointGatherStateEnum[scope.row.gather_state]?.text }}</el-tag> :type="
mpointGatherStateEnum[scope.row.gather_state]
?.type
"
>{{
mpointGatherStateEnum[scope.row.gather_state]
?.text
}}</el-tag
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="测点类型" width="80"> <el-table-column label="测点类型" width="80">
<template #default="scope">{{mpointTypeEnum[scope.row.type]?.text}} <template #default="scope"
>{{ mpointTypeEnum[scope.row.type]?.text }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采集间隔(s)" prop="interval" width="100"></el-table-column> <el-table-column
label="采集间隔(s)"
prop="interval"
width="100"
></el-table-column>
<el-table-column label="值类型" prop="val_type" width="80"> <el-table-column label="值类型" prop="val_type" width="80">
<template #default="scope">{{valTypeEnum[scope.row.val_type]?.text}} <template #default="scope"
>{{ valTypeEnum[scope.row.val_type]?.text }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位" prop="unit" width="80"></el-table-column> <el-table-column
<el-table-column label="计量物料" prop="material_name" width="100"></el-table-column> label="单位"
<el-table-column label="所属工段" prop="mgroup_name" width="100"></el-table-column> prop="unit"
width="80"
></el-table-column>
<el-table-column
label="计量物料"
prop="material_name"
width="100"
></el-table-column>
<el-table-column
label="所属工段"
prop="mgroup_name"
width="100"
></el-table-column>
<el-table-column label="是否展示" width="80"> <el-table-column label="是否展示" width="80">
<template #default="scope"> <template #default="scope">
<el-icon v-if="scope.row.need_display" color="green" <el-icon v-if="scope.row.need_display" color="green"
><CircleCheckFilled ><CircleCheckFilled
/></el-icon> /></el-icon>
<el-icon v-else color="red"><CircleCloseFilled /></el-icon> <el-icon v-else color="red"
><CircleCloseFilled
/></el-icon>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报告排序" prop="report_sortstr" width="100" sortable> <el-table-column
label="报告排序"
prop="report_sortstr"
width="100"
sortable
>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip sortable width="160"></el-table-column> <el-table-column
<el-table-column label="操作" fixed="right" align="center" width="140"> label="创建时间"
prop="create_time"
show-overflow-tooltip
sortable
width="160"
></el-table-column>
<el-table-column
label="操作"
fixed="right"
align="center"
width="140"
>
<template #default="scope"> <template #default="scope">
<el-button link size="small" @click="table_edit(scope.row)" v-auth="'mpoint.update'" type="primary">编辑</el-button> <el-button
link
size="small"
@click="mplog_record(scope.row)"
type="primary"
>原始记录</el-button
>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)"> <el-button
link
size="small"
@click="table_edit(scope.row)"
v-auth="'mpoint.update'"
type="primary"
>编辑</el-button
>
<el-divider direction="vertical"></el-divider>
<el-popconfirm
title="确定删除吗？"
@confirm="table_del(scope.row, scope.$index)"
>
<template #reference> <template #reference>
<el-button link size="small" v-auth="'mpoint.delete'" type="danger">删除</el-button> <el-button
link
size="small"
v-auth="'mpoint.delete'"
type="danger"
>删除</el-button
>
</template> </template>
</el-popconfirm> </el-popconfirm>
</template> </template>
@ -107,12 +256,36 @@
:size="1000" :size="1000"
destroy-on-close destroy-on-close
> >
1111 <scTable ref="table" row-key="id" :data="mplogRecord">
<el-table-column type="selection" width="50" />
<el-table-column label="采集时间" prop="timex"></el-table-column>
<el-table-column label="采集数值">
<template #default="scope">
<span v-if="scope.row.val_int != null">{{
scope.row.val_int
}}</span>
<span v-else-if="scope.row.val_bool != null">{{
scope.row.val_bool
}}</span>
<span v-else-if="scope.row.val_str != null">{{
scope.row.val_str
}}</span>
<span v-else-if="scope.row.val_float != null">{{
scope.row.val_float
}}</span>
</template>
</el-table-column>
</scTable>
</el-drawer> </el-drawer>
</template> </template>
<script> <script>
import saveDialog from "./mpoint_form.vue"; import saveDialog from "./mpoint_form.vue";
import { valTypeEnum, boolEnum, mpointTypeEnum, mpointGatherStateEnum } from "@/utils/enum.js"; import {
valTypeEnum,
boolEnum,
mpointTypeEnum,
mpointGatherStateEnum,
} from "@/utils/enum.js";
export default { export default {
name: "rparty", name: "rparty",
components: { components: {
@ -124,14 +297,15 @@ export default {
boolEnum, boolEnum,
mpointTypeEnum, mpointTypeEnum,
mpointGatherStateEnum, mpointGatherStateEnum,
logShow:false, logShow: false,
dialog: { dialog: {
save: false, save: false,
permission: false, permission: false,
}, },
apiObj: this.$API.enm.mpoint.list, apiObj: this.$API.enm.mpoint.list,
query: {}, query: {},
selection: [] selection: [],
mplogRecord: [],
}; };
}, },
methods: { methods: {
@ -150,8 +324,42 @@ export default {
}); });
}, },
//原始测点记录 //原始测点记录
mplog(row){ mplog_record(row) {
this.logShow = true; let that = this;
that.mplogRecord = [];
var nowDate = new Date();
let year = nowDate.getFullYear();
let month = nowDate.getMonth() + 1;
let day = nowDate.getDate();
let hour = nowDate.getHours();
month = month > 9 ? month : "0" + month;
day = day > 9 ? day : "0" + day;
if (hour > 0) {
hour = hour - 1;
hour = hour > 9 ? hour : "0" + hour;
} else {
hour = 23;
let timers = nowDate.getTime() - 1000 * 60 * 60; //上一小时
let useDate = new Date(timers);
year = useDate.getFullYear();
month = useDate.getMonth() + 1;
month = month > 9 ? month : "0" + month;
day = nowDate.getDate();
day = day > 9 ? day : "0" + day;
}
let obj = {};
obj.page = 0;
obj.mpoint = row.id;
obj.timex__gte =
year + "-" + month + "-" + day + " " + hour + ":00:00";
obj.timex__lte =
year + "-" + month + "-" + day + " " + hour + ":59:00";
that.$API.enm.mplogx.req(obj).then((res) => {
console.log("res", res);
that.mplogRecord = res;
that.logShow = true;
});
}, },
//查看 //查看
table_show(row) { table_show(row) {
@ -163,36 +371,39 @@ export default {
//删除 //删除
table_del(row) { table_del(row) {
var id = row.id; var id = row.id;
this.$API.enm.mpoint.delete.req(id).then(res=>{ this.$API.enm.mpoint.delete.req(id).then((res) => {
if(res.err_msg){ if (res.err_msg) {
this.$message.error(res.err_msg) this.$message.error(res.err_msg);
}else{ } else {
this.$refs.table.refresh(); this.$refs.table.refresh();
this.$message.success("删除成功") this.$message.success("删除成功");
} }
}) });
}, },
king_sync() { king_sync() {
const loading = this.$loading({text: '正在同步亚控测点...'}); const loading = this.$loading({ text: "正在同步亚控测点..." });
this.$API.enm.mpoint.kingSync.req().then(res=>{ this.$API.enm.mpoint.kingSync
.req()
.then((res) => {
this.$refs.table.refresh(); this.$refs.table.refresh();
}).finally(()=>{
loading.close()
}) })
.finally(() => {
loading.close();
});
}, },
//本地更新数据 //本地更新数据
handleSaveSuccess(data, mode) { handleSaveSuccess(data, mode) {
this.$refs.table.refresh(); this.$refs.table.refresh();
}, },
handleQuery() { handleQuery() {
this.$refs.table.queryData(this.query) this.$refs.table.queryData(this.query);
}, },
resetQuery() { resetQuery() {
this.query = {}; this.query = {};
}, },
selectionChange(rows){ selectionChange(rows) {
console.log('m', rows) console.log("m", rows);
} },
}, },
}; };
</script> </script>