Skip to content

T
tianjin
Commit 450a6f7d authored by 徐来柯's avatar 徐来柯
Browse files
Options

update

parent 4966e436
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 20 deletions
src/assets/sass/common.scss
View file @ 450a6f7d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
height: 98%; height: 98%;
margin:auto; margin:auto;
background: #fff; background: #fff;
padding:24px 20px 0px 20px; padding: 24px 20px 0px 20px;
} }
.table-style { .table-style {
height: calc(100% - 110px) !important; height: calc(100% - 110px) !important;
...@@ -176,3 +176,8 @@ ...@@ -176,3 +176,8 @@
-webkit-appearance: none; -webkit-appearance: none;
margin: 0; margin: 0;
} }
.page-title {
text-align: center;
margin-bottom: 10px;
}
\ No newline at end of file
src/store/index.js
View file @ 450a6f7d
...@@ -33,6 +33,7 @@ export default new Vuex.Store({ ...@@ -33,6 +33,7 @@ export default new Vuex.Store({
setTiemValue:null, //图表定时触发 setTiemValue:null, //图表定时触发
monitorShow:'false', //流动控件监听 monitorShow:'false', //流动控件监听
monitorName:null, //流动控件监听 monitorName:null, //流动控件监听
tableHeight: 585,
}, },
mutations: { mutations: {
......
src/views/education/LineBody.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">线体管理</h1>
<Head type="1"></Head> <Head type="1"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/ManageList.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">生产排程统计</h1>
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" /> <search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
class="table-style"
tooltip-effect="dark" tooltip-effect="dark"
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
......
src/views/education/MaterialDelivery.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">物料出库管理</h1>
<search-form :formList="[1,2,3]" :searchList="searchList" :btnList="[1,2]" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form :formList="[1,2,3]" :searchList="searchList" :btnList="[1,2]" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
class="table-style"
tooltip-effect="dark" tooltip-effect="dark"
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
......
src/views/education/MaterialWarehousingMoudle.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">物料入库管理</h1>
<search-form :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
class="table-style"
tooltip-effect="dark" tooltip-effect="dark"
highlight-current-row highlight-current-row
style="width: 100%" style="width: 100%"
......
src/views/education/ProducSchedule.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">生产排程</h1>
<Head type="8" :statusList="statusList" ref="head" @searchQuery="query"></Head> <Head type="8" :statusList="statusList" ref="head" @searchQuery="query"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/ProductDelivery.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">产品出库管理</h1>
<search-form :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
class="table-style"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
highlight-current-row highlight-current-row
......
src/views/education/ProductHouseshow.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">产品库存统计</h1>
<search-form :formList="[1]" :searchList="searchList" :formData="formData" @searchData="searchData" /> <search-form :formList="[1]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<baseTable :tableHead="tableHead" :tableData="tableData" /> <baseTable :tableHead="tableHead" :tableData="tableData" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" /> <Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
......
src/views/education/ProductStorage.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">产品入库管理</h1>
<search-form :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" /> <search-form :formList="[1,2,3]" :btnList="[1,2]" :searchList="searchList" :formData="formData" @scanGunCode="scanGunCode" @searchData="searchData" @openDialog="openDialog" @delData="delData" />
<el-table <el-table
border border
height="675"
ref="multipleTable" ref="multipleTable"
:height="$store.state.tableHeight"
:data="tableData" :data="tableData"
class="table-style"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
highlight-current-row highlight-current-row
......
src/views/education/ProductionPlan.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">生产计划</h1>
<Head type="12" ref="head" @searchQuery="query"></Head> <Head type="12" ref="head" @searchQuery="query"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/component/baseTable.vue
View file @ 450a6f7d
<template> <template>
<div class="baseTable"> <div class="baseTable">
<!-- height: 635 585 -->
<el-table <el-table
border border
height="635" :height="baseTableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
...@@ -52,6 +53,10 @@ ...@@ -52,6 +53,10 @@
<script> <script>
export default { export default {
props: { props: {
baseTableHeight: {
type: Number,
default: 575
},
// 是否显示表格勾选框 // 是否显示表格勾选框
showSelection: { showSelection: {
type: Boolean, type: Boolean,
......
src/views/education/deviceManage.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="deviceManage"> <div class="deviceManage">
<div class="deviceCenten"> <div class="deviceCenten">
<h1 class="page-title">设备管理</h1>
<Head type="11" ref="head" ></Head> <Head type="11" ref="head" ></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/materialinventory.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">物料库存统计</h1>
<search-form :formList="[1]" :searchList="searchList" :formData="formData" @searchData="searchData" /> <search-form :formList="[1]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<baseTable :tableHead="tableHead" :tableData="tableData" /> <baseTable :tableHead="tableHead" :tableData="tableData" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" /> <Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
......
src/views/education/materiel.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">物料管理</h1>
<Head type="4"></Head> <Head type="4"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/productManage.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">产品管理</h1>
<Head type="10" ref="head" @searchQuery="query" ></Head> <Head type="10" ref="head" @searchQuery="query" ></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/schedulingStatistics.vue
View file @ 450a6f7d
<template> <template>
<div class="box-container"> <div class="box-container">
<div class="wrap"> <div class="wrap">
<h1 class="page-title">生产计划统计</h1>
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" /> <search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<baseTable :tableHead="tableHead" :tableData="tableData" :rowClassName="tableRowClassName" /> <baseTable :tableHead="tableHead" :tableData="tableData" :rowClassName="tableRowClassName" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" /> <Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
......
src/views/education/technology.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">工艺管理</h1>
<Head type="3"></Head> <Head type="3"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
src/views/education/wordProcedure.vue
View file @ 450a6f7d
...@@ -8,11 +8,12 @@ ...@@ -8,11 +8,12 @@
<template> <template>
<div class="lineBox"> <div class="lineBox">
<div class="LineCenten"> <div class="LineCenten">
<h1 class="page-title">工序管理</h1>
<Head type="2"></Head> <Head type="2"></Head>
<div class="conterFool_middle" style="width:98%;margin:auto"> <div class="conterFool_middle" style="width:98%;margin:auto">
<el-table <el-table
border border
height="675" :height="$store.state.tableHeight"
class="conterFool_middle" class="conterFool_middle"
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment