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

页面调整

This commit is contained in:
caoqianming 2021-11-03 08:19:51 +08:00
parent c49bb54868
commit b47b2017de
35 changed files with 188 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_client/src/styles/index.scss
View File

@ -62,7 +62,7 @@ div:focus {
// main-container global css
.app-container {
padding: 10px;
padding: 2px;
}
.el-table--medium td,   .el-table--medium th {

4
hb_client/src/views/em/detection.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增设备</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="equipmentList.results"

4
hb_client/src/views/em/equipment.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增设备</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="equipmentList.results"

4
hb_client/src/views/em/record.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增校准或检定</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="equipmentrecordList.results"

6
hb_client/src/views/inm/fifo.vue
View File

@ -25,8 +25,8 @@
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<div style="margin-top: 10px">
<el-card style="margin-top: 2px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增物料</el-button
>
@ -153,7 +153,7 @@
</div>
<div>
<el-tooltip class="item" effect="dark" content="添加条件" placement="top">
<el-button @click="addConditions" style='cursor:pointer;width:95%;color:#fe000c;border:1px dashed #fe000c;height:40px;padding:0px;margin-top:10px;margin-left:20px;font-size:26px'>
<el-button @click="addConditions" style='cursor:pointer;width:95%;color:#fe000c;border:1px dashed #fe000c;height:40px;padding:0px;margin-top: 2px;margin-left:20px;font-size:26px'>
+
</el-button>
</el-tooltip>

2
hb_client/src/views/inm/fifodetail.vue
View File

@ -25,7 +25,7 @@
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"

2
hb_client/src/views/inm/inventory.vue
View File

@ -25,7 +25,7 @@
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"

2
hb_client/src/views/inm/materialbatch.vue
View File

@ -25,7 +25,7 @@
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"

4
hb_client/src/views/inm/warehouse.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增仓库</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="warehouseList.results"

391
hb_client/src/views/monitor/service.vue
View File

@ -1,130 +1,72 @@
<template>
<div class="app-container">
<el-row :gutter="12">
<el-col :span="8">
<el-card>
<div slot="header" class="clearfix">
<span>CPU</span>
</div>
<el-descriptions :column="1" border>
<el-descriptions-item>
<template slot="label"> 逻辑核心数 </template>
{{ cpuData.count }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 物理核心数 </template>
{{ cpuData.lcount }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 当前使用率 </template>
{{ cpuData.percent }}%
</el-descriptions-item>
</el-descriptions>
</el-card>
</el-col>
<el-col :span="8">
<el-card>
<div slot="header" class="clearfix">
<span>内存</span>
</div>
<el-descriptions :column="1" border>
<el-descriptions-item>
<template slot="label"> 总内存 </template>
{{ memoryData.total }}GB
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 已用内存 </template>
{{ memoryData.used }}GB
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 当前使用率 </template>
{{ memoryData.percent }}%
</el-descriptions-item>
</el-descriptions>
</el-card>
</el-col>
<el-col :span="8">
<el-card>
<div slot="header" class="clearfix">
<span>硬盘</span>
</div>
<el-descriptions :column="1" border>
<el-descriptions-item>
<template slot="label"> 总大小 </template>
{{ diskData.total }}GB
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 已用内存 </template>
{{ diskData.used }}GB
</el-descriptions-item>
<el-descriptions-item>
<template slot="label"> 当前使用率 </template>
{{ diskData.percent }}%
</el-descriptions-item>
</el-descriptions>
</el-card>
</el-col>
</el-row>
<div class="box-card">
<el-row :gutter="12">
<el-col :span="8">
<el-card shadow="always">
<div slot="header" class="clearfix">
<span>CPU</span>
</div>
<el-row class="row">
<el-col :span="8">
属性
</el-col>
<el-col :span="8">
值
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
逻辑核心数
</el-col>
<el-col :span="8">
{{cpuData.count}}
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
物理核心数
</el-col>
<el-col :span="8">
{{cpuData.lcount}}
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
当前使用率
</el-col>
<el-col :span="8">
{{cpuData.percent}}%
</el-col>
</el-row>
</el-card>
</el-col>
<el-col :span="8">
<el-card shadow="always">
<div slot="header" class="clearfix">
<span>内存</span>
</div>
<el-row class="row">
<el-col :span="8">
属性
</el-col>
<el-col :span="8">
值
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
使用率
</el-col>
<el-col :span="8">
{{memoryData.percent}}%
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
总内存
</el-col>
<el-col :span="8">
{{memoryData.total}}
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
已用内存
</el-col>
<el-col :span="8">
{{memoryData.used}}
</el-col>
</el-row>
</el-card>
</el-col>
<el-col :span="8">
<el-card shadow="always">
<div slot="header" class="clearfix">
<span>硬盘</span>
</div>
<el-row class="row">
<el-col :span="8">
属性
</el-col>
<el-col :span="8">
值
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
已用百分比
</el-col>
<el-col :span="8">
{{diskData.percent}}%
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
总大小
</el-col>
<el-col :span="8">
{{diskData.total}}
</el-col>
</el-row>
<el-row class="rowlist">
<el-col :span="8">
已用大小
</el-col>
<el-col :span="8">
{{diskData.used}}
</el-col>
</el-row>
</el-card>
</el-col>
</el-row>
</div>
<el-card class="box-card">
<el-card style="margin-top: 6px">
<div slot="header" class="clearfix">
<span>日志列表</span>
</div>
@ -141,45 +83,33 @@
type="primary"
icon="el-icon-search"
@click="handleFilter"
>搜索
>搜索
</el-button>
<el-button
class="filter-item"
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>重置
>重置
</el-button>
</div>
<el-table
:data="tableData"
style="width: 100%;height:400px"
style="width: 100%"
height="100"
v-el-height-adaptive-table="{ bottomOffset: 30 }"
>
<el-table-column
prop="name"
label="日志名称"
>
</el-table-column>
<el-table-column
prop="size"
label="日志大小"
>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
width="100"
>
<el-table-column prop="name" label="日志名称"> </el-table-column>
<el-table-column prop="size" label="日志大小"> </el-table-column>
<el-table-column fixed="right" label="操作" width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">查看详情</el-button>
<el-button @click="handleClick(scope.row)" type="text" size="small"
>查看详情</el-button
>
</template>
</el-table-column>
</el-table>
<el-dialog
:visible.sync="dialogVisible"
width="80%"
title="日志详情"
>
<el-dialog :visible.sync="dialogVisible" width="80%" title="日志详情">
<div v-html="logdec" class="dialogDiv"></div>
</el-dialog>
</el-card>
@ -188,121 +118,60 @@
<script>
import {getlogList, getLog, getServerList} from "@/api/moritor";
import { getlogList, getLog, getServerList } from "@/api/moritor";
const defaultCMA = {}
export default {
components: {},
data() {
return {
tableData: [],
cpuData: [],
diskData: [],
memoryData: [],
dialogVisible: false,
logdec: "",
text: "",
listQuery: {},
};
const defaultCMA = {};
export default {
components: {},
data() {
return {
tableData: [],
cpuData: [],
diskData: [],
memoryData: [],
dialogVisible: false,
logdec: "",
text: "",
listQuery: {},
};
},
computed: {},
watch: {},
created() {
this.getlogList();
this.getServerList();
},
methods: {
getlogList() {
getlogList(this.listQuery).then((response) => {
if (response.data) {
this.tableData = response.data;
}
});
},
computed: {},
watch: {},
created() {
handleFilter() {
this.getlogList();
this.getServerList();
},
methods: {
getlogList() {
getlogList(this.listQuery).then((response) => {
if (response.data) {
this.tableData = response.data;
}
});
},
handleFilter() {
this.getlogList();
},
resetFilter() {
this.getlogList();
},
getServerList() {
getServerList().then((response) => {
if (response.data) {
this.cpuData = response.data.cpu;
this.diskData = response.data.disk;
this.memoryData = response.data.memory;
}
});
},
handleClick(row) {
this.dialogVisible = true;
getLog(row.name).then((response) => {
if (response.data) {
this.logdec = response.data.replace(/\n/gm, "<br/>")
}
});
},
resetFilter() {
this.getlogList();
},
};
</script>
<style>
::-webkit-scrollbar {
width: 10px;
}
::-webkit-scrollbar-track{
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
background-color: #fefefe;
border-radius: 7px;
}
::-webkit-scrollbar-thumb{
border-radius: 7px;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
background-color: #f5f5f5;
}
.dialogDiv{
height: 70vh;
overflow-y: scroll;
}
.text {
font-size: 14px;
}
.item {
margin-bottom: 18px;
}
.clearfix:before,
.clearfix:after {
display: table;
content: "";
}
.clearfix:after {
clear: both
}
.box-card {
width: 90%;
margin: 0 auto;
margin-top: 30px;
}
.row {
border-bottom: 1px solid #dfe6ec;
color: #909399;
font-weight: 500;
padding: 10px;
}
.rowlist {
border-bottom: 1px solid #dfe6ec;
color: #606266;
font-weight: 500;
padding: 10px;
}
</style>
getServerList() {
getServerList().then((response) => {
if (response.data) {
this.cpuData = response.data.cpu;
this.diskData = response.data.disk;
this.memoryData = response.data.memory;
}
});
},
handleClick(row) {
this.dialogVisible = true;
getLog(row.name).then((response) => {
if (response.data) {
this.logdec = response.data.replace(/\n/gm, "<br/>");
}
});
},
},
};
</script>

4
hb_client/src/views/mtm/material.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增物料</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="materialList.results"

4
hb_client/src/views/mtm/process.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<el-card>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增工序</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="processList.results"

2
hb_client/src/views/mtm/stepdo.vue
View File

@ -21,7 +21,7 @@
<el-row :gutter="24">
<el-col :span="6" >
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增</el-button>
<el-table

4
hb_client/src/views/procurement/vendor.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增供应商</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="vendorList.results"

4
hb_client/src/views/qm/standard.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增标准</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="standardList.results"

4
hb_client/src/views/qm/testitem.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增项目</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="testitemList.results"

4
hb_client/src/views/sam/contract.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增客户</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="contractList.results"

4
hb_client/src/views/sam/customer.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增客户</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="customerList.results"

4
hb_client/src/views/sam/order.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增订单</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="orderList.results"

4
hb_client/src/views/sam/review.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增客户</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="contractList.results"

4
hb_client/src/views/system/dict.vue
View File

@ -16,7 +16,7 @@
highlight-current
:expand-on-click-node="false"
:filter-node-method="filterNode"
style="margin-top:10px;"
style="margin-top: 2px;"
@node-click="handleDictTypeClick"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
@ -52,7 +52,7 @@
v-show="listQuery.type"
v-loading="listLoading"
:data="dictList"
style="width: 100%;margin-top:10px;"
style="width: 100%;margin-top: 2px;"
highlight-current-row
row-key="id"
height="100"

2
hb_client/src/views/system/file.vue
View File

@ -41,7 +41,7 @@
<el-table
v-loading="listLoading"
:data="fileList.results"
style="width: 100%;margin-top:10px;"
style="width: 100%;margin-top: 2px;"
highlight-current-row
row-key="id"
height="100"

2
hb_client/src/views/system/organization.vue
View File

@ -25,7 +25,7 @@
!search || data.name.toLowerCase().includes(search.toLowerCase())
)
"
style="width: 100%; margin-top: 10px"
style="width: 100%; margin-top: 2px"
highlight-current-row
row-key="id"
height="100"

2
hb_client/src/views/system/perm.vue
View File

@ -24,7 +24,7 @@
!search || data.name.toLowerCase().includes(search.toLowerCase())
)
"
style="width: 100%; margin-top: 10px"
style="width: 100%; margin-top: 2px"
highlight-current-row
row-key="id"
height="100"

2
hb_client/src/views/system/position.vue
View File

@ -25,7 +25,7 @@
!search || data.name.toLowerCase().includes(search.toLowerCase())
)
"
style="width: 100%; margin-top: 10px"
style="width: 100%; margin-top: 2px"
highlight-current-row
row-key="id"
height="100"

2
hb_client/src/views/system/role.vue
View File

@ -20,7 +20,7 @@
<el-table
v-loading="listLoading"
:data="tableData"
style="width: 100%; margin-top: 10px"
style="width: 100%; margin-top: 2px"
highlight-current-row
row-key="id"
height="100"

2
hb_client/src/views/system/task.vue
View File

@ -53,7 +53,7 @@
<el-table
v-loading="listLoading"
:data="dataList.results"
style="width: 100%; margin-top: 10px"
style="width: 100%; margin-top: 2px"
highlight-current-row
row-key="id"
height="100"

4
hb_client/src/views/workflow/customfield.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<el-card>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
:data="customfieldList"

4
hb_client/src/views/workflow/index.vue
View File

@ -24,11 +24,11 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="workflowList.results"

6
hb_client/src/views/workflow/state.vue
View File

@ -1,12 +1,12 @@
<template>
<div class="app-container">
<el-card>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增
</el-button>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
:data="wfstateList"
style="width: 100%"
@ -166,7 +166,7 @@
</el-form-item>
<el-form-item label="字段状态">
<el-button @click="addWordStatusChange">添加修改</el-button>
<el-row v-for="(item,$index) in statusChange" :key="item+$index" style="margin-top: 10px">
<el-row v-for="(item,$index) in statusChange" :key="item+$index" style="margin-top: 2px">
<el-col :span="11">
<el-select style="width: 100%" v-model="item.name" placeholder="请选择字段">
<el-option v-for="item in customfieldList" :key="item.id" :label="item.field_name"

2
hb_client/src/views/workflow/ticket.vue
View File

@ -23,7 +23,7 @@
@click="handleFilter"
>搜索</el-button>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
</div>
</el-card>

4
hb_client/src/views/workflow/transitions.vue
View File

@ -2,13 +2,13 @@
<div class="app-container">
<el-card>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
:data="wftransitionList"
style="width: 100%"

4
hb_client/src/views/wpm/testitem.vue
View File

@ -24,13 +24,13 @@
>重置</el-button
>
</div>
<div style="margin-top: 10px">
<div style="margin-top: 2px">
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增项目</el-button
>
</div>
</el-card>
<el-card style="margin-top: 10px">
<el-card style="margin-top: 2px">
<el-table
v-loading="listLoading"
:data="testitemList.results"

1
hb_server/apps/mtm/views.py
View File

@ -153,6 +153,7 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet
queryset = RecordForm.objects.all()
filterset_fields = ['step', 'type', 'material']
search_fields = ['name']
ordering='id'
def get_serializer_class(self):
if self.action =='create':

5
hb_server/apps/pm/views.py
View File

@ -187,8 +187,9 @@ class ResourceViewSet(GenericViewSet):
res_d_list = []
res = []
for i in rdata:
materials = InputMaterial.objects.filter(subproduction__product__id=i['id'],
subproduction__is_deleted=False, is_deleted=False, material__type__in=[3,4]).order_by('material__number')\
# 计算输入物料
materials = SubprodctionMaterial.objects.filter(subproduction__product__id=i['id'],
subproduction__is_deleted=False, is_deleted=False, material__type__in=[3,4], type=1).order_by('material__number')\
.values('material__id', 'material__name', 'material__number', 'material__type', 'count', 'material__count')
l_m = list(materials)
for m in l_m: