From dfce0011f8b675debd45adaefb9915c23a673d61 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 27 十月 2023 17:01:24 +0800
Subject: [PATCH] 修改玻璃信息为分页显示，修改手动上面界面
---
CanadaMes-ui/src/views/home/index.vue | 139 +++++++++++++++++++++++++++++++++-
CanadaMes-ui/src/api/home.js | 2
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 3
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 53 ++++++++----
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 5 +
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 3
6 files changed, 177 insertions(+), 28 deletions(-)
diff --git a/CanadaMes-ui/src/api/home.js b/CanadaMes-ui/src/api/home.js
index 5f8aaad..c86ac99 100644
--- a/CanadaMes-ui/src/api/home.js
+++ b/CanadaMes-ui/src/api/home.js
@@ -130,4 +130,4 @@
method: 'post',
data:""
})
-}
+}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index ec6e292..7f82e44 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -194,8 +194,8 @@
</div>
</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(1)">{{ $t('Infeed barcodid') }}</el-button>
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
+ <el-button type="primary" @click="showform3()">{{ $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>
@@ -304,7 +304,6 @@
</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>
@@ -334,6 +333,59 @@
</span>
</template>
</el-dialog>
+
+ <el-dialog :visible.sync="dialogFormVisible5" :title="$t('Please confirm the glass information')">
+ <el-form :model="form" label-width="100px" style="padding-right: 30px">
+ <el-form-item style="text-align: center;">
+ <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input>
+ <el-button type="primary" @click="showform(3)">{{ $t('Query') }}</el-button>
+ </el-form-item>
+ <div style="display: flex;justify-content: space-around;">
+ <label for="">鎵爜浣�</label>
+ <label for="">涓婄墖浣�</label>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form2.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('Barcodid')">
+ <el-input v-model="form3.glassId" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form2.orderId" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('order')">
+ <el-input v-model="form3.orderId" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('length')">
+ <el-input v-model="form2.height" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('length')">
+ <el-input v-model="form3.height" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+ <div style="display: flex;justify-content: space-around;">
+ <el-form-item :label="$t('width')">
+ <el-input v-model="form2.width" readonly autocomplete="off" />
+ </el-form-item>
+ <el-form-item :label="$t('width')">
+ <el-input v-model="form3.width" readonly autocomplete="off" />
+ </el-form-item>
+ </div>
+
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="FeedInglassid()" type="primary">{{ $t('confirm') }}</el-button>
+ <el-button @click="cancel3()">{{ $t('cancel') }}</el-button>
+ </span>
+ </template>
+ </el-dialog>
+
<el-dialog :visible.sync="dialogFormVisible1" :title="$t('Please confirm the Ordering Information')">
<el-form :model="form1" label-width="100px" style="padding-right: 30px">
<el-form-item :label="$t('order')">
@@ -387,13 +439,38 @@
<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 :data="GlassInfo.slice((currentPage - 1) * pagesize, currentPage * pagesize)
+ " :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-table :data="tableDatas.slice((currentPage - 1) * pagesize, currentPage * pagesize)
+ " style="width: 100%">
+ <el-table-column label="Date" prop="date"> </el-table-column>
+ <el-table-column label="Name" prop="name"> </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="scope">
+ <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">Edit</el-button>
+ <el-button size="mini" type="danger"
+ @click="handleDelete(scope.$index, scope.row)">Delete</el-button>
+ </template>
+ </el-table-column>
+ </el-table> -->
+
+ <!-- 琛ㄦ牸鍒嗛〉 -->
+ <!-- pager-count pager-count灞炴�у彲浠ヨ缃渶澶ч〉鐮佹寜閽暟,瓒呭嚭鎶樺彔,榛樿涓�7-->
+ <!-- 娉ㄦ剰锛氳嫢鏁版嵁鏄悗绔帴鍙ｈ繑鍥炵殑鍒欐鏃�:total="pageCount"-->
+ <el-pagination :style="'margin-top:-2px'" @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :pager-count="7" :current-page="currentPage" :page-sizes="[5, 10, 15, 20]" :page-size="pagesize"
+ layout="total, sizes, prev, pager, next, jumper" :total="GlassInfo.length > 0 ? GlassInfo.length : null"
+ background style="float: right; margin-top: 20px">
+ </el-pagination>
+
+
</el-dialog>
</el-container>
</template>
@@ -423,6 +500,7 @@
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false,
+ dialogFormVisible5: false,
form: {
orderId: "",
glassId: "",
@@ -432,6 +510,18 @@
form1: {
order: "NG2210210",
number: 800,
+ },
+ form2: {
+ orderId: "5",
+ glassId: "6",
+ height: "7",
+ width: "8"
+ },
+ form3: {
+ orderId: "1",
+ glassId: "2",
+ height: "3",
+ width: "4"
},
alarm: [],
tableData: [],
@@ -445,6 +535,7 @@
tasklist2: [],
order: "",
glassid: "",
+ glassid1: "",
url: "../../img/bigcar01.png",
car1: 145,
car2: 210,
@@ -458,7 +549,10 @@
text: "",
zhuangtai: "",
orderid: "",
- GlassInfo: []
+ GlassInfo: [],
+ currentPage: 1, //榛樿鍒濆椤�
+ pagesize: 15, //姣忛〉榛樿鏄剧ず鐨勬暟鎹�
+ pageCount: 0
};
},
created() {
@@ -505,6 +599,14 @@
this.alarm = obj.alarmmg[0];
this.loadglassheight = obj.loadglassheight;
this.zhuangtai = obj.zhuangtai[0];
+
+ this.glassid1 = obj.queid[0];
+ if (this.glassid1 != "") {
+ this.showform3();
+ }
+ this.form2 = obj.form2;
+ this.form2 = obj.form3;
+
//if (obj.dbconnected == "false") {
this.text = this.$t('DataBase Connection failed');
// }
@@ -650,6 +752,10 @@
this.dialogFormVisible1 = true;
}
},
+ //鏄剧ず鎵爜浣嶅拰涓婄墖浣�
+ showform3() {
+ this.dialogFormVisible5 = true;
+ },
selectglassinfo() {
SelectGlass(this.orderid).then(res => {
this.GlassInfo = res.data.glass;
@@ -674,6 +780,10 @@
//鍙栨秷鎿嶄綔鏃跺叧闂〉闈�
cancel1() {
this.dialogFormVisible1 = false;
+ this.form1 = {};
+ },
+ cancel3() {
+ this.dialogFormVisible5 = false;
this.form1 = {};
},
//缁撴潫杩�/鍑虹墖浠诲姟
@@ -821,7 +931,22 @@
this.$message.success(this.$t('Operation successful'));
}
});
- }
+ },
+ handleEdit(index, row) {
+ console.log(index, row);
+ },
+ //琛ㄦ牸鍒犻櫎
+ handleDelete(index, row) {
+ console.log(index, row);
+ },
+ //鏀瑰彉姣忛〉瀹圭撼鐨勬暟鎹噺
+ handleSizeChange: function (size) {
+ this.pagesize = size;
+ },
+ //鍒囨崲椤电爜
+ handleCurrentChange: function (currentPage) {
+ this.currentPage = currentPage;
+ },
}
}
</script>
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index 34e8c89..06a6a0f 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -3,18 +3,26 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import org.springframework.web.bind.annotation.PostMapping;
+import com.example.springboot.common.Result;
+import com.example.springboot.entity.Glass;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.JdbcConnections;
public class Plchome extends Thread {
private HomeMapper homeMapper;
+ private SpianMapper spianMapper;
private JdbcConnections dbserve;
+
@Override
public void run() {
while (this != null) {
@@ -27,6 +35,7 @@
// 娉ㄥ叆mapper
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
// 绗煎瓙浣跨敤鎯呭喌
List<StorageCage> tableData = homeMapper.selectAll();
jsonObject.append("tableData", tableData);
@@ -36,7 +45,7 @@
List<StorageCage> cagelist3 = homeMapper.selectRack3();
List<StorageCage> cagelist4 = homeMapper.selectRack4();
jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", (Object)cagelist2);
+ jsonObject.append("cagelist2", (Object) cagelist2);
jsonObject.append("cagelist3", cagelist3);
jsonObject.append("cagelist4", cagelist4);
// 杩涘嚭鐗囦换鍔�
@@ -51,11 +60,19 @@
List<String> addressList = new ArrayList<String>();
addressList.add("DB106.12");
addressList.add("DB106.0");
- List<Short> paramlist= S7control.getinstance().ReadWord(addressList);
+ List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
// 鑾峰彇杩涚墖杞︾姸鎬�
List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 鑾峰彇杩涚墖杞︾姸鎬�
boolean exist1 = datas1ListState.contains((short) 0);
- jsonObject.append("zhuangtai",exist1);
+ jsonObject.append("zhuangtai", exist1);
+ // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
+ String queid = spianMapper.Selectqueueid();
+ jsonObject.append("queid", queid);
+ // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
+ List<Glass> form2 = homeMapper.GetQueueInfo(1);
+ List<Glass> form3 = homeMapper.GetQueueInfo(2);
+ jsonObject.append("form2", form2);
+ jsonObject.append("form3", form3);
// List<Short> paramlists = new ArrayList<Short>();
// short para1 = 11111;
// short para2 = 32000;
@@ -63,26 +80,24 @@
// paramlists.add(para2);
// System.out.println(paramlists);
-
-
- if(paramlist!=null){
- jsonObject.append("params", paramlist);
+ if (paramlist != null) {
+ jsonObject.append("params", paramlist);
}
- List<Short> inglassInfo= S7control.getinstance().ReadWord("DB106.24",1);
- if(inglassInfo!=null){
- if(inglassInfo.size()>0)
- jsonObject.append("loadglassheight", inglassInfo.get(0)*70);
+ List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
+ if (inglassInfo != null) {
+ if (inglassInfo.size() > 0)
+ jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
}
- dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- boolean dbconnected=false;
- try {
+ dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
+ boolean dbconnected = false;
+ try {
dbserve.getConn();
- dbconnected=true;
- } catch (Exception e) {
+ dbconnected = true;
+ } catch (Exception e) {
// TODO: handle exception
- dbconnected=false;
- }
- jsonObject.append("dbconnected", dbconnected);
+ dbconnected = false;
+ }
+ jsonObject.append("dbconnected", dbconnected);
// jsonObject.append("params", new short[] { 30, 40, });
WebSocketServer sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 09563f5..8ce263e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -216,4 +216,7 @@
map.put("glass", glass);
return Result.success(map);
}
+
+
+
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index ddec941..2d5febd 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -107,7 +107,10 @@
@Select("select count(*) from storage_cage where glass_id=#{glassId}")
short SelectStorageByGlassId(String glassId);
- @Select("select * from glass where orderid=#{orderid}")
+ @Select("select * from glass where position(#{orderid} in orderid)")
List<Glass> SelectGlass(String orderid);
+
+ @Select("select * from queue qe inner join glass gl on qe.glassid=gl.glassid where id=#{id}")
+ List<Glass> GetQueueInfo(int id);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 05b5daf..144eb1d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -103,5 +103,8 @@
//鏍规嵁绗煎瓙鏍煎瓙灞傛暟鑾峰彇鐜荤拑id
@Select("SELECT COUNT(*) FROM `storage_cage` where state=3;")
Integer Selectoutstate();
+ //鑾峰彇杩涚墖闃熷垪id
+ @Select("select glassid from queue where type=1 and state=0;")
+ String Selectqueueid();
}
\ No newline at end of file
--
Gitblit v1.8.0