From f3335e01ea71614db9fa6aedf1d35e1202c3b12f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 11 八月 2022 15:46:26 +0800
Subject: [PATCH] 修改登陆时传PC参数
---
src/views/zzmx/gxdy.vue | 260 ++++++++++++++++++++-------------------------------
1 files changed, 104 insertions(+), 156 deletions(-)
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index 7ab483b..43564bf 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -1,7 +1,13 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <div class="bodyTopButtonGroup">
+ <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 class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -58,19 +64,14 @@
</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-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
- <el-divider />
+
<div class="elTableDiv">
<el-table
:data="tableData"
:height="tableHeight"
border
- stripe
- :style="{width: 100+'%',height:tableHeight+'px',}"
+ :row-class-name="tableRowClassName"
+ :style="{width: 100+'%',height:tableHeight+'px'}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -147,7 +148,12 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
- <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="workClick(row)" />
+ <i
+ v-if="row.is_eqp==='N'"
+ class="el-icon-share"
+ style="color: rgb(180 ,181, 185)"
+ @click="workClick(row)"
+ />
</div>
</template>
</el-table-column>
@@ -159,18 +165,28 @@
<template slot-scope="{row}">
<div class="operationClass">
<i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
- <i v-if="row.is_defect==='N'" class="el-icon-share" style="color:rgb(180 ,181, 185);" @click="defectClick(row)" />
+ <i
+ v-if="row.is_defect==='N'"
+ class="el-icon-share"
+ style="color:rgb(180 ,181, 185);"
+ @click="defectClick(row)"
+ />
</div>
</template>
</el-table-column>
<el-table-column
label="鎿嶄綔"
fixed="right"
+ 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>
@@ -183,7 +199,7 @@
: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="getStepSearch"
/>
@@ -267,8 +283,7 @@
title="鍏宠仈宸ヤ綔绔�"
:visible.sync="workDialogVisible"
width="50%"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'5vh': '15vh'"
:close-on-click-modal="false"
class="workDialogVisible"
@closed="workHandleClose"
@@ -315,7 +330,7 @@
:data="workDialogForm.workTreeArr"
show-checkbox
node-key="code"
- style="height: 300px;"
+ style="height: 280px;"
default-expand-all
:props="workTreeDefaultProps"
@check="checkBoxClick"
@@ -336,8 +351,7 @@
title="宸ュ簭鍏宠仈缂洪櫡"
:visible.sync="defectDialogVisible"
width="50%"
- top="15vh"
- :fullscreen="isFullscreen"
+ :top="isIpad?'5vh':'15vh'"
:close-on-click-modal="false"
class="defectDialogVisible"
@closed="defectHandleClose"
@@ -358,7 +372,7 @@
:data="defectTree"
show-checkbox
node-key="code"
- style="height: 500px;"
+ style="height: 400px;"
default-expand-all
:props="workTreeDefaultProps"
/>
@@ -408,7 +422,7 @@
}
}
return {
- isFullscreen: false,
+ isIpad: false,
mainHeight: 0,
tableHeight: 0,
form: {
@@ -488,6 +502,9 @@
this.getHeight()
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
async getStepSearch() {
const res = await StepSearch(this.form)
this.tableData = res.data
@@ -600,12 +617,13 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
- // this.isFullscreen = window.innerHeight < 800
- if (window.innerHeight < 800) {
- this.tableHeight = this.tableHeight - 50
+ // this.mainHeight = window.innerHeight - 250
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 40
}
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
/* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
@@ -947,71 +965,10 @@
}
}
</script>
-
<style lang="scss" scoped>
$main_color: #42b983;
-::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 {
- 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-dialog__footer {
- display: flex;
- 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;
-}
-
-.defectDialogVisible {
- ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
- }
-}
.workDialogVisible {
- ::v-deep .el-dialog__body {
- padding: 20px 20px !important;
- }
-
.myCheckboxGroup {
display: flex;
flex-wrap: wrap;
@@ -1065,27 +1022,60 @@
}
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
}
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
+.el-icon-edit-outline {
+ margin-right: 15px;
}
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
+::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;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
}
::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+::v-deep .workDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .defectDialogVisible .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
}
::v-deep .el-table .caret-wrapper {
@@ -1093,57 +1083,25 @@
}
::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 {
@@ -1156,24 +1114,14 @@
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;
-}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
</style>
--
Gitblit v1.9.3