From 79545e4252d32c5a4b9690757f6e12beaf7a6843 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 07 十月 2024 00:31:18 +0800
Subject: [PATCH] update
---
src/views/console/workstation/index.vue | 94 +++++++++++++++-------------------------------
1 files changed, 31 insertions(+), 63 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 724afd8..a2148c6 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -149,69 +149,16 @@
type="primary" size="small">淇濆瓨</el-button> -->
<!-- <el-button text type="primary" size="small"
@click="editDMP">淇敼DMP閰嶇疆</el-button> -->
+ <el-button style="margin-left: auto;" @click="getExport"
+ text type="primary" size="small">瀵煎嚭</el-button>
<el-button @click="editCollection" text type="primary"
size="small">鏁版嵁鐐圭紪杈�</el-button>
+
</el-header>
<el-main>
- <el-table :data="list" height="200px"
- @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55"
- v-if="editFlag" />
- <el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name"
- width="120" />
- <el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem"
- width="120">
- <template #default="scope">
- <el-input :disabled="!editFlag"
- v-model="scope.row.dataItem"></el-input>
- </template>
- </el-table-column>
- <el-table-column label="鏁版嵁鏍囩" prop="description"
- width="150">
- <template #default="scope">
- <el-select :disabled="!editFlag"
- v-model="scope.row.description">
- <el-option
- v-for="item in workstation_param_type"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey - 0" />
- </el-select>
- <!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
- </template>
- </el-table-column>
- <el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType"
- width="150">
- <template #default="scope">
- <el-select disabled
- v-model="scope.row.wcsDataType">
- <el-option v-for="item in dmp_data_type"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey - 0" />
- </el-select>
- <!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
- </template>
- </el-table-column>
- <el-table-column label="澶у睆" prop="bigScreen">
- <template #default="scope">
- <el-checkbox :disabled="!editFlag"
- v-model="scope.row.bigScreen" />
- </template>
- </el-table-column>
- <el-table-column label="瀹炴椂鏁版嵁" prop="realTimeData">
- <template #default="scope">
- <el-checkbox :disabled="!editFlag"
- v-model="scope.row.realTimeData" />
- </template>
- </el-table-column>
- <el-table-column label="杩囩▼鍙傛暟" prop="processParameter">
- <template #default="scope">
- <el-checkbox :disabled="!editFlag"
- v-model="scope.row.processParameter" />
- </template>
- </el-table-column>
- </el-table>
+ <!-- <el-table :data="list" height="200px">
+ </el-table> -->
+ <CollTable ref="collTable" :info="previewData"></CollTable>
</el-main>
</el-container>
</el-tab-pane>
@@ -394,7 +341,7 @@
</el-tabs>
</el-card>
<Dialog ref="dialog" @success="success" :option="{ types, status, group }"></Dialog>
- <CollDialog ref="CollDialog" @success="success" :option="{ previewData }"></CollDialog>
+ <CollDialog ref="CollDialog" @success="successColl" :option="{ previewData }"></CollDialog>
</el-main>
</template>
@@ -402,12 +349,14 @@
import pmsPng from '@/assets/pms.png'
import Dialog from './Dialog.vue'
import CollDialog from './CollDialog.vue'
+import CollTable from './CollTable.vue'
import machinePng from '@/assets/machine.png'
export default {
name: 'system',
components: {
Dialog,
- CollDialog
+ CollDialog,
+ CollTable
},
data() {
return {
@@ -515,9 +464,22 @@
this.queryList()
},
methods: {
+ // 鏁版嵁鐐瑰鍑�
+ getExport() {
+ this.$HTTP.get(`/api/blade-cps/workstation/export-dp?` + this.$TOOL.qsStringify({
+ workstationId: this.previewData.id
+ })).then(res => {
+ if (res.code == 200) {
+ window.open(res.data.link)
+ }
+ })
+ },
// 鏁版嵁鐐圭紪杈�
editCollection() {
this.$refs.CollDialog.open('edit', this.previewData)
+ },
+ successColl() {
+ this.$refs.collTable.refresh()
},
handleSelectionChange(val) {
val.forEach(v => {
@@ -670,8 +632,14 @@
return
}
console.log(data, '>>>>>>>>>>>')
- this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
- this.list = res?.data?.dmpVariablesVOList
+ data.machineId && this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
+ this.list = res?.data
+ // Object.keys(this.basic).forEach(key => {
+ // this.basic[key] = res?.data?.[key] || '-'
+ // })
+ })
+ this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
+ // this.list = res?.data?.dmpVariablesVOList
Object.keys(this.basic).forEach(key => {
this.basic[key] = res?.data?.[key] || '-'
})
--
Gitblit v1.9.3