From 6babc30bf85777c888b9bcdfe39cee862d1e521f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 06 十二月 2024 17:40:30 +0800
Subject: [PATCH] 中空样式更改
---
UI-Project/config.js | 8 ++--
UI-Project/src/lang/zh.js | 1
UI-Project/src/utils/constants.js | 4 +-
UI-Project/src/views/hollow/hollowequipment.vue | 70 +++++++++++++++++++++++-----------
4 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index a4c5928..b6b1f5d 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,10 +1,10 @@
export default {
// serverUrl: "10.153.19.150:88/api",
-// serverUrl: "192.168.2.100:88",
- serverUrl: "127.0.0.1:88",
+ serverUrl: "192.168.2.100:88",
+ // serverUrl: "127.0.0.1:88",
// serverUrl2: "10.153.19.150:88"
- // serverUrl2: "192.168.2.100:88"
- serverUrl2: "127.0.0.1:88"
+ serverUrl2: "192.168.2.100:88"
+ // serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 041e4ef..2787fa0 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -675,5 +675,6 @@
croute: '璇烽�夋嫨璺嚎',
pairQuantity: '鎬婚厤瀵规暟閲忥細',
cpairQuantity: '璇疯緭鍏ユ�婚厤瀵规暟閲�',
+ schedulingswitch: '璋冨害寮�鍏�',
}
}
\ No newline at end of file
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 7851e6f..de60d51 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
-// export const WebSocketHost = "192.168.2.100";
+ export const WebSocketHost = "192.168.2.100";
// export const WebSocketHost = "10.153.19.150";
-export const WebSocketHost = "127.0.0.1";
+// export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index f445534..e5a67e0 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/UI-Project/src/views/hollow/hollowequipment.vue
@@ -12,7 +12,8 @@
$t('hellow.stoptask')
}}
</el-button>
- </div>
+ <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
+ </div>
<div style="margin-bottom: -5px;margin-left: 5px;">
<el-form>
<el-row>
@@ -50,17 +51,18 @@
<el-table-column prop="width" :label="$t('hellow.width')" align="center"/>
<el-table-column prop="state" :label="$t('hellow.state')" align="center"/>
</el-table>
- <div style="float: right;">
- <el-pagination
+ <div style="display: flex;margin-left: 500px;margin-top: 10px;">
+ <!-- <div style="float: center;"> -->
+ <div style="margin-top: 5px;margin-right: 5px;">绾胯矾</div>
+ <el-pagination
+ background
+ size="large"
layout="prev, pager, next"
:total="30"
:current-page.sync="currentPage"
@current-change="handlePageChange"
/>
</div>
- <!-- <div style="float: right;">
- <el-pagination layout="prev, pager, next" :total="3" :current-page.sync="currentPage" @current-change="handlePageChange"/>
- </div> -->
</div>
</el-card>
</div>
@@ -73,7 +75,8 @@
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="projectNumber"
>
- <el-table-column type="expand">
+ <!-- <el-table-column type="expand"> -->
+ <el-table-column >
<template #default="props">
<el-table :data="props.row.records" style="width: 100%">
<el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
@@ -81,15 +84,11 @@
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
<el-table-column prop="sumCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="80"/>
- <el-table-column prop="patternHeight" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
+ <el-table-column prop="pairCount" align="center" :label="$t('hellow.pairsnumber')" min-width="80"/>
</el-table>
</template>
</el-table-column>
- <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="80"/>
- <el-table-column min-width="80"/>
- <el-table-column min-width="80"/>
- <el-table-column min-width="80"/>
- <el-table-column min-width="80"/>
+ <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
<template #default="scope">
<el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
@@ -145,13 +144,13 @@
<el-form size="mini" label-width="100px">
<el-form label-width="210px" label-position="right">
<el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
- <el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
+ <el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
</el-form-item>
<el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
<el-select
:placeholder="$t('hellow.croute')"
style="width: 270px"
- v-model="cell">
+ v-model="cella">
<el-option
v-for="item in options"
:key="item.value"
@@ -184,9 +183,9 @@
<el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
<el-table-column prop="height" align="center" :label="$t('hellow.height')" min-width="80"/>
<el-table-column prop="width" align="center" :label="$t('hellow.width')" min-width="80"/>
- <el-table-column prop="totalCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/>
+ <!-- <el-table-column prop="totalCount" align="center" :label="$t('hellow.totalnumber')" min-width="80"/> -->
<el-table-column prop="lackCount" align="center" :label="$t('hellow.missingnumber')" min-width="80"/>
- <el-table-column prop="damageCount" align="center" :label="$t('hellow.brokenpieces')" min-width="80"/>
+ <!-- <el-table-column prop="damageCount" align="center" :label="$t('hellow.brokenpieces')" min-width="80"/> -->
<div style="float: right;margin-bottom: 5px;">
<el-pagination layout="prev, pager, next" :total="50"/>
</div>
@@ -231,7 +230,10 @@
const allData = ref({})
const flowCard = ref('')
const cell = ref('')
+const cella = ref('')
+const ganghua = ref('')
const totalPairQuantity = ref('')
+const totalPairQuantitya = ref('')
const dialogFormVisiblea = ref(false)
const dialogFormVisibleb = ref(false)
const dialogFormVisiblec = ref(false)
@@ -240,15 +242,15 @@
const options = [
{
value: 930,
- label: 930,
+ label: '绾胯矾涓�',
},
{
value: 931,
- label: 931,
+ label: '绾胯矾浜�',
},
{
value: 932,
- label: 932,
+ label: '绾胯矾涓�',
}
]
let socket = null;
@@ -413,13 +415,13 @@
const finishb = async () => {
let flowCardId = window.localStorage.getItem('flowCardId')
try {
- var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+cell.value + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantity.value;
+ var url="/hollowGlass/hollowGlassOutRelationInfo/forceOutGlass?cell="+cella.value + "&flowCardId=" + flowCardId + "&totalPairQuantity=" + totalPairQuantitya.value;
const response = await request.post(url)
if (response.code == 200) {
ElMessage.success(response.message);
dialogFormVisibled.value = false;
- cell.value = '';
- totalPairQuantity.value = '';
+ cella.value = '';
+ totalPairQuantitya.value = '';
} else {
ElMessage.error(response.message);
}
@@ -427,6 +429,28 @@
console.error(error);
}
}
+ // 璋冨害
+ const handleChange = async () => {
+ try {
+ const body = {
+ flag: ganghua.value, // 浣跨敤 ganghua.value 鑾峰彇褰撳墠寮�鍏崇殑鐘舵��
+ };
+
+ var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
+ const response = await request.post(url)
+ if (response.code == 200) {
+ // 缁戝畾鎴愬姛锛屽鐞嗛�昏緫
+ ElMessage.success(response.message);
+ ganghua.value = response.data
+ }else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ // 澶勭悊閿欒
+ console.error(error);
+ }
+}
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
--
Gitblit v1.8.0