From d9502f15ba2829816b466385df558ce266a8e197 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期六, 13 七月 2024 14:56:31 +0800
Subject: [PATCH] cvt前端界面优化
---
jcdm-ui/src/views/main/kb/cvt/index.vue | 183 ++++++++++++++++++++++++---------------------
1 files changed, 99 insertions(+), 84 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/cvt/index.vue b/jcdm-ui/src/views/main/kb/cvt/index.vue
index 866977f..270f6e5 100644
--- a/jcdm-ui/src/views/main/kb/cvt/index.vue
+++ b/jcdm-ui/src/views/main/kb/cvt/index.vue
@@ -21,67 +21,70 @@
</el-card>
</el-col>
</el-row>
- <el-row :gutter="0" >
- <el-col :span="14">
- <el-card class="box-card" style="margin-top: 5px" >
- <el-form :model="form" size="large" :inline="true" label-width="68px" @submit.native.prevent>
- <el-form-item label-width="200" label="鍙戝姩鏈虹爜" :prop="form.engineNo" style="align-content: center">
- <input v-model="form.engineNo"
- ref="inputdata"
- style="height: 39px; width: 300px"
- placeholder="璇疯緭鍏ュ彂鍔ㄦ満鐮�"
- />
- </el-form-item>
- </el-form>
- <el-form ref="form" :model="form" label-width="25%" >
- <el-form-item prop="productType"style="margin-top: 30px" >
- <span slot="label" style="font-size:22px;color:black"><strong>鏈哄瀷</strong></span>
- <el-input disabled style="font-size:20px" value="form.productType" v-model="form.productType" placeholder="" />
- </el-form-item>
- </el-form>
- <el-form ref="form" :model="form" label-width="25%" >
- <el-form-item prop="orderNo" style="margin-top: 30px">
- <span slot="label" style="font-size:22px;color:black"><strong>宸ュ崟缂栧彿</strong></span>
- <el-input disabled style="font-size:20px" v-model="form.orderNo" placeholder="" />
- </el-form-item>
- </el-form>
- <el-form ref="form" :model="form" label-width="25%" >
- <el-form-item prop="currentWorkstation" style="margin-top: 30px">
- <span slot="label" style="font-size:22px;color:black"><strong>璐ㄩ噺鐘舵��</strong></span>
- <el-input disabled style="font-size:20px" v-model:value="form.add" placeholder="" />
- </el-form-item>
- </el-form>
- <el-divider></el-divider>
+ <el-row :gutter="0" >
+ <el-col :span="14">
+ <el-card class="box-card" style="margin-top: 5px" >
+ <el-form ef="form" label-width="25%" :model="form" :inline="true" style="margin-top: 80px;margin-block: 80px" @submit.native.prevent>
+ <el-form-item :prop="form.engineNo" style="align-content: center">
+ <span slot="label" style="font-size:22px;color:black"><strong>宸ュ崟缂栧彿</strong></span>
+ <input v-model="form.engineNo"
+ ref="inputdata"
+ style="height: 40px; width: 300px;font-size:18px"
+ placeholder="璇疯緭鍏ュ彂鍔ㄦ満鐮�"
+ />
+ </el-form-item>
+ </el-form>
+<!-- <el-form ref="form" :model="form" label-width="25%" >-->
+<!-- <el-form-item prop="productType"style="margin-top: 30px" >-->
+<!-- <span slot="label" style="font-size:22px;color:black"><strong>鏈哄瀷</strong></span>-->
+<!-- <el-input disabled style="font-size:20px" value="form.productType" v-model="form.productType" placeholder="" />-->
+<!-- </el-form-item>-->
+<!-- </el-form>-->
+ <!-- <el-form ref="form" :model="form" label-width="25%" >-->
+ <!-- <el-form-item prop="orderNo" style="margin-top: 30px">-->
+ <!-- <span slot="label" style="font-size:22px;color:black"><strong>宸ュ崟缂栧彿</strong></span>-->
+ <!-- <el-input disabled style="font-size:20px" v-model="form.orderNo" placeholder="" />-->
+ <!-- </el-form-item>-->
+ <!-- </el-form>-->
+ <!-- <el-form ref="form" :model="form" label-width="25%" >-->
+ <!-- <el-form-item prop="currentWorkstation" style="margin-top: 30px">-->
+ <!-- <span slot="label" style="font-size:22px;color:black"><strong>璐ㄩ噺鐘舵��</strong></span>-->
+ <!-- <el-input disabled style="font-size:20px" v-model:value="form.add" placeholder="" />-->
+ <!-- </el-form-item>-->
+ <!-- </el-form>-->
+ <el-divider></el-divider>
- <el-row :gutter="10" class="mb8" type="flex" justify="center" style="text-align: center">
- <el-col :span="1.5">
- <el-button plain :disabled="buttondisabled" type="primary" style="width:400px;height:160px" v-hasPermi="['bs:formula:add']">
- <span class="el-icon-thumb" style="font-size:40px;color:black"></span>
- <span style="font-size:45px;color:black"><strong>寮哄埗涓婄嚎</strong></span>
- </el-button>
- </el-col>
- </el-row>
- </el-card>
- </el-col>
+ <el-row :gutter="10" class="mb8" type="flex" justify="center" style="text-align: center">
+ <el-col :span="1.5">
+ <el-button plain @click="ScannerInput" type="primary" style="width:400px;height:160px" v-hasPermi="['bs:formula:add']">
+ <span class="el-icon-thumb" style="font-size:40px;color:black"></span>
+ <span style="font-size:45px;color:black"><strong>鎵嬪姩鎵爜涓婄嚎</strong></span>
+ </el-button>
+ </el-col>
+ </el-row>
+ </el-card>
+ </el-col>
- <el-col :span="10" inline style="margin-top: 5px">
- <el-card class="custom-content" style="height: 530px" >
- <el-col :span="14"style=" ">
- <span style="font-size:25px"><strong>璐ㄩ噺鏁版嵁</strong></span>
- <el-divider></el-divider>
- {{this.form.engineCheckList}}
- </el-col>
- </el-card>
- </el-col>
- </el-row>
+ <el-col :span="10" inline style="margin-top: 5px">
+ <el-card class="custom-content" style="height: 453px" >
+ <el-col :span="14"style=" ">
+ <span style="font-size:25px"><strong>缁撴灉鏁版嵁</strong></span>
+ <el-divider></el-divider>
+ {{this.form.engineCheckList}}
+ </el-col>
+ </el-card>
+ </el-col>
+ </el-row>
</div>
</template>
<script>
+
import { listOrderScheduling, getOrderScheduling, delOrderScheduling, addOrderScheduling, updateOrderScheduling } from "@/api/main/bs/orderScheduling/orderScheduling";
import {listPassingStationCollection, getPassingStationCollection, delPassingStationCollection, addPassingStationCollection, updatePassingStationCollection,initializedData } from "@/api/main/da/passingStationCollection/passingStationCollection";
import {listLineInfo} from "@/api/main/bs/lineInfo/lineInfo";
import {getIp, listStationConf} from "@/api/main/sc/stationConf";
+import {time} from "echarts";
export default {
components: { },
@@ -158,58 +161,70 @@
if (event.key === 'Enter'){
this.scannerFlag = true
console.log("鏉＄爜锛�",this.form.engineNo)
- if(this.form.engineNo !== null && this.form.engineNo !== undefined) {
- console.log("鏉＄爜2锛�",this.locationCode)
+ console.log("鏉＄爜2锛�",this.locationCode)
+ if(this.form.engineNo !== null && this.form.engineNo !== '') {
+
+ console.log("鏉＄爜3锛�",this.form.engineCheckList)
initializedData({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
if(res.code===500){
this.$createElement;
}else {
+
addPassingStationCollection({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
- console.log("rrrrr",res)})
+ console.log("rrrrr",res)}
+ )
this.$message({
message: '鎵爜鎴愬姛',
type: 'success'
});
+ this.scanResult();
}
})
}else{
+ this.$message({
+ message: '鏈畬鎴愭壂鐮�',
+ type: 'error'
+ });
this.reset();
this.buttondisabled = true
- const h = this.$createElement;
+ }
+ }
+
+ },
+
+
+
+ ScannerInput(){
+ console.log("鏉＄爜锛�",this.form.engineNo)
+ console.log("鏉＄爜2锛�",this.locationCode)
+ if(this.form.engineNo !== null && this.form.engineNo !== '') {
+ initializedData({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
+ if(res.code===500){
+ this.$createElement;
+ }else {
+ addPassingStationCollection({sfcCode:this.form.engineNo,locationCode:this.locationCode}).then(res =>{
+ console.log("rrrrr",res)})
+ this.$message({
+ message: '鎵爜鎴愬姛',
+ type: 'success'
+ });
+ this.scanResult();
+ }
+ })
+ }
+ else {
this.$message({
- message: h('p',null, [
- h('span', null, '璀﹀憡 '),
- h('i', { style: 'color: black' }, '杈撳叆鐨勫彂鍔ㄦ満鍙锋湁璇�'),
- h()]),
- type: 'error',
- center: true,
- offset:300
+ message: '鏈畬鎴愭壂鐮�',
+ type: 'error'
});
}
-
- }
- // this.AddEngineNo();
},
- handleScannerInput111(event){
- const param = {
- sfcCode: this.from.engineNo,
- }
- addPassingStationCollection(param).then(response => {
- });
+ scanResult(){
+ this.currentDate = new Date().toLocaleDateString();
+ this.currentTime = new Date().toLocaleTimeString();
+ this.form.engineCheckList = "鏉＄爜:"+this.form.engineNo +"\n鎵爜鏃堕棿:" + this.currentDate+"/"+this.currentTime ;
},
-
-
- // AddEngineNo(){
- // const param = {
- // locationCode: this.from.locationCode,
- // sfcCode: this.from.engineNo,
- // // locationCode:"OP110",
- // // sfcCode:"666",
- //
- // }
- // addPassingStationCollection(param).then(response =>{});
- // },
getStationConf() {
getIp().then(response => {
@@ -232,7 +247,7 @@
qualityStatus:null,
currentWorkstation: null,
add: null,
- engineCheckList:'鏆傛棤鏁版嵁',
+ engineCheckList:'',
};
this.resetForm("form");
},
--
Gitblit v1.9.3