This commit is contained in:
parent
2edeb6fc20
commit
b679498542
|
|
@ -70,20 +70,20 @@ export const constantRoutes = [
|
||||||
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
/* {
|
{
|
||||||
path: '',
|
path: '',
|
||||||
component: Layout,
|
component: Layout,
|
||||||
redirect: 'index1',
|
redirect: 'index1',
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
path: 'index1',
|
path: 'index1',
|
||||||
component: () => import('@/views/index'),
|
component: () => import('@/views/index'),
|
||||||
name: 'Index1',
|
name: 'Index1',
|
||||||
meta: { title: '快捷导航', icon: 'dashboard', affix: true }
|
meta: { title: '快捷导航', icon: 'dashboard', affix: true }
|
||||||
},
|
},
|
||||||
|
|
||||||
]
|
]
|
||||||
}, */
|
},
|
||||||
{
|
{
|
||||||
path: '/qrCode/qrCodePage',
|
path: '/qrCode/qrCodePage',
|
||||||
component: () => import('@/views/qrCode/qrCode'),
|
component: () => import('@/views/qrCode/qrCode'),
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@
|
||||||
<el-card class="content-box">
|
<el-card class="content-box">
|
||||||
<el-row :gutter="10" class="mb8" justify="end">
|
<el-row :gutter="10" class="mb8" justify="end">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<span style="font-size: 20px; font-weight: 800">自用申请列表</span>
|
<span style="font-size: 20px; font-weight: 800">出库申请列表</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="20" style="display: flex; justify-content: flex-end">
|
<el-col :span="20" style="display: flex; justify-content: flex-end">
|
||||||
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新建申请</el-button>
|
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新建申请</el-button>
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
<el-card>
|
<el-card>
|
||||||
<el-row :gutter="10" class="mb8" justify="end">
|
<el-row :gutter="10" class="mb8" justify="end">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<span style="font-size: 20px; font-weight: 800">自用审核列表</span>
|
<span style="font-size: 20px; font-weight: 800">出库审核列表</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@
|
||||||
<el-card class="content-box">
|
<el-card class="content-box">
|
||||||
<el-row :gutter="10" class="mb8" justify="end">
|
<el-row :gutter="10" class="mb8" justify="end">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<span style="font-size: 20px; font-weight: 800">自用审核列表</span>
|
<span style="font-size: 20px; font-weight: 800">出库审核列表</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="20" style="display: flex; justify-content: flex-end; gap: 10px">
|
<el-col :span="20" style="display: flex; justify-content: flex-end; gap: 10px">
|
||||||
<el-button
|
<el-button
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8" justify="end">
|
<el-row :gutter="10" class="mb8" justify="end">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<span style="font-size: 20px; font-weight: 800">自用出库列表</span>
|
<span style="font-size: 20px; font-weight: 800">出库执行列表</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col v-if="routerParams.isView" :span="20" style="display: flex; justify-content: flex-end">
|
<el-col v-if="routerParams.isView" :span="20" style="display: flex; justify-content: flex-end">
|
||||||
<el-button type="primary" :disabled="queryParams.taskStatus =='3'" @click="handleOutAll">全部出库</el-button>
|
<el-button type="primary" :disabled="queryParams.taskStatus =='3'" @click="handleOutAll">全部出库</el-button>
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
<el-card class="content-box">
|
<el-card class="content-box">
|
||||||
<el-row :gutter="10" class="mb8" justify="end">
|
<el-row :gutter="10" class="mb8" justify="end">
|
||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<span style="font-size: 20px; font-weight: 800">自用出库列表</span>
|
<span style="font-size: 20px; font-weight: 800">出库执行列表</span>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-table
|
<el-table
|
||||||
|
|
|
||||||
4341
src/views/index.vue
4341
src/views/index.vue
File diff suppressed because one or more lines are too long
|
|
@ -209,10 +209,10 @@ export default {
|
||||||
},
|
},
|
||||||
label: {
|
label: {
|
||||||
normal: {
|
normal: {
|
||||||
show: false,
|
show: true,
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: 500,
|
fontWeight: 500,
|
||||||
color: 'rgba(255,255,255,0.5)',
|
color: 'rgba(255,255,255,0.8)',
|
||||||
},
|
},
|
||||||
emphasis: {
|
emphasis: {
|
||||||
show: true,
|
show: true,
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<span></span>
|
<span></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="content-view">
|
<div class="content-view">
|
||||||
<div >
|
<div class="table-container">
|
||||||
<div class="tableHeader">
|
<div class="tableHeader">
|
||||||
<div class="header" style="width: 5%">序号</div>
|
<div class="header" style="width: 5%">序号</div>
|
||||||
<div class="header" style="width: 35%">工序</div>
|
<div class="header" style="width: 35%">工序</div>
|
||||||
|
|
@ -162,11 +162,12 @@ export default {
|
||||||
.tableHeader {
|
.tableHeader {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 15%;
|
height: 15%;
|
||||||
background-color: #082d6e;
|
background-image: url('../../../../../assets/cityScreen/tableHeader.png');
|
||||||
opacity: 0.8;
|
background-size: 100% 100%;
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
font-weight: 800;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tableBox {
|
.tableBox {
|
||||||
|
|
@ -200,7 +201,7 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
color: #ccc;
|
color: #72b1f1;
|
||||||
padding: 4px 0;
|
padding: 4px 0;
|
||||||
width: 25%;
|
width: 25%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
@ -208,7 +209,7 @@ export default {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
|
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
|
|
|
||||||
|
|
@ -10,25 +10,25 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="content-view">
|
<div class="content-view">
|
||||||
|
|
||||||
<div >
|
<div class="table-container">
|
||||||
<div class="tableHeader">
|
<div class="tableHeader">
|
||||||
<div class="header" style="width: 5%">序号</div>
|
<div class="header" style="width: 5%">序号</div>
|
||||||
<div class="header" style="width: 30%">工序</div>
|
<div class="header" style="width: 35%">工序</div>
|
||||||
<div class="header" style="width: 25%">设备</div>
|
<div class="header" style="width: 30%">设备</div>
|
||||||
<div class="header" style="width: 40%">预警情况</div>
|
<div class="header" style="width: 30%">预警情况</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tableBox">
|
<div class="tableBox">
|
||||||
<div class="tableTr" v-for="(item, index) in tableList" :key="index">
|
<div class="tableTr" v-for="(item, index) in tableList" :key="index">
|
||||||
<div class="tableTd" style="width: 5%">
|
<div class="tableTd" style="width: 5%">
|
||||||
{{ index + 1 }}
|
{{ index + 1 }}
|
||||||
</div>
|
</div>
|
||||||
<div class="tableTd" style="width: 30%">
|
<div class="tableTd" style="width: 35%">
|
||||||
{{ item.procedureName }}
|
{{ item.procedureName }}
|
||||||
</div>
|
</div>
|
||||||
<div class="tableTd" style="width: 25%">
|
<div class="tableTd" style="width: 30%">
|
||||||
{{ item.deviceName }}
|
{{ item.deviceName }}
|
||||||
</div>
|
</div>
|
||||||
<div class="tableTd" style="width: 40%; color: #e3c54e">
|
<div class="tableTd" style="width: 30%; color: #e3c54e">
|
||||||
{{ item.situation }}
|
{{ item.situation }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -163,9 +163,10 @@ export default {
|
||||||
.tableHeader {
|
.tableHeader {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 15%;
|
height: 15%;
|
||||||
background-color: #082d6e;
|
background-image: url('../../../../../assets/cityScreen/tableHeader.png');
|
||||||
opacity: 0.8;
|
background-size: 100% 100%;
|
||||||
font-size: 10px;
|
font-size: 13px;
|
||||||
|
font-weight: 800;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
@ -206,7 +207,7 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
color: #ccc;
|
color: #72b1f1;
|
||||||
padding: 4px 0;
|
padding: 4px 0;
|
||||||
width: 25%;
|
width: 25%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
|
@ -214,7 +215,7 @@ export default {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
font-size: 10px;
|
font-size: 11px;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @media screen and (min-width: 1080px) {
|
// @media screen and (min-width: 1080px) {
|
||||||
|
|
|
||||||
|
|
@ -207,7 +207,7 @@ export default {
|
||||||
}
|
}
|
||||||
|
|
||||||
.right_3 {
|
.right_3 {
|
||||||
height: 306px;
|
height: 270px;
|
||||||
grid-row: 7 / 12;
|
grid-row: 7 / 12;
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue