From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
index 92bde2f..8e8194c 100644
--- a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
+++ b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
@@ -42,14 +42,14 @@
router.push("/login")
}
});
- request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
- if (res.code == 200) {
- console.log(res.data);
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- });
+ // request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
+ // if (res.code == 200) {
+ // console.log(res.data);
+ // } else {
+ // ElMessage.warning(res.msg)
+ // router.push("/login")
+ // }
+ // });
@@ -60,7 +60,7 @@
CanvaDraws(id,Datas,StoveCount) {
//var StoveCount=43;//鐐夋暟
var ArrangementMode='linefeed';//鎺掑竷鏂瑰紡锛歭inefeed(鎹㈣) /Wholeline 鏁磋
- var RowMaxCount=4;//姣忚鏈�澶氭樉绀虹殑鍥炬暟
+ var RowMaxCount=3;//姣忚鏈�澶氭樉绀虹殑鍥炬暟
var StoveWidth=3000; //瀹為檯鐐夊 2850
var StoveLength=5500;//瀹為檯鐐夐暱 5000
var StoveColor='#CFC8C5';//鐐夊瓙鑳屾櫙棰滆壊
@@ -86,7 +86,6 @@
// var TerritoryCross=TerritoryWidth/Bli; //椤甸潰鐗堝浘妯悜 鍍忕礌
// var TerritoryVertical=TerritoryLength/Bli;//椤甸潰鐗堝浘绾靛悜 鍍忕礌
- console.log(Font1);
var canva = this.$refs[id];
var content = canva.getContext('2d');
--
Gitblit v1.8.0