优化显示主界面

wu

2023-09-20 aaa2f09419a78299a01e80bd66ced6f6c5aa40bf

优化显示主界面

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

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

                    this.tasklist1 = obj.tasklist1[0];

                    this.tasklist2 = obj.tasklist2[0];

                    // console.log(this.cagelist4);

                    console.log(this.cagelist4);

                    this.alarm = obj.alarmmg[0];

                    this.loadglassheight = obj.loadglassheight;

                    this.zhuangtai = obj.zhuangtai[0];


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

@@ -64,6 +64,8 @@
            // paramlists.add(para2);
            // System.out.println(paramlists);

            

            if(paramlist!=null){
            jsonObject.append("params", paramlist);
            }

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

@@ -103,7 +103,7 @@
        homeMapper.UpdateTask(types);
        StorageCage glass=homeMapper.SelectGlassInfo(glassid);
        if (types == 0) {
            spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
            // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
            homeMapper.UpdateCageTask1(glassid);
            S7control.getinstance().WriteWord("DB105.14",(short)0);
        } else {

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

@@ -15,11 +15,11 @@
  List<StorageCage> selectAll();

  // 查询1-5笼内层格子状态
  @Select("SELECT cage,state,glasswidth/2750*2 as glasswidth from storage_cage where cage>5 and tier=2 order by cage desc,cell desc")
  @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笼内层格子状态
  @Select("SELECT cage,state,glasswidth/2750*2 as glasswidth from storage_cage where cage<=5 and tier=2 order by cage desc,cell desc")
  @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笼外层格子状态
@@ -67,7 +67,7 @@
  List<alarmmg> SelectAlarmmgInfo();

  //获取理片笼内玻璃信息
  @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage where cage=#{cage} and state!=0 ")
  @Select("select *,concat(glasswidth,' x ',glassheight) as lengthwidth from storage_cage  ")
  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}")