Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wu

2023-10-24 1c26bd4ac7453b5f4a29f0e428893b5247a8fde8

Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

 CanadaMes-ui/src/api/home.js

@@ -32,7 +32,7 @@
    return request({

        url: '/home/InsertOrder?orderid=' + orderid,

        method: 'get',

        data :""

        data: ""

    })

}



@@ -40,15 +40,15 @@
    return request({

        url: '/home/Addglassid?glassid=' + glassid,

        method: 'get',

        data :""

        data: ""

    })

}



export function UpdateTask(types,glassid,shelfrack) {

export function UpdateTask(types, glassid, shelfrack) {

    return request({

        url: '/home/UpdateTask?types=' + types + '&glassid='+glassid+'&shelfrack='+shelfrack,

        url: '/home/UpdateTask?types=' + types + '&glassid=' + glassid + '&shelfrack=' + shelfrack,

        method: 'get',

        data :""

        data: ""

    })

}



@@ -56,31 +56,31 @@
    return request({

        url: '/home/SelectAlarmmgInfo',

        method: 'get',

        data :""

        data: ""

    })

}



export function SelectCageInfo(cage) {

    return request({

        url: '/home/SelectCageInfo?cage='+cage,

        url: '/home/SelectCageInfo?cage=' + cage,

        method: 'get',

        data :""

        data: ""

    })

}



export function DeleteByGlassID(glassid) {

    return request({

        url: '/home/DeleteByGlassID?glassid='+glassid,

        url: '/home/DeleteByGlassID?glassid=' + glassid,

        method: 'get',

        data :""

        data: ""

    })

}



export function OutByGlassID(glassid) {

    return request({

        url: '/home/OutByGlassID?glassid='+glassid,

        url: '/home/OutByGlassID?glassid=' + glassid,

        method: 'get',

        data :""

        data: ""

    })

}



@@ -88,7 +88,7 @@
    return request({

        url: '/home/Loadcarlist',

        method: 'get',

        data :""

        data: ""

    })

}



@@ -96,8 +96,38 @@
    return request({

        url: '/home/SelectPassword',

        method: 'get',

        data :""

        data: ""

    })

}



export function SelectGlassByGlassID(glassid) {

    return request({

        url: '/home/SelectGlassByGlassID?glassid=' + glassid,

        method: 'get',

        data: ""

    })

}



export function Disabled(cage, cell, disabled) {

    return request({

        url: '/home/Disabled?cage=' + cage + '&cell=' + cell + '&disabled=' + disabled,

        method: 'get',

        data: ""

    })

}



export function Inglassid(cage,cell,tier,data) {

    return request({

        url: '/home/Inglassid?cage=' + cage + '&cell=' + cell+ '&tier=' + tier,

        method: 'post',

        data

    })

}



export function SelectGlass(orderid) {

    return request({

        url: '/home/SelectGlass?orderid=' + orderid,

        method: 'post',

        data:""

    })

}


 CanadaMes-ui/src/api/role.js

@@ -13,7 +13,13 @@
    })
}


export function saveOrUpdate2(data) {
    return request({
        url: '/api/role/saveOrUpdate2',
        method: 'post',
        data
    })
}

/**
 * 根据id删除角色

 CanadaMes-ui/src/api/rolePermission.js

@@ -1,3 +1,7 @@




import request from "../utils/request";

/**
@@ -51,3 +55,19 @@
        params: data
    })
}

export function getById2(data) {
    return request({
        url: '/api/rolePermission/getByRoleId',
        method: 'get',
        params: data
    })
}

export function saveOrUpdate2(data) {
    return request({
        url: '/api/rolePermission/savePermissions',
        method: 'post',
        data
    })
}

 CanadaMes-ui/src/img/xmjc.png

 CanadaMes-ui/src/lang/locales/en-US.json

@@ -228,7 +228,7 @@




  "Enter the glass lD":"Enter the glass lD",

  "Manually feed the glass":"Manually feed the glass",

  "Infeed barcodid":"Infeed barcodid",

  "Enter the order number":"Enter the order number",

  "Exit the glass by order number":"Exit the glass by order number",

  "Please confirm the glass information":"Please confirm the glass information",

@@ -238,28 +238,29 @@
  "order":"order",

  "length":"length",

  "width":"width",

  "coating":"coating",

  "Operate":"Operate",

  "end task":"end task",

  "cancal":"cancal",

  "cancel":"cancel",

  "confirm":"confirm",

  "number":"number",

  "Coming out glass ID":"Coming out glass ID",

  "Incoming glass ID":"Incoming glass ID",

  "The Cage number being used":"The Cage number being used",

  "The Grille number being used":"The Grille number being used",

  "Outfeed Barcodid":"Outfeed Barcodid",

  "Infeed Barcodid":"Infeed Barcodid",

  "The Cage number being used":"The Cage Number being used",

  "The Slot number being used":"The Slot Number being used",

  "Order Nmuber":"Order Nmuber",

  "Length and width":"Length and width",

  "Length and Width":"Length and Width",

  "id":"id",

  "content":"content",

  "timeon":"timeon",

  "endTime":"endTime",



  "The Cage number":"The Cage number",

  "tier":"tier",

  "cell":"cell",

  "glassid":"glassid",

  "order number":"order number",

  "The Side":"The Side",

  "The Slot Number":"The Slot Number",

  "Barcodid":"Barcodid",

  "Order Number":"Order Number",

  "List Number":"List Number",

  "Box Number":"Box Number",

  "delete":"delete",

  "out":"out",



@@ -274,11 +275,23 @@
  "Are you sure to perform this operation ?":"Are you sure to perform this operation ?",

  "prompt":"prompt",

  "Yes":"Yes",

  


  "No":"No",

  "Please enter the password":"Please enter the password",

  "Password error":"Password error",

  "DataBase Connection failed":"DataBase Connection failed",

  "Distribute parameters":"Distribute parameters"

  "Distribute parameters":"Distribute parameters",

  "The glass size is not within the range":"The glass size is not within the range",

  "increase":"increase",

  "Enable":"Enable",

  "Disable":"Disable",

  "Usage":"Usage",

  "Space (Pieces)":"Space (Pieces)",

  "This glass is already in the cage":"This glass is already in the cage",

  "Enter the Order lD":"Enter the Order lD",

  "OrderInfo":"OrderInfo",

  "Query":"Query",

  "permission update":"permission update"



}

 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -223,7 +223,7 @@




  "Enter the glass lD":"输入玻璃id",

  "Manually feed the glass":"手动上片",

  "Infeed barcodid":"手动上片",

  "Enter the order number":"输入订单号",

  "Exit the glass by order number":"按订单出片",

  "Please confirm the glass information":"请确认玻璃信息",

@@ -233,28 +233,29 @@
  "order":"订单",

  "length":"长",

  "width":"宽",

  "coating":"涂层",

  "Operate":"操作",

  "end task":"完成任务",

  "cancal":"取消",

  "cancel":"取消",

  "confirm":"确认",

  "number":"数量",

  "Coming out glass ID":"出片玻璃id",

  "Incoming glass ID":"进片玻璃id",

  "Outfeed Barcodid":"出片玻璃id",

  "Infeed Barcodid":"进片玻璃id",

  "The Cage number being used":"笼子",

  "The Grille number being used":"格子",

  "The Slot number being used":"格子",

  "Order Nmuber":"订单编号",

  "Length and width":"尺寸",

  "List Number":"列表编号",

  "Box Number":"箱子编号",

  "Length and Width":"尺寸",

  "id":"id",

  "content":"内容",

  "timeon":"报警时间",

  "endTime":"结束时间",



  "The Cage number":"笼子",

  "tier":"层",

  "cell":"格子",

  "glassid":"玻璃id",

  "order number":"订单",

  "The Side":"内外侧",

  "The Slot Number":"格子",

  "Barcodid":"玻璃id",

  "Order Number":"订单",

  "delete":"删除",

  "out":"出片",



@@ -283,6 +284,17 @@
  "Please enter the password":"请输入密码",

  "Password error":"密码错误",

  "DataBase Connection failed":"数据库连接失败",

  "Distribute parameters":"下发参数"

  "Distribute parameters":"下发参数",

  "The glass size is not within the range":"玻璃尺寸不在范围内",

  "increase":"添加",

  "Enable":"启用",

  "Disable":"禁用",

  "Usage":"使用率",

  "Space (Pieces)":"空间(片数)",

  "This glass is already in the cage":"笼子里已有此玻璃",

  "Enter the Order lD":"请输入订单id",

  "OrderInfo":"订单信息",

  "Query":"查询",

  "permission update":"权限编辑"



}

 CanadaMes-ui/src/layout/index.vue

@@ -157,9 +157,7 @@
    goToHome() {
      this.$router.push('/home');
    },
    youhua() {
      this.$router.push('/device/talk');
    },
  
    ...mapMutations('tags', ['addTag', 'removeTag', 'switchTag']),
    addTag(router) {
  let submenuItem;

 CanadaMes-ui/src/views/home/index.vue

@@ -66,16 +66,6 @@
    /* width: 4.22px; */

}



/* .gezi:nth-child(22),

.gezi:nth-child(43),

.gezi:nth-child(64),

.gezi:nth-child(85) {

    margin-left: 7px;

    margin-left: 10px;

} */







.blocks {





@@ -121,6 +111,12 @@
    top: 366px; */

}



.orderbutton {

    position: absolute;

    left: 1070px;

    top: 70px;

}



.blocks-img3 {

    height: 90px;

    max-width: 100vw;

@@ -139,7 +135,7 @@


.el-table td,

.el-table th {

    padding: 8px 0;

    padding: 5px 0;

}



.el-table__empty-block {

@@ -153,18 +149,21 @@
.box {

    width: 90%;

    margin-left: 5%;

    height: 35px;

    color: red;

    font-size: 12px;

    overflow: hidden;

    height: 20px;

    /* height: 35px; */

}



.text {

    width: auto;

    line-height: 35px;



    white-space: nowrap;

    animation: textScroll 20s linear infinite;

    margin: 0 auto;

    line-height: 20px;

    /* line-height: 35px; */

}



@keyframes textScroll {

@@ -178,7 +177,7 @@
}



.el-dialog {

    width: 80%;

    width: 90%;

}

</style>

<template>

@@ -196,18 +195,19 @@
            </div>

            <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">

                <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>

                <el-button type="primary" @click="showform()">{{ $t('Manually feed the glass') }}</el-button>

                <el-button type="primary" @click="showform(1)">{{ $t('Infeed barcodid') }}</el-button>

                <el-input style="width:15%;" :placeholder="$t('Enter the order number')" v-model="order"></el-input>

                <el-button type="warning" @click="showform1();">{{ $t('Exit the glass by order number') }}</el-button>

            </div>

            <div>

                <el-table :data="this.tasklist1" border style="width: 100%">

                    <el-table-column prop="glassId" :label="$t('Coming out glass ID')"></el-table-column>

                    <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>

                    <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>

                    <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

                    <el-table-column prop="coating" :label="$t('coating')"></el-table-column>

                    <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>

                    <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>

                    <el-table-column :width="150" prop="glassId" :label="$t('Outfeed Barcodid')"></el-table-column>

                    <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>

                    <el-table-column prop="list" :label="$t('List Number')"></el-table-column>

                    <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>

                    <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>

                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

@@ -216,12 +216,13 @@
                    </el-table-column>

                </el-table>

                <el-table :data="this.tasklist2" border style="width: 100%">

                    <el-table-column prop="glassId" :label="$t('Incoming glass ID')"></el-table-column>

                    <el-table-column :width="250" prop="cage" :label="$t('The Cage number being used')"></el-table-column>

                    <el-table-column :width="250" prop="cell" :label="$t('The Grille number being used')"></el-table-column>

                    <el-table-column prop="orderId" :label="$t('Order Nmuber')"></el-table-column>

                    <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

                    <el-table-column prop="coating" :label="$t('coating')"></el-table-column>

                    <el-table-column :width="130" prop="cage" :label="$t('The Cage number being used')"></el-table-column>

                    <el-table-column :width="130" prop="cell" :label="$t('The Slot number being used')"></el-table-column>

                    <el-table-column :width="150" prop="glassId" :label="$t('Infeed Barcodid')"></el-table-column>

                    <el-table-column :width="130" prop="orderId" :label="$t('Order Nmuber')"></el-table-column>

                    <el-table-column prop="list" :label="$t('List Number')"></el-table-column>

                    <el-table-column prop="box" :label="$t('Box Number')"></el-table-column>

                    <el-table-column prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>

                    <el-table-column :label="$t('Operate')">

                        <template slot-scope='scope'>

                            <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

@@ -234,11 +235,11 @@
                <div v-for="item in tableData" :key="item['cageno']" class="occupy">

                    <el-col style="text-align:left;font-weight: bold;">#{{ item['cage'] }}</el-col>

                    <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">

                        <span class="biao">Usage</span><span class="zhi">{{ item['cell'] }}%</span>

                        <span class="biao">{{ $t('Usage') }}</span><span class="zhi">{{ item['cell'] }}%</span>

                    </el-col>

                    <hr style="width:80%;margin: 0 auto;" />

                    <el-col style="text-align:left;display:flex;justify-content: space-between;align-items: center;">

                        <span class="biao">Space (Pieces)</span><span class="zhi">{{ item['state'] }}</span>

                        <span class="biao">{{ $t('Space (Pieces)') }}</span><span class="zhi">{{ item['state'] }}</span>

                    </el-col>

                </div>

            </div>

@@ -267,12 +268,14 @@
                        @click="showcageinfo(item['cage'])"></div>

                </div>

                <div class="blue gezi"

                    :style="{ display: flex, position: absolute, float: left, top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">

                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight + 'px', width: 5 + 'px' }">

                </div>

                <div class="blocks-img" :style="{ left: car1 + 'px', top: '16px' }"></div>

                <div class="blocks-img" :style="{ left: car2 + 'px', top: '175px' }"></div>

                <div class="blocks-img2"></div>

                <div class="blocks-img3"></div>

                <el-button class="orderbutton" type="primary" @click="showform2()">{{ $t('OrderInfo') }}</el-button>



                <!-- <div style="display:flex;position: absolute;float:left;z-index: 999;top:112px;left:328px;">

                    <div :class="getStatusClass(item.state)" v-for="(item,index) in cagelist1" :key="item['date']"

                        :style="{ height: 35 * item['glassWidth'] + 'px',left:4.22*index+'px' }"

@@ -301,23 +304,33 @@
        </el-footer>

        <el-dialog :visible.sync="dialogFormVisible" :title="$t('Please confirm the glass information')">

            <el-form :model="form" label-width="100px" style="padding-right: 30px">



                <el-form-item :label="$t('Barcodid')">

                    <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid"></el-input>

                    <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>

                </el-form-item>

                <el-form-item :label="$t('order')">

                    <el-input v-model="form.orderno" autocomplete="off" />

                    <el-input v-model="form.orderId" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('length')">

                    <el-input v-model="form.length" autocomplete="off" />

                    <el-input v-model="form.height" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('width')">

                    <el-input v-model="form.width" autocomplete="off" />

                    <el-input v-model="form.width" readonly autocomplete="off" />

                </el-form-item>

                <el-form-item :label="$t('coating')">

                    <el-input v-model="form.coating" autocomplete="off" />

                <el-form-item :label="$t('Barcodid')">

                    <el-input v-model="form.glassId" readonly autocomplete="off" />

                </el-form-item>

            </el-form>

            <template #footer>

                <span class="dialog-footer">

                    <el-button @click="cancal()">{{ $t('cancal') }}</el-button>

                    <el-button @click="sbumitglassid()" type="primary">{{ $t('confirm') }}</el-button>

                    <el-button @click="sbumitglassid()" :style="{ display: confirm1 == true ? '' : 'none' }"

                        type="primary">{{

                            $t('confirm') }}</el-button>

                    <el-button @click="FeedInglassid()" :style="{ display: confirm2 == true ? '' : 'none' }"

                        type="primary">{{

                            $t('confirm') }}</el-button>

                    <el-button @click="cancel()">{{ $t('cancel') }}</el-button>

                </span>

            </template>

        </el-dialog>

@@ -332,8 +345,8 @@
            </el-form>

            <template #footer>

                <span class="dialog-footer">

                    <el-button @click="cancal1()">{{ $t('cancal') }}</el-button>

                    <el-button @click="getOrder();" type="primary">{{ $t('confirm') }}</el-button>

                    <el-button @click="cancel1()">{{ $t('cancel') }}</el-button>

                </span>

            </template>

        </el-dialog>

@@ -345,32 +358,51 @@
                <el-table-column prop="endTime" :label="$t('endTime')"></el-table-column>

            </el-table>

        </el-dialog>

        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')">

        <el-dialog :visible.sync="dialogFormVisible3" :title="$t('Cage Details')" top="5vh">

            <el-table :data="this.cageinfo" :height="700" border style="width: 100%;overflow: auto;">

                <el-table-column prop="cage" :label="$t('The Cage number')"></el-table-column>

                <el-table-column prop="cell" :label="$t('cell')"></el-table-column>

                <el-table-column prop="tier" :label="$t('tier')"></el-table-column>

                <el-table-column prop="glassId" :label="$t('glassid')"></el-table-column>

                <el-table-column prop="orderId" :label="$t('order number')"></el-table-column>

                <el-table-column prop="lengthWidth" :label="$t('Length and width')"></el-table-column>

                <el-table-column prop="coating" :label="$t('coating')"></el-table-column>

                <el-table-column :label="$t('Operate')">

                <el-table-column :width="90" prop="cage" :label="$t('The Cage number')"></el-table-column>

                <el-table-column :width="90" prop="cell" :label="$t('The Slot Number')"></el-table-column>

                <el-table-column :width="55" prop="tier" :label="$t('The Side')"></el-table-column>

                <el-table-column :width="100" prop="glassId" :label="$t('Barcodid')"></el-table-column>

                <el-table-column :width="100" prop="orderId" :label="$t('Order Number')"></el-table-column>

                <el-table-column :width="100" prop="list" :label="$t('List Number')"></el-table-column>

                <el-table-column :width="100" prop="box" :label="$t('Box Number')"></el-table-column>

                <el-table-column :width="170" prop="lengthWidth" :label="$t('Length and Width')"></el-table-column>

                <el-table-column :width="280" :label="$t('Operate')">

                    <template slot-scope='scope'>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('delete') }}</el-button>

                        <!-- <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="open">{{ $t('delete')

                        }}</el-button> -->

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="outglass(scope.row.glassId, scope.row.state)">{{ $t('out') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="UpdateDisabled(scope.row.cage, scope.row.cell, scope.row.disabled == 0 ? 1 : 0)">

                            {{ scope.row.disabled == 0 ? $t('Enable') : $t('Disable') }}</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"

                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('increase')

                            }}</el-button>

                    </template>

                </el-table-column>

            </el-table>

        </el-dialog>

        <el-dialog :visible.sync="dialogFormVisible4" :title="$t('OrderInfo')" top="5vh">

            <el-input style="width:15%;" :placeholder="$t('Enter the Order lD')" v-model="orderid"></el-input>

            <el-button type="primary" @click="selectglassinfo()">{{ $t('Query') }}</el-button>

            <el-table :data="this.GlassInfo" :height="700" border style="width: 100%;overflow: auto;">



                <el-table-column prop="glassId" :label="$t('Barcodid')"></el-table-column>

                <el-table-column prop="orderId" :label="$t('Order Number')"></el-table-column>

                <el-table-column prop="width" :label="$t('length')"></el-table-column>

                <el-table-column prop="height" :label="$t('width')"></el-table-column>

            </el-table>

        </el-dialog>

    </el-container>

</template>

<script>



import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword } from "../../api/home";

//:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false"

import {

    home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo,

    SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass

} from "../../api/home";





import LanguageMixin from '../../lang/LanguageMixin'

@@ -379,17 +411,23 @@
    name: "Home",

    data() {

        return {

            confirm1: false,

            confirm2: false,

            insertcage: 0,

            insertcell: 0,

            inserttier: 0,

            name: 'Confirm',

            mixins: [LanguageMixin],

            dialogFormVisible: false,

            dialogFormVisible1: false,

            dialogFormVisible2: false,

            dialogFormVisible3: false,

            dialogFormVisible4: false,

            form: {

                orderno: "NG2210210",

                length: 800,

                width: 1000,

                coating: "red",

                orderId: "",

                glassId: "",

                height: "",

                width: ""

            },

            form1: {

                order: "NG2210210",

@@ -417,8 +455,10 @@
            carlist: [],

            loadglassheight: 0,

            password: 1,

            text: "DataBase Connection failed",

            zhuangtai: ""

            text: "",

            zhuangtai: "",

            orderid: "",

            GlassInfo: []

        };

    },

    created() {

@@ -454,8 +494,6 @@
                        this.car2 = 210 + 8.15 * Math.abs(obj.params[0][1] - this.carlist[1]['start']) / Math.abs(this.carlist[1]['end'] - this.carlist[1]['start']) * 100;

                        // this.car1 = 210 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;

                        // this.car2 = 300 + 11.25 * (obj.params[0][1]-this.carlist[1]['start'])/(this.carlist[1]['end']-this.carlist[1]['start'])*100;

                        console.log(obj.params[0][1], this.carlist[1]['start']);

                        console.log(obj.params[0][0], this.carlist[0]['start']);

                    }

                    this.tableData = obj.tableData[0];

                    this.cagelist1 = obj.cagelist1[0];

@@ -464,7 +502,6 @@
                    this.cagelist4 = obj.cagelist4[0];

                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    console.log(this.cagelist4);

                    this.alarm = obj.alarmmg[0];

                    this.loadglassheight = obj.loadglassheight;

                    this.zhuangtai = obj.zhuangtai[0];

@@ -473,6 +510,9 @@
                    // }

                    SelectCageInfo(this.cage).then(res => {

                        this.cageinfo = res.data.cageinfo;

                    });

                    SelectGlass(this.orderid).then(res => {

                        this.GlassInfo = res.data.glass;

                    });



                    this.$forceUpdate();

@@ -489,37 +529,34 @@
            }

        },

        load() {

            //加载笼子使用情况数据

            home().then(res => {

                this.tableData = res.data.list;

            });

            //加载理片笼玻璃数据

            home2().then(res => {

                this.cagelist1 = res.data.list1;

                this.cagelist2 = res.data.list2;

                this.cagelist3 = res.data.list3;

                this.cagelist4 = res.data.list4;

            });

            //加载进片任务数据

            loadtask(this.task1).then(res => {

                this.tasklist1 = res.data.list;

                if (res.data.list.length > 0) {

                    this.incell = this.tasklist1[0]['cell'];

                }

            });

            loadtask(this.task2).then(res => {

                this.tasklist2 = res.data.list;

                if (res.data.list.length > 0) {

                    this.outcell = this.tasklist2[0]['cell'];

                }

            });

            //加载进出片任务数据

            loadtask(this.task2).then(res => {

                this.tasklist2 = res.data.list;

            });

            //加载报警信息

            SelectAlarmmgInfo().then(res => {

                this.alarm = res.data.alarmmg;

            });

            //加载小车位置信息

            Loadcarlist().then(res => {

                this.carlist = res.data.carlist;

                console.log(this.carlist);

            });

            //加载确认密码

            SelectPassword().then(res => {

                this.password = res.data.password;

            });

@@ -547,7 +584,7 @@
                        this.$message.success(this.$t('Operation successful'));



                    } else {

                        this.$message.success(this.$t('There is no glass for this order'));

                        this.$message.error(this.$t('There is no glass for this order'));

                    }

                    this.load();

                });

@@ -557,39 +594,52 @@
        //手动上片

        sbumitglassid() {

            if (this.form.order != "") {

                if (this.zhuangtai == true) {

                    Addglassid(this.glassid).then(res => {

                        if (res.data.message2 == 200) {

                            this.$message.success(this.$t('Operation successful'));

                            this.cancal();

                        } else if (res.data.message2 == 500) {

                            this.$message.success(this.$t('There are currently tasks'));

                        }

                        else if (res.data.message2 == 300) {

                            this.$message.success(this.$t('There is no such glass'));

                        }

                        else if (res.data.message2 == 400) {

                            this.$message.success(this.$t('There is no such grid'));

                        }

                    });

                if (this.form.height < 380 || this.form.width < 390 || this.form.height > 1810 || this.form.width > 2760) {

                    this.$message.error(this.$t('The glass size is not within the range'));

                } else {

                    this.$message.success(this.$t('There are currently tasks'));

                    if (this.zhuangtai == true) {

                        Addglassid(this.glassid).then(res => {

                            if (res.data.message2 == 200) {

                                this.$message.success(this.$t('Operation successful'));

                                this.cancel();

                            } else if (res.data.message2 == 500) {

                                this.$message.error(this.$t('There are currently tasks'));

                            }

                            else if (res.data.message2 == 300) {

                                this.$message.error(this.$t('There is no such glass'));

                            }

                            else if (res.data.message2 == 400) {

                                this.$message.error(this.$t('There is no such grid'));

                            }

                        });

                    } else {

                        this.$message.error(this.$t('There are currently tasks'));

                    }

                }



            }

        },

        showform() {

            if (this.glassid != "") {

                this.form =

                {

                    orderno: "NG2210210",

                    length: 800,

                    width: 1000,

                    coating: "red",

                };

                this.dialogFormVisible = true;

        //显示确认玻璃信息也没

        showform(buttons) {

            if (buttons == 1) {

                this.confirm1 = true;

                this.confirm2 = false;

            } else if (buttons == 2) {

                this.confirm1 = false;

                this.confirm2 = true;

            }

            //根据输入的玻璃id获取玻璃信息

            SelectGlassByGlassID(this.glassid).then(res => {

                if (res.data.form != null) {

                    this.form = res.data.form;

                    this.dialogFormVisible = true;

                    this.$message.success('query was successful');

                } else {

                    this.dialogFormVisible = true;

                    this.$message.error(this.$t('There is no such glass'));

                }

            });

        },

        //显示订单信息页面

        showform1() {

            if (this.order != "") {

                this.form1 =

@@ -599,17 +649,34 @@
                };

                this.dialogFormVisible1 = true;

            }





        },

        cancal() {

        selectglassinfo() {

            SelectGlass(this.orderid).then(res => {

                this.GlassInfo = res.data.glass;

            });

        },

        showform2() {

            SelectGlass(this.orderid).then(res => {

                this.GlassInfo = res.data.glass;

            });

            this.dialogFormVisible4 = true;

        },

        //取消操作时关闭页面

        cancel() {

            this.dialogFormVisible = false;

            this.form = {};

            this.form = {

                orderId: "",

                glassId: "",

                height: "",

                width: ""

            };

        },

        cancal1() {

        //取消操作时关闭页面

        cancel1() {

            this.dialogFormVisible1 = false;

            this.form1 = {};

        },

        //结束进/出片任务

        endtask(type, glassid, cell) {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

@@ -625,7 +692,7 @@
                        }

                    });

                } else {

                    this.$message.success(this.$t('Password error'));//密码错误

                    this.$message.error(this.$t('Password error'));//密码错误

                }

            }).catch(() => {

                this.$message({

@@ -634,6 +701,7 @@
                });

            });

        },

        //显示理片笼详情信息

        showcageinfo(cage) {

            this.cage = cage;

            SelectCageInfo(cage).then(res => {

@@ -641,6 +709,7 @@
                this.dialogFormVisible3 = true;

            });

        },

        //删除理片笼玻璃

        deleteglass(glassid, state) {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

@@ -657,10 +726,10 @@
                            }

                        });

                    } else {

                        this.$message.success(this.$t('No delete allowed'));

                        this.$message.error(this.$t('No delete allowed'));

                    }

                } else {

                    this.$message.success(this.$t('Password error'));//密码错误

                    this.$message.error(this.$t('Password error'));//密码错误

                }



            }).catch(() => {

@@ -670,6 +739,7 @@
                });

            });

        },

        //手动出片

        outglass(glassid, state) {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

@@ -685,14 +755,17 @@
                                this.$message.success(this.$t('Operation successful'));

                            }

                            else if (res.data.message2 == 300) {

                                this.$message.success(this.$t('There is no such grid'));

                                this.$message.error(this.$t('There is no such grid'));

                            }

                            else if (res.data.message2 == 500) {

                                this.$message.error(this.$t('This glass is already in the cage'));

                            }

                        });

                    } else {

                        this.$message.success(this.$t('No out allowed'));

                        this.$message.error(this.$t('No out allowed'));

                    }

                } else {

                    this.$message.success(this.$t('Password error'));//密码错误

                    this.$message.error(this.$t('Password error'));//密码错误

                }

            }).catch(() => {

                this.$message({

@@ -700,10 +773,55 @@
                    message: this.$t('Operation canceled')

                });

            });

        },

        //手动往理片笼添加玻璃

        insertglass(cage, cell, tier) {

            this.$prompt(this.$t('Are you sure to perform this operation ?'), this.$t('prompt'), {

                inputType: 'password',

                inputPlaceholder: this.$t('Please enter the password'),

                confirmButtonText: this.$t('Yes'),

                cancelButtonText: this.$t('No'),

                type: 'warning'

            }).then(({ value }) => {

                if (this.password == value) {

                    this.insertcage = cage;

                    this.insertcell = cell;

                    this.inserttier = tier;

                    this.showform(2);

                } else {

                    this.$message.error(this.$t('Password error'));//密码错误

                }

            }).catch(() => {

                this.$message({

                    type: 'info',

                    message: this.$t('Operation canceled')

                });

            });

        },

        //手动上片

        FeedInglassid() {

            Inglassid(this.insertcage, this.insertcell, this.inserttier, this.form).then(res => {

                if (this.form.glassId != "") {

                    if (res.data.message == 200) {

                        this.$message.success(this.$t('Operation successful'));

                        this.dialogFormVisible = false;

                    } else {

                        this.$message.error(this.$t('This glass is already in the cage'));

                    }

                } else {

                    this.$message.error(this.$t('There is no such glass'));

                }



            });

        },

        //启用//理片笼禁用

        UpdateDisabled(cage, cell, disabled) {

            Disabled(cage, cell, disabled).then(res => {

                if (res.data.message == 200) {

                    this.$message.success(this.$t('Operation successful'));

                }

            });

        }

    }



}



</script>

 CanadaMes-ui/src/views/role/index.vue

@@ -39,6 +39,11 @@
  <!-- 修改 -->
  <el-tooltip effect="dark" :content="$t('langEdit')" placement="top" :enterable="false">
    <el-button type="primary" icon="el-icon-edit" size="mini" @click="showEditDialog(scope.row)"></el-button>
 
  </el-tooltip>
  <el-tooltip effect="dark" :content="$t('permission update')" placement="top" :enterable="false">
    
    <el-button type="primary"  size="mini" @click="showPermissionDialog(scope.row)">{{$t('permission update')}}</el-button>
  </el-tooltip>
  <!-- 删除 -->
  <el-tooltip effect="dark" :content="$t('langDelete')" placement="top" :enterable="false">
@@ -85,36 +90,58 @@
  </span>
    </el-dialog>
    <!--修改角色的对话框-->
    <el-dialog
        :title="$t('langEditRole')"
        :visible.sync="editDialogVisible"
        width="50%">
      <!--内容主体区域-->
      <el-form :model="editRoleForm" :rules="addRoleRules" ref="addRoleRef" label-width="130px">
        <el-form-item :label="$t('langRoleName')" prop="name">
          <el-input v-model="editRoleForm.name"></el-input>
        </el-form-item>
        <el-form-item :label="$t('langState')" prop="state">
          <el-select v-model="editRoleForm.state" placeholder="$t('langPleaseSelect')">
            <el-option v-for="(item,index) in options"
                       :key="index"
                       :value="item.value"
                       :label="item.label">
            </el-option>
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
    <el-dialog :title="$t('langEditRole')" :visible.sync="editDialogVisible" width="50%">
  <!-- 内容主体区域 -->
  <el-form :model="editRoleForm" :rules="addRoleRules" ref="addRoleRef" label-width="130px">
    <el-form-item :label="$t('langRoleName')" prop="name">
      <el-input v-model="editRoleForm.name"></el-input>
    </el-form-item>
    <el-form-item :label="$t('langState')" prop="state">
      <el-select v-model="editRoleForm.state" placeholder="$t('langPleaseSelect')">
        <el-option v-for="(item, index) in options" :key="index" :value="item.value" :label="item.label"></el-option>
      </el-select>
    </el-form-item>
    
  </el-form>
  <span slot="footer" class="dialog-footer">
    <el-button @click="editDialogVisible = false">{{$t('langCancel')}}</el-button>
    <el-button type="primary" @click="editRoleInfo">{{$t('langConfirm')}}</el-button>
  </span>
    </el-dialog>
</el-dialog>


<el-dialog :title="$t('langEditPermissions')" :visible.sync="permissionDialogVisible">
  <el-form label-width="130px">
    <el-form-item :label="$t('langPermissions')" prop="permissionList">
      <el-checkbox-group v-model="selectedPermissions">
        <el-checkbox
          v-for="(permission, index) in permissionList"
          :key="index"
          :label="permission.name"
          :checked="permission.state === 1"
          @change="updatePermissionState(permission.name, $event)"
        >{{ permission.name }}</el-checkbox>
      </el-checkbox-group>
    </el-form-item>
  </el-form>
  <span slot="footer" class="dialog-footer">
    <el-button @click="cancelEditPermissions">{{$t('langCancel')}}</el-button>
    <el-button type="primary" @click="savePermissions">{{$t('langConfirm')}}</el-button>
  </span>
</el-dialog>




  </div>
</template>

<script>
import {getById, removeById, saveOrUpdate, selectPage} from "../../api/role";
import LanguageMixin from '../../lang/LanguageMixin'
import {getById2} from "../../api/rolePermission";
import {saveOrUpdate2} from "../../api/rolePermission";

import LanguageMixin from '../../lang/LanguageMixin';
export default {
  name: "Role",
  mixins: [LanguageMixin],
@@ -133,13 +160,21 @@
      addDialogVisible: false,
      // 控制修改角色对话框的显示与隐藏
      editDialogVisible: false,
     
      // 添加的角色对象
      addRoleForm: {
        state: 1
      },
   
      // 修改的角色对象
      editRoleForm: {},
      editRoleForm: {
        
      },
     
      permissionList: [],
    permissionDialogVisible: false,
    selectedPermissions: [] ,// 添加selectedPermissions数组变量

      // 添加角色的验证规则
      addRoleRules: {
        name: [
@@ -179,7 +214,7 @@
    stateChange(info) {
      saveOrUpdate(info).then(() => {
        const 更新状态成功 = this.$t('更新状态成功');
        this.$message.success(更新状态成功)
        this.$message.success(更新状态成功);

      });
    },
@@ -206,9 +241,60 @@
    showEditDialog(role) {
      getById({id: role.id}).then(res => {
        this.editRoleForm = res.data;
        this.editDialogVisible = true;
     
  
       
      });

     
      this.editDialogVisible = true;
    },


    showPermissionDialog(role) {
      this.selectedPermissions=[];
      this.permissionList=[];
    
      getById2({ roleId: role.id }).then((res) => {
        this.permissionList = res.data.permissionList;
      

        this.selectedPermissions = this.permissionList.map(({ name, state }) => ({
          name,
          state: state === 1,
        }));
        console.log(this.selectedPermissions);
        this.permissionDialogVisible = true;
      });
    },
// 取消编辑权限弹出框
cancelEditPermissions() {
  this.permissionDialogVisible = false;
},
// 保存权限修改
updatePermissionState(name, isChecked) {
    const permission = this.permissionList.find(p => p.name === name);
    if (permission) {
      permission.state = isChecked ? 1 : 0;
    }
  },

  

  savePermissions() {
  const permissions = this.permissionList.map(({ roleId, name, state, permission_id }) => ({
    roleId,
    name,
    state,
    permission_id
  }));
  
  saveOrUpdate2({ permissions }).then(() => {
    // 成功更新权限后执行的操作
    const 更新状态成功 = this.$t('更新状态成功');
        this.$message.success(更新状态成功);
  });
},
    // 展示添加角色的对话框
    showAddDialog() {
      this.addDialogVisible = true;

 CanadaMes-ui/src/views/user/index.vue

@@ -123,7 +123,7 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('ElectricalPassword')" prop="dianqimima">
        <el-form-item :label="$t('ElectricalPassword')" prop="dianqimima"  v-if="editUserForm.username === 'admin'">
        <el-input   v-model="editUserForm.dianqimima"></el-input>
      </el-form-item>
      </el-form>

 CanadaMes-ui/vue.config.js

@@ -8,7 +8,7 @@
    devServer: {
        proxy: {
            '/api': {
                target: `http://127.0.0.1:8888/springboot-vue3`,
                target: `http://localhost:8888/springboot-vue3`,
                changeOrigin: true,
                pathRewrite: {
                    '^/api': ''

 springboot-vue3/pom.xml

@@ -145,7 +145,19 @@
                <artifactId>spring-boot-maven-plugin</artifactId>
                <version>${spring-boot.version}</version>
            </plugin>
            <plugin>
                <groupId>com.spotify</groupId>
                <artifactId>dockerfile-maven-plugin</artifactId>
                <version>1.3.6</version>
                <configuration>
                    <repository>docker/${project.artifactId}</repository>
                    <buildArgs>
                        <JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
                    </buildArgs>
                </configuration>
            </plugin>
        </plugins>

    </build>

    <repositories>

 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.ibatis.javassist.tools.framedump;

import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -13,6 +13,7 @@
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;

@@ -32,7 +33,8 @@

    @Autowired
    SpianMapper spianMapper;

    
    //查询理片笼使用情况
    @GetMapping("/load")
    public Result selectAll() {
        List<StorageCage> storageCagelist = homeMapper.selectAll();
@@ -40,7 +42,7 @@
        map.put("list", storageCagelist);
        return Result.success(map);
    }

    //查询理片笼玻璃情况
    @GetMapping("/loads")
    public Result selectRack() {
        List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
@@ -54,7 +56,7 @@
        map.put("list4", storageCagelist4);
        return Result.success(map);
    }

    //查询进/出片任务
    @GetMapping("/loadinout")
    public Result selectinout(Integer types) {
        List<StorageCage> storageCageinout = homeMapper.selectinout(types);
@@ -62,7 +64,7 @@
        map.put("list", storageCageinout);
        return Result.success(map);
    }

    //按订单出片
    @GetMapping("/InsertOrder")
    public Result InsertOrder(String orderid) {
        short result = homeMapper.SelectOrder(orderid);
@@ -76,16 +78,16 @@
        }
        return Result.success(map);
    }

    //根据玻璃id手动上片
    @GetMapping("/Addglassid")
    public Result Addglassid(short glassid) {
    public Result Addglassid(String glassid) {
        Map<String, Object> map = new HashMap<>();
        short taskno = homeMapper.SelectOutTask();
        short taskno = homeMapper.SelectInTask();
        if (taskno > 0) {
            map.put("message2", "500");
        } else {
            // 调用伍上片函数
            short results = spianService.selectAll(Short.toString(glassid));
            short results = spianService.selectAll(glassid);
            if (results == 200) {
                map.put("message2", "200");
            } else if (results == 300) {
@@ -96,26 +98,26 @@
        }
        return Result.success(map);
    }

    //手动完成进/出片任务
    @GetMapping("/UpdateTask")
    public Result UpdateTask(Integer types, Integer shelfrack, Integer glassid) {
    public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
        Map<String, Object> map = new HashMap<>();
        homeMapper.UpdateTask(types);
        StorageCage glass=homeMapper.SelectGlassInfo(glassid);
        StorageCage glass = homeMapper.SelectGlassInfo(glassid);
        if (types == 0) {
            // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
            homeMapper.UpdateCageTask1(glassid);
            S7control.getinstance().WriteWord("DB105.14",(short)0);
            S7control.getinstance().WriteWord("DB105.14", (short) 0);
        } else {
            
            spianMapper.UpdataOutCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());

            spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
            homeMapper.UpdateCageTask2(glassid);
            S7control.getinstance().WriteWord("DB105.12",(short)0);
            S7control.getinstance().WriteWord("DB105.12", (short) 0);
        }
        map.put("message3", "200");
        return Result.success(map);
    }

    //查询报警信息
    @GetMapping("/SelectAlarmmgInfo")
    public Result SelectAlarmmgInfo() {
        List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
@@ -123,7 +125,7 @@
        map.put("alarmmg", alarmmg);
        return Result.success(map);
    }

    //查询理片笼详情
    @GetMapping("/SelectCageInfo")
    public Result SelectCageInfo(short cage) {
        List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
@@ -131,32 +133,36 @@
        map.put("cageinfo", cageinfo);
        return Result.success(map);
    }

    //手动删除理片笼玻璃
    @GetMapping("/DeleteByGlassID")
    public Result DeleteByGlassID(short glassid) {
        StorageCage glassinfor= homeMapper.SelectGlassInfo(Integer.valueOf(glassid));
        spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(),glassinfor.getCage(),glassinfor.getCell());
        homeMapper.DeleteByGlassID(glassid);  
    public Result DeleteByGlassID(String glassid) {
        StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
        spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
        homeMapper.DeleteByGlassID(glassid);
        Map<String, Object> map = new HashMap<>();
        map.put("message3", "200");
        return Result.success(map);
    }

    //根据玻璃id手动出片
    @GetMapping("/OutByGlassID")
    public Result OutByGlassID(String glassid) {
        Map<String, Object> map = new HashMap<>();
        // 调用伍上片函数
        Short results = spianService.selectout2(glassid);
        if (results == 200) {
            map.put("message2", "200");
        } else if (results == 300) {
            map.put("message2", "300");
        } else if (results == 400) {
            map.put("message2", "400");
        short result = homeMapper.SelectStorageByGlassId(glassid);
        if (result > 0) {
            Short results = spianService.selectout2(glassid);
            if (results == 200) {
                map.put("message2", "200");
            } else if (results == 300) {
                map.put("message2", "300");
            } 
        }else{
            map.put("message2", "500");
        }

        return Result.success(map);
    }

    //加载小车位置
    @GetMapping("/Loadcarlist")
    public Result Loadcarlist() {
        List<CarPosition> carlist = homeMapper.Loadcarlist();
@@ -164,7 +170,7 @@
        map.put("carlist", carlist);
        return Result.success(map);
    }

    //查询确认密码
    @GetMapping("/SelectPassword")
    public Result SelectPassword() {
        String pwdct = homeMapper.SelectPassword();
@@ -172,6 +178,42 @@
        map.put("password", pwdct);
        return Result.success(map);
    }
    
    
    //根据玻璃id查询玻璃信息
    @GetMapping("/SelectGlassByGlassID")
    public Result SelectGlassByGlassID(String glassid) {
        Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
        Map<String, Object> map = new HashMap<>();
        map.put("form", Glass);
        return Result.success(map);
    }
    //启用/禁用理片笼格子
    @GetMapping("/Disabled")
    public Result Disabled(short cage, short cell, short disabled) {
        homeMapper.Disabled(cage, cell, disabled);
        Map<String, Object> map = new HashMap<>();
        map.put("message", "200");
        return Result.success(map);
    }
    //手动往理片笼添加玻璃
    @PostMapping("/Inglassid")
    public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
        Map<String, Object> map = new HashMap<>();
        short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
        if (result > 0) {
            map.put("message", "300");
        } else {
            homeMapper.Inglassid(glass, cage, cell, tier);
            spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
        }
        return Result.success(map);
    }

    //查询玻璃信息
    @PostMapping("/SelectGlass")
    public Result SelectGlass(String orderid) {
        Map<String, Object> map = new HashMap<>();
        List<Glass> glass=homeMapper.SelectGlass(orderid);
        map.put("glass", glass);
        return Result.success(map);
    }
}

 springboot-vue3/src/main/java/com/example/springboot/controller/RoleController.java

@@ -37,6 +37,7 @@
        return Result.success();
    }


    @ApiOperation(value = "根据id删除角色")
    @PostMapping("/removeById")
    @RequiresRoles({"admin"})
@@ -54,6 +55,8 @@
        return Result.success(roleService.getById(role.getId()));
    }



    @ApiOperation(value = "分页查询角色")
    @GetMapping("/selectPage")
    @RequiresRoles({"admin"})

 springboot-vue3/src/main/java/com/example/springboot/controller/RolePermissionController.java

@@ -1,10 +1,9 @@
package com.example.springboot.controller;

import com.example.springboot.entity.Permission;
import com.example.springboot.entity.Role;
import com.example.springboot.entity.RolePermission;
import com.example.springboot.entity.*;
import com.example.springboot.entity.vo.Result;
import com.example.springboot.entity.vo.RolePermissionVo;
import com.example.springboot.mapper.RolePermissionMapper;
import com.example.springboot.service.PermissionService;
import com.example.springboot.service.RolePermissionService;
import com.example.springboot.service.RoleService;
@@ -14,11 +13,13 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
@Slf4j
@@ -32,50 +33,136 @@
    @Autowired
    private PermissionService permissionService;

    @ApiOperation(value = "添加或者更新角色和权限关系")
    @PostMapping("/saveOrUpdate")
    @RequiresPermissions({"rolePermission:add"})
    @RequiresRoles({"admin"})
    public Result saveOrUpdate(@RequestBody RolePermission rolePermission) {
        Integer count = rolePermissionService.lambdaQuery()
                .eq(RolePermission::getRoleId, rolePermission.getRoleId())
                .eq(RolePermission::getPermissionId, rolePermission.getPermissionId())
                .ne(rolePermission.getId() != null, RolePermission::getId, rolePermission.getId())
                .count();
        if (count > 0) return Result.fail("授权已存在");
        rolePermissionService.saveOrUpdate(rolePermission);
        return Result.success();
    }

    @ApiOperation(value = "根据id删除角色和权限关系")
    @PostMapping("/removeById")
    @RequiresPermissions({"rolePermission:delete"})
    @RequiresRoles({"admin"})
    public Result removeById(@RequestBody RolePermissionVo rolePermissionVO) {
        rolePermissionService.removeById(rolePermissionVO.getId());
        return Result.success();
    }

    @ApiOperation(value = "分页查询角色和权限关系")
    @GetMapping("/selectPage")
    @RequiresRoles({"admin"})
    @RequiresPermissions({"rolePermission:select"})
    public Result selectPage(RolePermissionVo rolePermissionVO) {
        return Result.success(rolePermissionService.selectPage(rolePermissionVO));
    }

    @ApiOperation(value = "根据id查询角色和权限关系")
    @GetMapping("/getById")
    @RequiresRoles({"admin"})
    @RequiresPermissions({"rolePermission:select"})
    public Result getById(RolePermissionVo rolePermissionVO) {
        RolePermission rolePermission = rolePermissionService.getById(rolePermissionVO.getId());
        if (rolePermission != null) {
            Role role = roleService.getById(rolePermission.getRoleId());
            Permission permission = permissionService.getById(rolePermission.getPermissionId());
            rolePermission.setRole(role);
            rolePermission.setPermission(permission);
        @ApiOperation(value = "添加或者更新角色和权限关系")
        @PostMapping("/saveOrUpdate")
        @RequiresPermissions({"rolePermission:add"})
        @RequiresRoles({"admin"})
        public Result saveOrUpdate(@RequestBody RolePermission rolePermission) {
            Integer count = rolePermissionService.lambdaQuery()
                    .eq(RolePermission::getRoleId, rolePermission.getRoleId())
                    .eq(RolePermission::getPermissionId, rolePermission.getPermissionId())
                    .ne(rolePermission.getId() != null, RolePermission::getId, rolePermission.getId())
                    .count();
            if (count > 0) return Result.fail("授权已存在");
            rolePermissionService.saveOrUpdate(rolePermission);
            return Result.success();
        }
        return Result.success(rolePermission);

        @ApiOperation(value = "根据id删除角色和权限关系")
        @PostMapping("/removeById")
        @RequiresPermissions({"rolePermission:delete"})
        @RequiresRoles({"admin"})
        public Result removeById(@RequestBody RolePermissionVo rolePermissionVO) {
            rolePermissionService.removeById(rolePermissionVO.getId());
            return Result.success();
        }

        @ApiOperation(value = "分页查询角色和权限关系")
        @GetMapping("/selectPage")
        @RequiresRoles({"admin"})
        @RequiresPermissions({"rolePermission:select"})
        public Result selectPage(RolePermissionVo rolePermissionVO) {
            return Result.success(rolePermissionService.selectPage(rolePermissionVO));
        }

        @ApiOperation(value = "根据id查询角色和权限关系")
        @GetMapping("/getById")
        @RequiresRoles({"admin"})
        @RequiresPermissions({"rolePermission:select"})
        public Result getById(RolePermissionVo rolePermissionVO) {
            RolePermission rolePermission = rolePermissionService.getById(rolePermissionVO.getId());
            if (rolePermission != null) {
                Role role = roleService.getById(rolePermission.getRoleId());
                Permission permission = permissionService.getById(rolePermission.getPermissionId());
                rolePermission.setRole(role);
                rolePermission.setPermission(permission);
            }
            return Result.success(rolePermission);





        }
    @Autowired
    private JdbcTemplate jdbcTemplate;

    @Autowired RolePermissionMapper RolePermissionMapper;
    ;


    @GetMapping("/getByRoleId")
    public com.example.springboot.common.Result selectquanxian(@RequestParam("roleId") int roleId) {
        List<Map<String, Object>> resultSet = RolePermissionMapper.selectquanxian(roleId);

        List<Map<String, Object>> permissions = new ArrayList<>();
        for (Map<String, Object> result : resultSet) {

            Long role_id2 = (Long) result.get("role_id");
            int state = (int) result.get("state");
            Long permission_id = (Long) result.get("permission_id"); // 注意这里的类型是Long
            String permissionName = (String) result.get("name");

            Map<String, Object> permission = new HashMap<>();
            permission.put("roleId", role_id2.intValue());
            permission.put("name", permissionName);
            permission.put("permission_id", permission_id.intValue()); // 将Long类型转换为int类型
            permission.put("state", state);
            permissions.add(permission);
        }

        Map<String, Object> map = new HashMap<>();
        map.put("permissionList", permissions);
        return com.example.springboot.common.Result.success(map);
    }


    @PostMapping("/savePermissions")
    public Result savePermissions(@RequestBody Map<String, Object> requestBody) {
        try {
            // 获取权限数据列表
            List<Map<String, Object>> permissions = (List<Map<String, Object>>) requestBody.get("permissions");
            // 遍历接收到的权限数据
            for (Map<String, Object> permission : permissions) {
                // 获取权限项的roleId、name、state和permission_id
                int roleId = (int) permission.get("roleId");
                String name = (String) permission.get("name");
                int state = (int) permission.get("state");
                int permissionId = (int) permission.get("permission_id");

                // 根据roleId和permissionId查询是否已存在该权限记录
                boolean exists = RolePermissionMapper.checkExists(roleId, permissionId);

                if (exists) {
                    // 如果已存在该权限记录，则更新状态
                    RolePermissionMapper.updateState(roleId, permissionId, state);
                } else {
                    // 如果不存在该权限记录，则新增一条权限记录
                    RolePermissionMapper.insert(roleId, permissionId, state);
                }
            }

            return Result.success(); // 成功保存权限后返回结果
        } catch (Exception e) {
            e.printStackTrace();
            return Result.fail("保存权限失败"); // 保存权限失败时返回错误信息
        }
    }







}









 springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java

@@ -4,7 +4,8 @@
    private Integer id;
    private Short orderId;
    private double glassWidth;
    private Short glassId;
    private double glassHeight;
    private String glassId;
    
    

@@ -30,15 +31,23 @@
        return glassWidth;
    }

    public void setHeight(double glassHeight) {
        this.glassHeight = glassHeight;
    }

    public double getHeight() {
        return glassHeight;
    }

    public void setWidth(double glassWidth) {
        this.glassWidth = glassWidth;
    }

     public Short getGlassId() {
     public String getGlassId() {
        return glassId;
    }

    public void setGlassId(Short glassId) {
    public void setGlassId(String glassId) {
        this.glassId = glassId;
    }


 springboot-vue3/src/main/java/com/example/springboot/entity/Role.java

@@ -30,4 +30,5 @@

    @TableField(exist = false)
    private List<Permission> permissions;
}
}


 springboot-vue3/src/main/java/com/example/springboot/entity/RolePermission.java

@@ -22,8 +22,13 @@
    @ApiModelProperty("状态")
    private Integer state;




    @TableField(exist = false)
    private Role role;
    @TableField(exist = false)
    private Permission permission;


}

 springboot-vue3/src/main/java/com/example/springboot/entity/StorageCage.java

@@ -12,7 +12,7 @@
    private String state;
    private Integer tier;
    private String orderId;
    private String coating;
    private Integer disabled;
    private String lengthWidth;

    public Integer id() {
@@ -107,12 +107,12 @@
        this.glassheight = glassheight;
    }

    public String getCoating() {
        return coating;
    public Integer getDisabled() {
        return disabled;
    }

    public void setCoating(String coating) {
        this.coating = coating;
    public void setDisabled(Integer disabled) {
        this.disabled = disabled;
    }

    public String getLengthWidth() {

 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java

@@ -3,6 +3,7 @@
import org.apache.ibatis.annotations.*;

import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;

@@ -11,22 +12,22 @@
@Mapper
public interface HomeMapper {
  //查询每个笼子的使用情况
  @Select("select cage,round(100-(21-sum(state))/21*100) as cell,21-sum(state) as state from (select cage,cell,max(state) as state from storage_cage group by cage,cell) as cages group by cage")
  @Select("select cage,round(100-(21-sum(if(state>0,1,state)))/21*100) as cell,21-sum(if(state>0,1,state)) as state from (select cage,cell,max(state) as state from storage_cage group by cage,cell) as cages group by cage")
  List<StorageCage> selectAll();

  // 查询1-5笼内层格子状态
  // 查询10-6笼内层格子状态
  @Select("SELECT cage,state,ifnull(glasswidth/2750*2,0) as glasswidth from storage_cage where cage>5 and tier=2 order by cage desc,cell desc")
  List<StorageCage> selectRack1();

  // 查询6-10笼内层格子状态
  // 查询5-1笼内层格子状态
  @Select("SELECT cage,state,ifnull(glasswidth/2750*2,0) as glasswidth from storage_cage where cage<=5 and tier=2 order by cage desc,cell desc")
  List<StorageCage> selectRack2();

  // 查询1-5笼外层格子状态
  // 查询10-6笼外层格子状态
  @Select("SELECT case when tier=1 then cage else 0 end as cage,case when tier=1 then state else 0 end as state,sum(case when tier=1 then glasswidth/2750*2 else 0 end) as glasswidth,sum(case when tier=2 then glasswidth/2750*2 else 0 end) as width  from storage_cage where cage>5  group by cage,cell order by cage desc,cell desc")
  List<StorageCage> selectRack3();

  // 查询6-10笼外层格子状态
  // 查询5-1笼外层格子状态
  @Select("SELECT case when tier=1 then cage else 0 end as cage,case when tier=1 then state else 0 end as state,sum(case when tier=1 then glasswidth/2750*2 else 0 end) as glasswidth,sum(case when tier=2 then glasswidth/2750*2 else 0 end) as width  from storage_cage where cage<=5  group by cage,cell order by cage desc,cell desc")
  List<StorageCage> selectRack4();

@@ -47,8 +48,8 @@
  void updateOrder();

  // 查询是否存在正在上片的任务
  @Select("select count(*) from storage_task where task_state=0 and task_type=1")
  short SelectOutTask();
  @Select("select count(*) from storage_task where task_state=0 and task_type=0")
  short SelectInTask();

  // 手动完成任务
  @Update("update storage_task set task_state=1 where task_type=#{task_type} and task_state=0")
@@ -56,30 +57,57 @@

  // 手动完成进片任务修改笼子数据
  @Update("update storage_cage set state=1 where glass_id=#{glassid} and state=2")
  void UpdateCageTask1(@Param("glassid") Integer glassid);
  void UpdateCageTask1(@Param("glassid") String glassid);

  // 手动完成出片任务修改笼子数据
  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid} and state=3")
  void UpdateCageTask2(@Param("glassid") Integer glassid);
  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid} and state=3")
  void UpdateCageTask2(@Param("glassid") String glassid);

  //获取报警信息
  @Select("select id,content,timeon as timeons,endTime from alarmmg where endTime is null")
  List<alarmmg> SelectAlarmmgInfo();

  //获取理片笼内玻璃信息
  @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage  ")
  @Select("select *,concat(round(a.glasswidth*b.Conversionrate,2),' x ',round(a.glassheight*b.Conversionrate,2)) as lengthwidth from storage_cage  as a,glass as b  ")
  List<StorageCage> SelectCageInfo(short cage);

  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where glass_id=#{glassid}")
  void DeleteByGlassID(short glassid);
  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null where glass_id=#{glassid}")
  void DeleteByGlassID(String glassid);

  //查询小车位置
  @Select("select * from car_position")
  List<CarPosition> Loadcarlist();

  //查询操作密码
  @Select("select dianqimima from user where id=1")
  String SelectPassword();

  //根据玻璃id查询理片笼信息
  @Select("select * from storage_cage where glass_id=#{glassid}")
  StorageCage SelectGlassInfo(Integer glassid);
  StorageCage SelectGlassInfo(String glassid);

  //查询玻璃信息
//  @Select("select * from glass where glassid=#{glassid}")
  @Select("SELECT id,glassid,orderid,\n" +
          "       ROUND(width * Conversionrate, 2) AS width,\n" +
          "       ROUND(height * Conversionrate, 2) AS height\n" +
          "FROM glass\n" +
          "where glassid=#{glassid};")
  Glass SelectGlassByGlassID(String glassid);

  //启用/禁用理片笼格子
  @Update("update storage_cage set disabled=#{disabled} where cage=#{cage} and cell=#{cell}")
  void Disabled(short cage, short cell, short disabled);

  //理片笼新增玻璃
  @Update("update storage_cage set state=1,glass_id=#{glass.glassId},order_id=#{glass.orderId},glasswidth=#{glass.width},glassheight=#{glass.height} where cage=#{cage} and cell=#{cell} and tier=#{tier}")
  void Inglassid(Glass glass, short cage, short cell, short tier);

  //查询理片笼中是否有此玻璃
  @Select("select count(*) from storage_cage where glass_id=#{glassId}")
  short SelectStorageByGlassId(String glassId);

  @Select("select * from glass where orderid=#{orderid}")
  List<Glass> SelectGlass(String orderid);
  
}

 springboot-vue3/src/main/java/com/example/springboot/mapper/RolePermissionMapper.java

@@ -2,10 +2,29 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.springboot.entity.RolePermission;
import org.apache.ibatis.annotations.Mapper;


import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;

import java.util.List;
import java.util.Map;

@Mapper
@Repository
public interface RolePermissionMapper extends BaseMapper<RolePermission> {

    @Select("SELECT rp.state,rp.permission_id,rp.role_id, p.* FROM role_permission AS rp JOIN permission AS p ON rp.permission_id = p.id WHERE rp.role_id = #{roleId}")
    List<Map<String, Object>> selectquanxian(@Param("roleId") int roleId);

    @Select("SELECT COUNT(*) FROM role_permission WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
    boolean checkExists(@Param("roleId") int roleId, @Param("permissionId") int permissionId);


    @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
    void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);

    @Insert("INSERT INTO role_permission (role_id, permission_id, state) VALUES (#{roleId}, #{permissionId}, #{state})")
    void insert(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);

}

 springboot-vue3/src/main/resources/application.properties

@@ -23,7 +23,3 @@
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
spring.jackson.time-zone=GMT+8

spring.mvc.cors.enabled=true
spring.mvc.cors.allowed-origins=http://localhost:8080
spring.mvc.cors.allowed-methods=GET,POST
spring.mvc.cors.allowed-headers=*