smart-web.git - Gitblit

			@@ -7,11 +7,10 @@
			<el-aside width="200px" v-loading="showGrouploading">
			<el-container>
			<el-main class="nopadding">
			<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"
			@node-click="groupClick1"></el-tree>
			<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]"
			:render-content="renderContent" @node-click="groupClick1"></el-tree>
			</el-main>
			</el-container>
			</el-aside>
			@@ -45,11 +44,15 @@
			<div style="display: flex">
			<scTable highlight-current-row @dataChange="dataChange" @row-click="rowClick"
			ref="table" :params="params" :apiObj="apiObj"
			@selection-change="selectionChange" stripe>
			@selection-change="selectionChange" stripe v-show="showTable">
			<el-table-column type="selection" width="50"></el-table-column>
			<el-table-column label="工位编号" prop="code" width="120"></el-table-column>
			<el-table-column label="工位名称" prop="name" width="120"></el-table-column>
			<el-table-column label="工位类型" prop="type" width="120"></el-table-column>
			<el-table-column label="工位类型" prop="type" width="120">
			<template #default="scope">
			<span>{{ scope.row.type == '0' ? '机器' : '人工' }}</span>
			</template>
			</el-table-column>
			<el-table-column label="工位日历" prop="calendarName" width="120"></el-table-column>
			<el-table-column label="操作" fixed="right" align="right" width="160">
			<template #default="scope">
			@@ -72,8 +75,16 @@
			</template>
			</el-table-column>
			</scTable>
			<div style="margin-left: 14px" v-if="Object.keys(previewData).length > 0">
			<div :style="{
			'max-width': showTable ? '50%' : '100%', 'margin-left': '14px',
			flex: '1 1 auto'
			}" v-if="Object.keys(previewData).length > 0">
			<div class="header">
			<el-icon @click="showTable = !showTable"
			style="font-size: 20px;cursor: pointer;margin-top: 10px;">
			<el-icon-arrow-left v-show="showTable" />
			<el-icon-arrow-right v-show="!showTable" />
			</el-icon>
			<p class="preview-title">工位信息</p>
			<div class="preview-content">
			<div class="img">
			@@ -94,7 +105,9 @@
			<el-tabs tab-position="top" class="custom-tabs" v-model="normal">
			<el-tab-pane label="机器信息" name="1">
			<el-container>
			<el-header>基础数据</el-header>
			<el-header>
			<h2>基础数据</h2>
			</el-header>
			<el-main>
			<el-row>
			<el-col :span="4">
			@@ -115,28 +128,33 @@
			<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>
			<span>采集信息</span>
			<el-button @click="editFlag = !editFlag"
			<h2>采集信息</h2>
			<el-button v-show="list.length > 0"
			@click="() => { editFlag = !editFlag; showTable = !editFlag }"
			style="margin-left: auto;" text type="primary"
			size="small">配置工位采集</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">修改DMP配置</el-button>
			<!-- <el-button text type="primary" size="small"
			@click="editDMP">修改DMP配置</el-button> -->
			</el-header>
			<el-main>
			<el-table :data="list" height="200px">
			<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"
			@@ -388,6 +406,7 @@
			},
			data() {
			return {
			showTable: true,
			machinePng,
			showGrouploading: false,
			options: [],
			@@ -492,6 +511,31 @@
			this.queryList()
			},
			methods: {
			handleSelectionChange(val) {
			console.log(val)
			val.forEach(v => {
			v.bigScreen = true
			v.realTimeData = true
			v.processParameter = true
			})
			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
			}
			})
			},
			editDMP() {
			this.$HTTP.get(`/api/blade-system/param/detail?paramKey=system.dmp.url`).then(res => {
			if (res.success) {
			window.open(res.data.paramValue)
			} else {
			this.$message.error(res.msg)
			}
			})
			},
			renderContent(h, { data }) {
			let img = data.groupTag == 'fms_beltline'
			return h('span', {
			@@ -529,15 +573,18 @@
			let data = this.formatData(res.data)
			this.group = data
			this.showGrouploading = false
			console.log('>>>>>>>>>>>>>>>>>>>>>')
			// 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)
			}
			// })

			@@ -679,6 +726,7 @@
			saveInfo() {
			this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
			this.editFlag = false
			this.showTable = true
			})
			},
			}