From 167f3ab4bcf3810433554c1cddb8ec270b930ea3 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 04 十一月 2025 22:12:37 +0800
Subject: [PATCH] 修改所有工位不能提交
---
src/views/console/workstation/index.vue | 178 ++++++++++++++++++++++++++--------------------------------
1 files changed, 80 insertions(+), 98 deletions(-)
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 724afd8..0c45c6a 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -9,7 +9,7 @@
<el-main class="nopadding">
<el-tree :expand-on-click-node="false" ref="group" class="menu" node-key="id"
:data="group" :current-node-key="treeCheckKey" :highlight-current="true"
- :check-on-click-node="true" :default-expanded-keys="[1]"
+ :check-on-click-node="true" :default-expanded-keys="['1']"
:render-content="renderContent" @node-click="groupClick1"></el-tree>
</el-main>
</el-container>
@@ -88,7 +88,8 @@
<p class="preview-title">宸ヤ綅淇℃伅</p>
<div class="preview-content">
<div class="img">
- <img v-if="!previewData.avatar" :src="machinePng" alt="">
+ <img style="width: 148px;height: 148px;" v-if="!previewData.avatar"
+ :src="machinePng" alt="">
<scUpload v-else disabled v-model="previewData.avatar" title="宸ヤ綅鍥剧墖">
</scUpload>
</div>
@@ -138,7 +139,7 @@
</el-main>
</el-container>
<el-container>
- <el-header>
+ <el-header style="justify-content: flex-start;">
<h2>閲囬泦淇℃伅</h2>
<!-- <el-button v-show="list.length > 0"
@click="() => { editFlag = !editFlag; showTable = !editFlag }"
@@ -149,69 +150,16 @@
type="primary" size="small">淇濆瓨</el-button> -->
<!-- <el-button text type="primary" size="small"
@click="editDMP">淇敼DMP閰嶇疆</el-button> -->
+ <el-button @click="getExport" style="margin-left: 12px" text
+ type="primary" size="small">瀵煎嚭</el-button>
<el-button @click="editCollection" text type="primary"
- size="small">鏁版嵁鐐圭紪杈�</el-button>
+ style="margin-left: 0px;" 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>
@@ -229,7 +177,7 @@
<el-col :span="8">
{{ info.properties }}
</el-col>
- <el-col :span="4">
+ <!-- <el-col :span="4">
绋嬪簭浼犺緭鏂瑰紡
</el-col>
<el-col :span="8">
@@ -243,7 +191,7 @@
</el-col>
<el-col :span="4">
宸ヤ綔鍙�
- </el-col>
+ </el-col> -->
<el-col :span="8">
<ul class="workbench">
<li v-for="item in workbenchVOList" :key="item.sort">
@@ -267,26 +215,26 @@
<el-container>
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
- <el-main class="nopadding">
+ <el-main class="nopadding" style="overflow: hidden;">
<el-tree ref="group" class="menu" node-key="id" :data="group"
:current-node-key="treeCheckKey" :highlight-current="true"
:expand-on-click-node="false" :check-on-click-node="true"
- :default-expanded-keys="[1]" :render-content="renderContent"
+ :default-expanded-keys="['1']" :render-content="renderContent"
@node-click="groupClick"></el-tree>
</el-main>
</el-container>
</el-aside>
<el-container>
<el-main class="" v-show="addGroupShow">
- <el-form v-show="treeCheckedNode.id == 1" :model="form" :rules="rules" ref="dialogForm"
+ <el-form v-if="treeCheckedNode.id == 1" :model="form" :rules="rules" ref="dialogForm"
label-width="200px" label-position="left">
- <el-form-item label="浜х嚎鏍囩" prop="groupTag">
+ <!-- <el-form-item label="浜х嚎鏍囩" prop="groupTag">
<el-select v-model="form.groupTag" clearable placeholder="浜х嚎鏍囩"
style="width: 240px">
<el-option v-for="item in beltline_type" :key="item.dictKey"
:label="item.dictValue" :value="item.dictKey" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浜х嚎鍚嶇О" prop="name">
<el-input style="width: 240px" v-model="form.name" clearable
placeholder="浜х嚎鍚嶇О"></el-input>
@@ -300,8 +248,8 @@
</el-form-item>
</el-form>
<el-form
- v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || treeCheckedNode.id == 101"
- :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ v-if="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || treeCheckedNode.id == 101"
+ :model="form" :rules="rules" ref="dialogForm1" label-width="200px"
label-position="left">
<el-form-item label="宸ヤ綅缁勬爣绛�" prop="groupTag">
<el-select v-model="form.groupTag" clearable placeholder="宸ヤ綅缁勬爣绛�"
@@ -326,9 +274,16 @@
<el-header v-show="!addGroupShow">
<div class="left-panel">
<el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
- <el-button @click="deleteWorkGroup"
+ <el-popconfirm width="220" cancel-button-text="鍙栨秷" confirm-button-text="鍒犻櫎"
+ title="鍒犻櫎浼氬皢宸ヤ綅缁勪笅鐨勫伐浣嶇Щ鍔ㄥ埌榛樿缁勪腑锛岃纭鏄惁鍒犻櫎锛�" @confirm="deleteWorkGroup">
+ <template #reference>
+ <el-button v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
+ plain>鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ <!-- <el-button @click="deleteWorkGroup"
v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
- plain>鍒犻櫎</el-button>
+ plain>鍒犻櫎</el-button> -->
</div>
</el-header>
<el-main class="" v-show="!addGroupShow">
@@ -338,7 +293,7 @@
<li>澶囨敞: {{ treeCheckedNode.remark }}</li>
</ul>
<el-form
- v-show="beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
+ v-if="beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
:model="form" :rules="rules" ref="dialogForm" label-width="200px"
label-position="left">
<el-form-item label="浜х嚎鏍囩" prop="groupTag">
@@ -360,7 +315,7 @@
placeholder="澶囨敞"></el-input>
</el-form-item>
</el-form>
- <el-form v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
+ <el-form v-if="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
:model="form" :rules="rules" ref="dialogForm" label-width="200px"
label-position="left">
<el-form-item label="宸ヤ綅缁勬爣绛�" prop="groupTag">
@@ -394,7 +349,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 +357,14 @@
import pmsPng from '@/assets/pms.png'
import Dialog from './Dialog.vue'
import CollDialog from './CollDialog.vue'
-import machinePng from '@/assets/machine.png'
+import CollTable from './CollTable.vue'
+import machinePng from '@/assets/machine1.jpg'
export default {
name: 'system',
components: {
Dialog,
- CollDialog
+ CollDialog,
+ CollTable
},
data() {
return {
@@ -447,7 +404,7 @@
previewData: {},
// --------
form: {
- groupTag: '',
+ groupTag: 'beltline',
name: '',
sort: '',
remark: ''
@@ -515,9 +472,22 @@
this.queryList()
},
methods: {
+ // 鏁版嵁鐐瑰鍑�
+ getExport() {
+ this.$HTTP.get(`/api/smis/workstation/export-dp?` + this.$TOOL.qsStringify({
+ workstationId: this.previewData.id
+ })).then(res => {
+ if (res.code == 200) {
+ this.$TOOL.downFile(res.data.link,res.data.originalName);
+ }
+ })
+ },
// 鏁版嵁鐐圭紪杈�
editCollection() {
this.$refs.CollDialog.open('edit', this.previewData)
+ },
+ successColl() {
+ this.$refs.collTable.refresh()
},
handleSelectionChange(val) {
val.forEach(v => {
@@ -581,12 +551,10 @@
this.showGrouploading = false
// this.$nextTick(() => {
if (!flag) {
- debugger
let parent = res.data.filter(item => item.parentId == 0)[0]
this.treeCheckedNode = parent
this.treeCheckKey = parent.id
} else {
- debugger
let parent = res.data.filter(item => item.parentId == 0)[0]
parent && (this.treeCheckedNode = parent)
parent && (this.treeCheckKey = parent.id)
@@ -648,7 +616,13 @@
},
addChild() {
this.addGroupShow = true
- this.$refs.dialogForm.resetFields()
+ this.$nextTick(() => {
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = ''
+ })
+ // this.$refs.dialogForm.resetFields()
+ })
+
},
groupClick(node) {
this.treeCheckedNode = node
@@ -670,18 +644,26 @@
return
}
console.log(data, '>>>>>>>>>>>')
- this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
- this.list = res?.data?.dmpVariablesVOList
- Object.keys(this.basic).forEach(key => {
- this.basic[key] = res?.data?.[key] || '-'
- })
- })
- this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
- Object.keys(this.info).forEach(key => {
- this.info[key] = res?.data?.[key] || '-'
- })
- this.workbenchVOList = res?.data?.workstationList || []
- })
+
+
+ // data.machineId && this.$HTTP.get(`/api/smis/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/smis/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
+ // // this.list = res?.data?.dmpVariablesVOList
+ // Object.keys(this.basic).forEach(key => {
+ // this.basic[key] = res?.data?.[key] || '-'
+ // })
+ // })
+ // this.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
+ // Object.keys(this.info).forEach(key => {
+ // this.info[key] = res?.data?.[key] || '-'
+ // })
+ // this.workbenchVOList = res?.data?.workstationList || []
+ // })
},
groupClick1(data) {
var params = {
@@ -712,7 +694,7 @@
this.$refs.dialog.open('edit', row)
},
table_del(row, index, type) {
- this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${row.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${row.id}`).then(res => {
this.search()
})
},
@@ -720,12 +702,12 @@
this.selection = selection
},
batchDel() {
- this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
+ this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
this.search()
})
},
saveInfo() {
- this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
+ this.$HTTP.post('/api/smis/workstation-wcs/save', this.workbenchVOList).then(res => {
this.editFlag = false
this.showTable = true
})
--
Gitblit v1.9.3