From cffe20b222f298a757e96e2b2e08c8baa3834bb4 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期二, 05 七月 2022 18:06:45 +0800 Subject: [PATCH] 修改页面布局样式 --- src/views/specialWorkSystem/workPlan/workReservation/index.vue | 16 +++++-- src/views/specialWorkSystem/approvalProcess/approveProcessManagement/index.vue | 21 +++++----- src/views/specialWorkSystem/approvalProcess/reportTypeSetting/index.vue | 11 ++++- src/views/specialWorkSystem/approvalProcess/addApproveProcess/index.vue | 17 ++++++-- src/views/specialWorkSystem/approvalProcess/approveProcessSetting/index.vue | 11 ++++- src/views/specialWorkSystem/workApplyManagement/workApply/index.vue | 11 ++++- src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue | 19 ++++++--- src/main.ts | 3 + 8 files changed, 76 insertions(+), 33 deletions(-) diff --git a/src/main.ts b/src/main.ts index b5bd532..bc84b4a 100644 --- a/src/main.ts +++ b/src/main.ts @@ -12,6 +12,7 @@ import '/@/theme/index.scss'; import mitt from 'mitt'; import VueGridLayout from 'vue-grid-layout'; +import locale from 'element-plus/lib/locale/lang/zh-cn' const app = createApp(App); for (const [key, component] of Object.entries(ElementPlusIconsVue)) { @@ -20,6 +21,6 @@ directive(app); other.elSvg(app); -app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t }).use(i18n).use(VueGridLayout).mount('#app'); +app.use(pinia).use(router).use(ElementPlus, { i18n: i18n.global.t,locale }).use(i18n).use(VueGridLayout).mount('#app'); app.config.globalProperties.mittBus = mitt(); diff --git a/src/views/specialWorkSystem/approvalProcess/addApproveProcess/index.vue b/src/views/specialWorkSystem/approvalProcess/addApproveProcess/index.vue index f66bdec..e01d0e3 100644 --- a/src/views/specialWorkSystem/approvalProcess/addApproveProcess/index.vue +++ b/src/views/specialWorkSystem/approvalProcess/addApproveProcess/index.vue @@ -1,17 +1,18 @@ <template> <div class="home-container"> <el-scrollbar height="100%"> + <div class="homeCard"> <el-row> <el-button type="primary" size="large" @click="addApprove">新建审批环节</el-button> </el-row> <el-row> <el-table :data="tableData" border style="width: 100%"> <el-table-column type="index" label="编号" width="100"/> - <el-table-column prop="step" label="环节名称" width="180" /> - <el-table-column prop="type" label="审核类型"/> + <el-table-column prop="step" label="环节名称"/> + <el-table-column prop="type" label="审核类型" width="180"/> <el-table-column prop="createTime" label="创建时间" width="180" /> <el-table-column prop="editor" label="最新编辑人" width="180" /> - <el-table-column prop="editeTime" label="最新编辑时间" /> + <el-table-column prop="editeTime" label="最新编辑时间" width="180" /> <el-table-column fixed="right" label="操作" width="180"> <template #default="scope"> <el-button link type="primary" size="small" @click="editeRow(scope.$index,scope.row)">编辑</el-button> @@ -20,6 +21,7 @@ </el-table-column> </el-table> </el-row> + </div> <el-dialog v-model="dialogAddForm" title="新建审批环节" @close="dialogColse"> <el-form :model="reportForm" label-width="120px" ref="ruleFormRef" :rules="rules"> <el-form-item label="环节名称" prop="step"> @@ -194,9 +196,14 @@ $homeNavLengh: 8; .home-container { overflow: hidden; - background: #fff; - padding: 40px; + padding: 20px; height: 100%; + .homeCard{ + width: 100%; + padding: 20px; + background: #fff; + border-radius: 4px; + } .el-row{ margin-bottom: 20px; } diff --git a/src/views/specialWorkSystem/approvalProcess/approveProcessManagement/index.vue b/src/views/specialWorkSystem/approvalProcess/approveProcessManagement/index.vue index cb46d3d..45e65e2 100644 --- a/src/views/specialWorkSystem/approvalProcess/approveProcessManagement/index.vue +++ b/src/views/specialWorkSystem/approvalProcess/approveProcessManagement/index.vue @@ -2,6 +2,7 @@ <div class="home-container"> <el-scrollbar height="100%"> <el-row> + <div class="homeCard"> <el-col :span="12"> <div class="grid-content topInfo"> <div>流程名称</div> @@ -10,8 +11,9 @@ <el-button plain>重置</el-button> </div> </el-col> + </div> </el-row> - <div class="mainPages"> + <div class="homeCard"> <div class="main-card"> <el-row class="cardTop"> <el-col :span="12" class="mainCardBtn"> @@ -226,18 +228,19 @@ .home-container { height: 100%; overflow: hidden; - background: #fff; - padding: 40px; + padding: 20px; + .homeCard{ + width: 100%; + padding: 20px; + background: #fff; + border-radius: 4px; + } .el-row{ display: flex; align-items: center; + margin-bottom: 20px; &:last-child { margin-bottom: 0; - } - .el-col{ - display: flex; - align-items: center; - margin: 20px 0; } .grid-content{ align-items: center; @@ -264,8 +267,6 @@ } .main-card{ width: 100%; - padding: 20px; - background: #fff; .cardTop{ display: flex; align-items: center; diff --git a/src/views/specialWorkSystem/approvalProcess/approveProcessSetting/index.vue b/src/views/specialWorkSystem/approvalProcess/approveProcessSetting/index.vue index d8f4565..33de449 100644 --- a/src/views/specialWorkSystem/approvalProcess/approveProcessSetting/index.vue +++ b/src/views/specialWorkSystem/approvalProcess/approveProcessSetting/index.vue @@ -1,6 +1,7 @@ <template> <div class="home-container"> <el-scrollbar height="100%"> + <div class="homeCard"> <div> <div v-for="(item,index) in approveSteps" class="stepItem"> <div class="stepNum">{{index+1}}</div> @@ -26,6 +27,7 @@ <el-button type="primary" @click="confirmEdit" size="large">确认</el-button> <el-button @click="cancelEdit" size="large">取消</el-button> </el-row> + </div> <el-drawer v-model="showAdd" direction="rtl" @close="colseDrawer"> <template #title> <h4>新增审批流</h4> @@ -207,9 +209,14 @@ $homeNavLengh: 8; .home-container { height: 100%; - background: #fff; overflow: hidden; - padding: 40px; + padding: 20px; + .homeCard{ + width: 100%; + padding: 20px; + background: #fff; + border-radius: 4px; + } .stepItem{ display: flex; align-items: flex-start; diff --git a/src/views/specialWorkSystem/approvalProcess/reportTypeSetting/index.vue b/src/views/specialWorkSystem/approvalProcess/reportTypeSetting/index.vue index 94627cb..49fbc6d 100644 --- a/src/views/specialWorkSystem/approvalProcess/reportTypeSetting/index.vue +++ b/src/views/specialWorkSystem/approvalProcess/reportTypeSetting/index.vue @@ -1,6 +1,7 @@ <template> <div class="home-container"> <el-scrollbar height="100%"> + <div class="homeCard"> <el-row> <el-button type="primary" size="large" @click="addReport">新建上报类型</el-button> </el-row> @@ -20,6 +21,7 @@ </el-table-column> </el-table> </el-row> + </div> <el-dialog v-model="dialogAddForm" title="新建上报类型" @close="dialogColse"> <el-form :model="reportForm" label-width="120px" ref="ruleFormRef" :rules="addRules"> <el-form-item label="上报数据类型" prop="type"> @@ -184,9 +186,14 @@ $homeNavLengh: 8; .home-container { height: 100%; - background: #fff; overflow: hidden; - padding: 40px; + padding: 20px; + .homeCard{ + width: 100%; + padding: 20px; + background: #fff; + border-radius: 4px; + } .el-row{ margin-bottom: 20px; } diff --git a/src/views/specialWorkSystem/workApplyManagement/workApply/index.vue b/src/views/specialWorkSystem/workApplyManagement/workApply/index.vue index d25b731..09e11a7 100644 --- a/src/views/specialWorkSystem/workApplyManagement/workApply/index.vue +++ b/src/views/specialWorkSystem/workApplyManagement/workApply/index.vue @@ -1,6 +1,7 @@ <template> <div class="home-container"> <el-scrollbar height="100%"> + <div class="homeCard"> <el-form :model="form" label-width="150px"> <el-row> <el-col :span="8"> @@ -262,6 +263,7 @@ </el-col> </el-row> </el-form> + </div> <el-dialog v-model="dialogAddWorker" title="添加作业人"> <el-form :model="addWorkerForm" label-width="120px"> <el-form-item label="作业人"> @@ -585,9 +587,14 @@ <style scoped lang="scss"> .home-container { height: 100%; - background: #fff; overflow: hidden; - padding: 40px; + padding: 20px; + .homeCard{ + width: 100%; + padding: 20px; + background: #fff; + border-radius: 4px; + } .el-row{ margin-bottom: 20px; } diff --git a/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue b/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue index 2d9ebc4..a5a527b 100644 --- a/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue +++ b/src/views/specialWorkSystem/workPlan/workAppointSummary/index.vue @@ -2,6 +2,7 @@ <div class="home-container"> <el-scrollbar height="100%"> <el-row> + <div class="homeCard"> <el-col :span="6"> <div class="grid-content topInfo"> <div>预约时间:</div> @@ -32,12 +33,14 @@ </el-col> <el-col :span="12" class="topBtns"> <div class="grid-content topInfo"> - <div style="margin-right: 20px"><el-button type="primary" plain size="default">查询历史</el-button></div> - <div><el-button type="primary" @click="dialogChartsVisible = true" size="default">查看统计图表</el-button></div> + <div style="margin-right: 20px"><el-button type="primary" plain>查询历史</el-button></div> + <div><el-button type="primary" @click="dialogChartsVisible = true">查看统计图表</el-button></div> </div> </el-col> + </div> </el-row> <el-row> + <div class="homeCard"> <el-table :data="tableData" border style="width: 100%"> <el-table-column prop="id" label="编号" width="180" /> <el-table-column prop="time" label="预约时间" width="180" /> @@ -56,6 +59,7 @@ </template> </el-table-column> </el-table> + </div> </el-row> <el-dialog v-model="dialogChartsVisible" title="统计图表"> <el-row> @@ -430,20 +434,23 @@ $homeNavLengh: 8; .home-container { height: 100%; - background: #fff; overflow: hidden; - padding: 40px; + padding: 20px; .el-row{ margin-bottom: 20px; } .el-row:last-child { margin-bottom: 0; } - .el-col{ + .homeCard{ + width: 100%; display: flex; align-items: center; - margin: 20px 0; + padding: 20px; + background: #fff; + border-radius: 4px; } + .grid-content{ display: flex; align-items: center; diff --git a/src/views/specialWorkSystem/workPlan/workReservation/index.vue b/src/views/specialWorkSystem/workPlan/workReservation/index.vue index 1fef452..2378d4c 100644 --- a/src/views/specialWorkSystem/workPlan/workReservation/index.vue +++ b/src/views/specialWorkSystem/workPlan/workReservation/index.vue @@ -2,6 +2,7 @@ <div class="home-container"> <el-scrollbar height="100%"> <el-row> + <div class="homeCard"> <el-col :span="6"> <div class="grid-content topInfo"> <div>当前所属部门:</div> @@ -42,8 +43,10 @@ <div><el-button type="success" @click="dialogFormVisible = true">新增预约</el-button></div> </div> </el-col> + </div> </el-row> <el-row> + <div class="homeCard"> <el-table :data="tableData" border style="width: 100%"> <el-table-column prop="id" label="编号" width="120" /> <el-table-column prop="time" label="预约时间" width="150" /> @@ -62,6 +65,7 @@ </template> </el-table-column> </el-table> + </div> </el-row> <el-dialog v-model="dialogFormVisible" title="新增预约"> <el-form :model="reservationForm"> @@ -222,19 +226,21 @@ $homeNavLengh: 8; .home-container { height: 100%; - background: #fff; overflow: hidden; - padding: 40px; + padding: 20px; .el-row{ margin-bottom: 20px; } - .el-row:last-child { + .el-row:last-of-type { margin-bottom: 0; } - .el-col{ + .homeCard{ + width: 100%; display: flex; align-items: center; - margin: 20px 0; + padding: 20px; + background: #fff; + border-radius: 4px; } .grid-content{ align-items: center; -- Gitblit v1.9.2