Merge remote-tracking branch 'origin/master'

zhoushihao

2025-06-06 4e3b8155722b66e25df3c6fd42cc586b68dea391

 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")
    //   }
    // });

    

@@ -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');