From a9e5e23e75ddb7ce03e992cc68efcdf8cc0975da Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 11 四月 2024 10:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
index a574308..9a6c97a 100644
--- a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
+++ b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
@@ -8,7 +8,6 @@
import deepClone from "@/utils/deepClone";
import { ElMessage } from "element-plus";
import { useRouter } from "vue-router";
-import GlassType from '@/components/basic/product/GlassType.vue'
const router = useRouter()
@@ -24,7 +23,8 @@
export default {
mounted() {
//鑾峰彇鏁版嵁
- request.get("/Temper/Tindex").then((res) => {
+ var data="ProcessId="+"P24032508";
+ request.get("/TidyUpGlassModule/SelectTerritoryInfo?"+data).then((res) => {
if (res.code == 200) {
var StoveCount=0;
var temperid;
@@ -42,6 +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")
+ // }
+ // });
@@ -161,11 +169,8 @@
<template>
<div ref="content">
-
+ <canvas ref="mycanvas"></canvas>
</div>
- <canvas ref="mycanvas" >
-
- </canvas>
</template>
<style scoped>
--
Gitblit v1.8.0