From 2c65c31aceb16c1d06c692266e3fb555ecafdfb5 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 23 十月 2024 09:10:47 +0800
Subject: [PATCH] change-4
---
jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue b/jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue
index c6018b5..03ecb28 100644
--- a/jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/connectingRodUp/index.vue
@@ -8,26 +8,17 @@
</div>
</template>
</el-card>
- <el-row :gutter="3">
- <el-col :span="6">
- <el-card shadow="always" class="boxSize">
- <div class="centerImg">
- <img style="width: 140px;height: 30px;" src="@/assets/logo/jcdm2.png" alt="dark">
- </div>
-
- </el-card>
- </el-col>
- <el-col :span="3">
- <el-card shadow="always" class="boxSize">
- <span class="centerText" style="height: 60px">{{locationCode}}</span>
- </el-card>
- </el-col>
- <el-col :span="15">
- <el-card shadow="always" class="boxSize">
- <span class="centerText" >{{locationName}}</span>
- </el-card>
- </el-col>
- </el-row>
+<!-- <el-card class="query-card" >-->
+<!-- <el-form :model="from" size="large" :inline="true" label-width="78px" @submit.native.prevent>-->
+<!-- <el-form-item label-width="200" label="杩炴潌鐮�" :prop="from.connectCode" style="align-content: center">-->
+<!-- <input v-model="from.connectCode"-->
+<!-- ref="inputdata1"-->
+<!-- style="height: 39px; width: 300px"-->
+<!-- placeholder="璇锋壂鎻忚繛鏉嗙爜"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+<!-- </el-card>-->
<!-- <el-card class="box-card" >-->
<!-- <el-form :model="from" size="large" :inline="true" label-width="68px" @submit.native.prevent>-->
<!-- <el-form-item label-width="200" label="娲诲杩炴潌鎵樼洏鐮�" :prop="from.scanObject2" style="align-content: center">-->
@@ -74,6 +65,7 @@
import {getUrl} from "@/api/main/bs/orderScheduling/orderScheduling";
import WebSocketReconnect from "@/utils/WebsocketTool";
import result from "../../../../components/Crontab/result.vue";
+import {getSfcCodeByConnectCode} from "../../../../api/main/da/tileMatchMiddleware/tileMatchMiddleware";
export default {
name: "index",
dicts: ['colour_hex','productseries','axisname','neckname','tilename'],
@@ -90,6 +82,7 @@
qrCode: '',
// 鏌ヨ鍙傛暟
from:{
+ connectCode:'',
pageNum: 1,
pageSize: 10,
productSeries: null,
@@ -133,11 +126,63 @@
}
},
mounted() {
+ // this.setFocus1()
+ // this.$refs.inputdata1.addEventListener('keydown',this.handleScannerInput1)
this.getStationConf()
this.getWebUrl()
this.getDetailMessage()
},
+ // beforeDestroy() {
+ // this.$refs.inputdata1.removeEventListener('keydown',this.handleScannerInput1)
+ // },
methods:{
+ // setFocus1(){
+ // this.$nextTick(()=>{
+ // this.$refs.inputdata1.focus()
+ // })
+ // },
+ // handleScannerInput1(event) {
+ // if (this.scannerFlag) {
+ // this.$refs.inputdata1.value = ''
+ // this.scannerFlag = false
+ // }
+ // const input = event.target
+ // const inputValue = input.value
+ // this.from.connectCode = inputValue
+ // if (event.key === 'Enter') {
+ // this.scannerFlag = true
+ // //鎵弿瀹屾垚
+ // console.log('sssss', this.from.connectCode)
+ // getSfcCodeByConnectCode({connectCode:this.from.connectCode}).then(res => {
+ // console.log('res',res)
+ // if (res.code === 200){
+ // this.queryParams.scanObject2 = res.data.sfcCode
+ //
+ // if (this.queryParams.scanObject1 !== null && this.queryParams.scanObject1 !== ''
+ // && this.queryParams.scanObject2 !== null && this.queryParams.scanObject2 !== ''){
+ // if (this.queryParams.scanObject1 === this.queryParams.scanObject2){
+ // this.queryParams.words = "閰嶅鎴愬姛"
+ // this.queryParams.tileColor = "#3dcc1d"
+ // //璇锋眰鍑虹珯
+ // // this.passStation()
+ // }else {
+ // this.queryParams.words = "閰嶅澶辫触"
+ // this.queryParams.tileColor = "#f50909"
+ // }
+ // }
+ // this.$message({
+ // message: '鏌ヨ鎴愬姛',
+ // type: 'success'
+ // });
+ // } else {
+ // this.$message({
+ // message: '鏌ヨ澶辫触',
+ // type: 'error'
+ // });
+ // }
+ // })
+ // }
+ // },
getWebUrl(){
getUrl().then(res=>{
this.websocketUrl = res+"OP050"
@@ -166,6 +211,7 @@
this.queryParams.scanObject2 = resultMessage[0]
this.queryParams.productSeries = resultMessage[2]
} else if (resultMessage[1] === "clean"){
+ this.queryParams.productSeries = ''
this.queryParams.scanObject1 = ""
this.queryParams.scanObject2 = ""
this.queryParams.words = ""
--
Gitblit v1.9.3