From 677697e36b35ff80e3b45bb07a0e008fac8e9bd9 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 23:04:55 +0800
Subject: [PATCH] update
---
src/container/machineList/index.vue | 95 ++++++++++++++++++++++++++---------------------
1 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/src/container/machineList/index.vue b/src/container/machineList/index.vue
index 482c0ea..b1f16db 100644
--- a/src/container/machineList/index.vue
+++ b/src/container/machineList/index.vue
@@ -1,99 +1,109 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-16 20:11:37
+ * @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: center;">
+ <div class="item" style="flex: 1 1 auto;justify-content: flex-end;">
<el-button type="primary" size="small" @click="reset">鏌ヨ</el-button>
<el-button type="primary" size="small" @click="reset">閲嶇疆</el-button>
</div>
</template>
-
- <!-- <template slot="table-tool">
+ <!--
+ <template slot="table-tool">
<el-button type="primary" size="mini" @click="add">娣诲姞璁惧绫诲瀷</el-button>
- </template> -->
-
+ </template>
+ -->
<template slot="columns">
+
+ <el-table-column
+ prop="machineName"
+ label="鍚嶇О"
+ width="180">
+ </el-table-column>
<el-table-column
- prop="id"
- label="鏈哄簥鍚嶇О"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍔犲伐绫诲瀷"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
+ prop="type"
label="鍨嬪彿"
width="180">
</el-table-column>
<el-table-column
- prop="name"
- label="ip鍦板潃"
+ prop="category"
+ label="鍔犲伐绫诲瀷"
width="180">
</el-table-column>
- <el-table-column
- prop="name"
+ <el-table-column
+ prop="ip"
+ label="IP鍦板潃"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="port"
label="绔彛"
width="180">
</el-table-column>
- <el-table-column
- prop="name"
+ <el-table-column
+ prop="workshop"
label="杞﹂棿"
width="180">
</el-table-column>
- <el-table-column
- prop="name"
+ <el-table-column
+ prop="section"
label="宸ユ"
width="180">
</el-table-column>
- <el-table-column
- prop="name"
+ <el-table-column
+ prop="shiftType"
label="鐝埗"
width="180">
</el-table-column>
- <el-table-column
- prop="name"
+ <el-table-column
+ prop="port"
+ label="绔彛"
+ width="180">
+ </el-table-column>
+ <el-table-column
+ prop="transMode"
label="绋嬪簭浼犺緭妯″紡"
width="180">
+ <template slot-scope="scope">
+ <span v-if="scope.row.state == 0">com鍙�</span>
+ <span v-else-if="scope.row.state == 1">鍏变韩鏂囦欢澶�</span>
+ <span v-else-if="scope.row.state == 3">缃戝彛</span>
+ </template>
</el-table-column>
- <el-table-column
- prop="name"
- label="dnc鍚嶇О"
+ <el-table-column
+ prop="dncName"
+ label="DNC鍚嶇О"
width="180">
</el-table-column>
- <el-table-column align="center" label="鎿嶄綔" prop="editor">
+ <el-table-column fixed="right" align="center" label="鎿嶄綔">
<template slot-scope="scope">
- <el-button size="mini" type="text" @click="addDevice(2, scope.row, $event)">閰嶇疆</el-button>
- <!-- <el-button size="mini" type="text" @click="deleteHandle(2, scope.row)">鍒犻櫎</el-button> -->
+ <el-button type="text" size="small" @click="handlerSetting(scope.row)">閰嶇疆</el-button>
</template>
</el-table-column>
</template>
@@ -146,8 +156,7 @@
this.query()
this.close()
},
- addOrUpdateHandle(row) {
- this.row = row
+ handlerSetting(row) {
this.addOrUpdateVisible = true
}
--
Gitblit v1.9.3