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/byjl.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/views/sbgl/byjl.vue b/src/views/sbgl/byjl.vue
index 9e51ecb..1cec470 100644
--- a/src/views/sbgl/byjl.vue
+++ b/src/views/sbgl/byjl.vue
@@ -13,10 +13,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm" style="justify-content: flex-start">
- <el-form-item label="鐢熶骇杞﹂棿" label-width="70px" style=" display: flex;">
+ <el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select v-model="form.wkshopcode" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in wkshopSelectArr"
@@ -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 v-show="isExpandForm"label="淇濆吇浜哄憳" label-width="70px" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="淇濆吇浜哄憳" style=" display: flex;">
<el-input v-model="form.repairuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="淇濆吇鏃堕棿" style=" display: flex;font-size:14px;align-items: center">
@@ -62,7 +62,7 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <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>
@@ -109,21 +109,27 @@
<el-table-column
prop="bywo"
width="160"
+ show-tooltip-when-overflow
label="淇濆吇鍗曞彿"
sortable="custom"
/>
<el-table-column
prop="org_name"
label="鐢熶骇杞﹂棿"
+ min-width="120"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="eqp_code"
label="璁惧缂栧彿"
+ show-tooltip-when-overflow
sortable="custom"
+ min-width="120"
/>
<el-table-column
prop="eqp_name"
+ min-width="120"
label="璁惧鍚嶇О"
show-tooltip-when-overflow
sortable="custom"
@@ -132,18 +138,21 @@
prop="stanedcode"
label="淇濆吇鏍囧噯缂栫爜"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="stanedname"
label="淇濆吇鏍囧噯鍚嶇О"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="maint_cyc"
label="淇濆吇鍛ㄦ湡"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -154,6 +163,7 @@
prop="maint_user"
label="淇濆吇浜哄憳"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -165,16 +175,26 @@
prop="maint_result"
label="淇濆吇缁撴灉"
width="160"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
- <div v-if="row.maint_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.maint_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.maint_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.maint_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="maint_date"
label="淇濆吇鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
@@ -186,7 +206,8 @@
<template slot-scope="{row}">
<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>
@@ -246,8 +267,12 @@
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">
+ <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">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 寮傚父</div>
</template>
</el-table-column>
<el-table-column
--
Gitblit v1.9.3