From 677697e36b35ff80e3b45bb07a0e008fac8e9bd9 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 23:04:55 +0800
Subject: [PATCH] update
---
src/container/component/index.vue | 131 ++++++++++++++++++++++++-------------------
1 files changed, 74 insertions(+), 57 deletions(-)
diff --git a/src/container/component/index.vue b/src/container/component/index.vue
index c8712a8..4ab7264 100644
--- a/src/container/component/index.vue
+++ b/src/container/component/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-13 10:19:48
+ * @LastEditTime: 2024-01-16 23:04:06
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/component/index.vue
-->
<template>
@@ -11,24 +11,24 @@
<template slot="search">
<div class="item">
<span>闆朵欢鍙�</span>
- <el-select class="item-value" v-model="queryInfo.component" placeholder="璇烽�夋嫨">
+ <el-select class="item-value" v-model="queryInfo.component" placeholder="璇烽�夋嫨" clearable>
<el-option
v-for="item in componentList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item"
+ :label="item"
+ :value="item">
</el-option>
</el-select>
</div>
<div class="item">
<span>宸ュ簭鍙�</span>
<!-- <el-input class="item-value" v-model="query.no"></el-input> -->
- <el-select class="item-value" v-model="queryInfo.precess" placeholder="璇烽�夋嫨">
+ <el-select class="item-value" v-model="queryInfo.precess" placeholder="璇烽�夋嫨" clearable>
<el-option
v-for="item in precessList"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ :key="item"
+ :label="item"
+ :value="item">
</el-option>
</el-select>
</div>
@@ -41,6 +41,7 @@
align="right"
value-format="yyyy-MM-dd"
type="date"
+ clearable
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
@@ -50,21 +51,20 @@
class="item-value"
v-model="queryInfo.timeEnd"
align="right"
+ clearable
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
- <div class="item">
- <div class="query btn" @click="query">鏌ヨ</div>
- </div>
- <div class="item">
- <div class="reset btn" @click="reset">閲嶇疆</div>
+ <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
+ <el-button type="primary" size="small" @click="query">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="reset">閲嶇疆</el-button>
</div>
</template>
<template slot="columns">
<el-table-column
- prop="date"
+ prop="machineId"
label="鏈哄簥鍚�"
width="180">
</el-table-column>
@@ -74,12 +74,15 @@
width="180">
</el-table-column>
<el-table-column
- prop="address"
+ prop="process"
label="宸ュ簭鍙�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="time"
label="鍔犲伐鏃堕棿">
+ <template slot-scope="scope">
+ <span>{{scope.row.time.slice(0,10)}}</span>
+ </template>
</el-table-column>
</template>
</List>
@@ -143,51 +146,65 @@
border: 1px solid #435F9E;
}
}
+ .el-button--mini {
+ background: transparent;
+ }
+ .el-button--primary {
+ background-color: transparent;
+ }
}
</style>
<style lang="scss" scoped>
- .maintenance {
- width: 100%;
- height: 100%;
- overflow: hidden;
- color: #FFF;
+.maintenance {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ color: #FFF;
+ display: flex;
+ flex-direction: column;
+
+ .nav {
+ padding: 10px 30px;
+ font-size: 14px;
+ }
+
+ .item {
+ margin-top: 20px;
+ margin-left: 50px;
display: flex;
- flex-direction: column;
- .nav {
- padding: 10px 30px;
+ align-items: center;
+
+ span {
+ width: 120px;
+ font-size: 16px;
+ font-family: PingFangSC, PingFang SC;
+ color: #C6DCE0;
+ text-align: right;
+ padding-right: 20px;
}
- .item {
- margin-top: 20px;
- margin-left: 50px;
- display: flex;
- align-items: center;
- span {
- width: 120px;
- font-size: 16px;
- font-family: PingFangSC, PingFang SC;
- color: #C6DCE0;
- text-align: right;
- padding-right: 20px;
- }
- .item-value {
- width: 200px;
- border: 1px solid #435F9E;
- }
- .btn {
- line-height: 1.5;
- width: 100px;
- text-align: center;
- font-size: 16px;
- cursor: pointer;
- }
- .reset {
- background: #AAB6BA;
- color: #FFF;
- }
- .query {
- background: #5DD1FC;
- color: #FFF;
- }
+
+ .item-value {
+ width: 200px;
+ border: 1px solid #435F9E;
+ }
+
+ .btn {
+ line-height: 1.5;
+ width: 100px;
+ text-align: center;
+ font-size: 16px;
+ cursor: pointer;
+ }
+
+ .reset {
+ background: #AAB6BA;
+ color: #FFF;
+ }
+
+ .query {
+ background: #5DD1FC;
+ color: #FFF;
}
}
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3