打标机前端界面，以及空白基础界面

严智鑫

2024-09-11 1fe499f2ac56987522a64070c5d694c496e72307

打标机前端界面，以及空白基础界面

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


 UI-Project/src/assets/×Ô¶¯´ò±ê»ú.png

 UI-Project/src/lang/zh.js

@@ -114,8 +114,10 @@
        cancel :'取消',
        derole :'是否删除该角色',
        prompt:'提示',
        titleMenu:'菜单',
        menu:'菜单：',
        menuchoice:'请选择菜单',
        titlePage:'页面',
        page:'页面：',
        pagechoice:'请选择页面',
    },

 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')
    }
    

  ]
})


 UI-Project/src/views/Blank/blank.vue

New file
@@ -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>

 UI-Project/src/views/Marking/marking.vue

New file
@@ -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>

 UI-Project/src/views/TL/Temperedlayout/Temperedlayout.vue

File was deleted

 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>