From d3409e53d656dff668c12a335bcb6f367ca63fdb Mon Sep 17 00:00:00 2001 From: 懒羊羊 <15939171744@163.com> Date: 星期四, 25 一月 2024 09:03:10 +0800 Subject: [PATCH] opcua迁移 --- jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 43 ++++++++++++++++++++++++------------------- 1 files changed, 24 insertions(+), 19 deletions(-) diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue index 87e0d4c..2ea6b1f 100644 --- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue +++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue @@ -90,24 +90,14 @@ <el-tab-pane name="first"> <span slot="label"> <a class="el-icon-date"></a>棣栭〉</span> <el-col :span="8"> - <el-table> - <el-table-column label="搴忓彿" align="center" prop="repairIdentification" width="50px"/> - <el-table-column label="鎿嶄綔鍐呭" align="center" prop="boxCode" width="300px"/> + <el-table :data="formulaChildList"> + <el-table-column label="鎺掑簭" width="60" align="center" prop="stepSort"> + </el-table-column> + <el-table-column label="鎿嶄綔鍐呭" :show-overflow-tooltip='true' align="center" prop="operationSteps"> + </el-table-column> </el-table> </el-col> <el-col :span="16"> -<!-- <el-input v-model="url" type="text" style="width: 20%" /> --> -<!-- <el-button @click="join" type="primary">杩炴帴</el-button>--> -<!-- <el-button @click="exit" type="danger">鏂紑</el-button>--> - -<!-- <br />--> -<!-- <el-input type="textarea" v-model="message" :rows="9" />--> -<!-- <el-button type="info" @click="send">鍙戦�佹秷鎭�</el-button>--> -<!-- <br />--> -<!-- <br />--> -<!-- <el-input type="textarea" v-model="text_content" :rows="9" /> 杩斿洖鍐呭--> -<!-- <br />--> -<!-- <br />--> <el-image style="height: 520px;width: 100%" :src="imgSrc"></el-image> </el-col> </el-tab-pane> @@ -143,11 +133,20 @@ <script> import {listWorkReport} from "@/api/main/om/workReport/workReport"; import {listStationConf,getIpv4} from "@/api/main/sc/stationConf"; +import {listFormulaChild} from "@/api/main/bs/formulaChild/formulaChild"; export default { name: "stationTerminal", data() { return { + // 鏌ヨ鍙傛暟 + formulaChildParams: { + pageNum: 1, + pageSize: 10, + productCode: null, + }, + // 閰嶆柟閰嶇疆瀛愪俊鎭〃鏍兼暟鎹� + formulaChildList: [], ipAddress: '', imgSrc: '', headContent: { @@ -188,16 +187,13 @@ message: "", text_content: "", ws: null, + inputValue: '9' } }, beforeDestroy() { this.exit(); }, created() { - this.getStationConfList(); - this.connectWebsocket(); - - this.initStation(); // this.getStationConfList(); // setTimeout(() => { @@ -208,6 +204,14 @@ }, methods: { + /** 鏌ヨ閰嶆柟閰嶇疆瀛愪俊鎭垪琛� */ + getListFormulaChild() { + this.formulaChildParams.productCode = this.workpieceInformation.productCode + listFormulaChild(this.formulaChildParams).then(response => { + console.log(this.formulaChildList) + this.formulaChildList = response.rows; + }); + }, changeMenu(tab, event) { console.log(tab, event); }, @@ -220,6 +224,7 @@ this.headContent.sfcCode = this.content this.queryParams.sfcCode = this.content this.getList() + this.getListFormulaChild() this.cakeLamp.scanFinish = 1 }, /** 鏌ヨ鎶ュ伐璁板綍 琛ㄥ垪琛� */ -- Gitblit v1.9.3