From 1288a7890deb3b180b1e8df7015b1036514c4e71 Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期四, 27 三月 2025 09:07:12 +0800
Subject: [PATCH] 3.27优化
---
项目代码/client/src/views/tts/TheCurrentJob/Startjob.vue | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 26 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Startjob.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Startjob.vue"
index 66c4238..0a01bb0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Startjob.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/TheCurrentJob/Startjob.vue"
@@ -171,7 +171,7 @@
>
</span>
</div>
- <div style="position: absolute; width: 47rem; height: 2.5rem">
+ <div style="position: absolute; width: 62rem; height: 2.5rem">
<el-table
empty-text="鏆傛棤鏁版嵁"
style="margin-top: 0.88rem"
@@ -191,7 +191,7 @@
<el-table-column
property="craftsStep"
label="宸ヨ壓椤圭偣/姝ラ"
- min-width="30%"
+ min-width="13%"
>
<template #default="scope">
<span
@@ -205,16 +205,41 @@
"
>{{ scope.row.craftsStep }}
</span></template
- ></el-table-column
- >
+ >
+ </el-table-column>
+
<el-table-column
property="craftContent"
label="宸ヨ壓鍐呭"
- min-width="70%"
+ min-width="40%"
>
<template #default="scope">
+ <el-tooltip placement="bottom" effect="light">
+ <template #content>
+ <span style="display: block; width: 15rem">{{
+ scope.row.craftContent
+ }}</span>
+ </template>
+ <span
+ @click="true"
+ style="
+ color: #ffffff;
+ font-size: 0.88rem;
+ display: -webkit-box; /* 璁剧疆涓篧ebKit鍐呮牳鐨勫脊鎬х洅瀛愭ā鍨� */
+ -webkit-box-orient: vertical; /* 鍨傜洿鎺掑垪 */
+ -webkit-line-clamp: 2; /* 闄愬埗鏄剧ず涓よ */
+ overflow: hidden; /* 闅愯棌瓒呭嚭鑼冨洿鐨勫唴瀹� */
+ text-overflow: ellipsis; /* 浣跨敤鐪佺暐鍙� */
+ "
+ >{{ scope.row.craftContent }}</span
+ >
+ </el-tooltip>
+ </template></el-table-column
+ >
+ <el-table-column property="tools" label="宸ュ叿" min-width="12%">
+ <template #default="scope">
<span
- @click="true"
+ ref="spanHide"
style="
color: #ffffff;
font-size: 0.88rem;
@@ -224,12 +249,32 @@
overflow: hidden; /* 闅愯棌瓒呭嚭鑼冨洿鐨勫唴瀹� */
text-overflow: ellipsis; /* 浣跨敤鐪佺暐鍙� */
"
- >{{ scope.row.craftContent }}</span
+ >{{ scope.row.tools }}
+ </span></template
+ ></el-table-column
+ >
+ <el-table-column
+ property="craftsStep"
+ label="鐗╂枡"
+ min-width="15%"
+ >
+ <template #default="scope">
+ <span
+ style="
+ color: #ffffff;
+ font-size: 0.88rem;
+ display: -webkit-box; /* 璁剧疆涓篧ebKit鍐呮牳鐨勫脊鎬х洅瀛愭ā鍨� */
+ -webkit-box-orient: vertical; /* 鍨傜洿鎺掑垪 */
+ -webkit-line-clamp: 2; /* 闄愬埗鏄剧ず涓よ */
+ overflow: hidden; /* 闅愯棌瓒呭嚭鑼冨洿鐨勫唴瀹� */
+ text-overflow: ellipsis; /* 浣跨敤鐪佺暐鍙� */
+ "
+ >{{ scope.row.material }}</span
></template
></el-table-column
>
</el-table>
- <div class="consten" v-if="contentShow">
+ <div class="consten" v-show="contentShow">
<el-table
empty-text="鏆傛棤鏁版嵁"
:data="gridData"
@@ -363,7 +408,7 @@
justify-content: center;
align-items: center;
position: absolute;
- top: 35%;
+ top: 38%;
left: 50%;
transform: translateX(-50%);
z-index: 999;
@@ -419,7 +464,7 @@
>
<el-button
:disabled="obj.setpNum == sunNUm"
- @click="Next(false)"
+ @click="DialogVisible = true"
type="primary"
:style="{
width: '5rem',
@@ -454,13 +499,30 @@
<!-- 寮哄埗璺宠浆纭妗� -->
<el-dialog v-model="centerDialogVisible" title="纭" width="300" center>
- <span> 褰撳墠浠诲姟鏈畬鎴愶紝鏄惁寮哄埗璺宠浆鍒颁笅涓�姝ワ紵 </span>
+ <span sty> 褰撳墠浠诲姟鏈畬鎴愶紝鏄惁寮哄埗璺宠浆鍒颁笅涓�姝ワ紵 </span>
<template #footer>
<div class="dialog-footer">
<el-button style="width: 5rem" @click="centerDialogVisible = false"
>鍙栨秷</el-button
>
<el-button style="width: 5rem" type="primary" @click="Next(true)">
+ 纭
+ </el-button>
+ </div>
+ </template>
+ </el-dialog>
+
+ <!-- 鏄惁鍚堟牸鎴栧凡瀹屾垚 -->
+ <el-dialog v-model="DialogVisible" title="纭" width="300" center>
+ <span style="display: block; text-align: center; font-size: 1.5rem">
+ 璇风‘璁ゅ綋鍓嶆楠ゅ凡瀹屾垚涓斿悎鏍�
+ </span>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button style="width: 5rem" @click="DialogVisible = false"
+ >鍙栨秷</el-button
+ >
+ <el-button style="width: 5rem" type="primary" @click="Next(false)">
纭
</el-button>
</div>
@@ -491,12 +553,11 @@
const container = ref(null);
-// let scene, camera, renderer, controls;
-
const router = useRouter();
const gridData = ref([]);
const contentShow = ref(false);
const contentShow1 = ref(false);
+const DialogVisible = ref(false);
const info = ref({});
info.value = history.state?.info ? JSON.parse(history.state?.info) : {};
const title = ref("");
@@ -507,7 +568,7 @@
const Torque = ref("");
const showDetail1 = (va1) => {
contentShow1.value = false;
- contentShow.value = va1;
+ contentShow.value = true;
};
const showDetail = (va1) => {
contentShow1.value = va1;
@@ -591,11 +652,13 @@
obj.value = res.data.nowdate[0];
if (res.data.nowdate[0].setpNum == obj.value.setpNum) {
centerDialogVisible.value = true;
+ DialogVisible.value = false;
return;
}
return;
}
centerDialogVisible.value = false;
+ DialogVisible.value = false;
gridData.value = [res.data.nex];
xPos.value =
gridData.value[0].pointAxisXYZ != null &&
@@ -631,7 +694,6 @@
from.value.gruops = info.value.grouptype;
from.value.id = info.value.njtakeid;
from.value.creater = info.value.creater;
- console.log(from.value, info.value);
ChangeStatus(from.value).then((res) => {
ElMessage({
@@ -737,6 +799,7 @@
const BASE_COLOR = [0.2, 0.4, 0.6];
const RED_COLOR = [3.0, 0.2, 0.4];
const GREEN_COLOR = [0.0, 1.0, 0.0];
+
const xPos = ref("");
const yPos = ref("");
const zPos = ref("");
@@ -788,7 +851,6 @@
material.needsUpdate = true; // 寮哄埗鏇存柊鏉愯川
});
});
- console.log(part.split(","));
if (
part ==
"鎶楄泧琛屽噺鎸櫒铻烘爴1,鎶楄泧琛屽噺鎸櫒铻烘爴2,鎶楄泧琛屽噺鎸櫒铻烘爴3,鎶楄泧琛屽噺鎸櫒铻烘爴4"
@@ -886,12 +948,12 @@
[]
);
};
-window.addEventListener("resize", () => {
- console.log("鍒濆鍖栧満鏅�", window.innerWidth, window.innerHeight);
- // camera.aspect = window.innerWidth / window.innerHeight;
- // camera.updateProjectionMatrix();
- // renderer.setSize(window.innerWidth, window.innerHeight);
-});
+// window.addEventListener("resize", () => {
+// // console.log("鍒濆鍖栧満鏅�", window.innerWidth, window.innerHeight);
+// // camera.aspect = window.innerWidth / window.innerHeight;
+// // camera.updateProjectionMatrix();
+// // renderer.setSize(window.innerWidth, window.innerHeight);
+// });
const nodeList = [
"杞悜鏋�",
"鎶楄泧琛屽噺鎸櫒铻烘爴1,鎶楄泧琛屽噺鎸櫒铻烘爴2,鎶楄泧琛屽噺鎸櫒铻烘爴3,鎶楄泧琛屽噺鎸櫒铻烘爴4",
@@ -990,7 +1052,7 @@
onMounted(() => {
// 鍒濆鍖栧満鏅�
- renderer.setSize(window.innerWidth / 1.5, window.innerHeight / 2);
+ renderer.setSize(window.innerWidth / 1.01, window.innerHeight / 2.1);
renderer.setClearColor(0xeeeeee); // 璁剧疆鑳屾櫙鑹�
// 鍚敤鐗╃悊娓叉煋妯″紡
// renderer.physicallyCorrectLights = true;
@@ -1000,6 +1062,12 @@
// 娣诲姞浜や簰鎺у埗鍣紙榧犳爣鎷栨嫿缂╂斁锛�
const controls = new OrbitControls(camera, renderer.domElement);
+ controls.enablePan = false; //绂佹鍙抽敭鎷栨嫿
+ //鐩告満浣嶇疆涓庤瀵熺洰鏍囩偣鏈�灏忓��
+ controls.minDistance = 650;
+ //鐩告満浣嶇疆涓庤瀵熺洰鏍囩偣鏈�澶у��
+ controls.maxDistance = 900;
+
camera.position.set(...CAMERA_POS);
controls.update();
@@ -1135,10 +1203,11 @@
}
.rect-item2 {
- width: 49.88rem;
+ width: 65rem;
height: 15.38rem;
border: 0.1rem solid #02cde6;
padding: 0.69rem 1.44rem;
+ position: relative;
.el-table :deep(.el-table__header th) {
border: solid 1px #1ac0f6;
@@ -1146,8 +1215,9 @@
}
.consten {
- position: relative;
- top: 0;
+ width: 100%;
+ position: absolute;
+ top: 10rem;
z-index: 999;
}
}
--
Gitblit v1.9.3