From ef9633e0d1689fd8869170f3aa0af6c90c2e5e7f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 07 九月 2022 16:18:24 +0800
Subject: [PATCH] 1.优化项目2.搜索栏多行的变为一行可展开
---
src/views/sbgl/sbqd.vue | 321 +++++++++++++++++++++++-----------------------------
1 files changed, 142 insertions(+), 179 deletions(-)
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 0f01076..9d96565 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -1,7 +1,18 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <div style="display: flex">
+ <el-button icon="el-icon-c-scale-to-original" @click="deviceTypeButton">璁惧绫诲瀷</el-button>
+ <el-button icon="el-icon-document-copy" @click="deviceGroupButton">璁惧缁�</el-button>
+ </div>
+
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -56,7 +67,6 @@
style="width: 200px"
filterable
placeholder="璇烽�夋嫨"
-
@change="deviceTypeChange"
>
<!-- @focus="getDeviceTypeSelect"-->
@@ -68,7 +78,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="璁惧缁�" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
filterable
@@ -92,22 +102,22 @@
</div>
</el-form>
</div>
- <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>
- <el-divider />
- <div class="elTableDiv">
+ <div
+ class="bodyTopFormExpand"
+ @click="isExpandForm=!isExpandForm"
+ >
+ <i
+ :class="!isExpandForm?'el-icon-arrow-down':'el-icon-arrow-up'"
+ :style="{color:'#42B983'}"
+ /></div>
+ <div class="elTableDiv" style="margin-top: 0;">
<el-table
:data="tableData"
border
- :height="tableHeight+'px'"
- stripe
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
highlight-current-row
- :style="{width: 100+'%',height:(tableHeight-50)+'px'}"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChange"
@@ -153,8 +163,8 @@
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'">鏄�</div>
- <div v-if="row.enable==='N'">鍚�</div>
+ <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />鏄�</div>
+ <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />鍚�</div>
</template>
</el-table-column>
<el-table-column
@@ -185,7 +195,8 @@
width="100"
>
<template slot-scope="{row}">
- <div>{{ row.operation_ration }}%</div>
+ <div v-if=" parseFloat(row.operation_ration)===0">/</div>
+ <div v-else>{{ row.operation_ration }}%</div>
</template>
</el-table-column>
<el-table-column
@@ -203,12 +214,16 @@
<el-table-column
label="鎿嶄綔"
fixed="right"
- width="100"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <i class="el-icon-delete" @click="del(row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -216,12 +231,11 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceMangerSearch"
/>
@@ -367,10 +381,12 @@
<!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
+ ref="DeviceTypeArray"
:data="DeviceTypeArray"
border
height="300"
highlight-current-row
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceType"
@@ -379,6 +395,7 @@
width="50"
label="搴忓彿"
prop="RowNum"
+ fixed
/>
<el-table-column
prop="code"
@@ -386,7 +403,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+ <el-input v-if="row.isVisible===1" v-model="row.code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="璇疯緭鍏�" />
<div v-else> {{ row.code }}</div>
</template>
</el-table-column>
@@ -422,12 +439,12 @@
</el-table>
<!--鍒嗛〉-->
<pagination
- v-show="DeviceTypeTotal>0"
:total="DeviceTypeTotal"
:page.sync="formDeviceType.page"
:limit.sync="formDeviceType.rows"
align="right"
- layout="prev, pager, next,sizes"
+ style="margin-top: 10px"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceTypeSearchDialog"
/>
@@ -446,6 +463,7 @@
width="800px"
:close-on-click-modal="false"
top="15vh"
+
class="DeviceTypeDialogVisible"
@close="handleCloseDeviceGroup"
>
@@ -453,10 +471,12 @@
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="addDeviceGroup">鏂板</el-button>
</div>
<el-table
+ ref="DeviceGroupArray"
:data="DeviceGroupArray"
border
highlight-current-row
height="300"
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@sort-change="sortChangeOfDeviceGroup"
@@ -464,6 +484,7 @@
<el-table-column
width="50"
label="搴忓彿"
+ fixed
prop="RowNum"
/>
<el-table-column
@@ -472,7 +493,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.code" placeholder="璇疯緭鍏�" />
+ <el-input v-if="row.isVisible===1"v-model="row.code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="璇疯緭鍏�" />
<div v-else> {{ row.code }}</div>
</template>
</el-table-column>
@@ -531,12 +552,12 @@
</el-table>
<!--鍒嗛〉-->
<pagination
- v-show="DeviceGroupTotal>0"
:total="DeviceGroupTotal"
:page.sync="formDeviceGroup.page"
:limit.sync="formDeviceGroup.rows"
align="right"
- layout="prev, pager, next,sizes"
+ style="margin-top: 10px"
+ layout="total, prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDeviceGroupSearchDialog"
/>
@@ -557,7 +578,7 @@
import Pagination from '@/components/Pagination'
import {
AddUpdateDeviceGroup, AddUpdateDeviceManger,
- AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,
+ AddUpdateDeviceType, DeleteDeviceGroup, DeleteDeviceManger, DeleteDeviceType,
DeviceGroupSearch,
DeviceMangerSearch,
DeviceTypeSearch,
@@ -565,27 +586,16 @@
DeviceTypeSelectGroup,
WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
-import { handleDatetime } from '@/utils/global'
+import { handleDatetime, validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'SBQD',
components: {
Pagination
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -627,7 +637,7 @@
operation: '',
dialogFormRules: {
devicecode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
devicename: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -781,6 +791,9 @@
DeleteDeviceManger({ devicecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getDeviceMangerSearch()
}
})
@@ -851,11 +864,11 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- if (window.innerHeight < 800) {
- this.tableHeight = this.tableHeight - 50
- }
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 250
+ // if (window.innerHeight < 769) {
+ // this.tableHeight = this.tableHeight - 50
+ // }
})
},
@@ -864,6 +877,9 @@
deviceTypeButton() {
this.DeviceTypeDialogVisible = true
this.getDeviceTypeSearchDialog()
+ this.$nextTick(() => {
+ this.$refs.DeviceTypeArray.doLayout()
+ })
},
async getDeviceTypeSearchDialog() {
const res = await DeviceTypeSearch(this.formDeviceType)
@@ -911,6 +927,9 @@
DeleteDeviceType({ devicetypecode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formDeviceType.page > 1 && this.DeviceTypeArray.length === 1) {
+ this.formDeviceType.page--
+ }
this.getDeviceTypeSearchDialog()
}
})
@@ -959,6 +978,9 @@
deviceGroupButton() {
this.DeviceGroupDialogVisible = true
this.getDeviceGroupSearchDialog()
+ this.$nextTick(() => {
+ this.$refs.DeviceGroupArray.doLayout()
+ })
},
// 璁惧缁勫璇濇鍏抽棴浜嬩欢
handleCloseDeviceGroup() {
@@ -1022,6 +1044,9 @@
DeleteDeviceGroup({ devicegroupcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.formDeviceGroup.page > 1 && this.DeviceGroupArray.length === 1) {
+ this.formDeviceGroup.page--
+ }
this.getDeviceGroupSearchDialog()
}
})
@@ -1062,37 +1087,66 @@
this.DeviceGroupArray.splice(index, 1)
}
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
+<style lang="scss" scoped>
+::v-deep .DeviceTypeDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+::v-deep .el-button--text{
+ font-size: 14px ;
+ cursor: pointer ;
+}
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
+}
+.el-icon-edit-outline{
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
- border: none;
-}
-
-::v-deep .el-button--info {
//background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
}
::v-deep .el-dialog__footer {
@@ -1100,116 +1154,30 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-.DeviceTypeDialogVisible {
- ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
- }
-
- ::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
::v-deep .el-table .caret-wrapper {
- //float: right;
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -1221,23 +1189,18 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
+::v-deep .el-select__caret{
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
</style>
-<style lang="scss">
-.dateStyle {
- .el-date-table td.today span {
- color: #42b983;
- }
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
}
</style>
--
Gitblit v1.9.3