Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 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';//排布方式：linefeed(换行) /Wholeline  整行
        var RowMaxCount=4;//每行最多显示的图数
        var RowMaxCount=3;//每行最多显示的图数
        var StoveWidth=3000; //实际炉宽 2850
        var StoveLength=5500;//实际炉长 5000
        var StoveColor='#CFC8C5';//炉子背景颜色