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>
			@@ -26,12 +25,12 @@
			<div class="right-panel">
			<div class="right-panel-search">
			<span>类型</span>
			<el-select v-model="type" style="width: 240px">
			<el-select v-model="type" style="width: 240px" clearable>
			<el-option v-for="item in types" :key="item.value" :label="item.label"
			:value="item.value" />
			</el-select>
			<span>状态</span>
			<el-select v-model="statu" style="width: 240px">
			<el-select v-model="statu" style="width: 240px" clearable>
			<el-option v-for="item in status" :key="item.value" :label="item.label"
			:value="item.value" />
			</el-select>
			@@ -47,14 +46,10 @@
			ref="table" :params="params" :apiObj="apiObj"
			@selection-change="selectionChange" stripe>
			<el-table-column type="selection" width="50"></el-table-column>
			<el-table-column label="工位编号" prop="code" width="120"
			sortable='custom'></el-table-column>
			<el-table-column label="工位名称" prop="name" width="120"
			sortable='custom'></el-table-column>
			<el-table-column label="工位类型" prop="type" width="120"
			sortable='custom'></el-table-column>
			<el-table-column label="工位日历" prop="calendarName" width="120"
			sortable='custom'></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="calendarName" width="120"></el-table-column>
			<el-table-column label="操作" fixed="right" align="right" width="160">
			<template #default="scope">
			<el-button-group>
			@@ -81,7 +76,9 @@
			<p class="preview-title">工位信息</p>
			<div class="preview-content">
			<div class="img">
			<img :src="machinePng" alt="">
			<img v-if="!previewData.avatar" :src="machinePng" alt="">
			<scUpload v-else disabled v-model="previewData.avatar" title="工位图片">
			</scUpload>
			</div>
			<ul>
			<li>工位编号 {{ previewData.code }}</li>
			@@ -129,49 +126,68 @@
			<el-container>
			<el-header>
			<span>采集信息</span>
			<el-button @click="editFlag = !editFlag" style="margin-left: auto;" text type="primary" size="small">配置工位采集</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 @click="editFlag = !editFlag"
			style="margin-left: auto;" text type="primary"
			size="small">配置工位采集</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-header>
			<el-main>
			<el-table :data="list" height="200px">
			<el-table-column label="采集变量名称" prop="name" />
			<el-table-column label="工位变量名称" prop="dataItem">
			<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>
			<el-input :disabled="!editFlag"
			v-model="scope.row.dataItem"></el-input>
			</template>
			</el-table-column>
			<el-table-column label="数据标签" prop="description">
			<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 :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">
			<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 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" />
			<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" />
			<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" />
			<el-checkbox :disabled="!editFlag"
			v-model="scope.row.processParameter" />
			</template>
			</el-table-column>
			</el-table>
			@@ -210,7 +226,7 @@
			<el-col :span="8">
			<ul class="workbench">
			<li v-for="item in workbenchVOList" :key="item.sort">
			{{`【${item.sort}】`}}{{item.name}}
			{{ `【${item.sort}】` }}{{ item.name }}
			</li>
			</ul>
			</el-col>
			@@ -659,8 +675,8 @@
			this.search()
			})
			},
			saveInfo () {
			this.$HTTP.post('/api/blade-cps/workstation-wcs/save',this.workbenchVOList).then(res => {
			saveInfo() {
			this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
			this.editFlag = false
			})
			},
			@@ -701,6 +717,7 @@
			}
			}
			}

			.workbench {
			list-style: none;
			}