From 6d1bb629a56c3274630bb74cf93a855a7c96cbec Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 23:56:24 +0800
Subject: [PATCH] update
---
src/container/machineList/Manage-add-update.vue | 19 +++++----
src/container/machineList/index.vue | 52 +++++++++++++++++++++----
2 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/src/container/machineList/Manage-add-update.vue b/src/container/machineList/Manage-add-update.vue
index d9ec566..30bc482 100644
--- a/src/container/machineList/Manage-add-update.vue
+++ b/src/container/machineList/Manage-add-update.vue
@@ -24,18 +24,19 @@
<el-form-item label="绔彛" prop="port">
<el-input v-model="dataForm.port" placeholder="绔彛" clearable></el-input>
</el-form-item>
- <el-form-item label="杞﹂棿" prop="workshopId">
- <el-select class="value" v-model="dataForm.workshopId" @change="changewsl" placeholder="璇烽�夋嫨">
- <el-option v-for="item in workshopList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
<el-form-item label="绋嬪簭浼犺緭妯″紡" prop="transMode">
<el-select class="value" v-model="dataForm.transMode" placeholder="璇烽�夋嫨">
<el-option v-for="item in transModeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="杞﹂棿" prop="workshopId">
+ <el-select class="value" v-model="dataForm.workshopId" @change="changewsl" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in workshopList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+
<el-form-item label="宸ユ" prop="sectionId">
<el-select class="value" v-model="dataForm.sectionId" placeholder="璇烽�夋嫨">
<el-option v-for="item in sectionIds" :key="item.id" :label="item.name" :value="item.id">
@@ -100,7 +101,6 @@
workshopList: [],
accountList: [],
dataForm: {
- machineName: '',
id: '',
ip: '',
port: '',
@@ -154,7 +154,10 @@
// }
row: {
handler (val) {
- this.dataForm.id = val.id
+ Object.keys(this.dataForm).forEach(item => {
+ this.dataForm[item] = val[item]
+ })
+
},
immediate: true,
deep: true,
diff --git a/src/container/machineList/index.vue b/src/container/machineList/index.vue
index 22669e3..fe95c6f 100644
--- a/src/container/machineList/index.vue
+++ b/src/container/machineList/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-01-06 17:40:19
* @LastEditors: Sneed
- * @LastEditTime: 2024-01-16 23:40:13
+ * @LastEditTime: 2024-01-16 23:53:17
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
@@ -11,26 +11,32 @@
<template slot="search">
<div class="item">
<span>鏈哄簥鍚嶇О</span>
- <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
+ <el-input class="item-value" v-model="queryInfo.machineName" clearable></el-input>
</div>
<div class="item">
<span>ip鍦板潃</span>
- <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
+ <el-input class="item-value" v-model="queryInfo.ip" clearable></el-input>
</div>
<div class="item">
<span>鍨嬪彿</span>
- <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
+ <el-input class="item-value" v-model="queryInfo.type" clearable></el-input>
</div>
<div class="item">
<span>绋嬪簭浼犺緭妯″紡</span>
- <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
+ <el-select class="value" v-model="queryInfo.transMode" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in transModeList" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
</div>
<div class="item">
<span>鍔犲伐绫诲瀷</span>
- <el-input class="item-value" v-model="queryInfo.name" clearable></el-input>
+ <el-select class="item-value" v-model="queryInfo.category" placeholder="">
+ <el-option v-for="item in deviceType" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
</div>
<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="query">鏌ヨ</el-button>
<el-button type="primary" size="small" @click="reset">閲嶇疆</el-button>
</div>
</template>
@@ -124,9 +130,37 @@
},
data () {
return {
- url: '',
+ transModeList: [
+ {
+ label: 'com鍙�',
+ value: 0
+ },
+ {
+ label: '浜枃浠跺す',
+ value: 1
+ },
+ {
+ label: '缃戝彛',
+ value: 2
+ },
+ ],
+ deviceType: [
+ { value: '绔嬪姞', label: '绔嬪姞' },
+ { value: '鍗у姞', label: '鍗у姞' },
+ { value: '绔嬪崸杞崲', label: '绔嬪崸杞崲' },
+ { value: '浜旇酱', label: '浜旇酱' },
+ { value: '鏁版帶杞�', label: '鏁版帶杞�' },
+ { value: '澶嶅悎鍔犲伐', label: '澶嶅悎鍔犲伐' },
+ { value: '鏁版帶纾�', label: '鏁版帶纾�' },
+ { value: '榻垮姞宸�', label: '榻垮姞宸�' },
+ { value: '鐢靛伐鍔�', label: '鐢靛伐鍔�' }
+ ],
queryInfo: {
- name: ''
+ category: '',
+ transMode: '',
+ machineName: '',
+ ip: '',
+ type: '',
},
row: {},
addOrUpdateVisible: false
--
Gitblit v1.9.3