修改数据库连接，主界面显示

ZengTao

2024-03-07 a836d3f2c7bfd818060a39b0432f0200301ce1a5

修改数据库连接，主界面显示

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

@@ -1,4 +1,10 @@
{
  "Import order":"Importorder",
  "Measure":"Measure",
  "StorageCage":"StorageCage",
  "Task queue":"Task queue",
  "Height":"Height",
  "Thickness":"Thickness",
  "Clear":"Clear",
  "ip":"localhost",
  "systemTitle": "Login System",

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

@@ -1,8 +1,12 @@
{
  "Importorder":"导入订单",
  "Import order":"导入订单",
  "Measure":"测量",
  "StorageCage":"理片笼",
  "Taskqueue":"任务队列",
  "Task queue":"任务队列",
  "Height":"高",
  "Thickness":"厚度",


  "Clear":"清除",
  "ip":"localhost",
  "systemTitle": "登录系统",

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

@@ -319,150 +319,52 @@
                </div>
            </div>
        </el-main>
        <el-dialog :visible.sync="Importorder" :title="$t('Importorder')"
        <el-dialog :visible.sync="Importorder" :title="$t('Import order')"
            top="5vh">
        </el-dialog>

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

        <el-dialog :visible.sync="StorageCage" :title="$t('StorageCage')"
            top="5vh">
            <el-table :data="this.StorageCageInfo" :height="700" border style="width: 100%;overflow: auto;">
                <el-table-column :min-width="50" prop="cage" :label="$t('Cage No')"></el-table-column>
                <el-table-column :min-width="50" prop="cell" :label="$t('Slot No')"></el-table-column>
                <el-table-column :min-width="145" prop="glassId" :label="$t('Barcode')"></el-table-column>
                <el-table-column :min-width="80" prop="width" :label="$t('Width')"></el-table-column>
                <el-table-column :min-width="80" prop="height" :label="$t('Height')"></el-table-column>
                <el-table-column :min-width="80" prop="thickness" :label="$t('Thickness')"></el-table-column>
                <el-table-column :min-width="250" :label="$t('Operate')">
                    <template slot-scope='scope'>
                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
                            :disabled="scope.row.state == 1 ? false : true"
                            @click="deleteglass(scope.row.glassId, scope.row.state)">{{ $t('Delete') }}</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('Disable') : $t('Enable') }}</el-button>
                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;"
                            :disabled="scope.row.glassId != null ? true : false"
                            @click="insertglass(scope.row.cage, scope.row.cell, scope.row.tier)">{{ $t('Add')
                            }}</el-button>
                    </template>
                </el-table-column>
            </el-table>
        </el-dialog>
        <el-dialog :visible.sync="Taskqueue" :title="$t('Taskqueue')"
        
        <el-dialog :visible.sync="Taskqueue" :title="$t('Task queue')"
            top="5vh">
        </el-dialog>
        <!-- <el-footer>
            <div class="blocks" style="position: relative;">
                <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:237px;">
                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist1" :key="item['date']"
                        :style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"
                        @click="showcageinfo(item['cage'])"></div>
                </div>
                <div style="display:flex;position: absolute;float:left;z-index: 999;top:102px;left:640px;">
                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist2" :key="item['date']"
                        :style="{ height: 35 * item['glassWidth'] + 'px', left: 3.07 * index + Math.abs(item['cage'] - 5) * 6.8 + 'px' }"
                        @click="showcageinfo(item['cage'])"></div>
                </div>
                <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:237px;">
                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist3" :key="item['date']"
                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px', left: 3.07 * index + Math.abs(item['cage'] - 10) * 6.8 + 'px' }"
                        @click="showcageinfo(item['cage'])">
                    </div>
                </div>
                <div style="display:flex;position: absolute;float:left;z-index: 999;top:139px;left:640px;">
                    <div :class="getStatusClass(item.state)" v-for="(item, index) in cagelist4" :key="item['date']"
                        :style="{ height: 35 * item['glassWidth'] + 'px', top: item['width'] * 35 - 35 + 'px', left: 3.07 * index + Math.abs(item['cage'] - 5) * 6.8 + 'px' }"
                        @click="showcageinfo(item['cage'])"></div>
                </div>
                <div class="blue gezi"
                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 28 + 'px', left: 1050 + 'px', height: loadglassheight1 + 'px', width: 4 + 'px' }">
                </div>
                <div class="blue gezi"
                    :style="{ display: 'flex', position: 'absolute', float: 'left', top: 105 + 'px', left: 1050 + 'px', height: loadglassheight2 + 'px', width: 4 + 'px' }">
                </div>

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

                <div class="device" :style="'top: 25px;left: 1027px;background-color: ' + ShowDeviceList(0) + ';'">D01</div>
                <div class="device" :style="'top: 105px;left: 1027px;background-color: ' + ShowDeviceList(1) + ';'">D02
                </div>
                <div class="device" :style="'top: 102px;left: 605px;background-color: ' + ShowDeviceList(2) + ';'">B01</div>
                <div class="device" :style="'top: 102px;left: 197px;background-color: ' + ShowDeviceList(3) + ';'">B02</div>
                <div class="blocks-img" :style="'left:' + car2 + 'px;top:175px;background-color:' + ShowDeviceList(4) + ''">
                    A01</div>
                <div class="blocks-img" :style="'left:' + car1 + 'px;top:16px;background-color:' + ShowDeviceList(5) + ''">
                    A02</div>
                <div class="device" :style="'top: 108px;left: 150px;background-color: ' + ShowDeviceList(6) + ';'">D03</div>
                <div class="device" :style="'top: 185px;left: 150px;background-color: ' + ShowDeviceList(7) + ';'">D04</div>
                <div class="device" :style="'top: 262px;left: 150px;background-color: ' + ShowDeviceList(8) + ';'">D05</div>
                <div class="device" :style="'top: 339px;left: 150px;background-color: ' + ShowDeviceList(9) + ';'">D06</div>

                <div class="device" :style="'top: 395px;left: 90px;background-color: ;'">E01</div>
                <div class="device" :style="'top: 395px;left: 243px;background-color: ;'">E02</div>
                <div class="device" :style="'top: 395px;left: 395px;background-color: ;'">E03</div>
                <div class="device" :style="'top: 345px;left: 655px;background-color: ;'">E04</div>
                <div class="device" :style="'top: 345px;left: 810px;background-color: ;'">E05</div>
                <div class="device" :style="'top: 345px;left: 960px;background-color: ;'">E06</div>

                <div class="device" :style="'top: 345px;left: 525px;background-color: ;'">J01</div>
                <div class="device" :style="'top: 345px;left: 1100px;background-color: ;'">F01</div>
                <div class="device" :style="'top: 275px;left: 1100px;background-color: ;'">G01</div>

                <div class="glass D01" style="top: 39px;left: 1055px;position: absolute;">{{ ShowGlassIdList(0) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 0)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D02" style="top: 117px;left: 1055px;position: absolute;">{{ ShowGlassIdList(1) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.2', 1)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass B01" style="top: 270px;left: 640px;position: absolute;">
                    B01:{{ ShowGlassIdList(2) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.2', 2)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass B02" style="top: 315px;left: 640px;position: absolute;">B02:{{ ShowGlassIdList(3) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.3', 3)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass A01" style="top: 270px;left: 289px;position: absolute;">
                    A01.1:{{ ShowGlassIdList(4) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 4)">
                        {{ $t('Clear') }}</el-button>
                </div>

                <div class="glass A01" style="top: 315px;left: 289px;position: absolute;">A01.2:{{ ShowGlassIdList(5) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.0', 5)">
                        {{ $t('Clear') }}</el-button>
                </div>

                <div class="glass A02" style="top: 360px;left: 289px;position: absolute;">A02:{{ ShowGlassIdList(6) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.10.1', 6)">
                        {{ $t('Clear') }}</el-button>
                </div>

                <div class="glass D03" style="top: 122px;left: 42px;position: absolute;">
                    {{ ShowGlassIdList(7) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.4', 7)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D04" style="top: 198px;left: 42px;position: absolute;">
                    {{ ShowGlassIdList(8) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 8)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D05" style="top: 275px;left: 42px;position: absolute;">
                    {{ ShowGlassIdList(9) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.6', 9)">
                        {{ $t('Clear') }}</el-button>
                </div>
                <div class="glass D06" style="top: 352px;left: 42px;position: absolute;">
                    {{ ShowGlassIdList(10) }}
                    <br />
                    <el-button type="primary" size="mini" @click="ClearGlassId('DB101.9.5', 10)">
                        {{ $t('Clear') }}</el-button>
                </div>
            </div>
        </el-footer> -->
        
    </el-container>
</template>
<script>

import {
    home, home2,  UpdateTask, SelectCageInfo, DeleteByGlassID, 
    SelectPassword,  Disabled,  AddOutSliceS,  SelectPermissionByUserName, currentUsername, CompleteQueue,
    isAllowReorderings,  WriteGlassID, ClearGlassId, CloseForm7,  SoftEmergencyStop, SwitchScanMethod
    SelectPassword,  Disabled,  SelectPermissionByUserName, currentUsername, CompleteQueue,
    isAllowReorderings
} from "../../api/home";


@@ -486,12 +388,8 @@
            Measure:false,
            StorageCage:false,
            Taskqueue:false,
            form: {
                orderId: "",
                glassId: "",
                height: "",
                width: ""
            },
            StorageCageInfo:[],
            TaskqueueInfo:[],
            form1: {},
            form2: {},
            form3: {},
@@ -640,6 +538,10 @@
                            this.cageinfo = res.data.cageinfo;
                        });
                    }
                    if(obj.StorageCageInfo!=null){
                        this.StorageCageInfo=obj.StorageCageInfo[0];
                        console.log(this.StorageCageInfo);
                    }
                    this.$forceUpdate();

                }.bind(this);

 springboot-vue3/src/main/java/MyGenerator.java

@@ -18,7 +18,7 @@
public class MyGenerator {

    /** 数据源配置*/
    private static final String jdbc = "jdbc:mysql://localhost:3306/canadames?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    private static final String jdbc = "jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
    private static final String driverName = "com.mysql.cj.jdbc.Driver";

    private static final String username = "root";

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

@@ -83,11 +83,7 @@
                List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
                jsonObject.append("alarmmg", alarmmg);

                // 伍 获取进是否有待确认的玻璃id
                String queid = spianMapper.Selectqueueid();
                int state = spianMapper.Selectqueuestate();
                jsonObject.append("queid", queid);
                jsonObject.append("state", state);
                
                // 获取扫码位与上片位玻璃信息
                Queue form2 = homeMapper.GetQueueInfo(2);
                Queue form3 = homeMapper.GetQueueInfo(1);
@@ -114,9 +110,11 @@

                // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
                // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));

                

                //查询理片笼信息
                List<StorageCage> StorageCageInfo = storageCageService.SelectStorageCageInfo();
                jsonObject.append("StorageCageInfo", StorageCageInfo);
                
            } catch (InterruptedException e) {
                e.printStackTrace();
            }

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

@@ -1,5 +1,6 @@
package com.example.springboot.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;


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

@@ -1,182 +1,88 @@
package com.example.springboot.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

import lombok.Data;

//理片笼表
/**
 * 存储笼子表
 */
@Data
@TableName("storage_cage")
public class StorageCage {
    private Integer id; //自序id
    private Integer prcId;//plcid
    private String glassId;//玻璃id
    private Integer cage;//笼子号
    private Integer cell;//格子号
    private Double width;//格子宽
    private Double glasswidth;//玻璃宽
    private Double glassheight;//玻璃高
    private Double glasswidthmm;//英寸玻璃宽
    private Double glassheightmm;//英寸玻璃高
    private String state;//状态
    private Integer tier;//内外片
    private String orderId;//订单id
    private Integer disabled;//停用
    private String listId;//集合id
    private String boxId;//箱子id
    private String FrameBarcode;//铝框id;

    private north_glass_buffer1 north_glass_buffer1s;
    /**
     * 主键，自动生成
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    public void setnorth_glass_buffer1s(north_glass_buffer1 north_glass_buffer1s) {
        this.north_glass_buffer1s = north_glass_buffer1s;
    }
    /**
     * 玻璃id
     */
    private String glassId;
    /**
     * 流程卡
     */
    private String flowcard;
    /**
     * 笼子id
     */
    private Integer cage;
    /**
     * 格子id
     */
    private Integer cell;
    /**
     * 格子层id
     */
    private Integer tier;
    /**
     * 格子宽
     */
    private Double width;
    /**
     * 玻璃宽
     */
    private Double glassWidth;
    /**
     * 玻璃高
     */
    private Double glassHeight;
    /**
     * 测量宽
     */
    private Double glassWidthMm;
    /**
     * 测量高
     */
    private Double glassHeightMm;
    /**
     * 编号
     */
    private String listId;
    /**
     * 箱子号
     */
    private String boxId;
    /**
     * 状态（0：无玻璃，1：有玻璃，2：进片中，3：出片中，4：调度中）
     */
    private Integer state;
    /**
     * 格子状态（0：启用，1：禁用）
     */
    private Integer disabled;
    /**
     * 玻璃类型
     */
    private String glasstype;
    /**
     * 玻璃数量
     */
    private Integer number;

    public north_glass_buffer1 getnorth_glass_buffer1s() {
        return north_glass_buffer1s;
    }

    private Out_slice outSlice;

    public void setout_slice(Out_slice outSlice) {
        this.outSlice = outSlice;
    }

    public Out_slice getout_slice() {
        return outSlice;
    }

    public Integer id() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getId() {
        return id;
    }

    public Integer getPrcId() {
        return prcId;
    }

    public void setPrcId(Integer prcId) {
        this.prcId = prcId;
    }

    public String getGlassId() {
        return glassId;
    }

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

    public String getOrderId() {
        return orderId;
    }

    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }

    public Integer getCage() {
        return cage;
    }

    public void setGage(Integer cage) {
        this.cage = cage;
    }

    public void setCell(Integer cell) {
        this.cell = cell;
    }

    public Integer getCell() {
        return cell;
    }

    public Double getWidth() {
        return width;
    }

    public void setWidth(Double width) {
        this.width = width;
    }

    public String getState() {
        return state;
    }

    public void setState(String state) {
        this.state = state;
    }

    public Integer getTier() {
        return tier;
    }

    public void setTier(Integer tier) {
        this.tier = tier;
    }

    public Double getGlassWidth() {
        return glasswidth;
    }

    public void setGlassWidth(Double glasswidth) {
        this.glasswidth = glasswidth;
    }

    public Double getGlassHeight() {
        return glassheight;
    }

    public void setGlassHeight(Double glassheight) {
        this.glassheight = glassheight;
    }

    public Double getGlassWidthMm() {
        return glasswidthmm;
    }

    public void setGlassWidthMm(Double glasswidthmm) {
        this.glasswidthmm = glasswidthmm;
    }

    public Double getGlassHeightMm() {
        return glassheightmm;
    }

    public void setGlassHeightMm(Double glassheightmm) {
        this.glassheightmm = glassheightmm;
    }

    public Integer getDisabled() {
        return disabled;
    }

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

    public String getListId() {
        return listId;
    }

    public void setListno(String listId) {
        this.listId = listId;
    }

    public String getBoxId() {
        return boxId;
    }

    public void setBoxno(String boxId) {
        this.boxId = boxId;
    }
    
    public String getFrameBarcode() {
        return FrameBarcode;
    }

    public void setFrameBarcode(String FrameBarcode) {
        this.FrameBarcode = FrameBarcode;
    }

}
}

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

@@ -226,6 +226,11 @@
  //获取铝框有没有正在出片的玻璃
  @Select("select count(*) from out_slice where barcode=#{frameNo} and state=1")
  Short SelectOutingQueueCount(String frameNo);


  //查询理片笼内信息
  @Select("select * from storage_cage")
  List<StorageCage> SelectStorageCageInfo();
  

}

 springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java

@@ -202,4 +202,8 @@
        return Result.success(map);
    }

    public List<StorageCage> SelectStorageCageInfo() {
        return homeMapper.SelectStorageCageInfo();
    }

}

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

@@ -6,7 +6,7 @@
#\u6570\u636E\u5E93\u9A71\u52A8
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#\u6570\u636E\u5E93\u8FDE\u63A5\u5730\u5740
spring.datasource.url=jdbc:mysql://localhost:3306/canadames?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
spring.datasource.url=jdbc:mysql://10.153.19.150:3306/albania?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
#\u6570\u636E\u5E93\u7528\u6237\u540D
spring.datasource.username=root
#\u6570\u636E\u5E93\u7528\u6237\u5BC6\u7801