From 1fe499f2ac56987522a64070c5d694c496e72307 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 11 九月 2024 09:16:17 +0800
Subject: [PATCH] 打标机前端界面，以及空白基础界面
---
/dev/null | 212 -----------------------
UI-Project/src/assets/自动打标机.png | 0
UI-Project/src/lang/zh.js | 2
UI-Project/src/views/Blank/blank.vue | 74 ++++++++
UI-Project/src/router/index.js | 118 +++++++-----
UI-Project/src/views/User/permissions.vue | 2
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java | 24 ++
UI-Project/src/views/Marking/marking.vue | 93 ++++++++++
8 files changed, 264 insertions(+), 261 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
index 329b2ef..fa14e27 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingController.java
@@ -1,9 +1,17 @@
package com.mes.md.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.md.entity.Account;
+import com.mes.md.entity.Tasking;
+import com.mes.md.mapper.TaskingMapper;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -17,5 +25,17 @@
@RequestMapping("/tasking")
public class TaskingController {
+ @Autowired
+ TaskingMapper taskingMapper;
+
+ @ApiOperation("璐︽埛缁戝畾瑙掕壊")
+ @PostMapping("/bindAccountRole")
+ @ResponseBody
+ public Result Tasking (@RequestBody Tasking tasking) {
+ List<Tasking> list=taskingMapper.selectList(new MPJLambdaWrapper<Tasking>().selectAll()
+ .eq(Tasking::getState,"绾夸笂")
+ .eq(Tasking::getCurrentCraft,"gongui"));
+ return Result.build(200,"鎴愬姛",list);
+ }
}
diff --git "a/UI-Project/src/assets/\350\207\252\345\212\250\346\211\223\346\240\207\346\234\272.png" "b/UI-Project/src/assets/\350\207\252\345\212\250\346\211\223\346\240\207\346\234\272.png"
new file mode 100644
index 0000000..1f2560c
--- /dev/null
+++ "b/UI-Project/src/assets/\350\207\252\345\212\250\346\211\223\346\240\207\346\234\272.png"
Binary files differ
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 30fae38..8b3601f 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -114,8 +114,10 @@
cancel :'鍙栨秷',
derole :'鏄惁鍒犻櫎璇ヨ鑹�',
prompt:'鎻愮ず',
+ titleMenu:'鑿滃崟',
menu:'鑿滃崟锛�',
menuchoice:'璇烽�夋嫨鑿滃崟',
+ titlePage:'椤甸潰',
page:'椤甸潰锛�',
pagechoice:'璇烽�夋嫨椤甸潰',
},
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index b616bc5..674db0e 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -1,4 +1,4 @@
-import {createRouter, createWebHashHistory} from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router'
// import i18n from '@/utils/lang'
// import User from '../views/sys/User.vue'
// import Role from '../views/sys/Role.vue'
@@ -22,56 +22,80 @@
path: '/main',
name: 'main',
component: () => import('../layout/MainErpView.vue'),
- children:[
-
-
+ children: [
{
- path: 'Temperedlayout',
+ path: 'TL',
name: 'Temperedlayout',
- component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
- children:[
+ component: () => import('../views/TL/Temperedlayout.vue'),
+ children: [
{
- path: 'selectLayout',
- name: 'selectLayout',
- component: () => import('../views/TL/Temperedlayout/Temperedlayout.vue'),
+ path: '/TL/Temperedlayout',
+ name: 'Temperedlayout',
+ component: () => import('../views/TL/Temperedlayout.vue'),
}
- ]
+ ]
},
-
-/*----------- 绯荤粺绠＄悊 ----------------*/
-{
- path: 'User',
- name: 'user',
- component: () => import('../views/User/user.vue'),
- children:[
- {
- path: '/User/userlist',
- name: 'userlist',
- component: () => import('../views/User/userlist.vue')
- },
- // {
- // path: '/User/rolelist',
- // name: 'rolelist',
- // component: () => import('../views/User/rolelist.vue')
- // },
- {
- path: '/User/permissions',
- name: 'permissions',
- component: () => import('../views/User/permissions.vue')
- },
- {
- path: '/User/menu',
- name: 'menu',
- component: () => import('../views/User/menu.vue')
- },
- {
- path: '/User/page',
- name: 'page',
- component: () => import('../views/User/page.vue')
- }
- ]
- },
-
+ {
+ /*----------- 鑷姩涓婄墖 ----------------*/
+ path: 'ZiDongShangpian',
+ name: 'zidongshangpian',
+ component: () => import('../views/Marking/marking.vue'),
+ children: [
+ {
+ path: '/Marking/marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ }
+ ]
+ },
+ {
+ /*----------- 鑷姩鎵撴爣鏈� ----------------*/
+ path: 'Marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ children: [
+ {
+ path: '/Marking/marking',
+ name: 'marking',
+ component: () => import('../views/Marking/marking.vue'),
+ }
+ ]
+ },
+
+ /*----------- 绯荤粺绠＄悊 ----------------*/
+ {
+ path: 'User',
+ name: 'user',
+ component: () => import('../views/User/user.vue'),
+ children: [
+ {
+ path: '/User/userlist',
+ name: 'userlist',
+ component: () => import('../views/User/userlist.vue')
+ },
+ // {
+ // path: '/User/rolelist',
+ // name: 'rolelist',
+ // component: () => import('../views/User/rolelist.vue')
+ // },
+ {
+ path: '/User/permissions',
+ name: 'permissions',
+ component: () => import('../views/User/permissions.vue')
+ },
+ {
+ path: '/User/menu',
+ name: 'menu',
+ component: () => import('../views/User/menu.vue')
+ },
+ {
+ path: '/User/page',
+ name: 'page',
+ component: () => import('../views/User/page.vue')
+ }
+ ]
+ },
+
{
path: '',
redirect: '/User/userlist'
@@ -83,7 +107,7 @@
name: 'register',
component: () => import('../views/RegisterView.vue')
}
-
+
]
})
diff --git a/UI-Project/src/views/Blank/blank.vue b/UI-Project/src/views/Blank/blank.vue
new file mode 100644
index 0000000..c44af41
--- /dev/null
+++ b/UI-Project/src/views/Blank/blank.vue
@@ -0,0 +1,74 @@
+<!-- 绌虹櫧椤� -->
+<script setup>
+import request from "@/utils/request";
+import { ElMessage } from "element-plus";
+</script>
+<script>
+export default {
+ mounted() {
+ //鑾峰彇鏁版嵁
+ var data="ProcessId="+"P24032508";
+ request.get("/TidyUpGlassModule/SelectTerritoryInfo?"+data).then((res) => {
+ if (res.code == 200) {
+ for(var i=0;i<res.data.length;i++){
+ //閬嶅巻鏁版嵁
+ }
+ f1()
+ } else {blank
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ });
+ },
+ methods: {
+ //鏂规硶
+ f1() {
+
+ }
+ }
+}
+
+
+</script>
+
+
+
+<template>
+ <div ref="content">
+ <canvas ref="mycanvas"></canvas>
+ </div>
+</template>
+
+<style scoped>
+#main {
+ width: 100%;
+ height: 100%;
+}
+
+
+
+#div-title {
+ height: 5%;
+ width: 100%;
+}
+
+#searchButton {
+ margin-top: -5px;
+ margin-left: 1rem;
+}
+
+/*main-body鏍峰紡*/
+#main-body {
+ width: 99%;
+ height: 92%;
+ margin-top: 1%;
+}
+
+#select {
+ margin-left: 0.5rem;
+}
+
+:deep(.indexTag .el-breadcrumb__inner) {
+ color: #5CADFE !important;
+}
+</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
new file mode 100644
index 0000000..6ec2763
--- /dev/null
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -0,0 +1,93 @@
+<!-- 鎵撴爣鏈� -->
+<script setup>
+import request from "@/utils/request";
+import { ElMessage } from "element-plus";
+</script>
+<script>
+export default {
+ mounted() {
+ //鑾峰彇鏁版嵁
+ var data="ProcessId="+"P24032508";
+ request.get("/TidyUpGlassModule/SelectTerritoryInfo?"+data).then((res) => {
+ if (res.code == 200) {
+ for(var i=0;i<res.data.length;i++){
+ //閬嶅巻鏁版嵁
+ }
+ f1();
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login");
+ }
+ });
+ },
+ methods: {
+ //鏂规硶
+ f1() {
+
+ }
+ }
+}
+
+
+</script>
+<template>
+ <div ref="content">
+ <div id="div-title" style="font-size: 20px; font-weight: bold; margin:10px 0 10px 0;padding-left: 20px;">
+ 鑷姩鎵撴爣鏈�
+ </div>
+ <hr/>
+ <br>
+ <div id="search">
+ <!-- 鍔熻兘 -->
+ <el-button type="primary" id="searchButton">寮�宸�</el-button>
+ <el-button type="primary" id="searchButton">涓婄嚎</el-button>
+ <el-button type="primary" id="searchButton">涓嬬嚎</el-button>
+ <el-button type="primary" id="searchButton">鐮存崯</el-button>
+ <el-button type="primary" id="searchButton">瀹屽伐</el-button>
+ </div>
+ <div id="main-body" style="min-height:240px;">
+ <!-- 琛ㄦ牸鍐呭 -->
+ <el-table :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129',textAlign:'center'}">
+ <el-table-column prop="date" label="搴忓彿" />
+ <el-table-column prop="name" label="宸ョ▼鍙�" />
+ <el-table-column prop="name" label="鐜荤拑绫诲瀷" />
+ <el-table-column prop="name" label="鐜荤拑缂栧彿" />
+ <el-table-column prop="name" label="闀�" />
+ <el-table-column prop="name" label="瀹�" />
+ <el-table-column prop="name" label="鍘�" />
+ <el-table-column prop="name" label="鐘舵��" />
+ </el-table>
+ </div>
+
+ <div id="main-body" style="height: 100%;">
+ <!-- 鐢诲浘鍐呭 -->
+ <el-image style="width: 100%; height: 460px;" src="../../src/assets/鑷姩鎵撴爣鏈�.png"></el-image>
+ </div>
+ </div>
+</template>
+
+<style scoped>
+table{
+ text-align: center;
+ width: 100%;
+ height: 100%;
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+#main-body{
+ width: 100%;
+ height: 100%;
+ border: 1px solid #ccc;
+ margin-top: 25px;
+}
+#searchButton{
+ width: 100px;
+ height: 40px;
+ font-size: 16px;
+ border-radius: 5px;
+ background-color: #409EFF;
+ color: #fff;
+ border: none;
+ cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue b/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
deleted file mode 100644
index e1edb80..0000000
--- a/UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<!-- 鐗╂枡璧勬枡 -->
-
-
-<script setup>
-import { ref } from "vue";
-import { ArrowLeftBold, ArrowRight, Search } from "@element-plus/icons-vue";
-import request from "@/utils/request";
-import deepClone from "@/utils/deepClone";
-import { ElMessage } from "element-plus";
-import { useRouter } from "vue-router";
-
-
-const router = useRouter()
-let indexFlag = $ref(1)
-function changeRouter(index) {
- indexFlag = index
-}
-
-
-</script>
-
-<script>
-export default {
- mounted() {
- //鑾峰彇鏁版嵁
- var data="ProcessId="+"P24032508";
- request.get("/TidyUpGlassModule/SelectTerritoryInfo?"+data).then((res) => {
- if (res.code == 200) {
- var StoveCount=0;
- var temperid;
- for(var i=0;i<res.data.length;i++){
- if (temperid != res.data[i].layoutid) {
- StoveCount++;
- temperid=res.data[i].layoutid;
- }
- }
- // console.log(res.data);
- this.CanvaDraws("mycanvas",res.data,StoveCount);
-
- } 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")
- // }
- // });
-
-
-
- },
- methods: {
- //Canva(id,鍩虹鏁版嵁,椤甸潰闀匡細瀹為檯闀匡紝鏄剧ず琛屽唴鐗堝浘鏁帮紝 )
- //鍩虹鏁版嵁锛氬疄闄呯倝闀�,瀹為檯鐐夊, 灏忕墖X杞�, 灏忕墖y杞�, 灏忕墖闀�, 灏忕墖瀹斤紝鏄剧ず鏁版嵁锛堝昂瀵�,ID,娴佺▼鍗″彿,鐗堝浘鍙凤級
- CanvaDraws(id,Datas,StoveCount) {
- //var StoveCount=43;//鐐夋暟
- var ArrangementMode='linefeed';//鎺掑竷鏂瑰紡锛歭inefeed(鎹㈣) /Wholeline 鏁磋
- var RowMaxCount=3;//姣忚鏈�澶氭樉绀虹殑鍥炬暟
- var StoveWidth=3000; //瀹為檯鐐夊 2850
- var StoveLength=5500;//瀹為檯鐐夐暱 5000
- var StoveColor='#CFC8C5';//鐐夊瓙鑳屾櫙棰滆壊
-
-
- var StoveIntervalX=30; //椤甸潰姣忎竴鐐変箣闂寸殑闂磋窛X px
- var StoveIntervalY=50; //椤甸潰姣忎竴鐐変箣闂寸殑闂磋窛Y px
-
- var HtmlWidth=1800; //椤甸潰妯悜
- //var actualWidth=12000;//椤甸潰妯悜鎵�瀵瑰簲鐨勫疄闄呴暱搴�
- var actualWidth=StoveWidth*RowMaxCount;//椤甸潰妯悜鎵�瀵瑰簲鐨勫疄闄呴暱搴�
-
- var Bli = actualWidth / (HtmlWidth-StoveIntervalX*RowMaxCount);//姣斾緥锛氬疄闄呴暱搴m/椤甸潰闀垮害px
-
- var StoveCross=StoveWidth/Bli; //椤甸潰鐐夊瓙妯悜 鍍忕礌
- var StoveVertical=StoveLength/Bli;//椤甸潰鐐夊瓙绾靛悜 鍍忕礌
-
- var Font1=(StoveCross*0.05);
- var Font2=(StoveCross*0.028);
- // var TerritoryWidth=dataTempered.loadwidth; //瀹為檯鐗堝浘瀹�
- // var TerritoryLength=dataTempered.loadlength;//瀹為檯鐗堝浘闀�
- // var TerritoryColor='#0DB637';//鐗堝浘鑳屾櫙棰滆壊
-
- // var TerritoryCross=TerritoryWidth/Bli; //椤甸潰鐗堝浘妯悜 鍍忕礌
- // var TerritoryVertical=TerritoryLength/Bli;//椤甸潰鐗堝浘绾靛悜 鍍忕礌
- console.log(Font1);
-
- var canva = this.$refs[id];
- var content = canva.getContext('2d');
- canva.width = HtmlWidth;
- canva.height = StoveCount%RowMaxCount==0?((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount)):((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount+1));
- //console.log(StoveCount%RowMaxCount==0?((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount)):((StoveVertical+StoveIntervalY)*(StoveCount/RowMaxCount+1)) );
- var temperid;//鍒濆鐗堝浘
- var Xlayout = 0; //鐐夊瓙X杞磋捣鐐�
- var Ylayout = StoveIntervalY; //鐐夊瓙Y杞磋捣鐐�
- var layoutCount = 0;//鐗堝浘鏁�
- var row=0;
- for (var i = 0; i < Datas.length; i++) {
- var dataTempered = Datas[i];
-
- var TerritoryWidth=dataTempered.loadwidth; //瀹為檯鐗堝浘瀹�
- var TerritoryLength=dataTempered.loadlength;//瀹為檯鐗堝浘闀�
- var TerritoryColor='#0DB637';//鐗堝浘鑳屾櫙棰滆壊
-
- var TerritoryCross=TerritoryWidth/Bli; //椤甸潰鐗堝浘妯悜 鍍忕礌
- var TerritoryVertical=TerritoryLength/Bli;//椤甸潰鐗堝浘绾靛悜 鍍忕礌
-
- if (temperid != dataTempered.layoutid) {
- //鐢荤増鍥� 鏇存敼鍩虹鍊嶆暟
- if(layoutCount>0){
- Xlayout += StoveCross + StoveIntervalX;
- if (layoutCount %RowMaxCount== 0) {
- //鎹㈣
- Ylayout += StoveVertical+StoveIntervalY;
- Xlayout=0;
- row++;
- }
- }
- temperid=dataTempered.layoutid;
- layoutCount++;
- content.font ='bold '+Font1+'px Arial' ; //鏂囧瓧鏍峰紡锛氬姞绮� 16鍍忕礌 瀛椾綋Arial
- content.fillStyle = '#000000'; //瀛椾綋棰滆壊
- content.textAlign = 'center'; //鏂囧瓧灞呬腑
- content.fillText((dataTempered.layoutid), (StoveCross / 2+ Xlayout), 50/2+(StoveVertical+50)*row+10);
- //鐐夊瓙
- content.fillStyle = StoveColor;
- content.fillRect(Xlayout, Ylayout, StoveCross, StoveVertical);
- //鐗堝浘
- content.fillStyle = TerritoryColor;
- content.fillRect(Xlayout, Ylayout, TerritoryCross, TerritoryVertical);
- }
-
- var Rx = dataTempered.xaxis / Bli + Xlayout;
- var Ry = dataTempered.yaxis / Bli + Ylayout;
- var Rwidth = dataTempered.width / Bli;
- var Rheight = dataTempered.height / Bli;
- var Xwidth;
- var Xheight;
- content.fillStyle = '#5CADFE';
- if (dataTempered.rotateangle != 0) {
- Xwidth = Rwidth;
- Xheight = Rheight;
- } else {
- Xwidth = Rheight;
- Xheight = Rwidth;
- }
- content.fillRect(Rx, Ry, Xwidth, Xheight);
- content.font = 'bold '+Font2+'px Arial' ; //鏂囧瓧鏍峰紡锛氬姞绮� 16鍍忕礌 瀛椾綋Arial
- content.fillStyle = '#000000'; //瀛椾綋棰滆壊
- content.textAlign = 'center'; //鏂囧瓧灞呬腑
-
- content.fillText(('鐗堝浘:'+dataTempered.layoutid+'-'+dataTempered.sort), (Xwidth / 2) + Rx, (Xheight) / 2 + Ry-Font2);
- content.fillText((dataTempered.width + ' * ' + dataTempered.height), (Xwidth / 2) + Rx, (Xheight) / 2 + Ry); //fillText閲岄潰鐨勫彲濉啓鐨勫��(鏂囨湰鍐呭, x鍧愭爣, y鍧愭爣, 鏂囨湰鏈�澶у搴�)
- content.fillText((dataTempered.processid), (Xwidth / 2) + Rx, (Xheight) / 2 + Ry+Font2);
- //content.rotate(30*Math.PI/180);
- content.stroke();
- }
- }
- }
-}
-
-
-</script>
-
-
-
-<template>
- <div ref="content">
- <canvas ref="mycanvas"></canvas>
- </div>
-</template>
-
-<style scoped>
-#main {
- width: 100%;
- height: 100%;
-}
-
-
-
-#div-title {
- height: 5%;
- width: 100%;
-}
-
-#searchButton {
- margin-top: -5px;
- margin-left: 1rem;
-}
-
-#searchButton1 {
- /* margin-left: 10rem; */
-}
-
-/*main-body鏍峰紡*/
-#main-body {
- width: 99%;
- height: 92%;
- margin-top: 1%;
-}
-
-#select {
- margin-left: 0.5rem;
-}
-
-:deep(.indexTag .el-breadcrumb__inner) {
- color: #5CADFE !important;
-}
-</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/User/permissions.vue b/UI-Project/src/views/User/permissions.vue
index a9cdf4e..8bb45c7 100644
--- a/UI-Project/src/views/User/permissions.vue
+++ b/UI-Project/src/views/User/permissions.vue
@@ -239,6 +239,8 @@
:data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="id" align="center" :label="$t('delivery.id')" min-width="180" />
<el-table-column prop="role_name" align="center" :label="$t('delivery.role')" min-width="180" />
+ <el-table-column prop="menu_name" align="center" :label="$t('delivery.titleMenu')" min-width="180" />
+ <el-table-column prop="page_name" align="center" :label="$t('delivery.titlePage')" min-width="180" />
<el-table-column fixed="right" :label="$t('delivery.operate')" align="center" width="270">
<template #default="scope">
<el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('delivery.edit') }}</el-button>
--
Gitblit v1.8.0