smart-web.git - Gitblit

			@@ -50,7 +50,7 @@
			<el-table-column label="工位名称" prop="name" width="120"></el-table-column>
			<el-table-column label="工位类型" prop="type" width="120">
			<template #default="scope">
			<span>{{ scope.row.type == '0' ? '机器': '人工' }}</span>
			<span>{{ scope.row.type == '0' ? '机器' : '人工' }}</span>
			</template>
			</el-table-column>
			<el-table-column label="工位日历" prop="calendarName" width="120"></el-table-column>
			@@ -128,87 +128,34 @@
			<el-col :span="8">
			{{ basic.machineBrand }}
			</el-col>
			<el-col :span="4">
			<!-- <el-col :span="4">
			驱动名称
			</el-col>
			<el-col :span="8">
			{{ basic.typeName }}
			</el-col>
			</el-col> -->
			</el-row>
			</el-main>
			</el-container>
			<el-container>
			<el-header>
			<h2>采集信息</h2>
			<el-button v-show="list.length > 0"
			<!-- <el-button v-show="list.length > 0"
			@click="() => { editFlag = !editFlag; showTable = !editFlag }"
			style="margin-left: auto;" text type="primary"
			size="small">{{ editFlag ? '取消' : '配置工位采集' }}</el-button>
			size="small">{{ editFlag ? '取消' : '配置工位采集'
			}}</el-button>
			<el-button v-show="editFlag" @click="saveInfo" text
			type="primary" size="small">保存</el-button>
			<el-button text type="primary" size="small"
			@click="editDMP">修改DMP配置</el-button>
			type="primary" size="small">保存</el-button> -->
			<!-- <el-button text type="primary" size="small"
			@click="editDMP">修改DMP配置</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>
			@@ -391,17 +338,22 @@
			</el-tabs>
			</el-card>
			<Dialog ref="dialog" @success="success" :option="{ types, status, group }"></Dialog>
			<CollDialog ref="CollDialog" @success="successColl" :option="{ previewData }"></CollDialog>
			</el-main>
			</template>

			<script>
			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
			Dialog,
			CollDialog,
			CollTable
			},
			data() {
			return {
			@@ -481,7 +433,6 @@
			handler(val) {
			this.queryList().then(() => {
			if (val == 1) {
			console.log('>>>>>>>>>>>>>>', this.treeCheckedNode)
			this.apiObj = this.$API.workstation.getList
			this.params = {
			groupId: this.treeCheckedNode.id,
			@@ -510,8 +461,14 @@
			this.queryList()
			},
			methods: {
			// 数据点编辑
			editCollection() {
			this.$refs.CollDialog.open('edit', this.previewData)
			},
			successColl() {
			this.$refs.collTable.refresh()
			},
			handleSelectionChange(val) {
			console.log(val)
			val.forEach(v => {
			v.bigScreen = true
			v.realTimeData = true
			@@ -519,7 +476,6 @@
			})
			this.list.forEach(v => {
			if (val.filter(item => v.id === item.id).length == 0) {
			console.log(v)
			v.bigScreen = false
			v.realTimeData = false
			v.processParameter = false
			@@ -574,13 +530,15 @@
			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 {
			let parent = res.data.filter(item => item.id == this.treeCheckedNode.id)[0]
			this.treeCheckedNode = parent
			this.treeCheckKey = parent.id
			debugger
			let parent = res.data.filter(item => item.parentId == 0)[0]
			parent && (this.treeCheckedNode = parent)
			parent && (this.treeCheckKey = parent.id)
			}
			// })

			@@ -622,13 +580,11 @@
			groupCategory: this.treeCheckedNode.groupCategory
			}, this.form)
			return this.$API.workstation.saveWorkstationGroup.post(data).then(res => {
			console.log(res)
			this.queryList(true)
			})
			}
			let data = Object.assign({}, this.treeCheckedNode, this.form)
			this.$API.workstation.saveWorkstationGroup.put(data).then(res => {
			console.log(res)
			this.queryList(true)
			})
			},
			@@ -651,7 +607,6 @@
			},
			rowClick(data) {
			this.previewData = data
			console.log(data, '>>>>>>>>>>>')
			if (!data.id) {
			Object.keys(this.basic).forEach(key => {
			this.basic[key] = '-'
			@@ -663,8 +618,15 @@
			this.workbenchVOList = []
			return
			}
			console.log(data, '>>>>>>>>>>>')
			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
			// this.list = res?.data?.dmpVariablesVOList
			Object.keys(this.basic).forEach(key => {
			this.basic[key] = res?.data?.[key] \|\| '-'
			})
			@@ -677,7 +639,6 @@
			})
			},
			groupClick1(data) {
			console.log('-------', data)
			var params = {
			groupId: data.id,
			keyWord: this.keyWord,
			@@ -690,7 +651,6 @@
			dataChange(res, data) {

			if (data.length > 0) {
			console.log(data[0], '>>>>>>>>')
			this.$refs.table.setCurrentRow(data[0])
			this.previewData = data[0]
			this.rowClick(data[0])