From 18e4df43f79f51539474b2918544a9d2d4c5c4e0 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期三, 13 十一月 2024 15:43:52 +0800 Subject: [PATCH] 前端页面适配 --- UI-Project/src/views/StockBasicData/stockBasicData.vue | 79 ++++++++++++++++++++++----------------- 1 files changed, 44 insertions(+), 35 deletions(-) diff --git a/UI-Project/src/views/StockBasicData/stockBasicData.vue b/UI-Project/src/views/StockBasicData/stockBasicData.vue index f83f2e4..a3a214d 100644 --- a/UI-Project/src/views/StockBasicData/stockBasicData.vue +++ b/UI-Project/src/views/StockBasicData/stockBasicData.vue @@ -1,25 +1,24 @@ <script setup> -import {Search} from "@element-plus/icons-vue"; -import {reactive} from "vue"; +import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue"; import {useRouter} from "vue-router" +import {host, WebSocketHost} from '@/utils/constants' +import request from "@/utils/request" +import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService'; +// import { ref } from 'vue' +import {ElMessage, ElMessageBox} from 'element-plus' +// import LanguageMixin from './lang/LanguageMixin' +import {useI18n} from 'vue-i18n' + const router = useRouter() const adda = ref(false) -import { WebSocketHost ,host} from '@/utils/constants' -import request from "@/utils/request" -import { ref, onMounted , onBeforeUnmount,onUnmounted} from "vue"; -import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; -// import { ref } from 'vue' -import { ElMessage, ElMessageBox } from 'element-plus' -// import LanguageMixin from './lang/LanguageMixin' - import { useI18n } from 'vue-i18n' - const { t } = useI18n() - let language = ref(localStorage.getItem('lang') || 'zh') - +const {t} = useI18n() +let language = ref(localStorage.getItem('lang') || 'zh') + const tableData = ref([]) const slot = ref('') -const requestData = { - line: 2001 -}; +const requestData = { + line: 2001 +}; const timeRange = ref([]) const selectValuesa = reactive([]); // request.post("/cacheGlass/taskCache/selectEdgTask",{ @@ -144,26 +143,29 @@ }); onUnmounted(() => { if (socket) { - closeWebSocket(socket); + closeWebSocket(socket); } - }); + }); onBeforeUnmount(() => { console.log("鍏抽棴浜�") closeWebSocket(); }); </script> <template> - <div> - <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> - <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable style="margin-left: 20px;margin-bottom: 10px;"> - <el-option :label="$t('workOrder.edgingone')" value="2001"></el-option> - <el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option> - </el-select> - - <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable style="margin-left: 20px;margin-bottom: 10px;" > - <el-option :label="$t('workOrder.nedging')" value="0"></el-option> - <el-option :label="$t('workOrder.edging')" value="1"></el-option> - <el-option :label="$t('workOrder.finedging')" value="2"></el-option> + <div style="height: 500px;"> + <div> + <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> + <el-select v-model="selectValuesa[0]" filterable :placeholder="$t('workOrder.cway')" clearable + style="margin-left: 20px;margin-bottom: 10px;"> + <el-option :label="$t('workOrder.edgingone')" value="2001"></el-option> + <el-option :label="$t('workOrder.edgingtwo')" value="2002"></el-option> + </el-select> + + <el-select v-model="selectValuesa[1]" filterable :placeholder="$t('workOrder.cstate')" clearable + style="margin-left: 20px;margin-bottom: 10px;"> + <el-option :label="$t('workOrder.nedging')" value="0"></el-option> + <el-option :label="$t('workOrder.edging')" value="1"></el-option> + <el-option :label="$t('workOrder.finedging')" value="2"></el-option> </el-select> <span class="demonstration" style="margin-left: 20px;margin-bottom: 10px;">{{ $t('workOrder.time') }}</span> <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 20px;margin-bottom: 10px;" value-format = "YYYY-MM-DD hh:mm:ss" @@ -189,17 +191,24 @@ {{ scope.row.status==0?"鏈(杈�":scope.row.status==1?"纾ㄨ竟涓�":"宸茬(杈�" }} </template> </el-table-column> - - + + <el-table-column fixed="right" :label="$t('workOrder.operate')" align="center" width="200"> <template #default="scope"> - <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('workOrder.breakage') }}</el-button> - <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('workOrder.takeout') }}</el-button> + <el-button size="mini" type="text" plain @click="open(scope.row)">{{ + $t('workOrder.breakage') + }} + </el-button> + <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ + $t('workOrder.takeout') + }} + </el-button> </template> - </el-table-column> + </el-table-column> </el-table> </div> - </el-card> + </el-card> + </div> </div> </template> -- Gitblit v1.8.0