From fcb6eb2c02f00b0da864a8915af2afcb285a63a8 Mon Sep 17 00:00:00 2001
From: gaosp <gaosp>
Date: 星期二, 16 一月 2024 20:29:59 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front
---
src/container/ledger/Manage-add-update.vue | 4 +
src/container/machineList/index.vue | 81 +++++++++++++++++++++-------------------
2 files changed, 46 insertions(+), 39 deletions(-)
diff --git a/src/container/ledger/Manage-add-update.vue b/src/container/ledger/Manage-add-update.vue
index 56e11c9..7ed08aa 100644
--- a/src/container/ledger/Manage-add-update.vue
+++ b/src/container/ledger/Manage-add-update.vue
@@ -10,7 +10,7 @@
<el-row :gutter="20">
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鏈哄簥鍚�" prop="machineName">
- <el-input v-model="dataForm.machineName" placeholder="鏈哄簥ip" clearable></el-input>
+ <el-input v-model="dataForm.machineName" placeholder="鏈哄簥鍚嶇О" clearable></el-input>
</el-form-item>
</el-col>
<!--
@@ -177,6 +177,7 @@
</el-select>
</el-form-item>
</el-col>
+ <!--
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鐝" prop="classes">
<el-select v-model="dataForm.classes" placeholder="---璇烽�夋嫨---">
@@ -186,6 +187,7 @@
</el-select>
</el-form-item>
</el-col>
+ -->
<el-col :xs="24":sm="6":md="6":lg="6":xl="6">
<el-form-item label="鐢熶骇鍘傚" prop="manufacturer">
<el-input v-model="dataForm.manufacturer" placeholder="鐢熶骇鍘傚" clearable></el-input>
diff --git a/src/container/machineList/index.vue b/src/container/machineList/index.vue
index 482c0ea..5edc112 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 20:11:37
+ * @LastEditTime: 2024-01-16 20:26:19
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/mdc/src/container/machineList/index.vue
-->
<template>
@@ -34,68 +34,73 @@
<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">
- </el-table-column>
- <el-table-column
- prop="name"
- label="dnc鍚嶇О"
- width="180">
- </el-table-column>
- <el-table-column align="center" label="鎿嶄綔" prop="editor">
- <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> -->
+ <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="dncName"
+ label="DNC鍚嶇О"
+ width="180">
+ </el-table-column>
</template>
</List>
--
Gitblit v1.9.3