From 677697e36b35ff80e3b45bb07a0e008fac8e9bd9 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 23:04:55 +0800
Subject: [PATCH] update
---
src/container/maintenance/index.vue | 12 ++++++------
src/container/machineList/Manage-add-update.vue | 2 +-
src/container/component/index.vue | 8 +++++---
src/container/machineList/index.vue | 22 +++++++++++++---------
4 files changed, 25 insertions(+), 19 deletions(-)
diff --git a/src/container/component/index.vue b/src/container/component/index.vue
index 5e0b1f8..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-14 15:36:44
+ * @LastEditTime: 2024-01-16 23:04:06
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/component/index.vue
-->
<template>
@@ -11,7 +11,7 @@
<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"
@@ -23,7 +23,7 @@
<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"
@@ -41,6 +41,7 @@
align="right"
value-format="yyyy-MM-dd"
type="date"
+ clearable
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
@@ -50,6 +51,7 @@
class="item-value"
v-model="queryInfo.timeEnd"
align="right"
+ clearable
value-format="yyyy-MM-dd"
type="date"
placeholder="閫夋嫨鏃ユ湡">
diff --git a/src/container/machineList/Manage-add-update.vue b/src/container/machineList/Manage-add-update.vue
index f95fc32..4c1cb21 100644
--- a/src/container/machineList/Manage-add-update.vue
+++ b/src/container/machineList/Manage-add-update.vue
@@ -20,7 +20,7 @@
<!-- 鎸夐挳 -->
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="cancel">鍙栨秷</el-button>
- <el-button size="mini" type="primary" @click="dataFormSubmit()">淇濆瓨</el-button>
+ <el-button size="mini" class="active" type="primary" @click="dataFormSubmit()">淇濆瓨</el-button>
</span>
</el-dialog>
</div>
diff --git a/src/container/machineList/index.vue b/src/container/machineList/index.vue
index 29e9ddd..b1f16db 100644
--- a/src/container/machineList/index.vue
+++ b/src/container/machineList/index.vue
@@ -1,33 +1,33 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-16 22:25:31
+ * @LastEditTime: 2024-01-16 23:03:37
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
<div class="maintenance">
- <div class="nav">鏈哄簥缁存姢</div>
+ <div class="nav">鏈哄簥閲囬泦</div>
<List ref="list" url="/machine/pageQuery">
<template slot="search">
<div class="item">
<span>鏈哄簥鍚嶇О</span>
- <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
</div>
<div class="item">
<span>ip鍦板潃</span>
- <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
</div>
<div class="item">
<span>鍨嬪彿</span>
- <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
</div>
<div class="item">
<span>绋嬪簭浼犺緭妯″紡</span>
- <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
</div>
<div class="item">
<span>鍔犲伐绫诲瀷</span>
- <el-input class="item-value" v-model="queryInfo.name"></el-input>
+ <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
</div>
<div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
<el-button type="primary" size="small" @click="reset">鏌ヨ</el-button>
@@ -101,6 +101,11 @@
label="DNC鍚嶇О"
width="180">
</el-table-column>
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="handlerSetting(scope.row)">閰嶇疆</el-button>
+ </template>
+ </el-table-column>
</template>
</List>
@@ -151,8 +156,7 @@
this.query()
this.close()
},
- addOrUpdateHandle(row) {
- this.row = row
+ handlerSetting(row) {
this.addOrUpdateVisible = true
}
diff --git a/src/container/maintenance/index.vue b/src/container/maintenance/index.vue
index 40f7d57..257e81b 100644
--- a/src/container/maintenance/index.vue
+++ b/src/container/maintenance/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-16 22:28:00
+ * @LastEditTime: 2024-01-16 23:02:37
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/maintenance/index.vue
-->
<template>
@@ -11,11 +11,11 @@
<template slot="search">
<div class="item">
<span>缁熶竴缂栧彿</span>
- <el-input class="item-value" v-model="queryInfo.uuid"></el-input>
+ <el-input class="item-value" v-model="queryInfo.uuid" clearable></el-input>
</div>
<div class="item">
<span>璁惧鍚嶇О</span>
- <el-select class="item-value" v-model="queryInfo.machineName" placeholder="璇烽�夋嫨">
+ <el-select class="item-value" v-model="queryInfo.machineName" placeholder="璇烽�夋嫨" clearable>
<el-option v-for="item in machineList" :key="item.id" :label="item.machineName" :value="item.id">
</el-option>
</el-select>
@@ -30,7 +30,7 @@
</div> -->
<div class="item">
<span>浣跨敤閮ㄩ棬</span>
- <el-select class="item-value" v-model="queryInfo.department">
+ <el-select class="item-value" v-model="queryInfo.department" clearable>
<el-option v-for="item in departmentlist" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -41,12 +41,12 @@
</div> -->
<div class="item">
<span>璁″垝寮�濮嬫棩鏈�</span>
- <el-date-picker class="item-value" v-model="queryInfo.planStartDate" align="right" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker class="item-value" clearable v-model="queryInfo.planStartDate" align="right" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
<div class="item">
<span>璁″垝瀹屾垚鏃ユ湡</span>
- <el-date-picker class="item-value" v-model="queryInfo.planFinishDate" align="right" type="date" placeholder="閫夋嫨鏃ユ湡">
+ <el-date-picker class="item-value" clearable v-model="queryInfo.planFinishDate" align="right" type="date" placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</div>
<div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
--
Gitblit v1.9.3