From 3d14449abab5055e2f370be4fa1a31c15c715453 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 24 六月 2022 10:05:51 +0800
Subject: [PATCH] 1.修改部分页面样式
---
src/api/wlgl.js | 62 +++++++
src/views/jcsz/zzjg.vue | 29 +-
src/views/xtsy/index.vue | 2
src/api/zzmx.js | 184 +++++++++++++++++++++++
src/views/jcsz/wldw.vue | 32 ++-
src/views/jcsz/yhqd.vue | 43 +---
src/styles/global.css | 18 +
src/views/jcsz/jsqd.vue | 32 ++--
src/views/sbgl/sbqd.vue | 24 +-
src/views/template.vue | 29 +-
src/router/index.js | 8 +
src/components/Breadcrumb/index.vue | 2
12 files changed, 362 insertions(+), 103 deletions(-)
diff --git a/src/api/wlgl.js b/src/api/wlgl.js
new file mode 100644
index 0000000..11fff8e
--- /dev/null
+++ b/src/api/wlgl.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+
+// 浠撳簱瀹氫箟鏌ヨ
+export function WareHouseDefSearch(data) {
+ return request({
+ url: 'BasicSetting/WareHouseDefSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 浠撳簱瀹氫箟鏂板缂栬緫
+export function AddUpdateWareHouseDef(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateWareHouseDef',
+ method: 'post',
+ data
+ })
+}
+
+// 浠撳簱鍒犻櫎
+export function DeleteWareHouseDef(data) {
+ return request({
+ url: 'BasicSetting/DeleteWareHouseDef',
+ method: 'post',
+ params: data
+ })
+}
+
+// 鎵�灞炰粨搴撴帴鍙�
+export function WareHouseSelect() {
+ return request({
+ url: 'BasicSetting/WareHouseSelect',
+ method: 'get'
+ })
+}
+
+// 搴撲綅瀹氫箟鏌ヨ
+export function StorageDefSearch(data) {
+ return request({
+ url: 'BasicSetting/StorageDefSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 搴撲綅瀹氫箟鏂板缂栬緫
+export function AddUpdateStorageDef(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateStorageDef',
+ method: 'post',
+ data
+ })
+}
+// 搴撲綅鍒犻櫎
+export function DeleteStorageDef(data) {
+ return request({
+ url: 'BasicSetting/DeleteStorageDef',
+ method: 'post',
+ params: data
+ })
+}
+
diff --git a/src/api/zzmx.js b/src/api/zzmx.js
new file mode 100644
index 0000000..c8bccf9
--- /dev/null
+++ b/src/api/zzmx.js
@@ -0,0 +1,184 @@
+import request from '@/utils/request'
+
+// 瀛樿揣绫诲瀷鎺ュ彛
+export function StockTypeSelect() {
+ return request({
+ url: 'BasicSetting/StockTypeSelect',
+ method: 'get'
+ })
+}
+
+// 鐗╂枡绫诲瀷鏌ヨ
+export function MaterialTypeSearch(data) {
+ return request({
+ url: 'BasicSetting/MaterialTypeSearch',
+ method: 'get',
+ params: data
+ })
+}
+
+// 鐗╂枡绫诲瀷鏂板缂栬緫
+export function AddUpdateMaterialType(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateMaterialType',
+ method: 'post',
+ data
+ })
+}
+
+// 鐗╂枡绫诲瀷鍒犻櫎
+export function DeleteMaterialType(data) {
+ return request({
+ url: 'BasicSetting/DeleteMaterialType',
+ method: 'post',
+ params: data
+ })
+}
+
+// 鍗曚綅鍒楄〃鏌ヨ
+export function UomSearch(data) {
+ return request({
+ url: 'BasicSetting/UomSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 鍗曚綅鏂板
+export function UomAdd(data) {
+ return request({
+ url: 'BasicSetting/UomAdd',
+ method: 'post',
+ data
+ })
+}
+// 鍗曚綅鍒犻櫎
+export function UomDelete(data) {
+ return request({
+ url: 'BasicSetting/UomDelete',
+ method: 'post',
+ params: data
+ })
+}
+// 瀛樼被鍨嬫煡鎵剧墿鏂欑被鍨�
+export function StockTypeSelectMaterialType(data) {
+ return request({
+ url: 'BasicSetting/StockTypeSelectMaterialType',
+ method: 'get',
+ params: data
+ })
+}
+// 瀛樿揣妗ｆ鏌ヨ
+export function InventoryFileSelect(data) {
+ return request({
+ url: 'BasicSetting/InventoryFileSelect',
+ method: 'get',
+ params: data
+ })
+}
+
+// 瀛樿揣妗ｆ鏂板缂栬緫
+export function AddUpdateInventoryFile(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateInventoryFile',
+ method: 'post',
+ data
+ })
+}
+// 瀛樿揣妗ｆ鍒犻櫎
+export function DeleteInventoryFile(data) {
+ return request({
+ url: 'BasicSetting/DeleteInventoryFile',
+ method: 'post',
+ params: data
+ })
+}
+// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鏌ヨ
+export function InventoryFileAssociationRoute(data) {
+ return request({
+ url: 'BasicSetting/InventoryFileAssociationRoute',
+ method: 'get',
+ params: data
+ })
+}
+// 瀛樿揣妗ｆ鍏宠仈宸ヨ壓璺嚎鎻愪氦
+export function SaveInventoryFile(partcode, data) {
+ return request({
+ url: 'BasicSetting/SaveInventoryFile?partcode=' + partcode,
+ method: 'post',
+ data
+ })
+}
+// 宸ヨ壓璺嚎鏌ヨ
+export function RouteSearch(data) {
+ return request({
+ url: 'BasicSetting/RouteSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 宸ヨ壓璺嚎棰勮
+export function ViewRoute(data) {
+ return request({
+ url: 'BasicSetting/ViewRoute',
+ method: 'get',
+ params: data
+ })
+}
+// 宸ヨ壓璺嚎鏂板缂栬緫
+export function AddUpdateRoute(id, opertype, data) {
+ return request({
+ url: 'BasicSetting/AddUpdateRoute?id=' + id + '&opertype=' + opertype,
+ method: 'post',
+ data
+ })
+}
+
+// 宸ヨ壓璺嚎鍒犻櫎
+export function DeleteRoute(data) {
+ return request({
+ url: 'BasicSetting/DeleteRoute',
+ method: 'post',
+ params: data
+ })
+}
+// 宸ュ簭鏌ヨ
+export function StepSearch(data) {
+ return request({
+ url: 'BasicSetting/StepSearch',
+ method: 'get',
+ params: data
+ })
+}
+// 宸ュ簭鏂板缂栬緫
+export function AddUpdateStep(data) {
+ return request({
+ url: 'BasicSetting/AddUpdateStep',
+ method: 'post',
+ data
+ })
+}
+// 宸ュ簭鍒犻櫎
+export function DeleteStep(data) {
+ return request({
+ url: 'BasicSetting/DeleteStep',
+ method: 'post',
+ params: data
+ })
+}
+
+// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐煡璇�
+export function StepAssociationEqp(data) {
+ return request({
+ url: 'BasicSetting/StepAssociationEqp',
+ method: 'get',
+ params: data
+ })
+}
+// 宸ュ簭瀹氫箟鍏宠仈宸ヤ綔绔欐彁浜�
+export function SaveStepAssociationEqp(stepcode, data) {
+ return request({
+ url: 'BasicSetting/SaveStepAssociationEqp?stepcode=' + stepcode,
+ method: 'post',
+ data
+ })
+}
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index f87d687..3467ca8 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,5 +1,5 @@
<template>
- <el-breadcrumb class="app-breadcrumb" separator="|">
+ <el-breadcrumb class="app-breadcrumb" separator="/">
<transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
diff --git a/src/router/index.js b/src/router/index.js
index 2d661e6..2f6b37a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -73,6 +73,7 @@
name: '鍩虹璁剧疆',
code: '1001',
meta: { title: '鍩虹璁剧疆', icon: 'tree' },
+ alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
path: 'zzjg',
@@ -114,6 +115,7 @@
name: '璁惧绠＄悊',
code: '1002',
meta: { title: '璁惧绠＄悊', icon: 'example' },
+ alwaysShow: true,
children: [
{
path: 'sblx',
@@ -192,6 +194,7 @@
name: '宸ヨ绠＄悊',
code: '1003',
meta: { title: '宸ヨ绠＄悊', icon: 'component' },
+ alwaysShow: true,
children: [
{
path: 'gzlx',
@@ -269,6 +272,7 @@
name: '鐗╂枡绠＄悊',
code: '1004',
meta: { title: '鐗╂枡绠＄悊', icon: 'table' },
+ alwaysShow: true,
children: [
{
path: 'ckdy',
@@ -317,6 +321,7 @@
name: '鍒堕�犳ā鍨�',
code: '1005',
meta: { title: '鍒堕�犳ā鍨�', icon: 'icu' },
+ alwaysShow: true,
children: [
{
path: 'wllx',
@@ -367,6 +372,7 @@
name: '鐢熶骇绠＄悊',
code: '1006',
meta: { title: '鐢熶骇绠＄悊', icon: 'production' },
+ alwaysShow: true,
children: [
{
path: 'scdd',
@@ -402,6 +408,7 @@
name: '璐ㄩ噺绠＄悊',
code: '1007',
meta: { title: '璐ㄩ噺绠＄悊', icon: 'quality' },
+ alwaysShow: true,
children: [
{
path: 'zjbz',
@@ -443,6 +450,7 @@
name: '绯荤粺璁剧疆',
code: '1009',
meta: { title: '绯荤粺璁剧疆', icon: 'xtsz' },
+ alwaysShow: true,
children: [
{
path: 'bmgz',
diff --git a/src/styles/global.css b/src/styles/global.css
index c388c30..3ddbd99 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -12,13 +12,25 @@
.body {
display: flex;
flex-direction: column;
- height: 800px;
- background-color: #eee;
+ height: 100%;
+ /*background-color: #eee;*/
margin: 0;
- padding: 30px 10px 0 20px;
+ padding: 0 10px;
}
+.elForm {
+ display: flex;
+ justify-content: flex-start;
+ width: 100%;
+ flex-wrap: wrap;
+}
+.elTableDiv {
+ display: flex;
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 0 auto;
+}
/*
瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 096d44a..9c8fe83 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -1,8 +1,7 @@
<template>
<div>
- <!-- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">-->
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -37,13 +36,14 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex; z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
@@ -190,7 +190,6 @@
width="50%"
top="15vh"
class="settingDialogVisible"
- @closed="handleCloseSetting"
@close="handleCloseSetting"
>
<div style="margin-bottom: 20px;display: flex">
@@ -976,7 +975,7 @@
this.$nextTick(() => {
$('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 10)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
// 3.绗笁绉嶆儏鍐礟C鏈�変腑锛孉PP宸查�変腑
@@ -987,7 +986,7 @@
this.$nextTick(() => {
$('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 10)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightAPPArr[0].code
}
// 4.绗洓绉嶆儏鍐礟C宸查�変腑锛孉PP宸查�変腑
@@ -1001,7 +1000,7 @@
$('input:checkbox').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
$('input:checkbox').eq(1).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
- }, 10)
+ }, 100)
this.dialogFormRight.rightCurrentCode = this.dialogFormRight.rightPCArr[0].code
}
this.dialogFormRight.rightOperationArr.push({
@@ -1473,11 +1472,12 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
-
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 100%;
- flex-wrap: wrap;
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+::v-deep .el-form-item{
+ margin-bottom: 0;
}
</style>
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 349d2d6..88bafed 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -36,12 +36,13 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex;z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>
</div>
- <!-- :style="{width: 100+'%',height:isCompatible?(tableHeight+'px'):'800px'}"-->
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
@@ -140,7 +141,7 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-button type="text" @click="edit('edit',row)">淇敼</el-button>
- <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
+ <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -226,7 +227,6 @@
}
}
return {
- isCompatible: false, // 鏄惁鍏煎
mainHeight: 0,
tableHeight: 0,
form: {
@@ -369,13 +369,13 @@
})
},
// 鍒犻櫎鎸夐挳
- async del(id) {
+ async del(row) {
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteCurrentUnit({ unitid: id }).then(res => {
+ DeleteCurrentUnit({ unitcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
this.getCurrentUnitSearch()
@@ -579,10 +579,14 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
}
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 100%;
- flex-wrap: wrap;
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+::v-deep .el-form-item {
+ margin-bottom: 0;
}
</style>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 56a8215..80a2903 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -1,8 +1,7 @@
<template>
<div>
- <!-- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">-->
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -53,11 +52,13 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex;z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
@@ -938,7 +939,6 @@
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -986,7 +986,6 @@
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin: 10px 30px 0px 0;
- //cursor: default !important;
}
::v-deep .el-radio__input.is-checked + .el-radio__label {
@@ -998,20 +997,11 @@
}
.dialogVisibleRoles {
- //::v-deep .el-checkbox.is-bordered.el-checkbox--medium{
- // pointer-events: none;
- //}
-
- //::v-deep .el-checkbox__label{
- // pointer-events: none !important;
- // color: red;
- //}
.myCheckboxGroup {
display: flex;
flex-wrap: wrap;
.myCheckbox {
- //border: 1px solid $main_color;
border: 1px solid #eee;
display: flex;
min-width: 100px;
@@ -1027,10 +1017,6 @@
}
- //.myCheckbox{
- // border: 1px solid $main_color;
- //}
-
input[type=checkbox] {
cursor: pointer;
position: relative;
@@ -1042,13 +1028,12 @@
input[type=checkbox]::after {
position: absolute;
top: 0;
- //color: rgb(130, 35, 35);
color: $main_color;
width: 14px;
height: 14px;
display: inline-block;
visibility: visible;
- padding-left: 0px;
+ padding-left: 0;
text-align: center;
content: ' ';
border-radius: 3px
@@ -1063,12 +1048,14 @@
background-color: $main_color;
}
}
-
}
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 100%;
- flex-wrap: wrap;
+
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+::v-deep .el-form-item{
+ margin-bottom: 0;
}
</style>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 440ae40..46ae373 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -1,8 +1,7 @@
<template>
<div>
- <!-- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;">-->
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -37,13 +36,12 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex;z-index: 2">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-edit" @click="edit('edit')">淇敼</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-delete" @click="del">鎵归噺鍒犻櫎</el-button>-->
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
@@ -422,7 +420,6 @@
}
::v-deep .el-button--info{
- //background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
@@ -479,7 +476,6 @@
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -501,10 +497,13 @@
justify-content: space-between;
align-items: center;
}
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 100%;
- flex-wrap: wrap;
+
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+::v-deep .el-form-item{
+ margin-bottom: 0;
}
</style>
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 717a8a9..3d79b96 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -68,14 +68,15 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<el-button type="primary" icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
<el-button type="primary" icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
@@ -257,7 +258,6 @@
width="50%"
top="15vh"
class="DeviceTypeDialogVisible"
- @closed="handleCloseDeviceType"
@close="handleCloseDeviceType"
>
<div style="margin-bottom: 20px;display: flex">
@@ -1037,10 +1037,12 @@
margin: 10px 30px 0px 0;
}
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 100%;
- flex-wrap: wrap;
+.body ::v-deep .el-divider{
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+::v-deep .el-form-item{
+ margin-bottom: 0;
}
</style>
diff --git a/src/views/template.vue b/src/views/template.vue
index 5a0e09c..c052c45 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -1,7 +1,7 @@
<template>
<div>
- <div class="body" style="background-color: #ffffff; padding: 20px 10px 0 20px;" :style="{height:mainHeight+'px'}">
- <div>
+ <div class="body" :style="{height:mainHeight+'px'}">
+ <div style="padding: 10px 5px 0 0">
<el-form
ref="form"
:model="form"
@@ -36,13 +36,12 @@
</div>
</el-form>
</div>
- <div style="margin-bottom: 20px;display: flex">
+ <el-divider />
+ <div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-edit" @click="edit('edit')">淇敼</el-button>-->
- <!-- <el-button type="primary" icon="el-icon-delete" @click="del">鎵归噺鍒犻櫎</el-button>-->
</div>
-
- <div style="display: flex;border: 1px solid #eee">
+ <el-divider />
+ <div class="elTableDiv">
<el-table
:data="tableData"
border
@@ -416,7 +415,6 @@
}
::v-deep .el-button--info {
- //background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
@@ -473,7 +471,6 @@
}
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
@@ -531,10 +528,14 @@
margin: 10px 30px 0px 0;
}
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 85%;
- flex-wrap: wrap;
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
}
+
+::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
</style>
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 2ba6293..6efdb9f 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -1,6 +1,6 @@
<template>
<!-- <div>-->
- <div class="body" :style="{height:mainHeight+'px'}">
+ <div class="body" style=" padding: 30px 10px 0 20px;background-color: #eee;" :style="{height:mainHeight+'px'}">
<div style="">
<div class="title"><i class="el-icon-s-fold" style="margin-right: 5px" />瀹炴椂鏁版嵁</div>
<div class="top">
--
Gitblit v1.9.3