From 0b1837e9b6d1ac8825e9c1acf6f0cd5b2b14a897 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 10:41:00 +0800
Subject: [PATCH] 1.列展示设置 静态框架初步搭建完成
---
src/views/sbgl/djjl.vue | 98 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 28 deletions(-)
diff --git a/src/views/sbgl/djjl.vue b/src/views/sbgl/djjl.vue
index 1a4ee6b..6ce2795 100644
--- a/src/views/sbgl/djjl.vue
+++ b/src/views/sbgl/djjl.vue
@@ -11,11 +11,11 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
- <div class="elForm">
+ <div class="elForm" style="justify-content: flex-start">
<el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
@@ -35,7 +35,7 @@
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
<el-input v-model="form.stanedname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="鐐规浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鐐规浜哄憳" style=" display: flex;">
<el-input v-model="form.checkuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鐐规鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
@@ -62,21 +62,31 @@
<!-- </el-select>-->
<!-- </el-form-item>-->
</div>
- <div class="bodySearchReset">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
- <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">
+
+ <div class="elTableDiv">
<el-table
ref="tableDataRef"
class="tableFixed"
@@ -100,31 +110,37 @@
prop="djwo"
label="鐐规鍗曞彿"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="org_name"
label="鐢熶骇杞﹂棿"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqp_code"
label="璁惧缂栧彿"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="eqp_name"
label="璁惧鍚嶇О"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="stanedcode"
label="鐐规鏍囧噯缂栫爜"
width="160"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="stanedname"
label="鐐规鏍囧噯鍚嶇О"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -132,6 +148,7 @@
prop="chk_user"
label="鐐规浜哄憳"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -143,16 +160,27 @@
prop="chk_result"
label="鐐规缁撴灉"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
- <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+
+ 姝ｅ父
+ </div>
+ <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寮傚父
+ </div>
</template>
</el-table-column>
<el-table-column
prop="chk_date"
label="鐐规鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -172,7 +200,8 @@
<!-- </div>-->
<i
class="el-icon-tickets"
- style="cursor: pointer;color: #42b983;margin-right: 15px"
+ :style="{color:$store.state.settings.theme}"
+ style="cursor: pointer;margin-right: 15px"
@click="edit('edit',row)"
/>
</template>
@@ -232,8 +261,16 @@
label="鐐规缁撴灉"
>
<template slot-scope="{row}">
- <div v-if="row.result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />姝ｅ父</div>
- <div v-if="row.result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />寮傚父</div>
+ <div v-if="row.result==='OK'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 姝ｅ父
+ </div>
+ <div v-if="row.result==='NG'" style="display: flex;align-items: center">
+ <!-- <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寮傚父
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -286,6 +323,7 @@
},
data() {
return {
+ mouseHoverType: 'mouseout',
isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
@@ -415,7 +453,7 @@
this.dialogVisible = true
},
// 淇敼鎸夐挳
- async edit(operation, row) {
+ async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
@@ -503,7 +541,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 245
+ this.tableHeight = this.mainHeight - 255
this.$refs.tableDataRef.doLayout()
})
@@ -519,16 +557,19 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-range__icon{
+::v-deep .el-range__icon {
line-height: 28px !important;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
line-height: 28px !important;
}
-::v-deep .el-range-input{
+
+::v-deep .el-range-input {
font-size: 14px;
}
-::v-deep .el-range-separator{
+
+::v-deep .el-range-separator {
display: flex;
justify-content: center;
align-items: center;
@@ -636,11 +677,12 @@
justify-content: center;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
--
Gitblit v1.9.3