From a3a40ee1800c25e280945e5ecbff7fed4b4cde2c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 15 四月 2024 09:08:12 +0800
Subject: [PATCH] 接口
---
LoadGlassModule/target/classes/application.yml | 21 ----
UI-Project/src/views/Returns/returns.vue | 23 +++++
UI-Project/src/views/Identify/identify.vue | 12 +++
LoadGlassModule/src/main/java/com/mes/MesApplication.java | 2
LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java | 2
LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java | 2
LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java | 16 +--
LoadGlassModule/src/main/resources/application.yml | 21 ----
/dev/null | 17 ----
LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java | 2
UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue | 2
LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java | 4 +
UI-Project/src/utils/request.js | 13 +-
LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java | 2
UI-Project/src/router/index.js | 24 +++---
LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java | 2
UI-Project/package-lock.json | 36 +++-----
LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java | 3
UI-Project/package.json | 2
19 files changed, 92 insertions(+), 114 deletions(-)
diff --git a/LoadGlassModule/src/main/java/com/mes/MesApplication.java b/LoadGlassModule/src/main/java/com/mes/MesApplication.java
index 14b69cd..0f26687 100644
--- a/LoadGlassModule/src/main/java/com/mes/MesApplication.java
+++ b/LoadGlassModule/src/main/java/com/mes/MesApplication.java
@@ -3,7 +3,7 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.transaction.annotation.Transactional;
+
//springboot 鍚姩鍏ュ彛
@SpringBootApplication
diff --git a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
index 57419a0..94397d5 100644
--- a/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
+++ b/LoadGlassModule/src/main/java/com/mes/controller/LoadGlassController.java
@@ -4,11 +4,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.mes.common.Result;
-import com.mes.entity.Tempering;
import com.mes.entity.UpWorkstation;
import com.mes.service.LoadGlassService;
-import com.mes.service.TemperingOverService;
-import com.mes.service.TemperingService;
@RestController
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java b/LoadGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java
deleted file mode 100644
index 3dd0188..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`big_storage_cage_details`")
-public class BigStorageCageDetails {
- @TableId(type = IdType.AUTO)
- private Integer id;//澶х悊鐗囩璇︽儏琛╥d
- private Integer deviceid;//璁惧id
- private Integer slot;//鏍呮牸鍙�
- private Integer glassid;//鐜荤拑id
- private Integer sequence;//灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
- private String flowcardid;//娴佺▼鍗″彿
- private Integer glasstype;//鐜荤拑绫诲瀷
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Integer temperinglayoutid;//閽㈠寲鐗堝浘id
- private Integer temperingfeedsequence;//閽㈠寲鐗堝浘鐗囧簭
- private Integer state;//鐘舵��
- private Integer gap;//鐜荤拑闂撮殭
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java b/LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
deleted file mode 100644
index 9dcf7eb..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`edg_storage_cage`")
-public class EdgStorageCage {
- @TableId(type = IdType.AUTO)
- private Integer id;//纾ㄨ竟鍓嶇悊鐗囩琛╥d
- private Integer flowcard_id;//璁惧id
- private Integer glass_type;//鏍呮牸鍙�
- private String height;//鍚敤鐘舵��
- private Integer thickness;//鍓╀綑
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java b/LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
deleted file mode 100644
index 6cf60bd..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`edg_storage_cage_details`")
-public class EdgStorageCageDetails {
- @TableId(type = IdType.AUTO)
- private Integer id;//纾ㄨ竟鍓嶇悊鐗囩璇︽儏琛╥d
- private Integer deviceid;//璁惧id
- private Integer slot;//鏍呮牸鍙�
- private Integer glassid;//鐜荤拑id
- private Integer sequence;//灏忕墖鍦ㄦ牸鍐呯殑椤哄簭
- private String flowcardid;//娴佺▼鍗″彿
- private Integer glasstype;//鐜荤拑绫诲瀷
- private Double width;//瀹�
- private Double height;//楂�
- private Double thickness;//鍘氬害
- private Double edgwidth;//纾ㄥ墠瀹�
- private Double edgheight;//纾ㄥ墠楂�
- private Integer temperinglayoutid;//閽㈠寲鐗堝浘id
- private Integer temperingfeedsequence;//閽㈠寲鐗堝浘鐗囧簭
- private Integer patternsequence;//鍘熺墖椤哄簭
- private Integer state;//鐘舵��
- private Integer gap;//鐜荤拑闂撮殭
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/Engineering.java b/LoadGlassModule/src/main/java/com/mes/entity/Engineering.java
deleted file mode 100644
index 95eb3a0..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/Engineering.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.mes.entity;
-
-import java.math.BigInteger;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`engineering`")
-public class Engineering {
- @TableId(type = IdType.AUTO)
- private BigInteger id;//宸ョ▼琛╥d
- private Integer engineerid;//宸ョ▼鍙�
- private String engineername;//宸ョ▼鍚嶇О
- private Double avgavailability;//骞冲潎鍒╃敤鐜�
- private Double validavailability;//鏈夋晥鍒╃敤鐜�
- private Double lastavailability;//灏剧墖鍒╃敤鐜�
- private Integer state;//鐘舵��
- private Integer glasstotal;//灏忕墖鎬绘暟
- private Double glasstotalarea;//灏忕墖鎬婚潰绉�
- private Integer planpatterntotal;//璁″垝鍘熺墖鎬绘暟
- private Double planpatterntotalarea;//璁″垝鍘熺墖鎬婚潰绉�
- private Integer realitypatterntotal;//瀹為檯鍘熺墖鎬绘暟
- private Double realitypatterntotalarea;//瀹為檯鍘熺墖鎬婚潰绉�
- private Integer filmsid;//鑶滅郴id
- private String notes;//澶囨敞
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/entity/GlassFilms.java b/LoadGlassModule/src/main/java/com/mes/entity/GlassFilms.java
deleted file mode 100644
index a5d9044..0000000
--- a/LoadGlassModule/src/main/java/com/mes/entity/GlassFilms.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@Data //lombok 绠�鍐檍ava浠ｇ爜 瀹炰綋绫荤殑get涓巗et
-@TableName("`glass_films`")
-public class GlassFilms {
- @TableId(type = IdType.AUTO)
- private Integer id;//鑶滅郴琛╥d
- private Integer films_id;//鑶滅郴id
- private String films_name;//鑶滅郴
-
-
-}
diff --git a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
index 0bf0923..4b42b5f 100644
--- a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
+++ b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/SysMenuItemMapper.java
@@ -2,11 +2,15 @@
import com.mes.entity.userInfo.SysMenuItem;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface SysMenuItemMapper {
+ @Select("select * from `sys_menu_item` as a where a.state=1 order by a.menuId,a.listSort;")
+
+
List<SysMenuItem> findAll() ;
}
diff --git a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
index 8ddf4a2..a2bf58d 100644
--- a/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
+++ b/LoadGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
@@ -16,7 +16,9 @@
User findOne(Integer id);
+ @Select("select user_name FROM `user` where login_name=#{LoginName} ")
User findOneLoginName(String LoginName);
+
@Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ")
int checkUser(@Param("userName") String userName,@Param("password") String password);
diff --git a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
index ae21fd0..95514e3 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
@@ -1,21 +1,17 @@
package com.mes.service;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mes.entity.device.PLCAutoMes;
import com.mes.common.PlcTools.S7control;
import com.mes.entity.device.PlcParameterObject;
-import com.google.common.primitives.Bytes;
-import com.mes.entity.GlassInfo;
+
import com.mes.entity.UpWorkstation;
import com.mes.mapper.LoadGlassMapper;
@Service
public class LoadGlassService {
- @Autowired
- private com.mes.common.PlcTools.S7control s7control;
+
+ private S7control s7control;
private LoadGlassMapper LoadGlassMapper;
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
//鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅
@@ -25,7 +21,7 @@
}
//澧炲姞浜哄伐杈撳叆鐨勫伐浣嶇幓鐠冧俊鎭�
public void insertGlass(UpWorkstation upwork) {
- LoadGlassMapper.insertGlass(upwork.getPatternwidth(),upwork.getPatternheigth(),upwork.getPatternthickness(),upwork.getWorkstationid());
+ LoadGlassMapper.insertGlass(upwork);
}
//鍒犻櫎浜哄伐鎼蛋鐨勭幓鐠冧俊鎭�
public void deleteGlass(int id) {
@@ -50,8 +46,8 @@
s7control.WriteWord("DB100.10", (short)2);
}else if(loadid1==loadid2){
//褰撲袱涓伐浣嶄笂鐨勭幓鐠冩暟鐩稿悓鏃讹紝鍒ゆ柇鍝釜宸ヤ綅涓婄殑鐜荤拑鏁版洿灏�,浼樺厛娓呯┖涓�涓灦瀛�
- int glassnum1=plcmes.getPlcParameter("鐜荤拑鏁�").getValue();
- int glassnum2=plcmes.getPlcParameter("鐜荤拑鏁�").getValue();
+ int glassnum1=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
+ int glassnum2=Integer.parseInt(plcmes.getPlcParameter("鐜荤拑鏁�").getValue());
if(glassnum1>glassnum2){
s7control.WriteWord("DB100.10", (short)2);
}else{
diff --git a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
index 004399b..9940470 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysErrorService.java
@@ -7,7 +7,7 @@
import org.springframework.stereotype.Service;
@Service
-@DS("user_info")
+@DS("hangzhoumes")
public class SysErrorService {
private final SysErrorMapper sysErrorMapper;
diff --git a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
index 6efd838..ee38452 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuItemService.java
@@ -9,7 +9,7 @@
import java.util.List;
@Service
-@DS("user_info")
+@DS("hangzhoumes")
public class SysMenuItemService {
@Autowired
SysMenuItemMapper sysMenuItemMapper;
diff --git a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
index 278b057..55f8fc6 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/userInfo/SysMenuService.java
@@ -9,7 +9,7 @@
import java.util.List;
@Service
-@DS("user_info")
+@DS("hangzhoumes")
public class SysMenuService {
@Autowired
private SysMenuMapper sysMenuMapper;
diff --git a/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java b/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
index 08fb8dd..0652226 100644
--- a/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
+++ b/LoadGlassModule/src/main/java/com/mes/service/userInfo/UserService.java
@@ -18,7 +18,7 @@
import java.util.List;
@Service
-@DS("user_info")
+@DS("hangzhoumes")
public class UserService {
@Autowired
diff --git a/LoadGlassModule/src/main/resources/application.yml b/LoadGlassModule/src/main/resources/application.yml
index d74069d..67844c9 100644
--- a/LoadGlassModule/src/main/resources/application.yml
+++ b/LoadGlassModule/src/main/resources/application.yml
@@ -7,26 +7,11 @@
spring:
datasource:
dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
- user_info:
- url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
- sd:
- url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- mm:
- url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
diff --git a/LoadGlassModule/target/classes/application.yml b/LoadGlassModule/target/classes/application.yml
index d74069d..67844c9 100644
--- a/LoadGlassModule/target/classes/application.yml
+++ b/LoadGlassModule/target/classes/application.yml
@@ -7,26 +7,11 @@
spring:
datasource:
dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
- user_info:
- url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8
+ hangzhoumes:
+ url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
- sd:
- url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- mm:
- url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
- pp:
- url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
- username: root
- password: beibo.123/
- driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
diff --git a/UI-Project/package-lock.json b/UI-Project/package-lock.json
index 282cdfa..3a65897 100644
--- a/UI-Project/package-lock.json
+++ b/UI-Project/package-lock.json
@@ -10,7 +10,7 @@
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@vue-macros/reactivity-transform": "^0.3.23",
- "axios": "^1.5.1",
+ "axios": "^1.6.8",
"element-plus": "^2.4.0",
"moment": "^2.30.1",
"pinia": "^2.1.6",
@@ -877,11 +877,11 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"node_modules/axios": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
- "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+ "version": "1.6.8",
+ "resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.8.tgz",
+ "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
"dependencies": {
- "follow-redirects": "^1.15.0",
+ "follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
@@ -1103,15 +1103,9 @@
}
},
"node_modules/follow-redirects": {
- "version": "1.15.3",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
- "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
- "funding": [
- {
- "type": "individual",
- "url": "https://github.com/sponsors/RubenVerborgh"
- }
- ],
+ "version": "1.15.6",
+ "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz",
+ "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
"engines": {
"node": ">=4.0"
},
@@ -2272,11 +2266,11 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"axios": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
- "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+ "version": "1.6.8",
+ "resolved": "https://registry.npmmirror.com/axios/-/axios-1.6.8.tgz",
+ "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
"requires": {
- "follow-redirects": "^1.15.0",
+ "follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
@@ -2442,9 +2436,9 @@
}
},
"follow-redirects": {
- "version": "1.15.3",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
- "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
+ "version": "1.15.6",
+ "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.6.tgz",
+ "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
},
"form-data": {
"version": "4.0.0",
diff --git a/UI-Project/package.json b/UI-Project/package.json
index afef130..b816c15 100644
--- a/UI-Project/package.json
+++ b/UI-Project/package.json
@@ -10,7 +10,7 @@
"dependencies": {
"@element-plus/icons-vue": "^2.1.0",
"@vue-macros/reactivity-transform": "^0.3.23",
- "axios": "^1.5.1",
+ "axios": "^1.6.8",
"element-plus": "^2.4.0",
"moment": "^2.30.1",
"pinia": "^2.1.6",
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index bc72f00..6ff9458 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -22,18 +22,18 @@
children:[
- // {
- // path: 'Temperedlayout',
- // name: 'Temperedlayout',
- // component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
- // children:[
- // {
- // path: 'selectLayout',
- // name: 'selectLayout',
- // component: () => import('../views/TL/Temperedlayout/SelectLayout.vue'),
- // }
- // ]
- // },
+ {
+ path: 'Temperedlayout',
+ name: 'Temperedlayout',
+ component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
+ children:[
+ {
+ path: 'selectLayout',
+ name: 'selectLayout',
+ component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
+ }
+ ]
+ },
/*----------- 鐢ㄦ埛鍒楄〃 ----------------*/
{
diff --git a/UI-Project/src/utils/request.js b/UI-Project/src/utils/request.js
index e7abe99..2159de6 100644
--- a/UI-Project/src/utils/request.js
+++ b/UI-Project/src/utils/request.js
@@ -6,9 +6,9 @@
baseURL: `http://${config.serverUrl}`, // 娉ㄦ剰锛侊紒 杩欓噷鏄叏灞�缁熶竴鍔犱笂浜� 鍚庣鎺ュ彛鍓嶇紑 鍓嶇紑锛屽悗绔繀椤昏繘琛岃法鍩熼厤缃紒
timeout: 5000
})
-
+
//
-
+
// request 鎷︽埅鍣�
// 鍙互鑷姹傚彂閫佸墠瀵硅姹傚仛涓�浜涘鐞�
// 姣斿缁熶竴鍔爐oken锛屽璇锋眰鍙傛暟缁熶竴鍔犲瘑
@@ -22,7 +22,7 @@
}, error => {
return Promise.reject(error)
});
-
+
// response 鎷︽埅鍣�
// 鍙互鍦ㄦ帴鍙ｅ搷搴斿悗缁熶竴澶勭悊缁撴灉
request.interceptors.response.use(
@@ -43,7 +43,6 @@
return Promise.reject(error)
}
)
-
-
-export default request
-
+
+
+export default request
\ No newline at end of file
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 92ec074..be0e99f 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -59,6 +59,18 @@
<script>
import Swal from 'sweetalert2'
+import request from "@/utils/request";
+
+
+request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
+ if (res.code == 200) {
+ console.log(res.data);
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ });
+
export default {
data() {
return {
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index dacd22f..d757769 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -10,8 +10,28 @@
const dialogFormVisible = ref(false)
const add = ref(false)
const adda = ref(false)
-
const value = ref('')
+import request from "@/utils/request"
+
+request.post(`/LoadGlass/SelectAll`).then((res) => {
+ console.log(555555555555);
+ if (res.code == 200) {
+ console.log(1111);
+ // console.log(res.data);
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+});
+
+// request.get("/LoadGlass/SelectAll").then((res) => {
+// if (res.code == 200) {
+// console.log(res.data);
+// } else {
+// ElMessage.warning(res.msg)
+// router.push("/login")
+// }
+// });
interface User {
id: string
@@ -404,6 +424,7 @@
}
#parent{
position: relative;
+ width: 1500px;
}
#overlay{
position: absolute;
diff --git a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
index 92bde2f..1fd2d32 100644
--- a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
+++ b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
@@ -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';//鐐夊瓙鑳屾櫙棰滆壊
--
Gitblit v1.8.0