From 77742219f5d4eb8d667b6bebc25c1ad025e18b8c Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 01 八月 2024 14:23:21 +0800
Subject: [PATCH] -页面优化
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 579 ---------------------------------------------------------
1 files changed, 9 insertions(+), 570 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 3ed8cd6..37712ce 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -84,7 +84,7 @@
</el-col>
<el-col :span="17">
- <el-tabs type="border-card" style="height: 600px" v-model="activeName" @tab-click="changeMenu">
+ <el-tabs type="border-card" style="height: 600px" v-model="activeName">
<el-tab-pane name="first">
<span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
<el-col :span="24">
@@ -108,143 +108,6 @@
</el-tabs>
</el-col>
</el-row>
- <el-dialog v-dialogpop-up :title="title" :visible.sync="open1" width="1000" append-to-body>
- <el-row
- type="flex"
- class="row-bg"
- justify="center"
- v-show="portsList.length === 0"
- >
- <el-col :span="7">
- <div style="margin-top: 400px">
- <span style="display: block">
- 浠呮敮鎸丆hrome 89+鎴栬�匛dge 89+娴忚鍣�(瀹夊叏涓婁笅鏂囷紙HTTPS锛変腑鍙敤)
- </span>
- <el-button type="primary" @click="obtainAuthorization">鎺堟潈</el-button>
- </div>
- </el-col>
- </el-row>
- <el-form
- v-show="portsList.length > 0"
- ref="form1"
- :model="form1"
- label-width="100px">
- <el-row>
- <el-col :span="24"
- ><div>
- <el-form-item label="涓插彛">
- <el-select
- v-model="form1.port"
- filterable
- placeholder="璇烽�夋嫨涓插彛"
- :disabled="isDisable"
- >
- <el-option
- v-for="item in portsList"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="娉㈢壒鐜�">
- <el-autocomplete
- popper-class="my-autocomplete"
- v-model="form1.baudRate"
- :fetch-suggestions="querySearch"
- placeholder="璇疯緭鍏ユ尝鐗圭巼"
- :disabled="isDisable"
- >
- <i class="el-icon-edit el-input__icon" slot="suffix"> </i>
- <template slot-scope="{ item }">
- <div class="name">{{ item.value }}</div>
- <span class="addr">{{ item.address }}</span>
- </template>
- </el-autocomplete>
- </el-form-item>
- <el-form-item label="鏁版嵁浣�">
- <el-select
- v-model="form1.dataBits"
- placeholder="璇烽�夋嫨鏁版嵁浣�"
- :disabled="isDisable"
- >
- <el-option label="7" value="7"></el-option>
- <el-option label="8" value="8"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍋滄浣�">
- <el-select
- v-model="form1.stopBits"
- placeholder="璇烽�夋嫨鍋滄浣�"
- :disabled="isDisable"
- >
- <el-option label="1" value="1"></el-option>
- <el-option label="2" value="2"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="鏍￠獙浣�">
- <el-select
- v-model="form1.parity"
- placeholder="璇烽�夋嫨鏍￠獙浣�"
- :disabled="isDisable"
- >
- <el-option label="None" value="none"></el-option>
- <el-option label="Even" value="even"></el-option>
- <el-option label="Odd" value="odd"></el-option>
- </el-select>
- </el-form-item>
-
- <el-form-item label="娴佹帶鍒�">
- <el-select
- v-model="form1.flowControl"
- placeholder="璇烽�夋嫨娴佹帶鍒�"
- :disabled="isDisable"
- >
- <el-option label="None" value="none"></el-option>
- <el-option label="HardWare" value="hardware"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏄剧ず鍘嗗彶">
- <el-switch
- v-model="form1.isShowHistory"
- @change="loadHistory"
- ></el-switch>
- <el-button
- type="danger"
- icon="el-icon-delete"
- circle
- title="娓呯┖鍘嗗彶"
- @click="clearHistory"
- ></el-button>
- </el-form-item>
- <el-form-item label="鍙戦�佸尯璁剧疆" v-show="isShowSendArea">
- <el-form-item label="鍙戦�佹牸寮�">
- <el-radio-group v-model="form1.type">
- <el-radio label="1">ASCII</el-radio>
- <el-radio label="2">HEX</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鍙戦�佷俊鎭�">
- <el-input type="textarea" v-model="form1.sendMsg"></el-input>
- </el-form-item>
- <el-button type="primary" @click="sendCommon">鍙戦��</el-button>
- </el-form-item>
-
- <el-form-item>
- <el-button :type="btnType" @click="connectBtn">{{
- btnText
- }}</el-button>
- <el-button type="info" @click="obtainAuthorization"
- >鏂板鎺堟潈</el-button
- >
- </el-form-item>
- </div>
- </el-col>
- </el-row>
- </el-form>
- </el-dialog>
</div>
</template>
<script>
@@ -338,75 +201,20 @@
release: 0 //鍏佽鏀捐
},
content: '',
- activeName: 'first',
url: "ws://10.103.210.248:8080/websocket/message/",
- // url: "ws://192.168.10.100:8080/websocket/message/",
- message: "",
- text_content: "",
- ws: null,
- inputValue: '9',
-
- open1: false,
- input: "",
- keepReading: true,
- form1: {
- baudRate: "115200",
- dataBits: "8",
- stopBits: "1",
- parity: "none",
- flowControl: "none",
- desc: "",
- type: "1",
- isShowHistory: false,
- },
- btnType: "primary",
- btnText: "杩炴帴涓插彛",
- restaurants: [],
- portsList: [],
- isShowSendArea: false,
- readType: 1,
- title: "",
passingStationForm: {},
originalArray: [],
- yzSfcFlag: 1,
- endYz: false,
- orderFlag: true
+ orderFlag: true,
+ activeName: 'first',
+
}
},
beforeDestroy() {
this.exit();
},
created() {
- document.onkeyup = e => {
- if (e.keyCode === 13) {
- // 璋冪敤鐧诲綍 楠岃瘉鏂规硶
- this.submitForm()
- }
- }
this.initStation();
- // this.getStationConfList();
- // setTimeout(() => {
- // this.connectWebsocket();
- // }, 3000);
- },
- mounted() {
- if ("serial" in navigator) {
- this.myserialport = new MySerialPort();
- this.getPorts();
- navigator.serial.addEventListener("connect", (e) => {
- this.$message.success("璁惧宸茶繛鎺�");
- this.getPorts();
- });
- navigator.serial.addEventListener("disconnect", (e) => {
- this.$message.error("璁惧宸叉柇寮�");
- });
- this.restaurants = this.loadAll();
- } else {
- this.$message.error(
- "褰撳墠涓篐TTP妯″紡鎴栬�呮祻瑙堝櫒鐗堟湰杩囦綆锛屼笉鏀寔缃戦〉杩炴帴涓插彛"
- );
- }
},
computed: {
isDisable() {
@@ -414,6 +222,9 @@
},
},
methods: {
+ changeMenu(tab, event) {
+ console.log(tab, event);
+ },
handleEnter() {
this.serialPortMethod(this.materialCode)
this.$message("鎵弿鐗╂枡缂栫爜"+this.materialCode);
@@ -436,46 +247,8 @@
this.$message.error("宸茬粡鏈夊伐鍗曚簡锛屼笉鑳芥帴鏀讹紒");
}
},
- bindcardCode(scanValue){
- // this.$message('缁戝畾鎴愬姛锛�');
- let param = {
- productNum: this.headContent.sfcCode,
- trolleyYard: scanValue,
- }
- trolleyYardBinDing(param).then(response => {
- });
-
- },
serialLink() {
this.open1 = true
- },
- bindYzSfc(){
- if(this.headContent.sfcCode!==""&&this.headContent.yzSfcCode!==""){
- let param = {
- sfcCode: this.headContent.sfcCode,
- locationCode: this.headContent.processesCode,
- yzSfcCode: this.headContent.yzSfcCode
- }
- const orderParam = {
- productNum: this.headContent.sfcCode,
- }
- replaceAssemblyCode(param).then(response => {
- this.$message('缁戝畾鎴愬姛锛�');
- bindYzSfcFlag(orderParam).then(response => {
- this.yzSfcFlag = 1
- });
- });
- }
- },
- Release(){
- // this.$message('portsList锛�'+this.portsList.length);
- if(this.btnType === "danger"){
- this.$message('杩炴帴浜嗭紒');
-
- }else {
- this.$message('mei杩炴帴浜嗭紒');
-
- }
},
serialPortMethod(value){
let formulaChildParams = {
@@ -549,9 +322,7 @@
this.headContent.sfcCode = '';
this.headContent.yzSfcCode = '';
this.headContent.cardCode = '';
- },
- changeMenu(tab, event) {
- console.log(tab, event);
+ this.workpieceInformation.planQty = ''
},
clearClick(){
const param = {
@@ -564,16 +335,6 @@
clearWorkpieceRelease(param).then(response => {});
this.headContent.sfcCode = ''
this.$message('娓呴櫎鎴愬姛锛�');
- },
- scanCompleted(){
- this.$message('鎵爜瀹屾垚'+this.content);
- this.headContent.sfcCode = this.content
- this.queryParams.sfcCode = this.content
- this.getList()
- this.getListFormulaChild()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
-
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
@@ -619,25 +380,7 @@
padTimeUnit(value) {
return value.toString().padStart(2, '0');
},
- addBaseData(){
- addBasicParameters(this.passingStationForm).then(response => {});
- },
- /** 鍏ョ珯澧炲姞杩囩珯閲囬泦璁板綍 **/
- addOverStationCollection(){
- this.passingStationForm = {
- id: null,
- workOrderNo: this.workpieceInformation.workOrderNo,
- productCode: this.workpieceInformation.productCode,
- locationCode: this.headContent.processesCode,
- model: this.workpieceInformation.productModel,
- productBarcode: this.headContent.sfcCode,
- sfcCode: this.headContent.sfcCode,
- inboundTime: new Date()
- }
- addPassingStationCollection(this.passingStationForm).then(response => {});
- // addBasicParameters(this.passingStationForm).then(response => {});
- },
exit() {
if (this.ws) {
this.ws.close();
@@ -668,7 +411,6 @@
this.initializedData()
});
- this.conCom()
console.log('websocket杩炴帴宸ヤ綅涓�' + this.headContent.processesCode)
const wsuri = this.url + this.headContent.processesCode;
this.ws = new WebSocket(wsuri);
@@ -682,13 +424,6 @@
this.ws.onmessage = function (event) {
if (event.data === "IN") {
self.cakeLamp.InPlace = 1;
- console.log(self.headContent.processesCode);
- // const param = {
- // processesCode: self.headContent.processesCode,
- // }
- // fistSetpNumber(param).then(response => {});
- } else if (event.data === "IN0") {
- self.cakeLamp.InPlace = 0;
} else if (event.data === "OUT") {
self.cakeLamp.release = 1;
} else if (event.data === "END") {
@@ -724,51 +459,7 @@
console.log("杩涘叆鏈�缁堟柟娉�")
self.endSaveData(param)
- } else if (event.data.includes("[")) {
- let formulaChilds = "";
- self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort);
- self.formulaChildList
- .filter((formulaChild) => formulaChild.operationType === '1');
- for (let i = 0; i < self.formulaChildList.length; i++) {
- let formulaChild = self.formulaChildList[i];
- let results = formulaChild.results;
-
- if (results === '' || results === null || results === 'NG') {
- formulaChilds = formulaChild;
- break;
- }
- }
- if(formulaChilds === ""){
- self.$message.error('鏈伐浣嶅凡宸ヤ綔瀹屾垚锛�');
- return;
- }
- const param = {
- id: formulaChilds.id,
- tightenTheArray: event.data,
- paramCode: formulaChilds.paramCode,
- workOrderNo: self.workpieceInformation.workOrderNo,
- productCode: self.workpieceInformation.productCode,
- locationCode: self.headContent.processesCode,
- productBarcode: self.headContent.sfcCode,
- spareField1: formulaChilds.spareField1,
- spareField2: formulaChilds.spareField2,
- spareField3: formulaChilds.spareField3,
- spareField4: formulaChilds.spareField4,
- stepSort: formulaChilds.stepSort
- }
- if(formulaChilds.paramCode === null||formulaChilds.paramCode ===''){
- self.$message('鏈壘鍒板弬鏁扮爜锛岃妫�鏌ュ弬鏁扮爜鏄惁姝ｇ‘');
- return;
- }
- if(self.headContent.sfcCode!==null||self.headContent.sfcCode!==''){
- updateTighteningFormula(param).then(response => {
- //addTighteningParameters(param).then(response => {});
- self.getListFormulaChild()
- }).catch(error =>{
- self.getListFormulaChild()
- });
- }
- }else if(event.data.includes("productNum")){
+ } else if(event.data.includes("productNum")){
let productNum = event.data.split(',')[1];
self.headContent.sfcCode = productNum;
self.queryParams.productNum = productNum;
@@ -787,258 +478,6 @@
this.endClear()
workpieceRelease(param).then(response => {});
});
- },
-
- //鎺ュ彈鏁版嵁鐨勫洖璋�
- callBack(value) {
- if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
- else {
- const scanValue = this.myserialport.hex2atostr(value).replace(/[\r\n]/g, '');
- console.log("涓插彛鏀跺埌鏁版嵁-------------------"+scanValue)
- console.log("sfc=--"+this.headContent.sfcCode+"--")
- if(this.headContent.sfcCode !== '' && this.headContent.sfcCode !== null
- && this.headContent.sfcCode !== undefined){
- if(scanValue.includes("0RSP1TE") && this.headContent.processesCode === 'OP240'){
- this.headContent.cardCode = scanValue
- this.bindcardCode(scanValue);
- this.serialPortMethod(scanValue)
- }else {
- this.$message('宸ヤ綅缁堢鎵弿鐗╂枡缂栫爜'+scanValue);
- console.log(scanValue)
- this.serialPortMethod(scanValue)
- }
- } else {
- // if(this.headContent.processesCode === 'OP240'){
- this.headContent.sfcCode = scanValue;
- this.queryParams.productNum = scanValue;
- this.getList()
- this.cakeLamp.scanFinish = 1
- this.cakeLamp.startWork = 1
- this.cakeLamp.InPlace = 1
- // }else {
- // let param = {
- // trolleyYard: scanValue
- // }
- // findBytrolleyYardGetOne(param).then(response => {
- // if(response.msg !== '2'){
- // this.headContent.sfcCode = response.msg;
- // this.queryParams.productNum = response.msg;
- // this.$message('鎵爜璇嗗埆浜у搧搴忓垪鍙�'+scanValue);
- // this.getList()
- // this.cakeLamp.scanFinish = 1
- // this.cakeLamp.startWork = 1
- // this.cakeLamp.InPlace = 1
- // }else {
- // this.$message('娌℃湁搴忓垪鍙�'+scanValue);
- // return
- // }
- // });
- // }
-
- }
-
- }
- },
- clearHistory() {
- this.form1.desc = "";
- this.myserialport.state.readValue = [];
- },
- loadHistory() {
- if (this.form1.isShowHistory) this.form1.desc = this.readLi().join("");
- else {
- let temp = this.readLi();
- if (temp.length > 0) this.form1.desc = temp[temp.length - 1].join("");
- }
- },
- readLi() {
- let readType = this.readType;
- return this.myserialport.state.readValue.map((items, index) => {
- const item = items.value;
- const type = items.type; // 1鎺ユ敹锛�2鍙戦��
- let body = [];
- if (item !== undefined) {
- let strArr = [];
- for (let hex of Array.from(item)) {
- strArr.push(hex.toString(16).toLocaleUpperCase());
- }
- if (strArr.includes("D") && strArr.includes("A")) {
- if (strArr.indexOf("A") - strArr.indexOf("D") === 1) {
- strArr.splice(strArr.indexOf("D"), 1);
- strArr.splice(strArr.indexOf("A"), 1, <br key={0} />);
- }
- }
- strArr = strArr.map((item) => {
- if (typeof item === "string") {
- if (readType === 1) {
- return this.myserialport.hex2a(parseInt(item, 16));
- } else if (readType === 2) {
- return item + " ";
- }
- }
- return item;
- });
- if (typeof strArr[strArr.length - 1] === "string") {
- strArr.push("\r\n");
- }
- body.push(strArr.join(""));
- }
- return body;
- });
- },
- conCom(){
- try {
- this.myserialport.state.baudRate = this.form1.baudRate;
- this.myserialport.state.dataBits = this.form1.dataBits;
- this.myserialport.state.stopBits = this.form1.stopBits;
- this.myserialport.state.parity = this.form1.parity;
- this.myserialport.state.flowControl = this.form1.flowControl;
- this.myserialport.openPort(0, true, this.callBack);
- console.log(this.form1.port)
- } catch (error) {
- this.$message.error("涓插彛杩炴帴澶辫触锛佽妫�鏌ヤ覆鍙ｆ槸鍚﹀凡琚崰鐢�");
- }
- if (this.myserialport.state.isOpen) {
- this.$message.success("涓插彛杩炴帴鎴愬姛");
- }
- },
- //杩炴帴
- async connectBtn() {
- if (this.btnType === "primary") {
- try {
- this.myserialport.state.baudRate = this.form1.baudRate;
- this.myserialport.state.dataBits = this.form1.dataBits;
- this.myserialport.state.stopBits = this.form1.stopBits;
- this.myserialport.state.parity = this.form1.parity;
- this.myserialport.state.flowControl = this.form1.flowControl;
- await this.myserialport.openPort(this.form1.port, true, this.callBack);
- console.log(this.form1.port)
- } catch (error) {
- this.$message.error("涓插彛杩炴帴澶辫触锛佽妫�鏌ヤ覆鍙ｆ槸鍚﹀凡琚崰鐢�");
- }
- if (this.myserialport.state.isOpen) {
- this.$message.success("涓插彛杩炴帴鎴愬姛");
- this.open1 = false
- this.btnType = "danger";
- this.btnText = "鍏抽棴涓插彛";
- }
- } else {
- this.myserialport.openPort(this.form1.port, false, this.callBack);
- this.$message.success("涓插彛鍏抽棴鎴愬姛");
- this.btnType = "primary";
- this.btnText = "杩炴帴涓插彛";
- }
- },
- //鎺堟潈
- async obtainAuthorization() {
- if ("serial" in navigator) {
- console.log("The Web Serial API is supported.");
- if (!this.myserialport) this.myserialport = new MySerialPort();
- try {
- await this.myserialport.handleRequestPort();
- this.$message.success("涓插彛鎺堟潈鎴愬姛");
- this.getPortInfo(this.myserialport.state.ports);
- } catch (error) {
- this.$message.warning("鏈�夋嫨鏂颁覆鍙ｆ巿鏉冿紒");
- }
- } else {
- this.$message.error(
- "褰撳墠涓篐TTP妯″紡鎴栬�呮祻瑙堝櫒鐗堟湰杩囦綆锛屼笉鏀寔缃戦〉杩炴帴涓插彛"
- );
- }
- },
- //涓插彛鍒楄〃鍒濆鍖�
- getPortInfo(portList) {
- this.portsList = [];
- portList.map((port, index) => {
- const { usbProductId, usbVendorId } = port.getInfo();
- if (usbProductId === undefined || usbVendorId === undefined) {
- this.portsList.push({ label: "鏈煡璁惧" + index, value: index });
- } else {
- const usbVendor = USBDevice.filter(
- (item) => parseInt(item.vendor, 16) === usbVendorId
- );
- let usbProduct = [];
- if (usbVendor.length === 1) {
- usbProduct = usbVendor[0].devices.filter(
- (item) => parseInt(item.devid, 16) === usbProductId
- );
- }
- this.portsList.push({ label: usbProduct[0].devname, value: index });
- }
- });
- },
- // 鍙戦��
- async sendCommon() {
- if (this.myserialport.state.isOpen) {
- if (this.form1.sendMsg.length !== 0) {
- const writeType = this.form1.type;
- let value = this.form1.sendMsg;
- let arr = [];
- if (writeType === 1) {
- // ASCII
- for (let i = 0; i < value.length; i++) {
- arr.push(this.myserialport.a2hex(value[i]));
- }
- } else if (writeType === 2) {
- // HEX
- if (/^[0-9A-Fa-f]+$/.test(value) && value.length % 2 === 0) {
- for (let i = 0; i < value.length; i = i + 2) {
- arr.push(parseInt(value.substring(i, i + 2), 16));
- }
- } else {
- this.$message.error("鏍煎紡閿欒");
- return;
- }
- }
- this.myserialport.writeText(arr);
- } else {
- this.$message.warning("璇疯緭鍏ュ彂閫佺殑淇℃伅");
- }
- } else {
- this.$message.warning("涓插彛澶勪簬鍏抽棴鐘舵�侊紝璇疯繛鎺ヤ覆鍙�");
- }
- },
- async getPorts() {
- await this.myserialport.getPorts();
- this.getPortInfo(this.myserialport.state.ports);
- },
- querySearch(queryString, cb) {
- var restaurants = this.restaurants;
- var results = queryString
- ? restaurants.filter(this.createFilter(queryString))
- : restaurants;
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results);
- },
- createFilter(queryString) {
- return (restaurant) => {
- return (
- restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
- 0
- );
- };
- },
- loadAll() {
- return [
- { value: "110" },
- { value: "300" },
- { value: "600" },
- { value: "1200" },
- { value: "2400" },
- { value: "4800" },
- { value: "7200" },
- { value: "9600" },
- { value: "14400" },
- { value: "19200" },
- { value: "28800" },
- { value: "38400" },
- { value: "56000" },
- { value: "57600" },
- { value: "76800" },
- { value: "115200" },
- { value: "230400" },
- { value: "460800" },
- ];
},
}
}
--
Gitblit v1.9.3