From f22f95e24d8c338566da772bfb71253758c9d5c3 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 15:01:19 +0800
Subject: [PATCH] 1
---
src/views/mdc/configuration.vue | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/src/views/mdc/configuration.vue b/src/views/mdc/configuration.vue
index b00cf3a..e2f30df 100644
--- a/src/views/mdc/configuration.vue
+++ b/src/views/mdc/configuration.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-04-17 23:35:22
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-11-08 10:38:02
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configuration.vue
* 搴旂敤璁剧疆
-->
@@ -9,16 +9,16 @@
<el-main>
<el-card shadow="never">
<el-tabs :tab-position="'left'" class="demo-tabs">
- <el-tab-pane label="瀹炴椂鐪嬫澘鏌ヨ缁勮缃�">
+ <el-tab-pane label="瀹炴椂鐪嬫澘鏌ヨ缁勮缃�" v-if="$route.query.isShowSearch == 1">
<Board />
</el-tab-pane>
- <el-tab-pane label="鐘舵�佸拰缁╂晥鏃堕棿璁剧疆">
+ <el-tab-pane label="鐘舵�佸拰缁╂晥鏃堕棿璁剧疆" v-if="$route.query.isShowSearch != 1">
<Status />
</el-tab-pane>
- <el-tab-pane label="鏁堢巼缁熻璁剧疆">
+ <el-tab-pane label="鏁堢巼缁熻璁剧疆" v-if="false">
<Efficiency />
</el-tab-pane>
- <el-tab-pane label="閲囬泦鏁版嵁鏍囩璁剧疆">
+ <!-- <el-tab-pane label="閲囬泦鏁版嵁鏍囩璁剧疆">
<scFormTable ref="table1" v-model="Tabledata" stripe hideDelete :addTemplate="addTemplate">
<el-table-column label="鏁版嵁鏍囩" prop="usageName">
<template #default="scope">
@@ -36,21 +36,29 @@
<template #default="scope">
<el-select v-if="scope.row.isEdit" v-model="scope.row.collectType" style="width: 100%;"
@change="update(scope.row)">
- <el-option v-for="(item, index) in options.rps" :key="index" :label="item.label"
+ <el-option v-for="(item, index) in options" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
<span v-else>{{ scope.row.dataTypeDesc }}</span>
</template>
</el-table-column>
+ <el-table-column label="鑴夊啿璁℃暟鍊嶇巼" prop="value">
+ <template #default="scope">
+ <el-input-number v-if="scope.row.isEdit && scope.row.collectType == 9" :min="1"
+ :max="10" />
+ <span>{{ scope?.row?.parameter?.value }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔" prop="state">
<template #default="scope">
- <el-button v-show="!scope.row.id || !scope.row.isEdit"
+ <el-button v-show="!scope.row.id || scope.row.isEdit"
@click="add(scope.row)">淇濆瓨</el-button>
- <el-button v-show="!scope.row.isEdit" @click="edit(scope.row)">缂栬緫</el-button>
+ <el-button v-show="!scope.row.isEdit && scope.row.collectType > 7"
+ @click="edit(scope.row)">缂栬緫</el-button>
</template>
</el-table-column>
</scFormTable>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-card>
</el-main>
@@ -74,12 +82,19 @@
dataTypeDesc: '',
id: null,
parameter: {
- value: 0
+ value: ''
},
usageCode: '',
usageName: '',
- isEdit: false,
- }
+ isEdit: true,
+ },
+ options: [{
+ label: '宸�艰绠�',
+ value: 8
+ }, {
+ label: '鑴夊啿璁$畻',
+ value: 9
+ }]
}
},
created() {
@@ -87,17 +102,53 @@
},
methods: {
getList() {
- this.$HTTP.get('/api/blade-cps/workstation-wcs-usage/list').then(res => {
+ this.$HTTP.get('/api/smis/workstation-wcs-usage/list').then(res => {
if (res.code === 200) {
- this.Tabledata = res.data
+ this.Tabledata = res.data.map(item => {
+ return {
+ ...item,
+ parameter: item.parameter ? JSON.parse(item.parameter) : null
+ }
+ })
}
})
},
edit(row) {
row.isEdit = true
},
+ update(row) {
+ row.dataTypeDesc = this.options.find(item => item.value === row.collectType)?.label
+ if (row.collectType === 9) {
+ row.parameter = { value: 0 }
+ } else {
+ row.parameter = null
+ }
+ },
add(row) {
- // /api/blade-cps/workstation-wcs-usage
+ let url = '/api/smis/workstation-wcs-usage'
+ let data = {
+ ...row
+ }
+ if (row.id) {
+ try {
+ delete data.isEdit
+ } catch (error) {
+
+ }
+ if (data.parameter) data.parameter = JSON.stringify(row.parameter)
+ this.$HTTP.post(url, data).then(res => {
+ if (res.code === 200) {
+ this.getList()
+ }
+ })
+ } else {
+ this.$HTTP.post(url, data).then(res => {
+ if (res.code === 200) {
+ this.getList()
+ }
+ })
+ }
+ //
// collectType
// usageCode
// usageName
--
Gitblit v1.9.3