Skip to content

Q
qr-consistency-vue3
Commit 9362f0b6 authored by 高滢's avatar 高滢
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 09daf4a0 6681340f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/assets/styles/index.scss
View file @ 9362f0b6
...@@ -127,8 +127,8 @@ aside { ...@@ -127,8 +127,8 @@ aside {
//main-container全局样式 //main-container全局样式
.app-container { .app-container {
display: flex; //display: flex;
flex-direction: column; /* 垂直排列 */ //flex-direction: column; /* 垂直排列 */
margin: 24px; margin: 24px;
padding: 20px; padding: 20px;
background: #FAFAFB; background: #FAFAFB;
......
src/views/system/factory/index.vue
View file @ 9362f0b6
<template> <template>
<div style="padding: 30px"> <div class="app-container">
<el-button type="primary" plain style="float: right;margin: 12px 0" @click="addFactory">新建</el-button> <div>
<el-button type="primary" plain style="float: right;margin: 12px 0" @click="addFactory">新建</el-button>
</div>
<el-table :data="tableList" style="width: 100%;" border> <el-table :data="tableList" style="width: 100%;" border>
<el-table-column label="序号" align="center"> <el-table-column label="序号" align="center">
<template #default="scope"> <template #default="scope">
......
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